From 71acdf085fb5783feb7e8247b586ed7ce91b33c5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 16 May 2017 13:24:22 +0530
Subject: [PATCH] DOCX Input: When a style only specifies a complex script
 font, use it instead of the normal font

---
 src/calibre/ebooks/docx/char_styles.py | 34 ++++++++++++++------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/calibre/ebooks/docx/char_styles.py b/src/calibre/ebooks/docx/char_styles.py
index df35af6039..71234b1cdd 100644
--- a/src/calibre/ebooks/docx/char_styles.py
+++ b/src/calibre/ebooks/docx/char_styles.py
@@ -106,15 +106,6 @@ def read_letter_spacing(parent, dest, XPath, get):
     setattr(dest, 'letter_spacing', ans)
 
 
-def read_sz(parent, dest, XPath, get):
-    ans = inherit
-    for col in XPath('./w:sz[@w:val]')(parent):
-        val = simple_float(get(col, 'w:val'), 0.5)
-        if val is not None:
-            ans = val
-    setattr(dest, 'font_size', ans)
-
-
 def read_underline(parent, dest, XPath, get):
     ans = inherit
     for col in XPath('./w:u[@w:val]')(parent):
@@ -144,17 +135,30 @@ def read_position(parent, dest, XPath, get):
     setattr(dest, 'position', ans)
 
 
-def read_font_family(parent, dest, XPath, get):
-    ans = inherit
+def read_font(parent, dest, XPath, get):
+    ff = inherit
+    used_cs = False
     for col in XPath('./w:rFonts')(parent):
         val = get(col, 'w:asciiTheme')
         if val:
             val = '|%s|' % val
         else:
             val = get(col, 'w:ascii')
+        if not val:
+            val = get(col, 'w:cs')
+            used_cs = bool(val)
         if val:
-            ans = val
-    setattr(dest, 'font_family', ans)
+            ff = val
+    setattr(dest, 'font_family', ff)
+    sizes = ('szCs', 'sz') if used_cs else ('sz', 'szCs')
+    for q in sizes:
+        for col in XPath('./w:%s[@w:val]' % q)(parent):
+            val = simple_float(get(col, 'w:val'), 0.5)
+            if val is not None:
+                setattr(dest, 'font_size', val)
+                return
+    setattr(dest, 'font_size', inherit)
+
 # }}}
 
 
@@ -185,7 +189,8 @@ class RunStyle(object):
             ):
                 setattr(self, p, binary_property(rPr, p, namespace.XPath, namespace.get))
 
-            for x in ('text_border', 'color', 'highlight', 'shd', 'letter_spacing', 'sz', 'underline', 'vert_align', 'position', 'lang', 'font_family'):
+            read_font(rPr, self, namespace.XPath, namespace.get)
+            for x in ('text_border', 'color', 'highlight', 'shd', 'letter_spacing', 'underline', 'vert_align', 'position', 'lang'):
                 f = globals()['read_%s' % x]
                 f(rPr, self, namespace.XPath, namespace.get)
 
@@ -274,4 +279,3 @@ class RunStyle(object):
 
     def same_border(self, other):
         return self.get_border_css({}) == other.get_border_css({})
-