From 8a1690dec1482d5fe5838a3441cd73b81c7c8bf4 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 28 Jun 2020 12:11:23 -0700
Subject: PDF: all verbose output now goes to stderr, not stdout.
Closes #6483.
---
src/Text/Pandoc/PDF.hs | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
(limited to 'src')
diff --git a/src/Text/Pandoc/PDF.hs b/src/Text/Pandoc/PDF.hs
index 7dc0b1671..4c69efd96 100644
--- a/src/Text/Pandoc/PDF.hs
+++ b/src/Text/Pandoc/PDF.hs
@@ -33,7 +33,7 @@ import System.Directory
import System.Environment
import System.Exit (ExitCode (..))
import System.FilePath
-import System.IO (stdout, hClose)
+import System.IO (stderr, hClose)
import System.IO.Temp (withSystemTempDirectory, withTempDirectory,
withTempFile)
import qualified System.IO.Error as IE
@@ -312,9 +312,9 @@ runTectonic verbosity program args' tmpDir' source = do
(pipeProcess (Just env) program programArgs sourceBL)
(handlePDFProgramNotFound program)
when (verbosity >= INFO) $ liftIO $ do
- putStrLn "[makePDF] Running"
- BL.hPutStr stdout out
- putStr "\n"
+ UTF8.hPutStrLn stderr "[makePDF] Running"
+ BL.hPutStr stderr out
+ UTF8.hPutStr stderr "\n"
let pdfFile = tmpDir ++ "/texput.pdf"
(_, pdf) <- getResultingPDF Nothing pdfFile
return (exit, out, pdf)
@@ -378,9 +378,9 @@ runTeXProgram verbosity program args numRuns tmpDir' source = do
(pipeProcess (Just env'') program programArgs BL.empty)
(handlePDFProgramNotFound program)
when (verbosity >= INFO) $ liftIO $ do
- putStrLn $ "[makePDF] Run #" ++ show runNumber
- BL.hPutStr stdout out
- putStr "\n"
+ UTF8.hPutStrLn stderr $ "[makePDF] Run #" ++ show runNumber
+ BL.hPutStr stderr out
+ UTF8.hPutStr stderr "\n"
if runNumber < numRuns
then runTeX (runNumber + 1)
else do
@@ -432,8 +432,8 @@ html2pdf verbosity program args source =
(pipeProcess (Just env') program programArgs BL.empty)
(handlePDFProgramNotFound program)
when (verbosity >= INFO) $ do
- BL.hPutStr stdout out
- putStr "\n"
+ BL.hPutStr stderr out
+ UTF8.hPutStr stderr "\n"
pdfExists <- doesFileExist pdfFile
mbPdf <- if pdfExists
-- We read PDF as a strict bytestring to make sure that the
@@ -465,8 +465,8 @@ context2pdf verbosity program pdfargs tmpDir source =
(pipeProcess (Just env') program programArgs BL.empty)
(handlePDFProgramNotFound program)
when (verbosity >= INFO) $ do
- BL.hPutStr stdout out
- putStr "\n"
+ BL.hPutStr stderr out
+ UTF8.hPutStr stderr "\n"
let pdfFile = replaceExtension file ".pdf"
pdfExists <- doesFileExist pdfFile
mbPdf <- if pdfExists
@@ -492,17 +492,17 @@ showVerboseInfo :: Maybe FilePath
showVerboseInfo mbTmpDir program programArgs env source = do
case mbTmpDir of
Just tmpDir -> do
- putStrLn "[makePDF] temp dir:"
- putStrLn tmpDir
+ UTF8.hPutStrLn stderr "[makePDF] temp dir:"
+ UTF8.hPutStrLn stderr tmpDir
Nothing -> return ()
- putStrLn "[makePDF] Command line:"
- putStrLn $ program ++ " " ++ unwords (map show programArgs)
- putStr "\n"
- putStrLn "[makePDF] Environment:"
- mapM_ print env
- putStr "\n"
- putStrLn "[makePDF] Source:"
- UTF8.putStrLn source
+ UTF8.hPutStrLn stderr "[makePDF] Command line:"
+ UTF8.hPutStrLn stderr $ program ++ " " ++ unwords (map show programArgs)
+ UTF8.hPutStr stderr "\n"
+ UTF8.hPutStrLn stderr "[makePDF] Environment:"
+ mapM_ (UTF8.hPutStrLn stderr . show) env
+ UTF8.hPutStr stderr "\n"
+ UTF8.hPutStrLn stderr "[makePDF] Source:"
+ UTF8.hPutStrLn stderr source
handlePDFProgramNotFound :: String -> IE.IOError -> IO a
handlePDFProgramNotFound program e
--
cgit v1.2.3