Don't include empty captions in figures.

Closes #581.

6 files changed, 32 insertions, 17 deletions

diff --git a/src/Text/Pandoc/Writers/Docbook.hs b/src/Text/Pandoc/Writers/Docbook.hs
index b31eb976f..e696fc63e 100644
--- a/src/Text/Pandoc/Writers/Docbook.hs
+++ b/src/Text/Pandoc/Writers/Docbook.hs
@@ -145,13 +145,16 @@ blockToDocbook _ Null = empty
 blockToDocbook _ (Header _ _) = empty -- should not occur after hierarchicalize
 blockToDocbook opts (Plain lst) = inlinesToDocbook opts lst
 blockToDocbook opts (Para [Image txt (src,_)]) =
-  let capt = inlinesToDocbook opts txt
+  let alt  = inlinesToDocbook opts txt
+      capt = if null txt
+                then empty
+                else inTagsSimple "title" alt
   in  inTagsIndented "figure" $
-        inTagsSimple "title" capt $$
+        capt $$
         (inTagsIndented "mediaobject" $
            (inTagsIndented "imageobject"
              (selfClosingTag "imagedata" [("fileref",src)])) $$
-           inTagsSimple "textobject" (inTagsSimple "phrase" capt))
+           inTagsSimple "textobject" (inTagsSimple "phrase" alt))
 blockToDocbook opts (Para lst) =
   inTagsIndented "para" $ inlinesToDocbook opts lst
 blockToDocbook opts (BlockQuote blocks) =
diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index 78361dafc..9a15e4bd3 100644
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -379,13 +379,17 @@ blockToHtml _ Null = return mempty
 blockToHtml opts (Plain lst) = inlineListToHtml opts lst
 blockToHtml opts (Para [Image txt (s,tit)]) = do
   img <- inlineToHtml opts (Image txt (s,tit))
-  capt <- inlineListToHtml opts txt
+  let tocapt = if writerHtml5 opts
+                  then H5.figcaption
+                  else H.p ! A.class_ "caption"
+  capt <- if null txt
+             then return mempty
+             else tocapt `fmap` inlineListToHtml opts txt
   return $ if writerHtml5 opts
               then H5.figure $ mconcat
-                    [nl opts, img, H5.figcaption capt, nl opts]
+                    [nl opts, img, capt, nl opts]
               else H.div ! A.class_ "figure" $ mconcat
-                    [nl opts, img, H.p ! A.class_ "caption" $ capt,
-                    nl opts]
+                    [nl opts, img, capt, nl opts]
 blockToHtml opts (Para lst) = do
   contents <- inlineListToHtml opts lst
   return $ H.p contents
diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs
index edd0bf9e2..e4788ab06 100644
--- a/src/Text/Pandoc/Writers/LaTeX.hs
+++ b/src/Text/Pandoc/Writers/LaTeX.hs
@@ -266,10 +266,12 @@ blockToLaTeX :: Block     -- ^ Block to convert
 blockToLaTeX Null = return empty
 blockToLaTeX (Plain lst) = inlineListToLaTeX lst
 blockToLaTeX (Para [Image txt (src,tit)]) = do
-  capt <- inlineListToLaTeX txt
+  capt <- if null txt
+             then return empty
+             else (\c -> "\\caption" <> braces c) `fmap` inlineListToLaTeX txt
   img <- inlineToLaTeX (Image txt (src,tit))
   return $ "\\begin{figure}[htbp]" $$ "\\centering" $$ img $$
-           ("\\caption{" <> capt <> char '}') $$ "\\end{figure}"
+           capt $$ "\\end{figure}"
 blockToLaTeX (Para lst) = do
   result <- inlineListToLaTeX lst
   return result
diff --git a/src/Text/Pandoc/Writers/MediaWiki.hs b/src/Text/Pandoc/Writers/MediaWiki.hs
index 6af2febf5..84d7393c1 100644
--- a/src/Text/Pandoc/Writers/MediaWiki.hs
+++ b/src/Text/Pandoc/Writers/MediaWiki.hs
@@ -82,11 +82,12 @@ blockToMediaWiki opts (Plain inlines) =
   inlineListToMediaWiki opts inlines
 
 blockToMediaWiki opts (Para [Image txt (src,tit)]) = do
-  capt <- inlineListToMediaWiki opts txt
+  capt <- if null txt
+             then return ""
+             else ("|caption " ++) `fmap` inlineListToMediaWiki opts txt
   let opt = if null txt
                then ""
-               else "|alt=" ++ if null tit then capt else tit ++
-                    "|caption " ++ capt
+               else "|alt=" ++ if null tit then capt else tit ++ capt
   return $ "[[Image:" ++ src ++ "|frame|none" ++ opt ++ "]]\n"
 
 blockToMediaWiki opts (Para inlines) = do
diff --git a/src/Text/Pandoc/Writers/Org.hs b/src/Text/Pandoc/Writers/Org.hs
index 383a897b5..b885a7a40 100644
--- a/src/Text/Pandoc/Writers/Org.hs
+++ b/src/Text/Pandoc/Writers/Org.hs
@@ -115,9 +115,12 @@ blockToOrg :: Block         -- ^ Block element
 blockToOrg Null = return empty
 blockToOrg (Plain inlines) = inlineListToOrg inlines
 blockToOrg (Para [Image txt (src,tit)]) = do
-  capt <- inlineListToOrg txt
+  capt <- if null txt
+             then return empty
+             else (\c -> "#+CAPTION: " <> c <> blankline) `fmap`
+                    inlineListToOrg txt
   img <- inlineToOrg (Image txt (src,tit))
-  return $ "#+CAPTION: " <> capt <> blankline <> img
+  return $ capt <> img
 blockToOrg (Para inlines) = do
   contents <- inlineListToOrg inlines
   return $ contents <> blankline
diff --git a/src/Text/Pandoc/Writers/Texinfo.hs b/src/Text/Pandoc/Writers/Texinfo.hs
index e0ff24f8c..40e76c615 100644
--- a/src/Text/Pandoc/Writers/Texinfo.hs
+++ b/src/Text/Pandoc/Writers/Texinfo.hs
@@ -117,10 +117,12 @@ blockToTexinfo (Plain lst) =
   inlineListToTexinfo lst
 
 blockToTexinfo (Para [Image txt (src,tit)]) = do
-  capt <- inlineListToTexinfo txt
+  capt <- if null txt
+             then return empty
+             else (\c -> text "@caption" <> braces c) `fmap`
+                    inlineListToTexinfo txt
   img  <- inlineToTexinfo (Image txt (src,tit))
-  return $ text "@float" $$ img $$ (text "@caption{" <> capt <> char '}') $$
-           text "@end float"
+  return $ text "@float" $$ img $$ capt $$ text "@end float"
 
 blockToTexinfo (Para lst) =
   inlineListToTexinfo lst    -- this is handled differently from Plain in blockListToTexinfo