Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixes to compile after rebase.

Browse source
This commit is contained in:
John MacFarlane 2016-11-27 11:52:32 +01:00
parent 04545c92c8
commit 33af62acc5
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Text/Pandoc/Writers/Docx.hs
View file

@ -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

4
src/Text/Pandoc/Writers/ICML.hs
View file

@ -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