aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Text/Pandoc/Writers/Docx.hs17
-rw-r--r--test/docx/golden/block_quotes.docxbin9981 -> 9981 bytes
-rw-r--r--test/docx/golden/codeblock.docxbin9830 -> 9830 bytes
-rw-r--r--test/docx/golden/comments.docxbin10168 -> 10168 bytes
-rw-r--r--test/docx/golden/custom_style_no_reference.docxbin9931 -> 9931 bytes
-rw-r--r--test/docx/golden/custom_style_preserve.docxbin10560 -> 10560 bytes
-rw-r--r--test/docx/golden/custom_style_reference.docxbin12317 -> 12368 bytes
-rw-r--r--test/docx/golden/definition_list.docxbin9830 -> 9830 bytes
-rw-r--r--test/docx/golden/document-properties-short-desc.docxbin9835 -> 9835 bytes
-rw-r--r--test/docx/golden/document-properties.docxbin10314 -> 10314 bytes
-rw-r--r--test/docx/golden/headers.docxbin9969 -> 9969 bytes
-rw-r--r--test/docx/golden/image.docxbin26647 -> 26647 bytes
-rw-r--r--test/docx/golden/inline_code.docxbin9769 -> 9769 bytes
-rw-r--r--test/docx/golden/inline_formatting.docxbin9949 -> 9949 bytes
-rw-r--r--test/docx/golden/inline_images.docxbin26703 -> 26703 bytes
-rw-r--r--test/docx/golden/link_in_notes.docxbin9991 -> 9991 bytes
-rw-r--r--test/docx/golden/links.docxbin10162 -> 10162 bytes
-rw-r--r--test/docx/golden/lists.docxbin10228 -> 10228 bytes
-rw-r--r--test/docx/golden/lists_continuing.docxbin10024 -> 10024 bytes
-rw-r--r--test/docx/golden/lists_multiple_initial.docxbin10106 -> 10106 bytes
-rw-r--r--test/docx/golden/lists_restarting.docxbin10022 -> 10022 bytes
-rw-r--r--test/docx/golden/nested_anchors_in_header.docxbin10126 -> 10126 bytes
-rw-r--r--test/docx/golden/notes.docxbin9938 -> 9938 bytes
-rw-r--r--test/docx/golden/raw-blocks.docxbin9870 -> 9870 bytes
-rw-r--r--test/docx/golden/raw-bookmarks.docxbin10004 -> 10004 bytes
-rw-r--r--test/docx/golden/table_one_row.docxbin9840 -> 9840 bytes
-rw-r--r--test/docx/golden/table_with_list_cell.docxbin10159 -> 10159 bytes
-rw-r--r--test/docx/golden/tables.docxbin10200 -> 10200 bytes
-rw-r--r--test/docx/golden/track_changes_deletion.docxbin9813 -> 9813 bytes
-rw-r--r--test/docx/golden/track_changes_insertion.docxbin9796 -> 9796 bytes
-rw-r--r--test/docx/golden/track_changes_move.docxbin9830 -> 9830 bytes
-rw-r--r--test/docx/golden/track_changes_scrubbed_metadata.docxbin9942 -> 9942 bytes
-rw-r--r--test/docx/golden/unicode.docxbin9755 -> 9755 bytes
-rw-r--r--test/docx/golden/verbatim_subsuper.docxbin9802 -> 9802 bytes
34 files changed, 16 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index 75bed1595..e7a49ba02 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -469,12 +469,27 @@ writeDocx opts doc = do
-- adds references to footnotes or endnotes we don't have...
-- we do, however, copy some settings over from reference
let settingsPath = "word/settings.xml"
- settingsList = [ "autoHyphenation"
+ settingsList = [ "zoom"
+ , "embedSystemFonts"
+ , "doNotTrackMoves"
+ , "defaultTabStop"
+ , "drawingGridHorizontalSpacing"
+ , "drawingGridVerticalSpacing"
+ , "displayHorizontalDrawingGridEvery"
+ , "displayVerticalDrawingGridEvery"
+ , "characterSpacingControl"
+ , "savePreviewPicture"
+ , "mathPr"
+ , "themeFontLang"
+ , "decimalSymbol"
+ , "listSeparator"
+ , "autoHyphenation"
, "consecutiveHyphenLimit"
, "hyphenationZone"
, "doNotHyphenateCap"
, "evenAndOddHeaders"
, "proofState"
+ , "compat"
]
settingsEntry <- copyChildren refArchive distArchive settingsPath epochtime settingsList
diff --git a/test/docx/golden/block_quotes.docx b/test/docx/golden/block_quotes.docx
index f5e4b6428..d05020f82 100644
--- a/test/docx/golden/block_quotes.docx
+++ b/test/docx/golden/block_quotes.docx
Binary files differ
diff --git a/test/docx/golden/codeblock.docx b/test/docx/golden/codeblock.docx
index 0bbe42bd7..616c9b1d0 100644
--- a/test/docx/golden/codeblock.docx
+++ b/test/docx/golden/codeblock.docx
Binary files differ
diff --git a/test/docx/golden/comments.docx b/test/docx/golden/comments.docx
index 6b759b522..aa200c8d6 100644
--- a/test/docx/golden/comments.docx
+++ b/test/docx/golden/comments.docx
Binary files differ
diff --git a/test/docx/golden/custom_style_no_reference.docx b/test/docx/golden/custom_style_no_reference.docx
index 74e30f651..49cf42f38 100644
--- a/test/docx/golden/custom_style_no_reference.docx
+++ b/test/docx/golden/custom_style_no_reference.docx
Binary files differ
diff --git a/test/docx/golden/custom_style_preserve.docx b/test/docx/golden/custom_style_preserve.docx
index 7ee99c87b..e24940478 100644
--- a/test/docx/golden/custom_style_preserve.docx
+++ b/test/docx/golden/custom_style_preserve.docx
Binary files differ
diff --git a/test/docx/golden/custom_style_reference.docx b/test/docx/golden/custom_style_reference.docx
index dfaf16e2b..e7da8f06d 100644
--- a/test/docx/golden/custom_style_reference.docx
+++ b/test/docx/golden/custom_style_reference.docx
Binary files differ
diff --git a/test/docx/golden/definition_list.docx b/test/docx/golden/definition_list.docx
index 02992c6bd..df148cfed 100644
--- a/test/docx/golden/definition_list.docx
+++ b/test/docx/golden/definition_list.docx
Binary files differ
diff --git a/test/docx/golden/document-properties-short-desc.docx b/test/docx/golden/document-properties-short-desc.docx
index 9bfe56dca..2d9e96b15 100644
--- a/test/docx/golden/document-properties-short-desc.docx
+++ b/test/docx/golden/document-properties-short-desc.docx
Binary files differ
diff --git a/test/docx/golden/document-properties.docx b/test/docx/golden/document-properties.docx
index 2a37045f2..d8f091956 100644
--- a/test/docx/golden/document-properties.docx
+++ b/test/docx/golden/document-properties.docx
Binary files differ
diff --git a/test/docx/golden/headers.docx b/test/docx/golden/headers.docx
index ca2c7a261..8c1b3e870 100644
--- a/test/docx/golden/headers.docx
+++ b/test/docx/golden/headers.docx
Binary files differ
diff --git a/test/docx/golden/image.docx b/test/docx/golden/image.docx
index c4447d021..48b72e283 100644
--- a/test/docx/golden/image.docx
+++ b/test/docx/golden/image.docx
Binary files differ
diff --git a/test/docx/golden/inline_code.docx b/test/docx/golden/inline_code.docx
index 1824c0aae..048ac8f15 100644
--- a/test/docx/golden/inline_code.docx
+++ b/test/docx/golden/inline_code.docx
Binary files differ
diff --git a/test/docx/golden/inline_formatting.docx b/test/docx/golden/inline_formatting.docx
index 82565a5b1..cf1301c4b 100644
--- a/test/docx/golden/inline_formatting.docx
+++ b/test/docx/golden/inline_formatting.docx
Binary files differ
diff --git a/test/docx/golden/inline_images.docx b/test/docx/golden/inline_images.docx
index 0416bcc15..662e70556 100644
--- a/test/docx/golden/inline_images.docx
+++ b/test/docx/golden/inline_images.docx
Binary files differ
diff --git a/test/docx/golden/link_in_notes.docx b/test/docx/golden/link_in_notes.docx
index b51ec5220..d800a5fb4 100644
--- a/test/docx/golden/link_in_notes.docx
+++ b/test/docx/golden/link_in_notes.docx
Binary files differ
diff --git a/test/docx/golden/links.docx b/test/docx/golden/links.docx
index ba0d100c8..bffdbbaf8 100644
--- a/test/docx/golden/links.docx
+++ b/test/docx/golden/links.docx
Binary files differ
diff --git a/test/docx/golden/lists.docx b/test/docx/golden/lists.docx
index 9632c598b..2b201df28 100644
--- a/test/docx/golden/lists.docx
+++ b/test/docx/golden/lists.docx
Binary files differ
diff --git a/test/docx/golden/lists_continuing.docx b/test/docx/golden/lists_continuing.docx
index 3269a0528..257053a78 100644
--- a/test/docx/golden/lists_continuing.docx
+++ b/test/docx/golden/lists_continuing.docx
Binary files differ
diff --git a/test/docx/golden/lists_multiple_initial.docx b/test/docx/golden/lists_multiple_initial.docx
index 716129170..0a3bf1016 100644
--- a/test/docx/golden/lists_multiple_initial.docx
+++ b/test/docx/golden/lists_multiple_initial.docx
Binary files differ
diff --git a/test/docx/golden/lists_restarting.docx b/test/docx/golden/lists_restarting.docx
index af6edfe86..0aa69805f 100644
--- a/test/docx/golden/lists_restarting.docx
+++ b/test/docx/golden/lists_restarting.docx
Binary files differ
diff --git a/test/docx/golden/nested_anchors_in_header.docx b/test/docx/golden/nested_anchors_in_header.docx
index f141425f7..88dd21abd 100644
--- a/test/docx/golden/nested_anchors_in_header.docx
+++ b/test/docx/golden/nested_anchors_in_header.docx
Binary files differ
diff --git a/test/docx/golden/notes.docx b/test/docx/golden/notes.docx
index 93b4222f6..f02d5951c 100644
--- a/test/docx/golden/notes.docx
+++ b/test/docx/golden/notes.docx
Binary files differ
diff --git a/test/docx/golden/raw-blocks.docx b/test/docx/golden/raw-blocks.docx
index 9d1aa9853..58a101b3f 100644
--- a/test/docx/golden/raw-blocks.docx
+++ b/test/docx/golden/raw-blocks.docx
Binary files differ
diff --git a/test/docx/golden/raw-bookmarks.docx b/test/docx/golden/raw-bookmarks.docx
index b57289fdd..484c363a2 100644
--- a/test/docx/golden/raw-bookmarks.docx
+++ b/test/docx/golden/raw-bookmarks.docx
Binary files differ
diff --git a/test/docx/golden/table_one_row.docx b/test/docx/golden/table_one_row.docx
index edb23cc72..f75e567ab 100644
--- a/test/docx/golden/table_one_row.docx
+++ b/test/docx/golden/table_one_row.docx
Binary files differ
diff --git a/test/docx/golden/table_with_list_cell.docx b/test/docx/golden/table_with_list_cell.docx
index f9cbed156..a49f70643 100644
--- a/test/docx/golden/table_with_list_cell.docx
+++ b/test/docx/golden/table_with_list_cell.docx
Binary files differ
diff --git a/test/docx/golden/tables.docx b/test/docx/golden/tables.docx
index b585c803d..f24e27516 100644
--- a/test/docx/golden/tables.docx
+++ b/test/docx/golden/tables.docx
Binary files differ
diff --git a/test/docx/golden/track_changes_deletion.docx b/test/docx/golden/track_changes_deletion.docx
index 313942750..de7c44bf4 100644
--- a/test/docx/golden/track_changes_deletion.docx
+++ b/test/docx/golden/track_changes_deletion.docx
Binary files differ
diff --git a/test/docx/golden/track_changes_insertion.docx b/test/docx/golden/track_changes_insertion.docx
index f18b3f85f..958533459 100644
--- a/test/docx/golden/track_changes_insertion.docx
+++ b/test/docx/golden/track_changes_insertion.docx
Binary files differ
diff --git a/test/docx/golden/track_changes_move.docx b/test/docx/golden/track_changes_move.docx
index 50bdab767..04fa05062 100644
--- a/test/docx/golden/track_changes_move.docx
+++ b/test/docx/golden/track_changes_move.docx
Binary files differ
diff --git a/test/docx/golden/track_changes_scrubbed_metadata.docx b/test/docx/golden/track_changes_scrubbed_metadata.docx
index 230b27006..ef2dc96f8 100644
--- a/test/docx/golden/track_changes_scrubbed_metadata.docx
+++ b/test/docx/golden/track_changes_scrubbed_metadata.docx
Binary files differ
diff --git a/test/docx/golden/unicode.docx b/test/docx/golden/unicode.docx
index 627276e4b..a9de2b367 100644
--- a/test/docx/golden/unicode.docx
+++ b/test/docx/golden/unicode.docx
Binary files differ
diff --git a/test/docx/golden/verbatim_subsuper.docx b/test/docx/golden/verbatim_subsuper.docx
index 790278108..3ebadc59d 100644
--- a/test/docx/golden/verbatim_subsuper.docx
+++ b/test/docx/golden/verbatim_subsuper.docx
Binary files differ