diff options
| author | ickc <ickc@users.noreply.github.com> | 2016-05-09 19:24:40 -0700 |
|---|---|---|
| committer | ickc <ickc@users.noreply.github.com> | 2016-05-09 19:24:40 -0700 |
| commit | 0ae60a91535a8f55f3061f36fdb3a54f6ddda85d (patch) | |
| tree | f0c74ae411967ed5f67bd8b0bdf175ee5ca964ab /src/Text/Pandoc/Writers/Docx.hs | |
| parent | 846fa8704618e7e544313f5b3b627ccb6e65b550 (diff) | |
| parent | f7601297f0ff184a59efdc3ea279137fc6012eef (diff) | |
| download | pandoc-0ae60a91535a8f55f3061f36fdb3a54f6ddda85d.tar.gz | |
Merge pull request #1 from jgm/master
Merge from jgm's master
Diffstat (limited to 'src/Text/Pandoc/Writers/Docx.hs')
| -rw-r--r-- | src/Text/Pandoc/Writers/Docx.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs index 150e19043..a841e1b66 100644 --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -1103,7 +1103,7 @@ inlineToOpenXML opts (Link _ txt (src,_)) = do M.insert src i extlinks } return i return [ mknode "w:hyperlink" [("r:id",id')] contents ] -inlineToOpenXML opts (Image attr alt (src, tit)) = do +inlineToOpenXML opts (Image attr alt (src, _)) = do -- first, check to see if we've already done this image pageWidth <- gets stPrintWidth imgs <- gets stImages @@ -1154,7 +1154,7 @@ inlineToOpenXML opts (Image attr alt (src, tit)) = do mknode "wp:inline" [] [ mknode "wp:extent" [("cx",show xemu),("cy",show yemu)] () , mknode "wp:effectExtent" [("b","0"),("l","0"),("r","0"),("t","0")] () - , mknode "wp:docPr" [("descr",tit),("id","1"),("name","Picture")] () + , mknode "wp:docPr" [("descr",stringify alt),("id","1"),("name","Picture")] () , graphic ] let imgext = case mt >>= extensionFromMimeType of Just x -> '.':x |