diff options
| author | Jesse Rosenthal <jrosenthal@jhu.edu> | 2016-11-27 00:05:53 -0500 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2017-01-25 17:07:39 +0100 |
| commit | 04545c92c8588f2487518fc45cffcf2df8935e7b (patch) | |
| tree | 1e100a0d48491b9bfca3e6caf40e2cc33071e14a /pandoc.hs | |
| parent | 23c5b0d0f1901aa3ab68391f927de4f5278b5942 (diff) | |
Clean up Text.Pandoc
We had primed versions of all the Writer types and getWriter
functions, as we transitioned. Now that we're using the new ones
exclusively, we'll get rid of the old ones, and get rid of the primes in
the names.
Diffstat (limited to 'pandoc.hs')
| -rw-r--r-- | pandoc.hs | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -915,7 +915,7 @@ options = let allopts = unwords (concatMap optnames options) UTF8.hPutStrLn stdout $ printf tpl allopts (unwords (map fst readers)) - (unwords (map fst (writers' :: [(String, Writer' PandocIO)]))) + (unwords (map fst (writers :: [(String, Writer PandocIO)]))) (unwords $ map fst highlightingStyles) ddir exitSuccess )) @@ -932,7 +932,7 @@ options = , Option "" ["list-output-formats"] (NoArg (\_ -> do - let writers'names = sort (map fst (writers' :: [(String, Writer' PandocIO)])) + let writers'names = sort (map fst (writers :: [(String, Writer PandocIO)])) mapM_ (UTF8.hPutStrLn stdout) writers'names exitSuccess )) "" @@ -1274,7 +1274,7 @@ convertWithOpts opts args = do writer <- if ".lua" `isSuffixOf` format -- note: use non-lowercased version writerName then error "custom writers disabled for now" - else case getWriter' writerName' of + else case getWriter writerName' of Left e -> err 9 $ if format == "pdf" then e ++ @@ -1481,8 +1481,8 @@ convertWithOpts opts args = do case writer of -- StringWriter f -> f writerOptions doc' >>= writerFn outputFile - ByteStringWriter' f -> (runIOorExplode $ f writerOptions doc') >>= writeFnBinary outputFile - StringWriter' f + ByteStringWriter f -> (runIOorExplode $ f writerOptions doc') >>= writeFnBinary outputFile + StringWriter f | pdfOutput -> do -- make sure writer is latex or beamer or context or html5 unless (laTeXOutput || conTeXtOutput || html5Output) $ |