git.iko.soy/typeable/pandoc
on master help sign in
Merge pull request #278 from tanimoto/master
4ffb787John MacFarlane
src/markdown2pdf.hs+6−5
@@ -2,8 +2,10 @@ module Main where
2
2
3import Data.List (isInfixOf, intercalate, isPrefixOf)
3import Data.List (isInfixOf, intercalate, isPrefixOf)
4import Data.Maybe (isNothing)
4import Data.Maybe (isNothing)
5−
5+import qualified Data.ByteString as BS
6+import Codec.Binary.UTF8.String (decodeString, encodeString)
7+import Data.ByteString.UTF8 (toString)
6−import Control.Monad (unless, guard)
8+import Control.Monad (unless, guard, liftM)
7import Control.Exception (tryJust, bracket)
9import Control.Exception (tryJust, bracket)
8
10
9import System.IO (stderr)
11import System.IO (stderr)
@@ -14,8 +16,6 @@ import System.Exit (ExitCode (..), exitWith)
14import System.FilePath
16import System.FilePath
15import System.Directory
17import System.Directory
16import System.Process (readProcessWithExitCode)
18import System.Process (readProcessWithExitCode)
17−import Codec.Binary.UTF8.String (decodeString, encodeString)
18−import Control.Monad (liftM)
19
19
20run :: FilePath -> [String] -> IO (Either String String)
20run :: FilePath -> [String] -> IO (Either String String)
21run file opts = do
21run file opts = do
@@ -52,7 +52,8 @@ runLatexRaw latexProgram file = do
52 takeDirectory file, dropExtension file] >> return ()
52 takeDirectory file, dropExtension file] >> return ()
53 let pdfFile = replaceExtension file "pdf"
53 let pdfFile = replaceExtension file "pdf"
54 let logFile = replaceExtension file "log"
54 let logFile = replaceExtension file "log"
55− txt <- tryJust (guard . isDoesNotExistError) (UTF8.readFile logFile)
55+ txt <- tryJust (guard . isDoesNotExistError)
56+ (liftM toString $ BS.readFile logFile)
56 let checks = checkLatex $ either (const "") id txt
57 let checks = checkLatex $ either (const "") id txt
57 case checks of
58 case checks of
58 -- err , bib , ref , msg
59 -- err , bib , ref , msg