diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2020-12-12 08:28:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-12 08:28:14 -0800 |
| commit | 3a7d97f02fbad0c7dbe6428535c7e8e9a6d0df12 (patch) | |
| tree | d9e098dc5264f1c4fc6cc2ad2956926b82f6c761 | |
| parent | ccd235e31ff00c4741ba52552ba58669f700bbdc (diff) | |
| parent | 208cb9619632ee9490b75158e44213ee6d4ab93e (diff) | |
| download | pandoc-3a7d97f02fbad0c7dbe6428535c7e8e9a6d0df12.tar.gz | |
Merge pull request #6946 from mb21/icml-image-fit
ICML writer: fix image bounding box for custom widths/heights
| -rw-r--r-- | src/Text/Pandoc/Writers/ICML.hs | 7 | ||||
| -rw-r--r-- | test/command/5541-nesting.md | 1 | ||||
| -rw-r--r-- | test/command/svg.md | 4 | ||||
| -rw-r--r-- | test/writer.icml | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Writers/ICML.hs b/src/Text/Pandoc/Writers/ICML.hs index dcf5acfef..c254fbc58 100644 --- a/src/Text/Pandoc/Writers/ICML.hs +++ b/src/Text/Pandoc/Writers/ICML.hs @@ -621,7 +621,12 @@ imageICML opts style attr (src, _) = do image = inTags True "Image" [("Self","ue6"), ("ItemTransform", scale<>" -"<>hw<>" -"<>hh)] $ vcat [ - inTags True "Properties" [] $ inTags True "Profile" [("type","string")] $ text "$ID/Embedded" + inTags True "Properties" [] $ vcat [ + inTags True "Profile" [("type","string")] $ text "$ID/Embedded" + , selfClosingTag "GraphicBounds" [("Left","0"), ("Top","0") + , ("Right", showFl $ ow*ow / imgWidth) + , ("Bottom", showFl $ oh*oh / imgHeight)] + ] , selfClosingTag "Link" [("Self", "ueb"), ("LinkResourceURI", src')] ] doc = inTags True "CharacterStyleRange" attrs diff --git a/test/command/5541-nesting.md b/test/command/5541-nesting.md index 194b79164..5abe41a9a 100644 --- a/test/command/5541-nesting.md +++ b/test/command/5541-nesting.md @@ -80,6 +80,7 @@ <Profile type="string"> $ID/Embedded </Profile> + <GraphicBounds Left="0" Top="0" Right="150" Bottom="150" /> </Properties> <Link Self="ueb" LinkResourceURI="file:lalune.jpg" /> </Image> diff --git a/test/command/svg.md b/test/command/svg.md index 26a8213f6..57506570b 100644 --- a/test/command/svg.md +++ b/test/command/svg.md @@ -23,6 +23,7 @@ <Profile type="string"> $ID/Embedded </Profile> + <GraphicBounds Left="0" Top="0" Right="300" Bottom="200" /> </Properties> <Link Self="ueb" LinkResourceURI="file:command/corrupt.svg" /> </Image> @@ -56,6 +57,7 @@ <Profile type="string"> $ID/Embedded </Profile> + <GraphicBounds Left="0" Top="0" Right="300" Bottom="200" /> </Properties> <Link Self="ueb" LinkResourceURI="file:command/SVG_logo.svg" /> </Image> @@ -89,6 +91,7 @@ <Profile type="string"> $ID/Embedded </Profile> + <GraphicBounds Left="0" Top="0" Right="300" Bottom="200" /> </Properties> <Link Self="ueb" LinkResourceURI="file:command/SVG_logo-without-xml-declaration.svg" /> </Image> @@ -122,6 +125,7 @@ <Profile type="string"> $ID/Embedded </Profile> + <GraphicBounds Left="0" Top="0" Right="109.5" Bottom="130.5" /> </Properties> <Link Self="ueb" LinkResourceURI="file:command/inkscape-cube.svg" /> </Image> diff --git a/test/writer.icml b/test/writer.icml index a4b40056a..0601ba494 100644 --- a/test/writer.icml +++ b/test/writer.icml @@ -2800,6 +2800,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> <Profile type="string"> $ID/Embedded </Profile> + <GraphicBounds Left="0" Top="0" Right="150" Bottom="150" /> </Properties> <Link Self="ueb" LinkResourceURI="file:lalune.jpg" /> </Image> @@ -2836,6 +2837,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content> <Profile type="string"> $ID/Embedded </Profile> + <GraphicBounds Left="0" Top="0" Right="20" Bottom="22" /> </Properties> <Link Self="ueb" LinkResourceURI="file:movie.jpg" /> </Image> |