git.iko.soy/typeable/pandoc
on master help sign in
Improved warnings when image size can't be determined.

Closes #1834.

commit60bf4a8bfb543fcf8021356e6c4ad2b994acd8c8 authorJohn MacFarlane <fiddlosopher@gmail.com> dateSat 9 May 2015, 23:56 (11 years ago) parent31b3f2e
4 files changed+14−6
compare with master
unifiedsplit
data/templates+1−1 src/Text/Pandoc/Writers/Docx.hs+5−2 src/Text/Pandoc/Writers/ODT.hs+4−2 src/Text/Pandoc/Writers/RTF.hs+4−1
data/templates+1−1

Submodule changed.

src/Text/Pandoc/Writers/Docx.hs+5−2
@@ -1122,8 +1122,11 @@ inlineToOpenXML opts (Image alt (src, tit)) = do
11221122 ident <- ("rId"++) `fmap` getUniqueId
11231123 (xpt,ypt) <- case imageSize img of
11241124 Right size -> return $ sizeInPoints size
1125− Left msg -> do liftIO (warn msg)
1126− return (120,120)
1125+ Left msg -> do
1126+ liftIO $ warn $
1127+ "Could not determine image size in `" ++
1128+ src ++ "': " ++ msg
1129+ return (120,120)
11271130 -- 12700 emu = 1 pt
11281131 let (xemu,yemu) = fitToPage (xpt * 12700, ypt * 12700) (pageWidth * 12700)
11291132 let cNvPicPr = mknode "pic:cNvPicPr" [] $
src/Text/Pandoc/Writers/ODT.hs+4−2
@@ -136,8 +136,10 @@ transformPicMath opts entriesRef (Image lab (src,t)) = do
136136 Right (img, mbMimeType) -> do
137137 (w,h) <- case imageSize img of
138138 Right size -> return $ sizeInPoints size
139− Left msg -> do warn msg
140− return (0,0)
139+ Left msg -> do
140+ warn $ "Could not determine image size in `" ++
141+ src ++ "': " ++ msg
142+ return (0,0)
141143 let tit' = show w ++ "x" ++ show h
142144 entries <- readIORef entriesRef
143145 let extension = fromMaybe (takeExtension $ takeWhile (/='?') src)
src/Text/Pandoc/Writers/RTF.hs+4−1
@@ -57,7 +57,10 @@ rtfEmbedImage opts x@(Image _ (src,_)) = do
5757 "image/png" -> "\\pngblip"
5858 _ -> error "Unknown file type"
5959 sizeSpec <- case imageSize imgdata of
60− Left msg -> warn msg >> return ""
60+ Left msg -> do
61+ warn $ "Could not determine image size in `" ++
62+ src ++ "': " ++ msg
63+ return ""
6164 Right sz -> return $ "\\picw" ++ show xpx ++
6265 "\\pich" ++ show ypx ++
6366 "\\picwgoal" ++ show (xpt * 20)