Docx writer: allow embedded fonts to be used in reference.docx.

Closes #6728.

37 files changed, 15 insertions, 5 deletions

diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index f2e26322b..0178cec17 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -307,10 +307,13 @@ writeDocx opts doc = do
                         | e <- zEntries refArchive
                         , "word/media/" `isPrefixOf` eRelativePath e ]
 
-  let defaultnodes = [mknode "Default"
-              [("Extension","xml"),("ContentType","application/xml")] (),
-             mknode "Default"
-              [("Extension","rels"),("ContentType","application/vnd.openxmlformats-package.relationships+xml")] ()]
+  let mkDefaultNode (ext, mt) =
+        mknode "Default" [("Extension",ext),("ContentType",mt)] ()
+  let defaultnodes = map mkDefaultNode
+        [("xml", "application/xml"),
+         ("rels", "application/vnd.openxmlformats-package.relationships+xml"),
+         ("odttf",
+           "application/vnd.openxmlformats-officedocument.obfuscatedFont")]
   let contentTypesDoc = mknode "Types" [("xmlns","http://schemas.openxmlformats.org/package/2006/content-types")] $ defaultnodes ++ overrides
   let contentTypesEntry = toEntry "[Content_Types].xml" epochtime
         $ renderXml contentTypesDoc
@@ -538,6 +541,11 @@ writeDocx opts doc = do
   docPropsAppEntry <- entryFromArchive refArchive "docProps/app.xml"
   themeEntry <- entryFromArchive refArchive "word/theme/theme1.xml"
   fontTableEntry <- entryFromArchive refArchive "word/fontTable.xml"
+  let fontTableRelsEntries = maybeToList $
+       findEntryByPath "word/_rels/fontTable.xml.rels" refArchive
+  let fontEntries = [entry | entry <- zEntries refArchive
+                           , "word/fonts/" `isPrefixOf` (eRelativePath entry)]
+                        -- or parse fontTable.xml.rels?
   webSettingsEntry <- entryFromArchive refArchive "word/webSettings.xml"
   headerFooterEntries <- mapM (entryFromArchive refArchive . ("word/" ++)) $
                          mapMaybe (fmap T.unpack . extractTarget)
@@ -557,7 +565,9 @@ writeDocx opts doc = do
                   commentsEntry :
                   docPropsEntry : docPropsAppEntry : customPropsEntry :
                   themeEntry :
-                  fontTableEntry : settingsEntry : webSettingsEntry :
+                  settingsEntry : webSettingsEntry :
+                  fontTableEntry :
+                  fontTableRelsEntries ++ fontEntries ++
                   imageEntries ++ headerFooterEntries ++
                   miscRelEntries ++ otherMediaEntries
   return $ fromArchive archive
