Use simpleFigureWith in Docx reader

Author: argent0

src/Text/Pandoc/Readers/Docx.hs

@@ -67,6 +67,7 @@ import Data.Default (Default)
 import Data.List (delete, intersect, foldl')
 import Data.Char (isSpace)
 import qualified Data.Map as M
+import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Maybe (catMaybes, isJust, fromMaybe)
 import Data.Sequence (ViewL (..), viewl)
@@ -739,7 +740,18 @@ bodyToOutput (Body bps) = do
   blks <- smushBlocks <$> mapM bodyPartToBlocks blkbps
   blks' <- rewriteLinks $ blocksToDefinitions $ blocksToBullets $ toList blks
   blks'' <- removeOrphanAnchors blks'
-  return (meta, blks'')
+  return (meta, floatFigures <$> blks'')
+
+  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 :: Attr -> [Inline] -> Text -> Text -> Block
+  simpleFigureBlockWith attr figureCaption url title =
+    Para [Image attr figureCaption (url, "fig:" <> title)]
 
 docxToOutput :: PandocMonad m
              => ReaderOptions

test/docx/image_no_embed.native

@@ -1,2 +1 @@
-[Para [Str "An",Space,Str "image:"]
-,Para [Image ("",[],[("width","6.5in"),("height","5.508333333333334in")]) [Str "He",Space,Str "realizes",Space,Str "he's",Space,Str "making",Space,Str "the",Space,Str "file-size",Space,Str "too",Space,Str "big."] ("media/image1.jpg","An unhappy fish.")]]
+[Para [Str "An",Space,Str "image:"] ,Para [Image ("",[],[("width","6.5in"),("height","5.508333333333334in")]) [Str "He",Space,Str "realizes",Space,Str "he's",Space,Str "making",Space,Str "the",Space,Str "file-size",Space,Str "too",Space,Str "big."] ("media/image1.jpg","fig:An unhappy fish.")]]

test/docx/image_vml_as_object.native

@@ -1,2 +1,2 @@
 [Para [Str "Test",Space,Str "with",Space,Str "object",Space,Str "as",Space,Str "image:"]
-,Para [Image ("",[],[]) [] ("media/image1.emf","")]]
+,Para [Image ("",[],[]) [] ("media/image1.emf","fig:")]]