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

Serialize styles to docx

Browse Source
This commit is contained in:
Kovid Goyal 2015-03-15 09:51:50 +05:30
parent 93cfaa69a8
commit 221297ad49
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/ebooks/docx/writer/TODO
View File

@ -7,4 +7,5 @@ Tables
Lists Lists
Embed Fonts Embed Fonts
RTL text RTL text
Lang support in run styles <w:lang>

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

@ -67,6 +67,9 @@ class TextRun(object):
def serialize(self, p): def serialize(self, p):
r = p.makeelement(w('r')) r = p.makeelement(w('r'))
p.append(r) p.append(r)
rpr = r.makeelement(w('rPr'))
rpr.append(rpr.makeelement(w('rStyle'), **{w('val'):self.style.id}))
r.append(rpr)
for text, preserve_whitespace in self.texts: for text, preserve_whitespace in self.texts:
if text is None: if text is None:
r.append(r.makeelement(w('br'), **{w('clear'):preserve_whitespace})) r.append(r.makeelement(w('br'), **{w('clear'):preserve_whitespace}))
@ -120,6 +123,7 @@ class Block(object):
p.append(ppr) p.append(ppr)
if self.keep_next: if self.keep_next:
ppr.append(ppr.makeelement(w('keepNext'))) ppr.append(ppr.makeelement(w('keepNext')))
ppr.append(ppr.makeelement(w('pStyle'), **{w('val'):self.style.id}))
for run in self.runs: for run in self.runs:
run.serialize(p) run.serialize(p)
@ -140,6 +144,7 @@ class Convert(object):
for item in self.oeb.spine: for item in self.oeb.spine:
self.process_item(item) self.process_item(item)
self.styles_manager.finalize(self.blocks)
self.write() self.write()
def process_item(self, item): def process_item(self, item):
@ -235,3 +240,4 @@ class Convert(object):
) )
) )
) )
self.styles_manager.serialize(self.docx.styles)

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

@ -14,6 +14,7 @@ from lxml import etree
from calibre.ebooks import parse_css_length from calibre.ebooks import parse_css_length
from calibre.ebooks.docx.names import namespaces from calibre.ebooks.docx.names import namespaces
from calibre.ebooks.docx.writer.utils import convert_color, int_or_zero from calibre.ebooks.docx.writer.utils import convert_color, int_or_zero
from calibre.utils.icu import numeric_sort_key
from tinycss.css21 import CSS21Parser from tinycss.css21 import CSS21Parser
css_parser = CSS21Parser() css_parser = CSS21Parser()
@ -168,7 +169,7 @@ class TextStyle(DOCXStyle):
val = getattr(self, attr) val = getattr(self, attr)
if self is normal_style or getattr(normal_style, attr) != val: if self is normal_style or getattr(normal_style, attr) != val:
for suffix in ('', 'Cs'): for suffix in ('', 'Cs'):
style.append(makeelement(style, 'sz' + suffix, val=vmap(val))) style.append(makeelement(style, name + suffix, val=vmap(val)))
def check_attr(attr): def check_attr(attr):
val = getattr(self, attr) val = getattr(self, attr)
@ -201,7 +202,7 @@ class TextStyle(DOCXStyle):
if val: if val:
style.append(makeelement(style, 'vertAlign', val=val)) style.append(makeelement(style, 'vertAlign', val=val))
bdr = self.serialize_borders(makeelement(style, 'bdr', normal_style)) bdr = self.serialize_borders(makeelement(style, 'bdr'), normal_style)
if len(bdr): if len(bdr):
style.append(bdr) style.append(bdr)
@ -267,8 +268,8 @@ class BlockStyle(DOCXStyle):
val = int(css_val * 240 * mult) val = int(css_val * 240 * mult)
spacing.set(w('line'), str(val)) spacing.set(w('line'), str(val))
else: else:
spacing.set(w('line'), (0 if self.css_line_height == 'normal' else str(self.line_height))) spacing.set(w('line'), str(0 if self.css_line_height == 'normal' else self.line_height))
spacing.set(w('lineRule', 'exactly')) spacing.set(w('lineRule'), 'exactly')
if spacing.attrib: if spacing.attrib:
style.append(spacing) style.append(spacing)
@ -309,7 +310,7 @@ class BlockStyle(DOCXStyle):
style.append(makeelement(style, 'jc', val=self.text_align)) style.append(makeelement(style, 'jc', val=self.text_align))
if (self is normal_style and self.page_break_before) or self.page_break_before != normal_style.page_break_before: if (self is normal_style and self.page_break_before) or self.page_break_before != normal_style.page_break_before:
style.append(makeelement(style, 'pageBreakBefore', bmap(self.page_break_before))) style.append(makeelement(style, 'pageBreakBefore', val=bmap(self.page_break_before)))
if (self is normal_style and self.keep_lines) or self.keep_lines != normal_style.keep_lines: if (self is normal_style and self.keep_lines) or self.keep_lines != normal_style.keep_lines:
style.append(makeelement(style, 'keepLines', bmap(self.keep_lines))) style.append(makeelement(style, 'keepLines', bmap(self.keep_lines)))
@ -352,17 +353,23 @@ class StylesManager(object):
run_rmap[run.style].append(run) run_rmap[run.style].append(run)
for i, (block_style, count) in enumerate(block_counts.most_common()): for i, (block_style, count) in enumerate(block_counts.most_common()):
if i == 0: if i == 0:
normal_block_style = block_style self.normal_block_style = block_style
normal_block_style.id = 'BlockNormal' block_style.id = 'ParagraphNormal'
normal_block_style.name = 'Normal' block_style.name = 'Normal'
else: else:
block_style.id = 'Block%d' % i block_style.id = 'Paragraph%d' % i
block_style.name = 'Paragraph %d' % i block_style.name = 'Paragraph %d' % i
for i, (text_style, count) in enumerate(run_counts.most_common()): for i, (text_style, count) in enumerate(run_counts.most_common()):
if i == 0: if i == 0:
normal_text_style = text_style self.normal_text_style = text_style
normal_text_style.id = 'TextNormal' text_style.id = 'TextNormal'
normal_text_style.name = 'Normal' text_style.name = 'Normal'
else: else:
block_style.id = 'Text%d' % i text_style.id = 'Text%d' % i
block_style.name = 'Text %d' % i text_style.name = 'Text %d' % i
def serialize(self, styles):
for style in sorted(self.block_styles, key=lambda s:(s is not self.normal_block_style, numeric_sort_key(s.id))):
style.serialize(styles, self.normal_block_style)
for style in sorted(self.text_styles, key=lambda s:(s is not self.normal_text_style, numeric_sort_key(s.id))):
style.serialize(styles, self.normal_text_style)