From eed18d231cc706e27a1495d46e8c05dd18a0938f Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 13 Mar 2021 12:05:52 -0800 Subject: Use integral values for w:tblW in docx. Cloess #7141. --- src/Text/Pandoc/Writers/Docx.hs | 2 +- test/docx/golden/table_one_row.docx | Bin 9908 -> 9906 bytes test/docx/golden/table_with_list_cell.docx | Bin 10227 -> 10225 bytes test/docx/golden/tables.docx | Bin 10244 -> 10241 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs index 89c71d773..c47bfb2ea 100644 --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -1031,7 +1031,7 @@ blockToOpenXML' opts (Table _ blkCapt specs thead tbody tfoot) = do map mkcell cells let textwidth = 7920 -- 5.5 in in twips, 1/20 pt let fullrow = 5000 -- 100% specified in pct - let rowwidth = fullrow * sum widths + let (rowwidth :: Int) = round $ fullrow * sum widths let mkgridcol w = mknode "w:gridCol" [("w:w", tshow (floor (textwidth * w) :: Integer))] () let hasHeader = not $ all null headers diff --git a/test/docx/golden/table_one_row.docx b/test/docx/golden/table_one_row.docx index a1d2323c2..1178f7c6e 100644 Binary files a/test/docx/golden/table_one_row.docx and b/test/docx/golden/table_one_row.docx differ diff --git a/test/docx/golden/table_with_list_cell.docx b/test/docx/golden/table_with_list_cell.docx index 2f3a831a7..84be2720f 100644 Binary files a/test/docx/golden/table_with_list_cell.docx and b/test/docx/golden/table_with_list_cell.docx differ diff --git a/test/docx/golden/tables.docx b/test/docx/golden/tables.docx index af066107c..140366d8b 100644 Binary files a/test/docx/golden/tables.docx and b/test/docx/golden/tables.docx differ -- cgit v1.2.3