diff options
| -rw-r--r-- | README | 18 | ||||
| -rw-r--r-- | src/Text/Pandoc.hs | 6 | ||||
| -rw-r--r-- | src/Text/Pandoc/Templates.hs | 5 | ||||
| -rw-r--r-- | src/pandoc.hs | 4 |
4 files changed, 18 insertions, 15 deletions
@@ -26,8 +26,8 @@ tables, flexible ordered lists, definition lists, delimited code blocks, superscript, subscript, strikeout, title blocks, automatic tables of contents, embedded LaTeX math, citations, and markdown inside HTML block elements. (These enhancements, described below under -[Pandoc's markdown](#pandocs-markdown), can be disabled using the `strict` -input or output format.) +[Pandoc's markdown](#pandocs-markdown), can be disabled using the +`markdown_strict` input or output format.) In contrast to most existing tools for converting markdown to HTML, which use regex substitutions, Pandoc has a modular design: it consists of a @@ -118,7 +118,7 @@ and `xunicode` (if `xelatex` is used). A user who wants a drop-in replacement for `Markdown.pl` may create a symbolic link to the `pandoc` executable called `hsmarkdown`. When invoked under the name `hsmarkdown`, `pandoc` will behave as if -invoked with `-f strict --email-obfuscation=references`, +invoked with `-f markdown_strict --email-obfuscation=references`, and all command-line options will be treated as regular arguments. However, this approach does not work under Cygwin, due to problems with its simulation of symbolic links. @@ -757,7 +757,7 @@ Pandoc's markdown Pandoc understands an extended and slightly revised version of John Gruber's [markdown] syntax. This document explains the syntax, noting differences from standard markdown. Except where noted, these -differences can be suppressed by using the `strict` format instead +differences can be suppressed by using the `markdown_strict` format instead of `markdown`. Philosophy @@ -927,7 +927,7 @@ Standard markdown syntax does not require a blank line before a block quote. Pandoc does require this (except, of course, at the beginning of the document). The reason for the requirement is that it is all too easy for a `>` to end up at the beginning of a line by accident (perhaps through line -wrapping). So, unless the `strict` format is used, the following does +wrapping). So, unless the `markdown_strict` format is used, the following does not produce a nested block quote in pandoc: > This is a block quote. @@ -1284,7 +1284,7 @@ around "Third". Pandoc follows a simple rule: if the text is followed by a blank line, it is treated as a paragraph. Since "Second" is followed by a list, and not a blank line, it isn't treated as a paragraph. The fact that the list is followed by a blank line is irrelevant. (Note: -Pandoc works this way even when the `strict` format is specified. This +Pandoc works this way even when the `markdown_strict` format is specified. This behavior is consistent with the official markdown syntax description, even though it is different from that of `Markdown.pl`.) @@ -1605,7 +1605,7 @@ which allows only the following characters to be backslash-escaped: \`*_{}[]()>#+-.! -(However, if the `strict` format is used, the standard markdown rule +(However, if the `markdown_strict` format is used, the standard markdown rule will be used.) A backslash-escaped space is parsed as a nonbreaking space. It will @@ -1840,8 +1840,8 @@ with blank lines, and start and end at the left margin. Within these blocks, everything is interpreted as HTML, not markdown; so (for example), `*` does not signify emphasis. -Pandoc behaves this way when the `strict` format is used; but by default, -pandoc interprets material between HTML block tags as markdown. +Pandoc behaves this way when the `markdown_strict` format is used; but +by default, pandoc interprets material between HTML block tags as markdown. Thus, for example, Pandoc will turn <table> 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 } |