Handle Figures in HTML writer.

Author: argent0

src/Text/Pandoc/Writers/HTML.hs

@@ -993,7 +993,31 @@ blockToHtml opts (DefinitionList lst) = do
   defList opts contents
 blockToHtml opts (Table attr caption colspecs thead tbody tfoot) =
   tableToHtml opts (Ann.toTable attr caption colspecs thead tbody tfoot)
-blockToHtml opts (Figure attrs _ body) = blockToHtml opts $ Div attrs body
+blockToHtml opts (Figure attrs (Caption _ captBody)  body) = do
+  html5 <- gets stHtml5
+
+  htmlAttrs <- attrsToHtml opts attrs
+  contents <- blockListToHtml opts body
+
+  if html5
+     then do
+         capt <- if null captBody
+                    then return mempty
+                    else blockListToHtml opts captBody >>= \cb -> return $ mconcat
+                         [ H5.figcaption cb
+                         , nl opts ]
+         return $ foldl (!) H5.figure htmlAttrs $ mconcat
+             [nl opts, contents, nl opts, capt]
+     else do
+         capt <- if null captBody
+                    then return mempty
+                    else blockListToHtml opts captBody >>= \cb -> return $
+                            mconcat
+                                [ (H.div ! A.class_ "figcaption") cb
+                                , nl opts ]
+
+         return $ foldl (!) H.div (A.class_ "float" : htmlAttrs) $ mconcat
+             [nl opts, contents, nl opts, capt]
 
 tableToHtml :: PandocMonad m
             => WriterOptions

test/command/figures/figures-html.md

@@ -0,0 +1,49 @@
+HTML5 figure with caption and content.
+
+```
+% pandoc -f native -t html5
+[Figure ("fig-id",[],[]) (Caption Nothing [Plain [Str "caption"]]) [Para [Str "content"]]]
+
+^D
+<figure id="fig-id">
+<p>content</p>
+<figcaption>caption</figcaption>
+</figure>
+```
+
+HTML5 figure with NO caption and content.
+
+```
+% pandoc -f native -t html5
+[Figure ("fig-id",[],[]) (Caption Nothing []) [Para [Str "content"]]]
+
+^D
+<figure id="fig-id">
+<p>content</p>
+</figure>
+```
+
+HTML4 figure with caption and content.
+
+```
+% pandoc -f native -t html4
+[Figure ("fig-id",[],[]) (Caption Nothing [Plain [Str "caption"]]) [Para [Str "content"]]]
+
+^D
+<div class="float" id="fig-id">
+<p>content</p>
+<div class="figcaption">caption</div>
+</div>
+```
+
+HTML4 figure with NO caption and content.
+
+```
+% pandoc -f native -t html4
+[Figure ("fig-id",[],[]) (Caption Nothing []) [Para [Str "content"]]]
+
+^D
+<div class="float" id="fig-id">
+<p>content</p>
+</div>
+```