From 6c0e86d1444e401af2590287a86c1963043fee2e Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 5 Feb 2011 08:16:34 -0800
Subject: 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.
---
 src/Tests/Writers/HTML.hs       | 5 +++++
 src/Text/Pandoc/Writers/HTML.hs | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

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\">&gt;&gt;=</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 [] 
-- 
cgit v1.2.3