From a924a3f43d25b34ddd46da2100732ee077779785 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 13 Dec 2015 20:15:49 -0800
Subject: [PATCH] Fixed ICML image syntax for local files.
`file:filename` rather than `file://./filename`.
I think this is right; it matches what we had before
with people actually using the ICML writer, and seems
to match examples in the spec. I don't
have a copy of InDesign I can test on, though.
@DigitalPublishingToolkit and @mb21, can you have
a look?
---
src/Text/Pandoc/Writers/ICML.hs | 2 +-
tests/writer.icml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Text/Pandoc/Writers/ICML.hs b/src/Text/Pandoc/Writers/ICML.hs
index 7fe3de2f6..4b2e794d3 100644
--- a/src/Text/Pandoc/Writers/ICML.hs
+++ b/src/Text/Pandoc/Writers/ICML.hs
@@ -533,7 +533,7 @@ imageICML opts style attr _ (src, _) = do
hw = showFl $ ow / 2
hh = showFl $ oh / 2
scale = showFl (imgWidth / ow) ++ " 0 0 " ++ showFl (imgHeight / oh)
- src' = if isURI src then src else "file://." ++ pathSeparator : src
+ src' = if isURI src then src else "file:" ++ src
(stlStr, attrs) = styleToStrAttr style
props = inTags True "Properties" [] $ inTags True "PathGeometry" []
$ inTags True "GeometryPathType" [("PathOpen","false")]
diff --git a/tests/writer.icml b/tests/writer.icml
index b7444ef22..57f9d2f8a 100644
--- a/tests/writer.icml
+++ b/tests/writer.icml
@@ -2563,7 +2563,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content>
$ID/Embedded
</Profile>
</Properties>
- <Link Self="ueb" LinkResourceURI="file://./lalune.jpg" />
+ <Link Self="ueb" LinkResourceURI="file:lalune.jpg" />
</Image>
</Rectangle>
</CharacterStyleRange><Br />
@@ -2592,7 +2592,7 @@ These should not be escaped: \$ \\ \> \[ \{</Content>
$ID/Embedded
</Profile>
</Properties>
- <Link Self="ueb" LinkResourceURI="file://./movie.jpg" />
+ <Link Self="ueb" LinkResourceURI="file:movie.jpg" />
</Image>
</Rectangle>
</CharacterStyleRange>