41eded5 · typeable/pandoc

git.iko.soy/typeable/pandoc

pandoc.hs : changed a couple `writerName` to `writerName'`.

This fixes a bug in which `pandoc --self-contained` would only work properly if `-t html` were specified explicitly.

commit41eded5dd2bbf7595281520d590463d71f191635 authorJohn MacFarlane <fiddlosopher@gmail.com> dateWed 23 Nov 2011, 20:15 (15 years ago) parentdb1c16e

1 file changed+2−2

unifiedsplit

src/pandoc.hs+2−2

@@ -849,7 +849,7 @@ main = do

849849 writerAscii = ascii }

850850

851851 when (isNonTextOutput writerName' && outputFile == "-") $

852− do UTF8.hPutStrLn stderr ("Error: Cannot write " ++ writerName ++ " output to stdout.\n" ++

852+ do UTF8.hPutStrLn stderr ("Error: Cannot write " ++ writerName' ++ " output to stdout.\n" ++

853853 "Specify an output file using the -o option.")

854854 exitWith $ ExitFailure 5

855855

@@ -902,7 +902,7 @@ main = do

902902 writerFn f = UTF8.writeFile f

903903 result = r writerOptions doc2 ++ ['\n' | not standalone']

904904 htmlFormats = ["html","html+lhs","s5","slidy","dzslides"]

905− postProcess = if selfContained && writerName `elem` htmlFormats

905+ postProcess = if selfContained && writerName' `elem` htmlFormats

906906 then makeSelfContained datadir

907907 else return

908908