aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2016-11-27 11:52:32 +0100
committerJohn MacFarlane <jgm@berkeley.edu>2017-01-25 17:07:39 +0100
commit33af62acc5f2219cb093b83694cd73dec33f210b (patch)
treed2c3248a83e9ed63a8b2937315200868d7d9aac1 /src/Text/Pandoc
parent04545c92c8588f2487518fc45cffcf2df8935e7b (diff)
downloadpandoc-33af62acc5f2219cb093b83694cd73dec33f210b.tar.gz
Fixes to compile after rebase.
Diffstat (limited to 'src/Text/Pandoc')
-rw-r--r--src/Text/Pandoc/Writers/Docx.hs3
-rw-r--r--src/Text/Pandoc/Writers/ICML.hs4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index 36816eaa1..cc0c180f2 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -1121,7 +1121,8 @@ inlineToOpenXML' opts (Math mathType str) = do
case writeOMML displayType <$> readTeX str of
Right r -> return [r]
Left e -> do
- warn $ "Cannot convert the following TeX math, skipping:\n" ++ str ++
+ (lift . lift) $ P.warn $
+ "Cannot convert the following TeX math, skipping:\n" ++ str ++
"\n" ++ e
inlinesToOpenXML opts (texMathToInlines mathType str)
inlineToOpenXML' opts (Cite _ lst) = inlinesToOpenXML opts lst
diff --git a/src/Text/Pandoc/Writers/ICML.hs b/src/Text/Pandoc/Writers/ICML.hs
index c82a77452..f624b7dec 100644
--- a/src/Text/Pandoc/Writers/ICML.hs
+++ b/src/Text/Pandoc/Writers/ICML.hs
@@ -18,7 +18,7 @@ import Text.Pandoc.Definition
import Text.Pandoc.XML
import Text.Pandoc.Readers.TeXMath (texMathToInlines)
import Text.Pandoc.Writers.Shared
-import Text.Pandoc.Shared (linesToPara, splitBy, warn)
+import Text.Pandoc.Shared (linesToPara, splitBy)
import Text.Pandoc.Options
import Text.Pandoc.Templates (renderTemplate')
import Text.Pandoc.Pretty
@@ -542,7 +542,7 @@ imageICML opts style attr (src, _) = do
case imageSize img of
Right size -> return size
Left msg -> do
- warn $ "Could not determine image size in `" ++
+ lift $ P.warn $ "Could not determine image size in `" ++
src ++ "': " ++ msg
return def
let (ow, oh) = sizeInPoints imgS