diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2012-08-09 18:35:41 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2012-08-09 18:38:02 -0700 |
| commit | 41e00757898c48b96edf297320edb1c1d2341a92 (patch) | |
| tree | e8412ca87e783f6e16c3e3b2e5fee39260d7cbd4 /src | |
| parent | a740de05086960eb6d926f68acd43fedb4599f6c (diff) | |
| download | pandoc-41e00757898c48b96edf297320edb1c1d2341a92.tar.gz | |
Removed --enable, --disable options.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pandoc.hs | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/src/pandoc.hs b/src/pandoc.hs index 094be39eb..13e3e2021 100644 --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -134,7 +134,6 @@ data Opt = Opt , optDumpArgs :: Bool -- ^ Output command-line arguments , optIgnoreArgs :: Bool -- ^ Ignore command-line arguments , optStrict :: Bool -- ^ Use strict markdown syntax - , optExtensions :: [(Bool, Extension)]-- ^ Extensions to enable/disable , optReferenceLinks :: Bool -- ^ Use reference links in writing markdown, rst , optWrapText :: Bool -- ^ Wrap text , optColumns :: Int -- ^ Line length in characters @@ -188,7 +187,6 @@ defaultOpts = Opt , optDumpArgs = False , optIgnoreArgs = False , optStrict = False - , optExtensions = [] , optReferenceLinks = False , optWrapText = True , optColumns = 72 @@ -242,24 +240,6 @@ options = (\opt -> return opt { optStrict = True } )) "" -- "Disable markdown syntax extensions" - , Option "e" ["enable"] - (ReqArg - (\arg opt -> do - ext <- readExtension arg - return opt { optExtensions = - (True,ext) : optExtensions opt } ) - "EXTENSION") - "" -- "Enable specific markdown syntax extensions" - - , Option "d" ["disable"] - (ReqArg - (\arg opt -> do - ext <- readExtension arg - return opt { optExtensions = - (False,ext) : optExtensions opt } ) - "EXTENSION") - "" -- "Disable specific markdown syntax extensions" - , Option "R" ["parse-raw"] (NoArg (\opt -> return opt { optParseRaw = True })) @@ -840,7 +820,6 @@ main = do , optDumpArgs = dumpArgs , optIgnoreArgs = ignoreArgs , optStrict = strict - , optExtensions = exts , optReferenceLinks = referenceLinks , optWrapText = wrap , optColumns = columns @@ -967,12 +946,7 @@ main = do then strictExtensions else pandocExtensions - let extensions = foldl (\acc (inc,ext) -> if inc - then Set.insert ext acc - else Set.delete ext acc) - defaultExts exts - - let readerOpts = def{ readerExtensions = extensions + let readerOpts = def{ readerExtensions = defaultExts , readerSmart = smart || (texLigatures && (laTeXOutput || writerName' == "context")) , readerStandalone = standalone' @@ -998,7 +972,7 @@ main = do writerIgnoreNotes = False, writerNumberSections = numberSections, writerSectionDivs = sectionDivs, - writerExtensions = extensions, + writerExtensions = defaultExts, writerReferenceLinks = referenceLinks, writerWrapText = wrap, writerColumns = columns, |