Docx writer: add eastAsia font hints to w:r.

We do this when the text in the run contains any CJK characters. This ensures that ambiguous code points (e.g. quotation marks) will be represented as "wide" characters when together with CJK characters. Closes #9817.
jgm · May 29, 2024 · a6c3945 · a6c3945
1 parent 2f1f066
commit a6c3945
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Text/Pandoc/Writers/Docx/OpenXML.hs b/src/Text/Pandoc/Writers/Docx/OpenXML.hs
@@ -24,6 +24,7 @@ import Control.Applicative ((<|>))
 import Control.Monad.Except (catchError)
 import qualified Data.ByteString.Lazy as BL
 import Data.Char (isLetter)
+import Text.Pandoc.Char (isCJK)
 import Data.Ord (comparing)
 import Data.String (fromString)
 import qualified Data.Map as M
@@ -593,8 +594,13 @@ formattedString str =
 formattedString' :: PandocMonad m => Text -> WS m [Element]
 formattedString' str = do
   inDel <- asks envInDel
-  formattedRun [ mktnode (if inDel then "w:delText" else "w:t")
-                 [("xml:space","preserve")] (stripInvalidChars str) ]
+  let addFontProp
+       | T.any isCJK str
+          = withTextProp (mknode "w:rFonts" [("w:hint","eastAsia")] ())
+       | otherwise = id
+  addFontProp $
+    formattedRun [ mktnode (if inDel then "w:delText" else "w:t")
+                   [("xml:space","preserve")] (stripInvalidChars str) ]
 
 formattedRun :: PandocMonad m => [Element] -> WS m [Element]
 formattedRun els = do

diff --git a/test/docx/golden/unicode.docx b/test/docx/golden/unicode.docx