aboutsummaryrefslogtreecommitdiff
path: root/src/Text
diff options
context:
space:
mode:
authordamien clochard <damien@dalibo.info>2019-01-01 23:08:38 +0100
committerJohn MacFarlane <jgm@berkeley.edu>2019-01-01 14:08:38 -0800
commit4ab2a46bdcb7337ca6e23037e53b1dc88b2d2240 (patch)
tree2e06e70928951a618517687ebeffe6c6a385372e /src/Text
parent814e97df92bd3436e9bb3bf30728ef9822e35161 (diff)
downloadpandoc-4ab2a46bdcb7337ca6e23037e53b1dc88b2d2240.tar.gz
Zimwiki writer: remove automatic colon prefix before internal images (#5183)
* FIX #5183 : zimwiki : remove automatic colon prefix before internal images ![](foo.png) should be converted to {{foo.png}} (relative path) ![](/foo.png] should be converted to {{/foo.png}} (absolute path) Therefore the ':' prefix is useless and must be removed. I never used the zimwiki, but i submitted the similar dokuwiki fix. 1. The zimwiki syntax is inspired by dokuwiki 2. The zimwiki documentation does not mention the colon character for images 3. The pandoc zimwiki writer seems to be a copy-paste for the dokuwiki writer If the PR #5184 is applied, I think this one should be applied too.
Diffstat (limited to 'src/Text')
-rw-r--r--src/Text/Pandoc/Writers/ZimWiki.hs8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/Text/Pandoc/Writers/ZimWiki.hs b/src/Text/Pandoc/Writers/ZimWiki.hs
index 84b60fdfe..4d0680bc9 100644
--- a/src/Text/Pandoc/Writers/ZimWiki.hs
+++ b/src/Text/Pandoc/Writers/ZimWiki.hs
@@ -109,9 +109,7 @@ blockToZimWiki opts (Para [Image attr txt (src,'f':'i':'g':':':tit)]) = do
let opt = if null txt
then ""
else "|" ++ if null tit then capt else tit ++ capt
- -- Relative links fail isURI and receive a colon
- prefix = if isURI src then "" else ":"
- return $ "{{" ++ prefix ++ src ++ imageDims opts attr ++ opt ++ "}}\n"
+ return $ "{{" ++ src ++ imageDims opts attr ++ opt ++ "}}\n"
blockToZimWiki opts (Para inlines) = do
indent <- gets stIndent
@@ -383,9 +381,7 @@ inlineToZimWiki opts (Image attr alt (source, tit)) = do
("", _, False ) -> "|" ++ alt'
(_ , _, False ) -> "|" ++ tit
(_ , _, True ) -> ""
- -- Relative links fail isURI and receive a colon
- prefix = if isURI source then "" else ":"
- return $ "{{" ++ prefix ++ source ++ imageDims opts attr ++ txt ++ "}}"
+ return $ "{{" ++ source ++ imageDims opts attr ++ txt ++ "}}"
inlineToZimWiki opts (Note contents) = do
-- no concept of notes in zim wiki, use a text block