git.iko.soy/typeable/pandoc
on master help sign in
pandoc: Better error checking.
e6e4311John MacFarlane
src/Text/Pandoc/PDF.hs+5−5
@@ -72,9 +72,9 @@ extractMsg log' = do
72 let msg' = dropWhile (not . ("!" `BC.isPrefixOf`)) $ BC.lines log'
72 let msg' = dropWhile (not . ("!" `BC.isPrefixOf`)) $ BC.lines log'
73 let (msg'',rest) = break ("l." `BC.isPrefixOf`) msg'
73 let (msg'',rest) = break ("l." `BC.isPrefixOf`) msg'
74 let lineno = take 1 rest
74 let lineno = take 1 rest
75− if not (null msg')
75+ if null msg'
76+ then log'
76− then BC.unlines (msg'' ++ lineno)
77+ else BC.unlines (msg'' ++ lineno)
77− else "Unknown errorR"
78
78
79parseLine :: ByteString -> Bool
79parseLine :: ByteString -> Bool
80parseLine ln =
80parseLine ln =
@@ -101,7 +101,7 @@ runTeXProgram program runsLeft tmpDir source = do
101 hClose h
101 hClose h
102 let programArgs = ["-halt-on-error", "-interaction", "nonstopmode",
102 let programArgs = ["-halt-on-error", "-interaction", "nonstopmode",
103 "-output-directory", tmpDir, file]
103 "-output-directory", tmpDir, file]
104− (exit, out, _err) <- readCommand program programArgs
104+ (exit, out, err) <- readCommand program programArgs
105 removeFile file
105 removeFile file
106 let pdfFile = replaceDirectory (replaceExtension file ".pdf") tmpDir
106 let pdfFile = replaceDirectory (replaceExtension file ".pdf") tmpDir
107 pdfExists <- doesFileExist pdfFile
107 pdfExists <- doesFileExist pdfFile
@@ -110,7 +110,7 @@ runTeXProgram program runsLeft tmpDir source = do
110 else return Nothing
110 else return Nothing
111 if hasUndefinedRefs out && runsLeft > 0
111 if hasUndefinedRefs out && runsLeft > 0
112 then runTeXProgram program (runsLeft - 1) tmpDir source
112 then runTeXProgram program (runsLeft - 1) tmpDir source
113− else return (exit, out, pdf)
113+ else return (exit, out <> err, pdf)
114
114
115-- utility functions
115-- utility functions
116
116
src/pandoc.hs+10
@@ -549,6 +549,16 @@ options =
549 "FILENAME")
549 "FILENAME")
550 "" -- "Path of epub metadata file"
550 "" -- "Path of epub metadata file"
551
551
552+ , Option "" ["latex-program"]
553+ (ReqArg
554+ (\arg opt -> do
555+ let b = takeBaseName arg
556+ if (b == "pdflatex" || b == "lualatex" || b == "xelatex")
557+ then return opt { optLaTeXProgram = arg }
558+ else err 45 "latex-program must be pdflatex, lualatex, or xelatex.")
559+ "PROGRAM")
560+ "" -- "Name of latex program to use in generating PDF"
561+
552 , Option "D" ["print-default-template"]
562 , Option "D" ["print-default-template"]
553 (ReqArg
563 (ReqArg
554 (\arg _ -> do
564 (\arg _ -> do