From bd69218451037df2215ba0cbbb95eda2c3000450 Mon Sep 17 00:00:00 2001 From: Agustín Martín Barbero Date: Fri, 19 Jul 2019 18:32:43 +0200 Subject: Change order of ilvl and numId in document.xml (#5647) Workaround for Word Online shortcomming. Fixes #5645 Also, make list para properties go first. This reordering of properties shouldn't be necessary but it seems Word Online does not understand the docx correctly otherwise. --- src/Text/Pandoc/Writers/Docx.hs | 6 +++--- test/docx/golden/lists.docx | Bin 10281 -> 10282 bytes test/docx/golden/lists_continuing.docx | Bin 10078 -> 10077 bytes test/docx/golden/lists_restarting.docx | Bin 10077 -> 10077 bytes test/docx/golden/table_with_list_cell.docx | Bin 10197 -> 10194 bytes 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs index a7b9ee621..5fc004238 100644 --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -1082,9 +1082,9 @@ getParaProps displayMathPara = do listLevel <- asks envListLevel numid <- asks envListNumId let listPr = [mknode "w:numPr" [] - [ mknode "w:numId" [("w:val",show numid)] () - , mknode "w:ilvl" [("w:val",show listLevel)] () ] | listLevel >= 0 && not displayMathPara] - return $ case props ++ listPr of + [ mknode "w:ilvl" [("w:val",show listLevel)] () + , mknode "w:numId" [("w:val",show numid)] () ] | listLevel >= 0 && not displayMathPara] + return $ case listPr ++ props of [] -> [] ps -> [mknode "w:pPr" [] ps] diff --git a/test/docx/golden/lists.docx b/test/docx/golden/lists.docx index 4a8764a6c..96a2816b7 100644 Binary files a/test/docx/golden/lists.docx and b/test/docx/golden/lists.docx differ diff --git a/test/docx/golden/lists_continuing.docx b/test/docx/golden/lists_continuing.docx index 293bc34cc..e6bac969e 100644 Binary files a/test/docx/golden/lists_continuing.docx and b/test/docx/golden/lists_continuing.docx differ diff --git a/test/docx/golden/lists_restarting.docx b/test/docx/golden/lists_restarting.docx index 2fcd77629..3f153ce1d 100644 Binary files a/test/docx/golden/lists_restarting.docx and b/test/docx/golden/lists_restarting.docx differ diff --git a/test/docx/golden/table_with_list_cell.docx b/test/docx/golden/table_with_list_cell.docx index f4c01527a..9130c33f3 100644 Binary files a/test/docx/golden/table_with_list_cell.docx and b/test/docx/golden/table_with_list_cell.docx differ -- cgit v1.2.3