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 Output: Fix empty blocks not being styled

Browse Source
This commit is contained in:
Kovid Goyal 2015-05-12 13:21:17 +05:30
parent 9a6d687848
commit ae91363a68
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/docx/writer/from_html.py
View File

@ -218,6 +218,8 @@ class Block(object):
makeelement(numpr, 'w:numId', w_val=str(self.numbering_id[0])) makeelement(numpr, 'w:numId', w_val=str(self.numbering_id[0]))
if self.linked_style is not None: if self.linked_style is not None:
makeelement(ppr, 'w:pStyle', w_val=self.linked_style.id) makeelement(ppr, 'w:pStyle', w_val=self.linked_style.id)
elif self.style.id:
makeelement(ppr, 'w:pStyle', w_val=self.style.id)
if self.is_first_block: if self.is_first_block:
makeelement(ppr, 'w:pageBreakBefore', w_val='off') makeelement(ppr, 'w:pageBreakBefore', w_val='off')
elif self.page_break_before: elif self.page_break_before:

15
src/calibre/ebooks/docx/writer/styles.py
View File

@ -430,7 +430,7 @@ class BlockStyle(DOCXStyle):
makeelement = self.makeelement makeelement = self.makeelement
style_root = DOCXStyle.serialize(self, styles, normal_style) style_root = DOCXStyle.serialize(self, styles, normal_style)
style = makeelement(style_root, 'pPr') style = makeelement(style_root, 'pPr')
self.serialize_properties(style, normal_style)
if len(style) > 0: if len(style) > 0:
style_root.append(style) style_root.append(style)
return style_root return style_root
@ -540,6 +540,7 @@ class StylesManager(object):
used_pairs = defaultdict(list) used_pairs = defaultdict(list)
heading_styles = defaultdict(list) heading_styles = defaultdict(list)
headings = frozenset('h1 h2 h3 h4 h5 h6'.split()) headings = frozenset('h1 h2 h3 h4 h5 h6'.split())
pure_block_styles = set()
for block in blocks: for block in blocks:
bs = block.style bs = block.style
@ -556,6 +557,16 @@ class StylesManager(object):
used_pairs[(bs, rs)].append(block) used_pairs[(bs, rs)].append(block)
if block.html_tag in headings: if block.html_tag in headings:
heading_styles[block.html_tag].append((bs, rs)) heading_styles[block.html_tag].append((bs, rs))
else:
pure_block_styles.add(bs)
self.pure_block_styles = sorted(pure_block_styles, key=block_counts.__getitem__)
bnum = len(str(max(1, len(pure_block_styles) - 1)))
for i, bs in enumerate(self.pure_block_styles):
bs.id = bs.name = '%0{}d Block'.format(bnum) % i
bs.seq = i
if i == 0:
self.normal_pure_block_style = bs
rnum = len(str(max(1, len(run_counts) - 1))) rnum = len(str(max(1, len(run_counts) - 1)))
for i, (text_style, count) in enumerate(run_counts.most_common()): for i, (text_style, count) in enumerate(run_counts.most_common()):
@ -606,3 +617,5 @@ class StylesManager(object):
style.serialize(styles, self.normal_style) style.serialize(styles, self.normal_style)
for style in sorted(self.text_styles, key=attrgetter('seq')): for style in sorted(self.text_styles, key=attrgetter('seq')):
style.serialize(styles, self.normal_text_style) style.serialize(styles, self.normal_text_style)
for style in sorted(self.pure_block_styles, key=attrgetter('seq')):
style.serialize(styles, self.normal_pure_block_style)