ab3589f · typeable/pandoc

git.iko.soy/typeable/pandoc

Txt2Tags Reader: Integrated into pandoc

commitab3589ff0bc2c66c711e7a92021edd79bf52046a authorMatthew Pickering <matthewtpickering@gmail.com> dateSun 13 Jul 2014, 23:38 (12 years ago) parent7d04d38

2 files changed+6−1

compare with master

unifiedsplit

pandoc.hs+2−1 src/Text/Pandoc.hs+4

pandoc.hs+2−1

@@ -876,6 +876,7 @@ defaultReaderName fallback (x:xs) =

876876 ".native" -> "native"

877877 ".json" -> "json"

878878 ".docx" -> "docx"

879+ ".t2t" -> "t2t"

879880 _ -> defaultReaderName fallback xs

880881

881882-- Returns True if extension of first source is .lhs

@@ -1181,7 +1182,7 @@ main = do

11811182 let readFiles [] = error "Cannot read archive from stdin"

11821183 readFiles (x:_) = B.readFile x

11831184

1184− let convertTabs = tabFilter (if preserveTabs then 0 else tabStop)

1185+ let convertTabs = tabFilter (if (preserveTabs || readerName' == "t2t") then 0 else tabStop)

11851186

11861187 let handleIncludes' = if readerName' == "latex" || readerName' == "latex+lhs"

11871188 then handleIncludes

src/Text/Pandoc.hs+4

@@ -76,6 +76,8 @@ module Text.Pandoc

7676 , readHaddock

7777 , readNative

7878 , readJSON

79+ , readTxt2Tags

80+ , readTxt2TagsNoMacros

7981 -- * Writers: converting /from/ Pandoc format

8082 , Writer (..)

8183 , writeNative

@@ -130,6 +132,7 @@ import Text.Pandoc.Readers.Textile

130132import Text.Pandoc.Readers.Native

131133import Text.Pandoc.Readers.Haddock

132134import Text.Pandoc.Readers.Docx

135+import Text.Pandoc.Readers.Txt2Tags

133136import Text.Pandoc.Writers.Native

134137import Text.Pandoc.Writers.Markdown

135138import Text.Pandoc.Writers.RST

@@ -227,6 +230,7 @@ readers = [ ("native" , StringReader $ \_ s -> return $ readNative s)

227230 ,("latex" , mkStringReader readLaTeX)

228231 ,("haddock" , mkStringReader readHaddock)

229232 ,("docx" , mkBSReader readDocx)

233+ ,("t2t" , mkStringReader readTxt2Tags)

230234 ]

231235

232236data Writer = PureStringWriter (WriterOptions -> Pandoc -> String)