diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2011-01-12 08:13:11 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2011-01-12 08:13:11 -0800 |
| commit | 5da2d1e66ca0dec86b31407f6e6e9d129e5b23b5 (patch) | |
| tree | e1cfe10b843a78af8dbdd95d2f7572b40e715b30 /src/Text/Pandoc.hs | |
| parent | ff74c51b532f05303343b4c9de3a8c392298c014 (diff) | |
| parent | 91510a109f9284934fd5b6386fa23a5fc37b09bb (diff) | |
| download | pandoc-5da2d1e66ca0dec86b31407f6e6e9d129e5b23b5.tar.gz | |
Merge branch 'master' into tests
Diffstat (limited to 'src/Text/Pandoc.hs')
| -rw-r--r-- | src/Text/Pandoc.hs | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs index c752ffede..3532c1d4b 100644 --- a/src/Text/Pandoc.hs +++ b/src/Text/Pandoc.hs @@ -146,13 +146,15 @@ readers :: [(String, ParserState -> String -> Pandoc)] readers = [("native" , \_ -> read) ,("json" , \_ -> decodeJSON) ,("markdown" , readMarkdown) - ,("markdown+lhs" , readMarkdown) + ,("markdown+lhs" , \st -> + readMarkdown st{ stateLiterateHaskell = True}) ,("rst" , readRST) ,("textile" , readTextile) -- TODO : textile+lhs ,("rst+lhs" , readRST) ,("html" , readHtml) ,("latex" , readLaTeX) - ,("latex+lhs" , readLaTeX) + ,("latex+lhs" , \st -> + readLaTeX st{ stateLiterateHaskell = True}) ] -- | Association list of formats and writers (omitting the @@ -161,21 +163,25 @@ writers :: [ ( String, WriterOptions -> Pandoc -> String ) ] writers = [("native" , writeNative) ,("json" , \_ -> encodeJSON) ,("html" , writeHtmlString) - ,("html+lhs" , writeHtmlString) + ,("html+lhs" , \o -> + writeHtmlString o{ writerLiterateHaskell = True }) ,("s5" , writeHtmlString) ,("slidy" , writeHtmlString) ,("docbook" , writeDocbook) ,("opendocument" , writeOpenDocument) ,("latex" , writeLaTeX) - ,("latex+lhs" , writeLaTeX) + ,("latex+lhs" , \o -> + writeLaTeX o{ writerLiterateHaskell = True }) ,("context" , writeConTeXt) ,("texinfo" , writeTexinfo) ,("man" , writeMan) ,("markdown" , writeMarkdown) - ,("markdown+lhs" , writeMarkdown) + ,("markdown+lhs" , \o -> + writeMarkdown o{ writerLiterateHaskell = True }) ,("plain" , writePlain) ,("rst" , writeRST) - ,("rst+lhs" , writeRST) + ,("rst+lhs" , \o -> + writeRST o{ writerLiterateHaskell = True }) ,("mediawiki" , writeMediaWiki) ,("textile" , writeTextile) ,("rtf" , writeRTF) |