diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2011-02-05 08:16:34 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2011-02-05 08:16:34 -0800 |
| commit | 6c0e86d1444e401af2590287a86c1963043fee2e (patch) | |
| tree | 20fcd2f705a80747a8083b754b76559ecf4dc77f | |
| parent | 798c5d55bbfff566a7de9713ec38f1db75c96970 (diff) | |
| download | pandoc-6c0e86d1444e401af2590287a86c1963043fee2e.tar.gz | |
HTML writer: stringify alt text.
Previously, if you had formatting in the label of an Image
element, you'd get escaped HTML in the alt attribute. Now
you just get a plain string version, which seems preferable.
| -rw-r--r-- | src/Tests/Writers/HTML.hs | 5 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/HTML.hs | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Tests/Writers/HTML.hs b/src/Tests/Writers/HTML.hs index e13d0dc87..3e1e0ddc2 100644 --- a/src/Tests/Writers/HTML.hs +++ b/src/Tests/Writers/HTML.hs @@ -38,4 +38,9 @@ tests = [ testGroup "inline code" , "nolanguage" =: codeWith ("",["nolanguage"],[]) ">>=" =?> "<code class=\"nolanguage\">>>=</code>" ] + , testGroup "images" + [ "alt with formatting" =: + image "/url" "title" ("my " +++ emph "image") + =?> "<img src=\"/url\" title=\"title\" alt=\"my image\" />" + ] ] diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs index 7cc40e489..aba73a417 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -602,8 +602,7 @@ inlineToHtml opts inline = if null tit then [] else [title tit]) $ linkText (Image txt (s,tit)) -> do - alternate <- inlineListToHtml opts txt - let alternate' = showHtmlFragment alternate + let alternate' = stringify txt let attributes = [src s] ++ (if null tit then [] |