From 8028de33220af0a43ac8d14021b7fa2b98b22d64 Mon Sep 17 00:00:00 2001 From: Nils Carlson Date: Sat, 21 Sep 2019 20:12:00 +0000 Subject: odt: Add external option for native numbering This adds an external options +native_numbering to the ODT writer enabling enumeration of figures and tables in ODT output. --- src/Text/Pandoc/Writers/OpenDocument.hs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/Text/Pandoc/Writers') diff --git a/src/Text/Pandoc/Writers/OpenDocument.hs b/src/Text/Pandoc/Writers/OpenDocument.hs index 3da778ae9..7a3aa4973 100644 --- a/src/Text/Pandoc/Writers/OpenDocument.hs +++ b/src/Text/Pandoc/Writers/OpenDocument.hs @@ -397,9 +397,9 @@ blockToOpenDocument o bs captionDoc <- if null c then return empty else inlinesToOpenDocument o c >>= - if True -- temporary: see #5474 - then unNumberedCaption "TableCaption" - else numberedTableCaption + if isEnabled Ext_native_numbering o + then numberedTableCaption + else unNumberedCaption "TableCaption" th <- if all null h then return empty else colHeadsToOpenDocument o (map fst paraHStyles) h @@ -412,9 +412,9 @@ blockToOpenDocument o bs | otherwise = do imageDoc <- withParagraphStyle o "FigureWithCaption" [Para [Image attr caption (source,title)]] captionDoc <- inlinesToOpenDocument o caption >>= - if True -- temporary: see #5474 - then unNumberedCaption "FigureCaption" - else numberedFigureCaption + if isEnabled Ext_native_numbering o + then numberedFigureCaption + else unNumberedCaption "FigureCaption" return $ imageDoc $$ captionDoc @@ -423,7 +423,7 @@ numberedTableCaption caption = do id' <- gets stTableCaptionId modify (\st -> st{ stTableCaptionId = id' + 1 }) capterm <- translateTerm Term.Table - return $ numberedCaption "Table" capterm "Table" id' caption + return $ numberedCaption "TableCaption" capterm "Table" id' caption numberedFigureCaption :: PandocMonad m => Doc Text -> OD m (Doc Text) numberedFigureCaption caption = do -- cgit v1.2.3