Docx writer: omit jc attribute on table cells with AlignDefault.

Closes #5662.
jgm · Jun 2, 2024 · 39c549c · 39c549c
1 parent 1992913
commit 39c549c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/src/Text/Pandoc/Writers/Docx/Table.hs b/src/Text/Pandoc/Writers/Docx/Table.hs
@@ -159,7  159,7 @@ alignmentToString = \case
   AlignLeft    -> "left"
   AlignRight   -> "right"
   AlignCenter  -> "center"
-  AlignDefault -> "left"
   AlignDefault -> ""
 
 tableLayout :: [ColSpec] -> ([Element], [(Text, Text)])
 tableLayout specs =
@@ -253,7  253,7 @@ ooxmlCellToOpenXML blocksToOpenXML = \case
       , mknode "w:p" [] [mknode "w:pPr" [] ()]]
   OOXMLCell _attr align rowspan (ColSpan colspan) contents -> do
     compactStyle <- pStyleM "Compact"
-    es <- withParaProp (alignmentFor align) $ blocksToOpenXML contents
     es <- maybe id withParaProp (alignmentFor align) $ blocksToOpenXML contents
     -- Table cells require a <w:p> element, even an empty one!
     -- Not in the spec but in Word 2007, 2010. See #4953. And
     -- apparently the last element must be a <w:p>, see #6983.
@@ -271,5  271,6 @@ ooxmlCellToOpenXML blocksToOpenXML = \case
              e:_   | qName (elName e) == "p" -> es
              _ -> es    [Elem $ mknode "w:p" [] ()]
 
-alignmentFor :: Alignment -> Element
-alignmentFor al = mknode "w:jc" [("w:val",alignmentToString al)] ()
 alignmentFor :: Alignment -> Maybe Element
 alignmentFor AlignDefault = Nothing
 alignmentFor al = Just $ mknode "w:jc" [("w:val",alignmentToString al)] ()
diff --git a/test/docx/golden/table_one_row.docx b/test/docx/golden/table_one_row.docx
diff --git a/test/docx/golden/table_with_list_cell.docx b/test/docx/golden/table_with_list_cell.docx
diff --git a/test/docx/golden/tables-default-widths.docx b/test/docx/golden/tables-default-widths.docx
diff --git a/test/docx/golden/tables.docx b/test/docx/golden/tables.docx
diff --git a/test/docx/golden/tables_separated_with_rawblock.docx b/test/docx/golden/tables_separated_with_rawblock.docx