git.iko.soy/typeable/pandoc
on master help sign in
Docx writer: trim trailing whitespace.
788cb6eJesse Rosenthal
src/Text/Pandoc/Writers/Docx.hs+14−14
compare with master
unifiedsplit
@@ -1276,8 +1276,8 @@ inlineToOpenXML' opts (Link _ txt (src,_)) = do
1276 return [ mknode "w:hyperlink" [("r:id",id')] contents ]
1276 return [ mknode "w:hyperlink" [("r:id",id')] contents ]
1277inlineToOpenXML' opts (Image attr alt (src, title)) = do
1277inlineToOpenXML' opts (Image attr alt (src, title)) = do
1278 pageWidth <- asks envPrintWidth
1278 pageWidth <- asks envPrintWidth
1279− imgs <- gets stImages
1279+ imgs <- gets stImages
1280− let
1280+ let
1281 stImage = M.lookup src imgs
1281 stImage = M.lookup src imgs
1282 generateImgElt (ident, _, _, img) =
1282 generateImgElt (ident, _, _, img) =
1283 let
1283 let
@@ -1296,7 +1296,7 @@ inlineToOpenXML' opts (Image attr alt (src, title)) = do
1296 blipFill = mknode "pic:blipFill" []
1296 blipFill = mknode "pic:blipFill" []
1297 [ mknode "a:blip" [("r:embed",ident)] ()
1297 [ mknode "a:blip" [("r:embed",ident)] ()
1298 , mknode "a:stretch" [] $
1298 , mknode "a:stretch" [] $
1299− mknode "a:fillRect" [] ()
1299+ mknode "a:fillRect" [] ()
1300 ]
1300 ]
1301 xfrm = mknode "a:xfrm" []
1301 xfrm = mknode "a:xfrm" []
1302 [ mknode "a:off" [("x","0"),("y","0")] ()
1302 [ mknode "a:off" [("x","0"),("y","0")] ()
@@ -1316,7 +1316,7 @@ inlineToOpenXML' opts (Image attr alt (src, title)) = do
1316 [ mknode "pic:pic" []
1316 [ mknode "pic:pic" []
1317 [ nvPicPr
1317 [ nvPicPr
1318 , blipFill
1318 , blipFill
1319− , spPr
1319+ , spPr
1320 ]
1320 ]
1321 ]
1321 ]
1322 imgElt = mknode "w:r" [] $
1322 imgElt = mknode "w:r" [] $
@@ -1325,24 +1325,24 @@ inlineToOpenXML' opts (Image attr alt (src, title)) = do
1325 [ mknode "wp:extent" [("cx",show xemu),("cy",show yemu)] ()
1325 [ mknode "wp:extent" [("cx",show xemu),("cy",show yemu)] ()
1326 , mknode "wp:effectExtent"
1326 , mknode "wp:effectExtent"
1327 [("b","0"),("l","0"),("r","0"),("t","0")] ()
1327 [("b","0"),("l","0"),("r","0"),("t","0")] ()
1328− , mknode "wp:docPr"
1328+ , mknode "wp:docPr"
1329 [ ("descr", stringify alt)
1329 [ ("descr", stringify alt)
1330 , ("title", title)
1330 , ("title", title)
1331 , ("id","1")
1331 , ("id","1")
1332 , ("name","Picture")
1332 , ("name","Picture")
1333 ] ()
1333 ] ()
1334 , graphic
1334 , graphic
1335− ]
1335+ ]
1336 in
1336 in
1337− imgElt
1337+ imgElt
1338−
1338+
1339 case stImage of
1339 case stImage of
1340 Just imgData -> return $ [generateImgElt imgData]
1340 Just imgData -> return $ [generateImgElt imgData]
1341− Nothing -> ( do --try
1341+ Nothing -> ( do --try
1342 (img, mt) <- P.fetchItem src
1342 (img, mt) <- P.fetchItem src
1343 ident <- ("rId"++) `fmap` getUniqueId
1343 ident <- ("rId"++) `fmap` getUniqueId
1344−
1344+
1345− let
1345+ let
1346 imgext = case mt >>= extensionFromMimeType of
1346 imgext = case mt >>= extensionFromMimeType of
1347 Just x -> '.':x
1347 Just x -> '.':x
1348 Nothing -> case imageType img of
1348 Nothing -> case imageType img of
@@ -1353,12 +1353,12 @@ inlineToOpenXML' opts (Image attr alt (src, title)) = do
1353 Just Eps -> ".eps"
1353 Just Eps -> ".eps"
1354 Just Svg -> ".svg"
1354 Just Svg -> ".svg"
1355 Just Emf -> ".emf"
1355 Just Emf -> ".emf"
1356− Nothing -> ""
1356+ Nothing -> ""
1357 imgpath = "media/" ++ ident ++ imgext
1357 imgpath = "media/" ++ ident ++ imgext
1358 mbMimeType = mt <|> getMimeType imgpath
1358 mbMimeType = mt <|> getMimeType imgpath
1359−
1359+
1360 imgData = (ident, imgpath, mbMimeType, img)
1360 imgData = (ident, imgpath, mbMimeType, img)
1361−
1361+
1362 if null imgext
1362 if null imgext
1363 then -- without an extension there is no rule for content type
1363 then -- without an extension there is no rule for content type
1364 inlinesToOpenXML opts alt -- return alt to avoid corrupted docx
1364 inlinesToOpenXML opts alt -- return alt to avoid corrupted docx