HTML writer: Use a p rather than a div for image caption.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1900 788f1e2b-df1e-0410-8736-df70ead52e1b

README

@@ -915,7 +915,7 @@ Images with captions
 An image occurring by itself in a paragraph will be rendered as
 a figure with a caption.  (In LaTeX, a figure environment will be
 used; in HTML, the image will be placed in a `div` with class
-`figure`, together with a caption in a `div` with class `caption`.)
+`figure`, together with a caption in a `p` with class `caption`.)
 The image's alt text will be used as the caption.
 
     ![This is the caption](/url/of/image.png)

src/Text/Pandoc/Writers/HTML.hs

@@ -264,7 +264,7 @@ blockToHtml opts (Para [Image txt (s,tit)]) = do
   img <- inlineToHtml opts (Image txt (s,tit))
   capt <- inlineListToHtml opts txt
   return $ thediv ! [theclass "figure"] <<
-             [img, thediv ! [theclass "caption"] << capt]
+             [img, paragraph ! [theclass "caption"] << capt]
 blockToHtml opts (Para lst) = inlineListToHtml opts lst >>= (return . paragraph)
 blockToHtml _ (RawHtml str) = return $ primHtml str
 blockToHtml _ (HorizontalRule) = return $ hr

tests/writer.html

@@ -1158,8 +1158,8 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'<code>'+e+'</code>'+'<\/'+
   >From “Voyage dans la Lune” by Georges Melies (1902):</p
   ><div class="figure"
   ><img src="lalune.jpg" title="Voyage dans la Lune" alt="lalune"
-     /><div class="caption"
-    >lalune</div
+     /><p class="caption"
+    >lalune</p
     ></div
   ><p
   >Here is a movie <img src="movie.jpg" alt="movie"