diff options
author | John MacFarlane <jgm@berkeley.edu> | 2017-02-10 23:59:47 +0100 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2017-02-11 00:14:44 +0100 |
commit | 76c55466d3087224eccdc47c804ab2904be50df5 (patch) | |
tree | 8e605c9a6ab89569d8b51898f31487ac0c005a22 /src/Text/Pandoc/Writers/EPUB.hs | |
parent | 8ad7e2c21fd00d8225c5f243bf3383c956b6c83b (diff) | |
download | pandoc-76c55466d3087224eccdc47c804ab2904be50df5.tar.gz |
Use new warnings throughout the code base.
Diffstat (limited to 'src/Text/Pandoc/Writers/EPUB.hs')
-rw-r--r-- | src/Text/Pandoc/Writers/EPUB.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Writers/EPUB.hs b/src/Text/Pandoc/Writers/EPUB.hs index 7e9a20a0c..247014c20 100644 --- a/src/Text/Pandoc/Writers/EPUB.hs +++ b/src/Text/Pandoc/Writers/EPUB.hs @@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Conversion of 'Pandoc' documents to EPUB. -} module Text.Pandoc.Writers.EPUB ( writeEPUB2, writeEPUB3 ) where +import Text.Pandoc.Logging import qualified Data.Map as M import qualified Data.Set as Set import Data.Maybe ( fromMaybe, catMaybes ) @@ -65,7 +66,7 @@ import Text.Pandoc.MIME (MimeType, getMimeType, extensionFromMimeType) import Text.HTML.TagSoup (Tag(TagOpen), fromAttrib, parseTags) import Control.Monad.Except (throwError, catchError) import Text.Pandoc.Error -import Text.Pandoc.Class (PandocMonad) +import Text.Pandoc.Class (PandocMonad, report) import qualified Text.Pandoc.Class as P -- A Chapter includes a list of blocks and maybe a section @@ -415,7 +416,7 @@ pandocToEPUB version opts doc@(Pandoc meta _) = do let matchingGlob f = do xs <- lift $ P.glob f when (null xs) $ - lift $ P.warning $ f ++ " did not match any font files." + report $ CouldNotFetchResource f "glob did not match any font files" return xs let mkFontEntry f = mkEntry (takeFileName f) `fmap` (lift $ P.readFileLazy f) fontFiles <- concat <$> mapM matchingGlob (writerEpubFonts opts') @@ -883,8 +884,7 @@ modifyMediaRef opts oldsrc = do (oldsrc, (new, Just entry)):media} return new) (\e -> do - P.warning $ "Could not find media `" ++ oldsrc ++ - "', skipping...\n" ++ show e + report $ CouldNotFetchResource oldsrc (show e) return oldsrc) transformBlock :: PandocMonad m |