From 81afcdfaf808d345cc94facdcf927f87325dfa4e Mon Sep 17 00:00:00 2001
From: Alexander Krotov <ilabdsf@gmail.com>
Date: Tue, 20 Mar 2018 15:01:53 +0300
Subject: [PATCH] Muse writer: escape "]" in image title
---
src/Text/Pandoc/Writers/Muse.hs | 3 ++-
test/Tests/Writers/Muse.hs | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/Text/Pandoc/Writers/Muse.hs b/src/Text/Pandoc/Writers/Muse.hs
index b64756f91..8feb277c6 100644
--- a/src/Text/Pandoc/Writers/Muse.hs
+++ b/src/Text/Pandoc/Writers/Muse.hs
@@ -428,11 +428,12 @@ inlineToMuse (Image attr inlines (source, title)) = do
then if null inlines
then ""
else "[" <> alt <> "]"
- else "[" <> text title <> "]"
+ else "[" <> text (escape title) <> "]"
let width = case dimension Width attr of
Just (Percent x) | isEnabled Ext_amuse opts -> " " ++ show (round x :: Integer)
_ -> ""
return $ "[[" <> text (urlEscapeBrackets source ++ width) <> "]" <> title' <> "]"
+ where escape s = if "]" `isInfixOf` s then escapeString s else conditionalEscapeString s
inlineToMuse (Note contents) = do
-- add to notes in state
notes <- gets stNotes
diff --git a/test/Tests/Writers/Muse.hs b/test/Tests/Writers/Muse.hs
index 04f6de449..ad7e4f1c4 100644
--- a/test/Tests/Writers/Muse.hs
+++ b/test/Tests/Writers/Muse.hs
@@ -393,6 +393,7 @@ tests = [ testGroup "block elements"
, "image with width" =:
imageWith ("", [], [("width", "60%")]) "image.png" "Image" (str "") =?>
"[[image.png 60][Image]]"
+ , "escape brackets in image title" =: image "image.png" "Foo]bar" (str "") =?> "[[image.png][<verbatim>Foo]bar</verbatim>]]"
, "note" =: note (plain (text "Foo"))
=?> unlines [ "[1]"
, ""