From a01ba4463f1f0d14a8032f147cddb76dadb4b853 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Tue, 29 Jun 2021 11:15:13 -0700
Subject: [PATCH] Docx writer: Fixed a couple bugs in Figure numbering.

---
 src/Text/Pandoc/Writers/Docx.hs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index b3e008b8a..a3c4b6be1 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -856,7 +856,7 @@ blockToOpenXML' opts (Plain lst) = do
 blockToOpenXML' opts (Para [Image attr alt (src,T.stripPrefix "fig:" -> Just tit)]) = do
   setFirstPara
   fignum <- gets stNextFigureNum
-  modify $ \st -> st{ stNextFigureNum = fignum + 1 }
+  unless (null alt) $ modify $ \st -> st{ stNextFigureNum = fignum + 1 }
   let figid = "fig" <> tshow fignum
   figname <- translateTerm Term.Figure
   prop <- pStyleM $
@@ -870,10 +870,9 @@ blockToOpenXML' opts (Para [Image attr alt (src,T.stripPrefix "fig:" -> Just tit
                     else withParaPropM (pStyleM "Image Caption")
                          $ blockToOpenXML opts
                             (Para $ Span (figid,[],[])
-                               [Str "Figure\160",
+                               [Str (figname <> "\160"),
                                 RawInline (Format "openxml")
-                                ("<w:fldSimple w:instr=\"SEQ "
-                                <> figname
+                                ("<w:fldSimple w:instr=\"SEQ Figure"
                                 <> " \\* ARABIC \"><w:r><w:t>"
                                 <> tshow fignum
                                 <> "</w:t></w:r></w:fldSimple>"),