aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormb21 <mb21@users.noreply.github.com>2020-12-12 14:12:39 +0100
committermb21 <mb21@users.noreply.github.com>2020-12-12 14:49:11 +0100
commit208cb9619632ee9490b75158e44213ee6d4ab93e (patch)
treeb4b5cc63b98f26b8724e4988734c61c024756466
parentfcd065818901e57f01aca4c919f6102f9a047ba0 (diff)
downloadpandoc-208cb9619632ee9490b75158e44213ee6d4ab93e.tar.gz
ICML writer: fix image bounding box for custom widths/heights
fixes #6936
-rw-r--r--src/Text/Pandoc/Writers/ICML.hs7
-rw-r--r--test/command/5541-nesting.md1
-rw-r--r--test/command/svg.md4
-rw-r--r--test/writer.icml2
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: \$ \\ \&gt; \[ \{</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: \$ \\ \&gt; \[ \{</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>