git.iko.soy/typeable/pandoc
on master help sign in
Add Text2Tags to Text.Pandoc
3f7b3f5Jesse Rosenthal
src/Text/Pandoc.hs+2−4
compare with master
unifiedsplit
@@ -86,7 +86,6 @@ module Text.Pandoc
86 , readJSON
86 , readJSON
87 , readTWiki
87 , readTWiki
88 , readTxt2Tags
88 , readTxt2Tags
89− , readTxt2TagsNoMacros
90 , readEPUB
89 , readEPUB
91 -- * Writers: converting /from/ Pandoc format
90 -- * Writers: converting /from/ Pandoc format
92 , Writer(..)
91 , Writer(..)
@@ -179,8 +178,7 @@ import Text.Pandoc.Writers.Custom
179import Text.Pandoc.Writers.TEI
178import Text.Pandoc.Writers.TEI
180import Text.Pandoc.Templates
179import Text.Pandoc.Templates
181import Text.Pandoc.Options
180import Text.Pandoc.Options
182−import Text.Pandoc.Shared (safeRead, warn, mapLeft, pandocVersion)
181+import Text.Pandoc.Shared (safeRead, mapLeft, pandocVersion)
183−import Text.Pandoc.MediaBag (MediaBag)
184import Text.Pandoc.Error
182import Text.Pandoc.Error
185import Text.Pandoc.Class (PandocMonad, runIOorExplode, PandocExecutionError(..))
183import Text.Pandoc.Class (PandocMonad, runIOorExplode, PandocExecutionError(..))
186import Data.Aeson
184import Data.Aeson
@@ -266,7 +264,7 @@ readers = [ ("native" , StringReader $ \_ s -> readNative s)
266 ,("twiki" , StringReader readTWiki)
264 ,("twiki" , StringReader readTWiki)
267 ,("docx" , ByteStringReader readDocx)
265 ,("docx" , ByteStringReader readDocx)
268 ,("odt" , ByteStringReader readOdt)
266 ,("odt" , ByteStringReader readOdt)
269− -- ,("t2t" , mkStringReader readTxt2TagsNoMacros)
267+ ,("t2t" , StringReader readTxt2Tags)
270 ,("epub" , ByteStringReader readEPUB)
268 ,("epub" , ByteStringReader readEPUB)
271 ]
269 ]
272
270
src/Text/Pandoc/Readers/Txt2Tags.hs+3−3
@@ -29,7 +29,7 @@ Conversion of txt2tags formatted plain text to 'Pandoc' document.
29module Text.Pandoc.Readers.Txt2Tags ( readTxt2Tags
29module Text.Pandoc.Readers.Txt2Tags ( readTxt2Tags
30 , getT2TMeta
30 , getT2TMeta
31 , T2TMeta (..)
31 , T2TMeta (..)
32− , readTxt2TagsNoMacros)
32+ )
33 where
33 where
34
34
35import qualified Text.Pandoc.Builder as B
35import qualified Text.Pandoc.Builder as B
@@ -102,8 +102,8 @@ readTxt2Tags opts s = do
102
102
103-- | Read Txt2Tags (ignoring all macros) from an input string returning
103-- | Read Txt2Tags (ignoring all macros) from an input string returning
104-- a Pandoc document
104-- a Pandoc document
105−readTxt2TagsNoMacros :: PandocMonad m => ReaderOptions -> String -> m Pandoc
105+-- readTxt2TagsNoMacros :: PandocMonad m => ReaderOptions -> String -> m Pandoc
106−readTxt2TagsNoMacros = readTxt2Tags
106+-- readTxt2TagsNoMacros = readTxt2Tags
107
107
108parseT2T :: T2T Pandoc
108parseT2T :: T2T Pandoc
109parseT2T = do
109parseT2T = do