diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2011-12-15 21:17:32 -0800 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2011-12-17 22:46:03 -0800 |
| commit | 89c962a18cb354ead249dab3d45e09e3bf9de84e (patch) | |
| tree | b63b768f7ce22c0e3b336952f2cce19f25d3a24d /src/pandoc.hs | |
| parent | d78e9c1dac731b737daadcba7f94f81acbbe5d3c (diff) | |
Use blaze-html instead of xhtml for HTML generation.
* This is a breaking API change for `writeHtml`.
* It introduces a new dependency on blaze-html.
* Pandoc now depends on highlighting-kate >= 0.4, which
also uses blaze-html.
* The --ascii option has been removed, because of differences
in blaze-html's and xhtml's escaping.
* Pandoc will no longer transform leading newlines in code
blocks to `<br/>` tags.
Diffstat (limited to 'src/pandoc.hs')
| -rw-r--r-- | src/pandoc.hs | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/pandoc.hs b/src/pandoc.hs index 7dbbab5c7..0b7380f54 100644 --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -126,7 +126,6 @@ data Opt = Opt , optCslFile :: FilePath , optAbbrevsFile :: Maybe FilePath , optListings :: Bool -- ^ Use listings package for code blocks - , optAscii :: Bool -- ^ Avoid using nonascii characters } -- | Defaults for command-line options. @@ -171,7 +170,6 @@ defaultOpts = Opt , optCslFile = "" , optAbbrevsFile = Nothing , optListings = False - , optAscii = False } -- | A list of functions, each transforming the options data structure @@ -369,11 +367,6 @@ options = "NUMBER") "" -- "Length of line in characters" - , Option "" ["ascii"] - (NoArg - (\opt -> return opt { optAscii = True })) - "" -- "Avoid using non-ascii characters in output" - , Option "" ["email-obfuscation"] (ReqArg (\arg opt -> do @@ -723,7 +716,6 @@ main = do , optAbbrevsFile = cslabbrevs , optCiteMethod = citeMethod , optListings = listings - , optAscii = ascii } = opts when dumpArgs $ @@ -846,9 +838,8 @@ main = do writerUserDataDir = datadir, writerHtml5 = html5 || slideVariant == DZSlides, - writerChapters = chapters, - writerListings = listings, - writerAscii = ascii } + writerChapters = chapters, + writerListings = listings } when (isNonTextOutput writerName' && outputFile == "-") $ do UTF8.hPutStrLn stderr ("Error: Cannot write " ++ writerName' ++ " output to stdout.\n" ++ |