Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

DOCX: Table run style override hierarchy to match Word

Browse Source
This commit is contained in:
Kovid Goyal 2013-06-06 10:17:37 +05:30
parent a6e4a9bef9
commit 376db2d0cc
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/ebooks/docx/styles.py
View File

@ -282,12 +282,16 @@ class Styles(object):
default_char = self.default_styles.get('character', None) default_char = self.default_styles.get('character', None)
if self.default_character_style is not None: if self.default_character_style is not None:
parent_styles.append(self.default_character_style) parent_styles.append(self.default_character_style)
ts = self.tables.run_style(p)
if ts is not None:
parent_styles.append(ts)
pstyle = self.para_char_cache.get(p, None) pstyle = self.para_char_cache.get(p, None)
if pstyle is not None: if pstyle is not None:
parent_styles.append(pstyle) parent_styles.append(pstyle)
# As best as I can understand the spec, table overrides should be
# applied before paragraph overrides, but word does it
# this way, see the December 2007 table header in the demo
# document.
ts = self.tables.run_style(p)
if ts is not None:
parent_styles.append(ts)
if direct_formatting.linked_style is not None: if direct_formatting.linked_style is not None:
ls = self.get(direct_formatting.linked_style).character_style ls = self.get(direct_formatting.linked_style).character_style
if ls is not None: if ls is not None: