Merge pull request #2038 from lierdakil/docx-hyphen-settings

Docx Writer: Copy hyphenation settings from reference.docx

1 files changed, 26 insertions, 3 deletions

diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index 70319e94c..8bb1d0ced 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -449,6 +449,17 @@ writeDocx opts doc@(Pandoc meta _) = do
         ]
   let relsEntry = toEntry relsPath epochtime $ renderXml rels
 
+  -- we use dist archive for settings.xml, because Word sometimes
+  -- 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 = [ "w:autoHyphenation"
+                     , "w:consecutiveHyphenLimit"
+                     , "w:hyphenationZone"
+                     , "w:doNotHyphenateCap"
+                     ]
+  settingsEntry <- copyChildren refArchive distArchive settingsPath epochtime settingsList
+
   let entryFromArchive arch path =
          maybe (fail $ path ++ " corrupt or missing in reference docx")
                return
@@ -456,9 +467,6 @@ writeDocx opts doc@(Pandoc meta _) = do
   docPropsAppEntry <- entryFromArchive refArchive "docProps/app.xml"
   themeEntry <- entryFromArchive refArchive "word/theme/theme1.xml"
   fontTableEntry <- entryFromArchive refArchive "word/fontTable.xml"
-  -- we use dist archive for settings.xml, because Word sometimes
-  -- adds references to footnotes or endnotes we don't have...
-  settingsEntry <- entryFromArchive distArchive "word/settings.xml"
   webSettingsEntry <- entryFromArchive refArchive "word/webSettings.xml"
   headerFooterEntries <- mapM (entryFromArchive refArchive) $
                      mapMaybe (fmap ("word/" ++) . extractTarget)
@@ -521,6 +529,21 @@ styleToOpenXml sm style =
                                  $ backgroundColor style )
                              ]
 
+copyChildren :: Archive -> Archive -> String -> Integer -> [String] -> IO Entry
+copyChildren refArchive distArchive path timestamp elNames = do
+  ref  <- parseXml refArchive distArchive path
+  dist <- parseXml distArchive distArchive path
+  return $ toEntry path timestamp $ renderXml dist{
+      elContent = elContent dist ++ copyContent ref
+    }
+  where
+    strName QName{qName=name, qPrefix=prefix}
+      | Just p <- prefix = p++":"++name
+      | otherwise        = name
+    shouldCopy = (`elem` elNames) . strName
+    cleanElem el@Element{elName=name} = Elem el{elName=name{qURI=Nothing}}
+    copyContent = map cleanElem . filterChildrenName shouldCopy
+
 -- this is the lowest number used for a list numId
 baseListId :: Int
 baseListId = 1000