From 41eded5dd2bbf7595281520d590463d71f191635 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 23 Nov 2011 20:15:24 -0800 Subject: 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. --- src/pandoc.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pandoc.hs b/src/pandoc.hs index d6cf1da85..8ccdf205e 100644 --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -849,7 +849,7 @@ main = do writerAscii = ascii } when (isNonTextOutput writerName' && outputFile == "-") $ - do UTF8.hPutStrLn stderr ("Error: Cannot write " ++ writerName ++ " output to stdout.\n" ++ + do UTF8.hPutStrLn stderr ("Error: Cannot write " ++ writerName' ++ " output to stdout.\n" ++ "Specify an output file using the -o option.") exitWith $ ExitFailure 5 @@ -902,7 +902,7 @@ main = do writerFn f = UTF8.writeFile f result = r writerOptions doc2 ++ ['\n' | not standalone'] htmlFormats = ["html","html+lhs","s5","slidy","dzslides"] - postProcess = if selfContained && writerName `elem` htmlFormats + postProcess = if selfContained && writerName' `elem` htmlFormats then makeSelfContained datadir else return -- cgit v1.2.3