Use simpleFigureWith in ODT reader

Author: argent0

src/Text/Pandoc/Readers/Odt.hs

@@ -22,6 +22,7 @@ import System.FilePath
 
 import Control.Monad.Except (throwError)
 
+import Data.Text (Text)
 import qualified Data.Text as T
 
 import Text.Pandoc.Class.PandocMonad (PandocMonad)
@@ -85,9 +86,22 @@ archiveToOdt archive = do
         in  (dir == "Pictures/") || (dir /= "./" && name == "content.xml")
   let media = filteredFilesFromArchive archive filePathIsOdtMedia
   let startState = readerState styles media
-  either (\_ -> Left $ PandocParseError "Could not convert opendocument") Right
+  either
+    (\_ -> Left $ PandocParseError "Could not convert opendocument")
+    (\(Pandoc meta blocks, mediabag) -> Right (Pandoc meta (fmap floatFigures blocks), mediabag))
     (runConverter' read_body startState contentElem)
 
+  where
+  -- Capture all images as floating figures
+  floatFigures :: Block -> Block
+  floatFigures (Para [Image attr figureCaption (url, title)]) =
+    simpleFigureBlockWith attr figureCaption url title
+  floatFigures x = x
+
+  simpleFigureBlockWith :: Text.Pandoc.Definition.Attr -> [Inline] -> Text -> Text -> Block
+  simpleFigureBlockWith attr figureCaption url title =
+    Para [Image attr figureCaption (url, "fig:" <> title)]
+
 
 --
 entryToXmlElem :: Entry -> Either PandocError Element

src/Text/Pandoc/Readers/Odt/ContentReader.hs

@@ -819,13 +819,13 @@ read_frame_mathml =
 read_frame_text_box :: OdtReaderSafe XML.Element (FirstMatch Inlines)
 read_frame_text_box = proc box -> do
     paragraphs <- executeIn (matchChildContent' [ read_paragraph ]) -< box
-    arr read_img_with_caption -< toList paragraphs
+    arr read_img_with_caption  -< toList paragraphs
 
 read_img_with_caption :: [Block] -> FirstMatch Inlines
 read_img_with_caption (Para [Image attr alt (src,title)] : _) =
-  firstMatch $ singleton (Image attr alt (src, "fig:" <> title))   -- no text, default caption
+  firstMatch $ singleton (Image attr alt (src, title))   -- no text, default caption
 read_img_with_caption (Para (Image attr _ (src,title) : txt) : _) =
-  firstMatch $ singleton (Image attr txt (src, "fig:" <> title) )  -- override caption with the text that follows
+  firstMatch $ singleton (Image attr txt (src, title) )  -- override caption with the text that follows
 read_img_with_caption  ( Para (_ : xs) : ys) =
   read_img_with_caption (Para xs : ys)
 read_img_with_caption _ =

test/odt/native/image.native

@@ -1 +1 @@
-[Para [Image ("",[],[("width","5.292cm"),("height","5.292cm")]) [] ("Pictures/10000000000000FA000000FAD6A15225.jpg","")]]
+[Para [Image ("",[],[("width","5.292cm"),("height","5.292cm")]) [] ("Pictures/10000000000000FA000000FAD6A15225.jpg","fig:")]]