git.iko.soy/typeable/pandoc
on master help sign in
hlint fixes
commitf7e37141e5d6d03892148a6b66b0f544b0617c24 authorJohn MacFarlane <jgm@berkeley.edu> dateSun 22 Nov 2015, 07:42 (11 years ago) parentbbb3d8d
1 file changed+13−12
src/Text/Pandoc/PDF.hs+13−12
src/Text/Pandoc/PDF.hs+13−12
@@ -130,7 +130,7 @@ convertImage tmpdir fname =
130130 E.catch (Right fileOut <$ JP.savePngImage fileOut img) $
131131 \(e :: E.SomeException) -> return (Left (show e))
132132 where
133− fileOut = replaceDirectory (replaceExtension fname (".png")) tmpdir
133+ fileOut = replaceDirectory (replaceExtension fname ".png") tmpdir
134134 mime = getMimeType fname
135135 doNothing = return (Right fname)
136136
@@ -150,8 +150,8 @@ tex2pdf' verbose args tmpDir program source = do
150150 let logmsg = extractMsg log'
151151 let extramsg =
152152 case logmsg of
153− x | ("! Package inputenc Error" `BC.isPrefixOf` x
154− && program /= "xelatex")
153+ x | "! Package inputenc Error" `BC.isPrefixOf` x
154+ && program /= "xelatex"
155155 -> "\nTry running pandoc with --latex-engine=xelatex."
156156 _ -> ""
157157 return $ Left $ logmsg <> extramsg
@@ -199,18 +199,18 @@ runTeXProgram verbose program args runNumber numRuns tmpDir source = do
199199 let programArgs = ["-halt-on-error", "-interaction", "nonstopmode",
200200 "-output-directory", tmpDir'] ++ args ++ [file']
201201 env' <- getEnvironment
202− let sep = searchPathSeparator:[]
202+ let sep = [searchPathSeparator]
203203 let texinputs = maybe (tmpDir' ++ sep) ((tmpDir' ++ sep) ++)
204204 $ lookup "TEXINPUTS" env'
205205 let env'' = ("TEXINPUTS", texinputs) :
206206 [(k,v) | (k,v) <- env', k /= "TEXINPUTS"]
207207 when (verbose && runNumber == 1) $ do
208− putStrLn $ "[makePDF] temp dir:"
208+ putStrLn "[makePDF] temp dir:"
209209 putStrLn tmpDir'
210− putStrLn $ "[makePDF] Command line:"
210+ putStrLn "[makePDF] Command line:"
211211 putStrLn $ program ++ " " ++ unwords (map show programArgs)
212212 putStr "\n"
213− putStrLn $ "[makePDF] Environment:"
213+ putStrLn "[makePDF] Environment:"
214214 mapM_ print env''
215215 putStr "\n"
216216 putStrLn $ "[makePDF] Contents of " ++ file' ++ ":"
@@ -248,20 +248,20 @@ context2pdf verbose tmpDir source = inDirectory tmpDir $ do
248248#else
249249 let tmpDir' = tmpDir
250250#endif
251− let programArgs = ["--batchmode"] ++ [file]
251+ let programArgs = "--batchmode" : [file]
252252 env' <- getEnvironment
253− let sep = searchPathSeparator:[]
253+ let sep = [searchPathSeparator]
254254 let texinputs = maybe (".." ++ sep) ((".." ++ sep) ++)
255255 $ lookup "TEXINPUTS" env'
256256 let env'' = ("TEXINPUTS", texinputs) :
257257 [(k,v) | (k,v) <- env', k /= "TEXINPUTS"]
258258 when verbose $ do
259− putStrLn $ "[makePDF] temp dir:"
259+ putStrLn "[makePDF] temp dir:"
260260 putStrLn tmpDir'
261− putStrLn $ "[makePDF] Command line:"
261+ putStrLn "[makePDF] Command line:"
262262 putStrLn $ "context" ++ " " ++ unwords (map show programArgs)
263263 putStr "\n"
264− putStrLn $ "[makePDF] Environment:"
264+ putStrLn "[makePDF] Environment:"
265265 mapM_ print env''
266266 putStr "\n"
267267 putStrLn $ "[makePDF] Contents of " ++ file ++ ":"
@@ -287,3 +287,4 @@ context2pdf verbose tmpDir source = inDirectory tmpDir $ do
287287 return $ Left logmsg
288288 (ExitSuccess, Nothing) -> return $ Left ""
289289 (ExitSuccess, Just pdf) -> return $ Right pdf
290+