Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ensure that you don't get PDF output to terminal.

Browse source 
`-t pdf` should behave like `-t docx` and give an error
unless the output is redirected.
This commit is contained in:
John MacFarlane 2022-02-13 00:16:57 -08:00
parent e1b7f3a63d
commit f3b0f19d7a
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Text/Pandoc/App.hs
View file

@ -32,7 +32,6 @@ import Control.Monad.Except (throwError, catchError)
import qualified Data.ByteString as BS import qualified Data.ByteString as BS
import qualified Data.ByteString.Char8 as B8 import qualified Data.ByteString.Char8 as B8
import qualified Data.ByteString.Lazy as BL import qualified Data.ByteString.Lazy as BL
import Data.Char (toLower)
import Data.Maybe (fromMaybe, isJust, isNothing) import Data.Maybe (fromMaybe, isJust, isNothing)
import qualified Data.Set as Set import qualified Data.Set as Set
import Data.Text (Text) import Data.Text (Text)
@ -129,16 +128,6 @@ convertWithOpts opts = do
return "markdown" return "markdown"
let readerNameBase = T.takeWhile (\c -> c /= '+' && c /= '-') readerName let readerNameBase = T.takeWhile (\c -> c /= '+' && c /= '-') readerName
let pdfOutput = map toLower (takeExtension outputFile) == ".pdf"
when (pdfOutput && readerNameBase == "latex") $
case optInputFiles opts of
Just (inputFile:_) -> report $ UnusualConversion $ T.pack $
"to convert a .tex file to PDF, you get better results by using pdflatex "
<> "(or lualatex or xelatex) directly, try `pdflatex " <> inputFile
<> "` instead of `pandoc " <> inputFile <> " -o " <> outputFile <> "`."
_ -> return ()
let makeSandboxed pureReader = let makeSandboxed pureReader =
let files = maybe id (:) (optReferenceDoc opts) . let files = maybe id (:) (optReferenceDoc opts) .
@ -169,6 +158,8 @@ convertWithOpts opts = do
let writerNameBase = T.takeWhile (\c -> c /= '+' && c /= '-') writerName let writerNameBase = T.takeWhile (\c -> c /= '+' && c /= '-') writerName
let writerOptions = outputWriterOptions outputSettings let writerOptions = outputWriterOptions outputSettings
let pdfOutput = isJust $ outputPdfProgram outputSettings
let bibOutput = writerNameBase == "bibtex" || let bibOutput = writerNameBase == "bibtex" ||
writerNameBase == "biblatex" || writerNameBase == "biblatex" ||
writerNameBase == "csljson" writerNameBase == "csljson"
@ -178,6 +169,14 @@ convertWithOpts opts = do
pdfOutput || pdfOutput ||
bibOutput bibOutput
when (pdfOutput && readerNameBase == "latex") $
case optInputFiles opts of
Just (inputFile:_) -> report $ UnusualConversion $ T.pack $
"to convert a .tex file to PDF, you get better results by using pdflatex "
<> "(or lualatex or xelatex) directly, try `pdflatex " <> inputFile
<> "` instead of `pandoc " <> inputFile <> " -o " <> outputFile <> "`."
_ -> return ()
-- We don't want to send output to the terminal if the user -- We don't want to send output to the terminal if the user
-- does 'pandoc -t docx input.txt'; though we allow them to -- does 'pandoc -t docx input.txt'; though we allow them to
-- force this with '-o -'. On posix systems, we detect -- force this with '-o -'. On posix systems, we detect
@ -186,7 +185,8 @@ convertWithOpts opts = do
when ((pdfOutput || not (isTextFormat format)) && when ((pdfOutput || not (isTextFormat format)) &&
istty && isNothing ( optOutputFile opts)) $ istty && isNothing ( optOutputFile opts)) $
throwError $ PandocAppError $ throwError $ PandocAppError $
"Cannot write " <> format <> " output to terminal.\n" <> "Cannot write " <> (if pdfOutput then "pdf" else format) <>
" output to terminal.\n" <>
"Specify an output file using the -o option, or " <> "Specify an output file using the -o option, or " <>
"use '-o -' to force output to stdout." "use '-o -' to force output to stdout."