From b7cbd7b8c91915db5b4146af53f24e82d9394e1f Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 11 Mar 2019 22:09:21 -0700 Subject: docx writer: avoid extra copy of abstractNum and num elements... ...in numbering.xml. This caused pandoc-produced docx files to be uneditable using Word Online. The problem was that recent versions of reference.docx include samples of various kinds of text, including lists. The numering elements for these were getting copied over to the new docx, where they clashed with the autogenerated elements produced by pandoc. This didn't confuse Desktop Word, but it did confuse Word Online. Closes #5358. --- test/docx/golden/block_quotes.docx | Bin 10147 -> 10022 bytes test/docx/golden/codeblock.docx | Bin 10007 -> 9882 bytes test/docx/golden/comments.docx | Bin 10328 -> 10203 bytes test/docx/golden/custom_style_no_reference.docx | Bin 10092 -> 9967 bytes test/docx/golden/definition_list.docx | Bin 9986 -> 9861 bytes .../docx/golden/document-properties-short-desc.docx | Bin 9902 -> 9872 bytes test/docx/golden/document-properties.docx | Bin 10388 -> 10358 bytes test/docx/golden/headers.docx | Bin 10134 -> 10009 bytes test/docx/golden/image.docx | Bin 26810 -> 26685 bytes test/docx/golden/inline_code.docx | Bin 9929 -> 9804 bytes test/docx/golden/inline_formatting.docx | Bin 10115 -> 9990 bytes test/docx/golden/inline_images.docx | Bin 26865 -> 26740 bytes test/docx/golden/link_in_notes.docx | Bin 10150 -> 10025 bytes test/docx/golden/links.docx | Bin 10329 -> 10204 bytes test/docx/golden/lists.docx | Bin 10400 -> 10281 bytes test/docx/golden/lists_continuing.docx | Bin 10199 -> 10078 bytes test/docx/golden/lists_restarting.docx | Bin 10199 -> 10077 bytes test/docx/golden/nested_anchors_in_header.docx | Bin 10196 -> 10166 bytes test/docx/golden/notes.docx | Bin 10100 -> 9975 bytes test/docx/golden/table_one_row.docx | Bin 9950 -> 9825 bytes test/docx/golden/table_with_list_cell.docx | Bin 10317 -> 10197 bytes test/docx/golden/tables.docx | Bin 10332 -> 10207 bytes test/docx/golden/track_changes_deletion.docx | Bin 9973 -> 9848 bytes test/docx/golden/track_changes_insertion.docx | Bin 9956 -> 9831 bytes test/docx/golden/track_changes_move.docx | Bin 9990 -> 9865 bytes test/docx/golden/unicode.docx | Bin 9914 -> 9789 bytes test/docx/golden/verbatim_subsuper.docx | Bin 9962 -> 9837 bytes 27 files changed, 0 insertions(+), 0 deletions(-) (limited to 'test/docx') diff --git a/test/docx/golden/block_quotes.docx b/test/docx/golden/block_quotes.docx index d118a6fb0..d90c7c740 100644 Binary files a/test/docx/golden/block_quotes.docx and b/test/docx/golden/block_quotes.docx differ diff --git a/test/docx/golden/codeblock.docx b/test/docx/golden/codeblock.docx index 7068893c1..d549ed20d 100644 Binary files a/test/docx/golden/codeblock.docx and b/test/docx/golden/codeblock.docx differ diff --git a/test/docx/golden/comments.docx b/test/docx/golden/comments.docx index 2cdf4c210..394ae9986 100644 Binary files a/test/docx/golden/comments.docx and b/test/docx/golden/comments.docx differ diff --git a/test/docx/golden/custom_style_no_reference.docx b/test/docx/golden/custom_style_no_reference.docx index f7e332963..f9c657289 100644 Binary files a/test/docx/golden/custom_style_no_reference.docx and b/test/docx/golden/custom_style_no_reference.docx differ diff --git a/test/docx/golden/definition_list.docx b/test/docx/golden/definition_list.docx index b57686e7d..1fe2a1e00 100644 Binary files a/test/docx/golden/definition_list.docx and b/test/docx/golden/definition_list.docx differ diff --git a/test/docx/golden/document-properties-short-desc.docx b/test/docx/golden/document-properties-short-desc.docx index ae2813b90..4ac249316 100644 Binary files a/test/docx/golden/document-properties-short-desc.docx and b/test/docx/golden/document-properties-short-desc.docx differ diff --git a/test/docx/golden/document-properties.docx b/test/docx/golden/document-properties.docx index 5db470cd1..00c78bc0f 100644 Binary files a/test/docx/golden/document-properties.docx and b/test/docx/golden/document-properties.docx differ diff --git a/test/docx/golden/headers.docx b/test/docx/golden/headers.docx index a51443929..b8b3e0e16 100644 Binary files a/test/docx/golden/headers.docx and b/test/docx/golden/headers.docx differ diff --git a/test/docx/golden/image.docx b/test/docx/golden/image.docx index e1f043ca3..ea5d13a08 100644 Binary files a/test/docx/golden/image.docx and b/test/docx/golden/image.docx differ diff --git a/test/docx/golden/inline_code.docx b/test/docx/golden/inline_code.docx index 46a3a6172..962a4f058 100644 Binary files a/test/docx/golden/inline_code.docx and b/test/docx/golden/inline_code.docx differ diff --git a/test/docx/golden/inline_formatting.docx b/test/docx/golden/inline_formatting.docx index c214c7eda..a1928cbaa 100644 Binary files a/test/docx/golden/inline_formatting.docx and b/test/docx/golden/inline_formatting.docx differ diff --git a/test/docx/golden/inline_images.docx b/test/docx/golden/inline_images.docx index 6ae175e4f..ef3376ffd 100644 Binary files a/test/docx/golden/inline_images.docx and b/test/docx/golden/inline_images.docx differ diff --git a/test/docx/golden/link_in_notes.docx b/test/docx/golden/link_in_notes.docx index 7376966b3..967347ae9 100644 Binary files a/test/docx/golden/link_in_notes.docx and b/test/docx/golden/link_in_notes.docx differ diff --git a/test/docx/golden/links.docx b/test/docx/golden/links.docx index d5839c517..142ac19cb 100644 Binary files a/test/docx/golden/links.docx and b/test/docx/golden/links.docx differ diff --git a/test/docx/golden/lists.docx b/test/docx/golden/lists.docx index bcc5e706d..4a8764a6c 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 bd35f2887..293bc34cc 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 f693fca6f..2fcd77629 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/nested_anchors_in_header.docx b/test/docx/golden/nested_anchors_in_header.docx index 56f59584a..735b5a4a5 100644 Binary files a/test/docx/golden/nested_anchors_in_header.docx and b/test/docx/golden/nested_anchors_in_header.docx differ diff --git a/test/docx/golden/notes.docx b/test/docx/golden/notes.docx index 197ccff94..597d7cc83 100644 Binary files a/test/docx/golden/notes.docx and b/test/docx/golden/notes.docx differ diff --git a/test/docx/golden/table_one_row.docx b/test/docx/golden/table_one_row.docx index ace98df83..92b8c3963 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 fef0b16f5..f4c01527a 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 ec73cfeef..61449d981 100644 Binary files a/test/docx/golden/tables.docx and b/test/docx/golden/tables.docx differ diff --git a/test/docx/golden/track_changes_deletion.docx b/test/docx/golden/track_changes_deletion.docx index dab2c3170..b52d6948d 100644 Binary files a/test/docx/golden/track_changes_deletion.docx and b/test/docx/golden/track_changes_deletion.docx differ diff --git a/test/docx/golden/track_changes_insertion.docx b/test/docx/golden/track_changes_insertion.docx index 7b5af8ed5..8528a4ded 100644 Binary files a/test/docx/golden/track_changes_insertion.docx and b/test/docx/golden/track_changes_insertion.docx differ diff --git a/test/docx/golden/track_changes_move.docx b/test/docx/golden/track_changes_move.docx index 666cd85eb..7904f4e87 100644 Binary files a/test/docx/golden/track_changes_move.docx and b/test/docx/golden/track_changes_move.docx differ diff --git a/test/docx/golden/unicode.docx b/test/docx/golden/unicode.docx index ef9480059..cbca6d83f 100644 Binary files a/test/docx/golden/unicode.docx and b/test/docx/golden/unicode.docx differ diff --git a/test/docx/golden/verbatim_subsuper.docx b/test/docx/golden/verbatim_subsuper.docx index dc9453430..4fbfd9c21 100644 Binary files a/test/docx/golden/verbatim_subsuper.docx and b/test/docx/golden/verbatim_subsuper.docx differ -- cgit v1.2.3