From 5eb7ad7d1ebbfe27a282a2d75f199bacf2052be3 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 11 May 2021 22:31:38 -0600 Subject: Improve integration of settings from reference.docx. The settings we can carry over from a reference.docx are autoHyphenation, consecutiveHyphenLimit, hyphenationZone, doNotHyphenateCap, evenAndOddHeaders, and proofState. Previously this was implemented in a buggy way, so that the reference doc's values AND the new values were included. This change allows users to create a reference.docx that sets w:proofState for spelling or grammar to "dirty," so that spell/grammar checking will be triggered on the generated docx. Closes #1209. --- test/docx/golden/block_quotes.docx | Bin 10067 -> 10061 bytes test/docx/golden/codeblock.docx | Bin 9916 -> 9910 bytes test/docx/golden/comments.docx | Bin 10254 -> 10248 bytes test/docx/golden/custom_style_no_reference.docx | Bin 10017 -> 10011 bytes test/docx/golden/custom_style_preserve.docx | Bin 10646 -> 10640 bytes test/docx/golden/custom_style_reference.docx | Bin 12400 -> 12397 bytes test/docx/golden/definition_list.docx | Bin 9916 -> 9910 bytes .../docx/golden/document-properties-short-desc.docx | Bin 9922 -> 9916 bytes test/docx/golden/document-properties.docx | Bin 10399 -> 10393 bytes test/docx/golden/headers.docx | Bin 10055 -> 10049 bytes test/docx/golden/image.docx | Bin 26733 -> 26727 bytes test/docx/golden/inline_code.docx | Bin 9855 -> 9849 bytes test/docx/golden/inline_formatting.docx | Bin 10035 -> 10029 bytes test/docx/golden/inline_images.docx | Bin 26789 -> 26783 bytes test/docx/golden/link_in_notes.docx | Bin 10077 -> 10071 bytes test/docx/golden/links.docx | Bin 10248 -> 10242 bytes test/docx/golden/lists.docx | Bin 10314 -> 10308 bytes test/docx/golden/lists_continuing.docx | Bin 10110 -> 10104 bytes test/docx/golden/lists_multiple_initial.docx | Bin 10192 -> 10186 bytes test/docx/golden/lists_restarting.docx | Bin 10108 -> 10102 bytes test/docx/golden/nested_anchors_in_header.docx | Bin 10212 -> 10206 bytes test/docx/golden/notes.docx | Bin 10024 -> 10018 bytes test/docx/golden/raw-blocks.docx | Bin 9956 -> 9950 bytes test/docx/golden/raw-bookmarks.docx | Bin 10090 -> 10084 bytes test/docx/golden/table_one_row.docx | Bin 9925 -> 9920 bytes test/docx/golden/table_with_list_cell.docx | Bin 10230 -> 10225 bytes test/docx/golden/tables.docx | Bin 10271 -> 10266 bytes test/docx/golden/track_changes_deletion.docx | Bin 9899 -> 9893 bytes test/docx/golden/track_changes_insertion.docx | Bin 9882 -> 9876 bytes test/docx/golden/track_changes_move.docx | Bin 9916 -> 9910 bytes .../golden/track_changes_scrubbed_metadata.docx | Bin 10028 -> 10022 bytes test/docx/golden/unicode.docx | Bin 9841 -> 9835 bytes test/docx/golden/verbatim_subsuper.docx | Bin 9888 -> 9882 bytes 33 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 af1b33ca2..b6973fcfd 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 f748f1f01..f0d35d3ad 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 ac9d56680..fb1c15dec 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 f27727edd..43d536b65 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/custom_style_preserve.docx b/test/docx/golden/custom_style_preserve.docx index 1da499d6a..8865010d1 100644 Binary files a/test/docx/golden/custom_style_preserve.docx and b/test/docx/golden/custom_style_preserve.docx differ diff --git a/test/docx/golden/custom_style_reference.docx b/test/docx/golden/custom_style_reference.docx index 4d2fe245d..10f7bf661 100644 Binary files a/test/docx/golden/custom_style_reference.docx and b/test/docx/golden/custom_style_reference.docx differ diff --git a/test/docx/golden/definition_list.docx b/test/docx/golden/definition_list.docx index f386fcea3..2a7d81a34 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 debe9a3f6..2fcd14908 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 cd17400bf..39533f42d 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 d3af8a3dd..c8d67c45b 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 1c4e738c0..8a7aeec10 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 35f43f19f..969237cec 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 8de3f70f6..cda936a39 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 e76558be9..69991e791 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 88bae8142..40e848195 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 455adcfc7..28237a30d 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 081d9ddba..bf075805e 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 fc9213fc5..e7d308e13 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_multiple_initial.docx b/test/docx/golden/lists_multiple_initial.docx index b636fd3f8..9763e347e 100644 Binary files a/test/docx/golden/lists_multiple_initial.docx and b/test/docx/golden/lists_multiple_initial.docx differ diff --git a/test/docx/golden/lists_restarting.docx b/test/docx/golden/lists_restarting.docx index 252623215..b717ca619 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 a8c3f5478..873e731d2 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 43e650ebd..134cb2eaf 100644 Binary files a/test/docx/golden/notes.docx and b/test/docx/golden/notes.docx differ diff --git a/test/docx/golden/raw-blocks.docx b/test/docx/golden/raw-blocks.docx index fe4f7845b..c49ed79c8 100644 Binary files a/test/docx/golden/raw-blocks.docx and b/test/docx/golden/raw-blocks.docx differ diff --git a/test/docx/golden/raw-bookmarks.docx b/test/docx/golden/raw-bookmarks.docx index 45e90608f..1f2cbb214 100644 Binary files a/test/docx/golden/raw-bookmarks.docx and b/test/docx/golden/raw-bookmarks.docx differ diff --git a/test/docx/golden/table_one_row.docx b/test/docx/golden/table_one_row.docx index e60bb303f..a0160cdb4 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 a4037cf32..6427d475c 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 bc1bc27f8..470eac2ae 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 247725aaa..3542b8f9c 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 3863afef2..b36b4485e 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 5c848b63a..e30ab06ae 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/track_changes_scrubbed_metadata.docx b/test/docx/golden/track_changes_scrubbed_metadata.docx index e0c843713..11597d578 100644 Binary files a/test/docx/golden/track_changes_scrubbed_metadata.docx and b/test/docx/golden/track_changes_scrubbed_metadata.docx differ diff --git a/test/docx/golden/unicode.docx b/test/docx/golden/unicode.docx index 78a773bdd..c7bff82e5 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 c66a45b74..c70f6946e 100644 Binary files a/test/docx/golden/verbatim_subsuper.docx and b/test/docx/golden/verbatim_subsuper.docx differ -- cgit v1.2.3