git.iko.soy/typeable/pandoc
on master help sign in
Jira writer: keep image caption as alt attribute

Fixes #6529

commit36fede2b024d46f64d1a5bbc1a82b22d681fe7c3 authorAlbert Krewinkel <albert@zeitkraut.de> dateFri 17 Jul 2020, 16:01 (6 years ago) parent06d834c
2 files changed+14−12
src/Text/Pandoc/Writers/Jira.hs+12−10 test/writer.jira+2−2
src/Text/Pandoc/Writers/Jira.hs+12−10
@@ -194,7 +194,7 @@ toJiraInlines inlines = do
194194 Jira.Monospaced (escapeSpecialChars cs)
195195 Emph xs -> styled Jira.Emphasis xs
196196 Underline xs -> styled Jira.Insert xs
197− Image attr _ tgt -> imageToJira attr (fst tgt) (snd tgt)
197+ Image attr cap tgt -> imageToJira attr cap (fst tgt) (snd tgt)
198198 LineBreak -> pure . singleton $ Jira.Linebreak
199199 Link attr xs tgt -> toJiraLink attr tgt xs
200200 Math mtype cs -> mathToJira mtype cs
@@ -233,16 +233,18 @@ escapeSpecialChars t = case plainText t of
233233 Left _ -> singleton $ Jira.Str t
234234
235235imageToJira :: PandocMonad m
236− => Attr -> Text -> Text
236+ => Attr -> [Inline] -> Text -> Text
237237 -> JiraConverter m [Jira.Inline]
238−imageToJira (_, classes, kvs) src title =
239− let imgParams = if "thumbnail" `elem` classes
240− then [Jira.Parameter "thumbnail" ""]
241− else map (uncurry Jira.Parameter) kvs
242− imgParams' = if T.null title
243− then imgParams
244− else Jira.Parameter "title" title : imgParams
245− in pure . singleton $ Jira.Image imgParams' (Jira.URL src)
238+imageToJira (_, classes, kvs) caption src title =
239+ let imageWithParams ps = Jira.Image ps (Jira.URL src)
240+ alt = stringify caption
241+ in pure . singleton . imageWithParams $
242+ if "thumbnail" `elem` classes
243+ then [Jira.Parameter "thumbnail" ""]
244+ else map (uncurry Jira.Parameter)
245+ . (if T.null title then id else (("title", title):))
246+ . (if T.null alt then id else (("alt", alt):))
247+ $ kvs
246248
247249-- | Creates a Jira Link element.
248250toJiraLink :: PandocMonad m
test/writer.jira+2−2
@@ -513,9 +513,9 @@ or here: <http://example.com/>
513513h1. {anchor:images}Images
514514From "Voyage dans la Lune" by Georges Melies \(1902):
515515
516−!lalune.jpg|title=fig:Voyage dans la Lune!
516+!lalune.jpg|title=fig:Voyage dans la Lune, alt=lalune!
517517
518−Here is a movie !movie.jpg! icon.
518+Here is a movie !movie.jpg|alt=movie! icon.
519519
520520----
521521h1. {anchor:footnotes}Footnotes