From 631e5c16fc00ed5f08b4c1152c02f69c4f8411e1 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 26 Jul 2012 18:56:19 -0700 Subject: pandoc: Set readerExtensions instead of readerStrict. --- src/Text/Pandoc/Options.hs | 5 +++-- src/pandoc.hs | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/Text/Pandoc/Options.hs b/src/Text/Pandoc/Options.hs index 88fdbfb00..6784219c9 100644 --- a/src/Text/Pandoc/Options.hs +++ b/src/Text/Pandoc/Options.hs @@ -38,10 +38,11 @@ import Data.Default -- | Individually selectable syntax extensions. data Extension = Footnotes - | TeX_math + | Tex_math | Delimited_code_blocks - | Markdown_in_HTML_blocks + | Markdown_in_html_blocks | Fancy_lists + | Startnum | Definition_lists | Header_identifiers | All_symbols_escapable diff --git a/src/pandoc.hs b/src/pandoc.hs index d889913d2..196e1a146 100644 --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -58,6 +58,7 @@ import Network.HTTP (simpleHTTP, mkRequest, getResponseBody, RequestMethod(..)) import Network.URI (parseURI, isURI, URI(..)) import qualified Data.ByteString.Lazy as B import Data.ByteString.Lazy.UTF8 (toString) +import qualified Data.Set as Set import Text.CSL.Reference (Reference(..)) #if MIN_VERSION_base(4,4,0) #else @@ -936,7 +937,10 @@ main = do then "." else takeDirectory (head sources) - let readerOpts = def{ readerStrict = strict + let readerOpts = def{ readerExtensions = + if strict + then Set.empty + else Set.fromList [minBound..maxBound] , readerSmart = smart || (texLigatures && (laTeXOutput || writerName' == "context")) , readerStandalone = standalone' -- cgit v1.2.3