33af62a · typeable/pandoc

git.iko.soy/typeable/pandoc

Fixes to compile after rebase.

commit33af62acc5f2219cb093b83694cd73dec33f210b authorJohn MacFarlane <jgm@berkeley.edu> dateSun 27 Nov 2016, 11:52 (10 years ago) parent04545c9

2 files changed+4−3

unifiedsplit

src/Text/Pandoc/Writers/Docx.hs+2−1

@@ -1121,7 +1121,8 @@ inlineToOpenXML' opts (Math mathType str) = do

11211121 case writeOMML displayType <$> readTeX str of

11221122 Right r -> return [r]

11231123 Left e -> do

1124− warn $ "Cannot convert the following TeX math, skipping:\n" ++ str ++

1124+ (lift . lift) $ P.warn $

1125+ "Cannot convert the following TeX math, skipping:\n" ++ str ++

11251126 "\n" ++ e

11261127 inlinesToOpenXML opts (texMathToInlines mathType str)

11271128inlineToOpenXML' opts (Cite _ lst) = inlinesToOpenXML opts lst

src/Text/Pandoc/Writers/ICML.hs+2−2

@@ -18,7 +18,7 @@ import Text.Pandoc.Definition

1818import Text.Pandoc.XML

1919import Text.Pandoc.Readers.TeXMath (texMathToInlines)

2020import Text.Pandoc.Writers.Shared

21−import Text.Pandoc.Shared (linesToPara, splitBy, warn)

21+import Text.Pandoc.Shared (linesToPara, splitBy)

2222import Text.Pandoc.Options

2323import Text.Pandoc.Templates (renderTemplate')

2424import Text.Pandoc.Pretty

@@ -542,7 +542,7 @@ imageICML opts style attr (src, _) = do

542542 case imageSize img of

543543 Right size -> return size

544544 Left msg -> do

545− warn $ "Could not determine image size in `" ++

545+ lift $ P.warn $ "Could not determine image size in `" ++

546546 src ++ "': " ++ msg

547547 return def

548548 let (ow, oh) = sizeInPoints imgS