summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2012-07-26 18:56:19 -0700
committerJohn MacFarlane <fiddlosopher@gmail.com>2012-07-26 18:56:19 -0700
commit631e5c16fc00ed5f08b4c1152c02f69c4f8411e1 (patch)
tree5d13d30365e936821e5b83ab782b6d0608367f2b
parentf4c7ad6caf3abb52683456c93b58902931234b55 (diff)
pandoc: Set readerExtensions instead of readerStrict.
-rw-r--r--src/Text/Pandoc/Options.hs5
-rw-r--r--src/pandoc.hs6
2 files changed, 8 insertions, 3 deletions
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'