diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2012-08-09 22:30:44 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2012-08-09 22:32:22 -0700 |
| commit | 8d65651309ba99b0cd8f725f91fdada62f5eb955 (patch) | |
| tree | e7adfe3986883e16aac416a8eb896c261fee702e /src | |
| parent | 05216d29198618d7490cc5008ff263dfa60475c0 (diff) | |
| download | pandoc-8d65651309ba99b0cd8f725f91fdada62f5eb955.tar.gz | |
Changed strict to markdown_strict.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Text/Pandoc.hs | 6 | ||||
| -rw-r--r-- | src/Text/Pandoc/Templates.hs | 5 | ||||
| -rw-r--r-- | src/pandoc.hs | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs index b43eaede2..33706816e 100644 --- a/src/Text/Pandoc.hs +++ b/src/Text/Pandoc.hs @@ -176,7 +176,7 @@ parseFormatSpec = parse formatSpec "" readers :: [(String, ReaderOptions -> String -> Pandoc)] readers = [("native" , \_ -> readNative) ,("json" , \_ -> decodeJSON) - ,("strict" , readMarkdown) + ,("markdown_strict" , readMarkdown) ,("markdown" , readMarkdown) ,("rst" , readRST) ,("docbook" , readDocBook) @@ -220,7 +220,7 @@ writers = [ ,("texinfo" , PureStringWriter writeTexinfo) ,("man" , PureStringWriter writeMan) ,("markdown" , PureStringWriter writeMarkdown) - ,("strict" , PureStringWriter writeMarkdown) + ,("markdown_strict" , PureStringWriter writeMarkdown) ,("plain" , PureStringWriter writePlain) ,("rst" , PureStringWriter writeRST) ,("mediawiki" , PureStringWriter writeMediaWiki) @@ -231,7 +231,7 @@ writers = [ ] getDefaultExtensions :: String -> Set Extension -getDefaultExtensions "strict" = strictExtensions +getDefaultExtensions "markdown_strict" = strictExtensions getDefaultExtensions _ = pandocExtensions -- | Retrieve reader based on formatSpec (format+extensions). diff --git a/src/Text/Pandoc/Templates.hs b/src/Text/Pandoc/Templates.hs index 899f6510a..4f5ad54bd 100644 --- a/src/Text/Pandoc/Templates.hs +++ b/src/Text/Pandoc/Templates.hs @@ -92,8 +92,11 @@ getDefaultTemplate user writer = do "native" -> return $ Right "" "json" -> return $ Right "" "docx" -> return $ Right "" - "odt" -> getDefaultTemplate user "opendocument" "epub" -> return $ Right "" + "odt" -> getDefaultTemplate user "opendocument" + "markdown_strict" -> getDefaultTemplate user "markdown" + "multimarkdown" -> getDefaultTemplate user "markdown" + "markdown_github" -> getDefaultTemplate user "markdown" _ -> let fname = "templates" </> "default" <.> format in E.try $ readDataFile user fname diff --git a/src/pandoc.hs b/src/pandoc.hs index 12d7d74a2..63a0df51a 100644 --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -236,7 +236,7 @@ options = (NoArg (\opt -> do err 59 $ "The --strict option has been removed.\n" ++ - "Use `strict' input or output format instead." + "Use `markdown_strict' input or output format instead." return opt )) "" -- "Disable markdown syntax extensions" @@ -782,7 +782,7 @@ main = do ["Try " ++ prg ++ " --help for more information."] let defaultOpts' = if compatMode - then defaultOpts { optReader = "strict" + then defaultOpts { optReader = "markdown_strict" , optWriter = "html" , optEmailObfuscation = ReferenceObfuscation } |