From 3d0faf692708f9977a485ade57d67f2d528da817 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 1 Aug 2024 08:06:16 -0700 Subject: [PATCH] AsciiDoc writer: don't emit empty figure caption. Closes #10047. --- src/Text/Pandoc/Writers/AsciiDoc.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Text/Pandoc/Writers/AsciiDoc.hs b/src/Text/Pandoc/Writers/AsciiDoc.hs index f019cb51a..b315f0e92 100644 --- a/src/Text/Pandoc/Writers/AsciiDoc.hs +++ b/src/Text/Pandoc/Writers/AsciiDoc.hs @@ -204,7 +204,10 @@ blockToAsciiDoc opts (Header level (ident,_,_) inlines) = do blockToAsciiDoc opts (Figure attr (Caption _ longcapt) body) = do -- Images in figures all get rendered as individual block-level images -- with the given caption. Non-image elements are rendered unchanged. - capt <- inlineListToAsciiDoc opts (blocksToInlines longcapt) + capt <- if null longcapt + then pure mempty + else ("." <>) . nowrap <$> + inlineListToAsciiDoc opts (blocksToInlines longcapt) let renderFigElement = \case Plain [Image imgAttr alternate (src, tit)] -> do args <- imageArguments opts imgAttr alternate src tit @@ -213,7 +216,8 @@ blockToAsciiDoc opts (Figure attr (Caption _ longcapt) body) = do (ident, _, _) -> literal $ "[#" <> ident <> "]" -- .Figure caption -- image::images/logo.png[Company logo, title="blah"] - return $ "." <> nowrap capt $$ + return $ + capt $$ figAttributes $$ "image::" <> args <> blankline blk -> blockToAsciiDoc opts blk