1 files changed, 11 insertions, 7 deletions
diff --git a/src/Text/Pandoc/Writers/Docx/Table.hs b/src/Text/Pandoc/Writers/Docx/Table.hs
index 7a84c5278..4dc4ad6a2 100644
--- a/src/Text/Pandoc/Writers/Docx/Table.hs
+++ b/src/Text/Pandoc/Writers/Docx/Table.hs
@@ -20,6 +20,8 @@ import Text.Pandoc.Definition
 import Text.Pandoc.Class.PandocMonad (PandocMonad, translateTerm)
 import Text.Pandoc.Writers.Docx.Types
 import Text.Pandoc.Shared
+import Text.Pandoc.Options (WriterOptions, isEnabled)
+import Text.Pandoc.Extensions (Extension(Ext_native_numbering))
 import Text.Printf (printf)
 import Text.Pandoc.Writers.GridTable hiding (Table)
 import Text.Pandoc.Writers.OOXML
@@ -29,10 +31,11 @@ import qualified Text.Pandoc.Translations as Term
 import qualified Text.Pandoc.Writers.GridTable as Grid
 
 tableToOpenXML :: PandocMonad m
-               => ([Block] -> WS m [Content])
+               => WriterOptions
+               -> ([Block] -> WS m [Content])
                -> Grid.Table
                -> WS m [Content]
-tableToOpenXML blocksToOpenXML gridTable = do
+tableToOpenXML opts blocksToOpenXML gridTable = do
   setFirstPara
   let (Grid.Table (ident,_,_) caption colspecs _rowheads thead tbodies tfoot) =
         gridTable
@@ -50,7 +53,9 @@ tableToOpenXML blocksToOpenXML gridTable = do
                 then return []
                 else withParaPropM (pStyleM "Table Caption")
                      $ blocksToOpenXML
-                     $ addLabel tableid tablename tablenum captionBlocks
+                     $ if isEnabled Ext_native_numbering opts
+                          then addLabel tableid tablename tablenum captionBlocks
+                          else captionBlocks
   -- We set "in table" after processing the caption, because we don't
   -- want the "Table Caption" style to be overwritten with "Compact".
   modify $ \s -> s { stInTable = True }
@@ -93,8 +98,8 @@ tableToOpenXML blocksToOpenXML gridTable = do
 addLabel :: Text -> Text -> Int -> [Block] -> [Block]
 addLabel tableid tablename tablenum bs =
   case bs of
-    (Para ils : rest)  -> Para (label : Space : ils) : rest
-    (Plain ils : rest) -> Plain (label : Space : ils) : rest
+    (Para ils : rest)  -> Para (label : Str ": " : ils) : rest
+    (Plain ils : rest) -> Plain (label : Str ": " : ils) : rest
     _ -> Para [label] : bs
  where
   label = Span (tableid,[],[])
@@ -103,8 +108,7 @@ addLabel tableid tablename tablenum bs =
                ("<w:fldSimple w:instr=\"SEQ Table"
                <> " \\* ARABIC \"><w:r><w:t>"
                <> tshow tablenum
-               <> "</w:t></w:r></w:fldSimple>"),
-             Str ":"]
+               <> "</w:t></w:r></w:fldSimple>")]
 
 -- | Parts of a table
 data RowType = HeadRow | BodyRow | FootRow