git.iko.soy/typeable/pandoc
on master help sign in
Fixes to compile after rebase.
33af62aJohn MacFarlane
src/Text/Pandoc/Writers/Docx.hs+2−1
compare with master
unifiedsplit
@@ -1121,7 +1121,8 @@ inlineToOpenXML' opts (Math mathType str) = do
1121 case writeOMML displayType <$> readTeX str of
1121 case writeOMML displayType <$> readTeX str of
1122 Right r -> return [r]
1122 Right r -> return [r]
1123 Left e -> do
1123 Left e -> do
1124+ (lift . lift) $ P.warn $
1124− warn $ "Cannot convert the following TeX math, skipping:\n" ++ str ++
1125+ "Cannot convert the following TeX math, skipping:\n" ++ str ++
1125 "\n" ++ e
1126 "\n" ++ e
1126 inlinesToOpenXML opts (texMathToInlines mathType str)
1127 inlinesToOpenXML opts (texMathToInlines mathType str)
1127inlineToOpenXML' opts (Cite _ lst) = inlinesToOpenXML opts lst
1128inlineToOpenXML' opts (Cite _ lst) = inlinesToOpenXML opts lst
src/Text/Pandoc/Writers/ICML.hs+2−2
@@ -18,7 +18,7 @@ import Text.Pandoc.Definition
18import Text.Pandoc.XML
18import Text.Pandoc.XML
19import Text.Pandoc.Readers.TeXMath (texMathToInlines)
19import Text.Pandoc.Readers.TeXMath (texMathToInlines)
20import Text.Pandoc.Writers.Shared
20import Text.Pandoc.Writers.Shared
21−import Text.Pandoc.Shared (linesToPara, splitBy, warn)
21+import Text.Pandoc.Shared (linesToPara, splitBy)
22import Text.Pandoc.Options
22import Text.Pandoc.Options
23import Text.Pandoc.Templates (renderTemplate')
23import Text.Pandoc.Templates (renderTemplate')
24import Text.Pandoc.Pretty
24import Text.Pandoc.Pretty
@@ -542,7 +542,7 @@ imageICML opts style attr (src, _) = do
542 case imageSize img of
542 case imageSize img of
543 Right size -> return size
543 Right size -> return size
544 Left msg -> do
544 Left msg -> do
545− warn $ "Could not determine image size in `" ++
545+ lift $ P.warn $ "Could not determine image size in `" ++
546 src ++ "': " ++ msg
546 src ++ "': " ++ msg
547 return def
547 return def
548 let (ow, oh) = sizeInPoints imgS
548 let (ow, oh) = sizeInPoints imgS