diff --git a/test/docx/golden/block_quotes.docx b/test/docx/golden/block_quotes.docx
index 5d75e8302..29bf27d91 100644
--- a/test/docx/golden/block_quotes.docx
+++ b/test/docx/golden/block_quotes.docx
diff --git a/test/docx/golden/codeblock.docx b/test/docx/golden/codeblock.docx
index 0baa090c1..30262ffea 100644
--- a/test/docx/golden/codeblock.docx
+++ b/test/docx/golden/codeblock.docx
diff --git a/test/docx/golden/comments.docx b/test/docx/golden/comments.docx
index 6015d07bb..51c3cba34 100644
--- a/test/docx/golden/comments.docx
+++ b/test/docx/golden/comments.docx
diff --git a/test/docx/golden/custom_style_no_reference.docx b/test/docx/golden/custom_style_no_reference.docx
index c50cc9883..be41860cd 100644
--- a/test/docx/golden/custom_style_no_reference.docx
+++ b/test/docx/golden/custom_style_no_reference.docx
diff --git a/test/docx/golden/custom_style_preserve.docx b/test/docx/golden/custom_style_preserve.docx
index 034ab3863..8bb277cd0 100644
--- a/test/docx/golden/custom_style_preserve.docx
+++ b/test/docx/golden/custom_style_preserve.docx
diff --git a/test/docx/golden/custom_style_reference.docx b/test/docx/golden/custom_style_reference.docx
index e7da8f06d..a514d1a59 100644
--- a/test/docx/golden/custom_style_reference.docx
+++ b/test/docx/golden/custom_style_reference.docx
diff --git a/test/docx/golden/definition_list.docx b/test/docx/golden/definition_list.docx
index 7191805b5..e77b1b780 100644
--- a/test/docx/golden/definition_list.docx
+++ b/test/docx/golden/definition_list.docx
diff --git a/test/docx/golden/document-properties-short-desc.docx b/test/docx/golden/document-properties-short-desc.docx
index 685761550..72f0f83b9 100644
--- a/test/docx/golden/document-properties-short-desc.docx
+++ b/test/docx/golden/document-properties-short-desc.docx
diff --git a/test/docx/golden/document-properties.docx b/test/docx/golden/document-properties.docx
index 99ba3993c..2c611e160 100644
--- a/test/docx/golden/document-properties.docx
+++ b/test/docx/golden/document-properties.docx
diff --git a/test/docx/golden/headers.docx b/test/docx/golden/headers.docx
index 90b618d69..8369364c8 100644
--- a/test/docx/golden/headers.docx
+++ b/test/docx/golden/headers.docx
diff --git a/test/docx/golden/image.docx b/test/docx/golden/image.docx
index 1d6b5fa8b..9e0ac7b42 100644
--- a/test/docx/golden/image.docx
+++ b/test/docx/golden/image.docx
diff --git a/test/docx/golden/inline_code.docx b/test/docx/golden/inline_code.docx
index a0052fa30..3edef3049 100644
--- a/test/docx/golden/inline_code.docx
+++ b/test/docx/golden/inline_code.docx
diff --git a/test/docx/golden/inline_formatting.docx b/test/docx/golden/inline_formatting.docx
index 4ded6d1aa..6c8440441 100644
--- a/test/docx/golden/inline_formatting.docx
+++ b/test/docx/golden/inline_formatting.docx
diff --git a/test/docx/golden/inline_images.docx b/test/docx/golden/inline_images.docx
index ed39308ff..7976632d7 100644
--- a/test/docx/golden/inline_images.docx
+++ b/test/docx/golden/inline_images.docx
diff --git a/test/docx/golden/link_in_notes.docx b/test/docx/golden/link_in_notes.docx
index 0cd236321..7e511bf88 100644
--- a/test/docx/golden/link_in_notes.docx
+++ b/test/docx/golden/link_in_notes.docx
diff --git a/test/docx/golden/links.docx b/test/docx/golden/links.docx
index 86605fc75..1cd265d9e 100644
--- a/test/docx/golden/links.docx
+++ b/test/docx/golden/links.docx
diff --git a/test/docx/golden/lists.docx b/test/docx/golden/lists.docx
index 7e6be666a..f872965d5 100644
--- a/test/docx/golden/lists.docx
+++ b/test/docx/golden/lists.docx
diff --git a/test/docx/golden/lists_continuing.docx b/test/docx/golden/lists_continuing.docx
index 6173d5716..23e881342 100644
--- a/test/docx/golden/lists_continuing.docx
+++ b/test/docx/golden/lists_continuing.docx
diff --git a/test/docx/golden/lists_div_bullets.docx b/test/docx/golden/lists_div_bullets.docx
index ee53db559..1b21303b0 100644
--- a/test/docx/golden/lists_div_bullets.docx
+++ b/test/docx/golden/lists_div_bullets.docx
diff --git a/test/docx/golden/lists_multiple_initial.docx b/test/docx/golden/lists_multiple_initial.docx
index e15a8eb40..4bdc1ec85 100644
--- a/test/docx/golden/lists_multiple_initial.docx
+++ b/test/docx/golden/lists_multiple_initial.docx
diff --git a/test/docx/golden/lists_restarting.docx b/test/docx/golden/lists_restarting.docx
index d650e2830..6d9a67ad3 100644
--- a/test/docx/golden/lists_restarting.docx
+++ b/test/docx/golden/lists_restarting.docx
diff --git a/test/docx/golden/nested_anchors_in_header.docx b/test/docx/golden/nested_anchors_in_header.docx
index 6497dfe8c..d95ebd303 100644
--- a/test/docx/golden/nested_anchors_in_header.docx
+++ b/test/docx/golden/nested_anchors_in_header.docx
diff --git a/test/docx/golden/notes.docx b/test/docx/golden/notes.docx
index a78129145..e933eeeeb 100644
--- a/test/docx/golden/notes.docx
+++ b/test/docx/golden/notes.docx
diff --git a/test/docx/golden/raw-blocks.docx b/test/docx/golden/raw-blocks.docx
index af332bcf2..829b83635 100644
--- a/test/docx/golden/raw-blocks.docx
+++ b/test/docx/golden/raw-blocks.docx
diff --git a/test/docx/golden/raw-bookmarks.docx b/test/docx/golden/raw-bookmarks.docx
index 26f3c5dbf..447dcbec7 100644
--- a/test/docx/golden/raw-bookmarks.docx
+++ b/test/docx/golden/raw-bookmarks.docx
diff --git a/test/docx/golden/table_one_row.docx b/test/docx/golden/table_one_row.docx
index 47083b176..b135a99b1 100644
--- a/test/docx/golden/table_one_row.docx
+++ b/test/docx/golden/table_one_row.docx
diff --git a/test/docx/golden/table_with_list_cell.docx b/test/docx/golden/table_with_list_cell.docx
index 6ce56eadd..f1b9c59a0 100644
--- a/test/docx/golden/table_with_list_cell.docx
+++ b/test/docx/golden/table_with_list_cell.docx
diff --git a/test/docx/golden/tables-default-widths.docx b/test/docx/golden/tables-default-widths.docx
index 0a5449a7b..02a0c21ab 100644
--- a/test/docx/golden/tables-default-widths.docx
+++ b/test/docx/golden/tables-default-widths.docx
diff --git a/test/docx/golden/tables.docx b/test/docx/golden/tables.docx
index dedc6d587..fa96b80d1 100644
--- a/test/docx/golden/tables.docx
+++ b/test/docx/golden/tables.docx
diff --git a/test/docx/golden/tables_separated_with_rawblock.docx b/test/docx/golden/tables_separated_with_rawblock.docx
index f9ec90b19..cd289cdcb 100644
--- a/test/docx/golden/tables_separated_with_rawblock.docx
+++ b/test/docx/golden/tables_separated_with_rawblock.docx
diff --git a/test/docx/golden/track_changes_deletion.docx b/test/docx/golden/track_changes_deletion.docx
index 543c55068..94ec7705c 100644
--- a/test/docx/golden/track_changes_deletion.docx
+++ b/test/docx/golden/track_changes_deletion.docx
diff --git a/test/docx/golden/track_changes_insertion.docx b/test/docx/golden/track_changes_insertion.docx
index 8127f6c26..c3535ce2b 100644
--- a/test/docx/golden/track_changes_insertion.docx
+++ b/test/docx/golden/track_changes_insertion.docx
diff --git a/test/docx/golden/track_changes_move.docx b/test/docx/golden/track_changes_move.docx
index d8fe769c0..b1866a375 100644
--- a/test/docx/golden/track_changes_move.docx
+++ b/test/docx/golden/track_changes_move.docx
diff --git a/test/docx/golden/track_changes_scrubbed_metadata.docx b/test/docx/golden/track_changes_scrubbed_metadata.docx
index 539d25815..bf742b5c5 100644
--- a/test/docx/golden/track_changes_scrubbed_metadata.docx
+++ b/test/docx/golden/track_changes_scrubbed_metadata.docx
diff --git a/test/docx/golden/unicode.docx b/test/docx/golden/unicode.docx
index 0504b13df..bf6cd1bc5 100644
--- a/test/docx/golden/unicode.docx
+++ b/test/docx/golden/unicode.docx
diff --git a/test/docx/golden/verbatim_subsuper.docx b/test/docx/golden/verbatim_subsuper.docx
index 99d2bd8b2..8996d8491 100644
--- a/test/docx/golden/verbatim_subsuper.docx
+++ b/test/docx/golden/verbatim_subsuper.docx