@@ -130,7 +130,7 @@ convertImage tmpdir fname =
130 E.catch (Right fileOut <$ JP.savePngImage fileOut img) $
130 E.catch (Right fileOut <$ JP.savePngImage fileOut img) $
131 \(e :: E.SomeException) -> return (Left (show e))
131 \(e :: E.SomeException) -> return (Left (show e))
133− fileOut = replaceDirectory (replaceExtension fname (".png")) tmpdir
133+ fileOut = replaceDirectory (replaceExtension fname ".png") tmpdir
134 mime = getMimeType fname
134 mime = getMimeType fname
135 doNothing = return (Right fname)
135 doNothing = return (Right fname)
@@ -150,8 +150,8 @@ tex2pdf' verbose args tmpDir program source = do
150 let logmsg = extractMsg log'
150 let logmsg = extractMsg log'
151 let extramsg =
151 let extramsg =
152 case logmsg of
152 case logmsg of
153− x | ("! Package inputenc Error" `BC.isPrefixOf` x
153+ x | "! Package inputenc Error" `BC.isPrefixOf` x
154− && program /= "xelatex")
154+ && program /= "xelatex"
155 -> "\nTry running pandoc with --latex-engine=xelatex."
155 -> "\nTry running pandoc with --latex-engine=xelatex."
157 return $ Left $ logmsg <> extramsg
157 return $ Left $ logmsg <> extramsg
@@ -199,18 +199,18 @@ runTeXProgram verbose program args runNumber numRuns tmpDir source = do
199 let programArgs = ["-halt-on-error", "-interaction", "nonstopmode",
199 let programArgs = ["-halt-on-error", "-interaction", "nonstopmode",
200 "-output-directory", tmpDir'] ++ args ++ [file']
200 "-output-directory", tmpDir'] ++ args ++ [file']
201 env' <- getEnvironment
201 env' <- getEnvironment
202− let sep = searchPathSeparator:[]
202+ let sep = [searchPathSeparator]
203 let texinputs = maybe (tmpDir' ++ sep) ((tmpDir' ++ sep) ++)
203 let texinputs = maybe (tmpDir' ++ sep) ((tmpDir' ++ sep) ++)
204 $ lookup "TEXINPUTS" env'
204 $ lookup "TEXINPUTS" env'
205 let env'' = ("TEXINPUTS", texinputs) :
205 let env'' = ("TEXINPUTS", texinputs) :
206 [(k,v) | (k,v) <- env', k /= "TEXINPUTS"]
206 [(k,v) | (k,v) <- env', k /= "TEXINPUTS"]
207 when (verbose && runNumber == 1) $ do
207 when (verbose && runNumber == 1) $ do
208− putStrLn $ "[makePDF] temp dir:"
208+ putStrLn "[makePDF] temp dir:"
209 putStrLn tmpDir'
209 putStrLn tmpDir'
210− putStrLn $ "[makePDF] Command line:"
210+ putStrLn "[makePDF] Command line:"
211 putStrLn $ program ++ " " ++ unwords (map show programArgs)
211 putStrLn $ program ++ " " ++ unwords (map show programArgs)
212 putStr "\n"
212 putStr "\n"
213− putStrLn $ "[makePDF] Environment:"
213+ putStrLn "[makePDF] Environment:"
214 mapM_ print env''
214 mapM_ print env''
215 putStr "\n"
215 putStr "\n"
216 putStrLn $ "[makePDF] Contents of " ++ file' ++ ":"
216 putStrLn $ "[makePDF] Contents of " ++ file' ++ ":"
@@ -248,20 +248,20 @@ context2pdf verbose tmpDir source = inDirectory tmpDir $ do
249 let tmpDir' = tmpDir
249 let tmpDir' = tmpDir
251− let programArgs = ["--batchmode"] ++ [file]
251+ let programArgs = "--batchmode" : [file]
252 env' <- getEnvironment
252 env' <- getEnvironment
253− let sep = searchPathSeparator:[]
253+ let sep = [searchPathSeparator]
254 let texinputs = maybe (".." ++ sep) ((".." ++ sep) ++)
254 let texinputs = maybe (".." ++ sep) ((".." ++ sep) ++)
255 $ lookup "TEXINPUTS" env'
255 $ lookup "TEXINPUTS" env'
256 let env'' = ("TEXINPUTS", texinputs) :
256 let env'' = ("TEXINPUTS", texinputs) :
257 [(k,v) | (k,v) <- env', k /= "TEXINPUTS"]
257 [(k,v) | (k,v) <- env', k /= "TEXINPUTS"]
258 when verbose $ do
258 when verbose $ do
259− putStrLn $ "[makePDF] temp dir:"
259+ putStrLn "[makePDF] temp dir:"
260 putStrLn tmpDir'
260 putStrLn tmpDir'
261− putStrLn $ "[makePDF] Command line:"
261+ putStrLn "[makePDF] Command line:"
262 putStrLn $ "context" ++ " " ++ unwords (map show programArgs)
262 putStrLn $ "context" ++ " " ++ unwords (map show programArgs)
263 putStr "\n"
263 putStr "\n"
264− putStrLn $ "[makePDF] Environment:"
264+ putStrLn "[makePDF] Environment:"
265 mapM_ print env''
265 mapM_ print env''
266 putStr "\n"
266 putStr "\n"
267 putStrLn $ "[makePDF] Contents of " ++ file ++ ":"
267 putStrLn $ "[makePDF] Contents of " ++ file ++ ":"
@@ -287,3 +287,4 @@ context2pdf verbose tmpDir source = inDirectory tmpDir $ do
287 return $ Left logmsg
287 return $ Left logmsg
288 (ExitSuccess, Nothing) -> return $ Left ""
288 (ExitSuccess, Nothing) -> return $ Left ""
289 (ExitSuccess, Just pdf) -> return $ Right pdf
289 (ExitSuccess, Just pdf) -> return $ Right pdf