From 7a686175567295a5169625b5e5428f5b3300ea2a Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 3 Dec 2016 22:59:05 +0100 Subject: LaTeX reader: further fixes to include. --- src/Text/Pandoc/Readers/LaTeX.hs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/Text') diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs index 222b91e5d..9dc043783 100644 --- a/src/Text/Pandoc/Readers/LaTeX.hs +++ b/src/Text/Pandoc/Readers/LaTeX.hs @@ -977,14 +977,18 @@ readTeXFile f = do readFileFromDirs (splitBy (==':') texinputs) f readFileFromDirs :: PandocMonad m => [FilePath] -> FilePath -> m String -readFileFromDirs ds f = - mconcat <$> mapM (\d -> readFileLazy' (d f)) ds - -readFileLazy' :: PandocMonad m => FilePath -> m String -readFileLazy' f = catchError (UTF8.toStringLazy <$> readFileLazy f) $ - \(e :: PandocError) -> do - warning $ "Could not load include file " ++ f ++ ", skipping.\n" ++ show e +readFileFromDirs [] f = do + warning $ "Could not load include file " ++ f ++ ", skipping." return "" +readFileFromDirs (d:ds) f = do + res <- readFileLazy' (d f) + case res of + Right s -> return s + Left _ -> readFileFromDirs ds f + +readFileLazy' :: PandocMonad m => FilePath -> m (Either PandocError String) +readFileLazy' f = catchError ((Right . UTF8.toStringLazy) <$> readFileLazy f) $ + \(e :: PandocError) -> return (Left e) ---- -- cgit v1.2.3