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

DOCX Output: Fix line-height conversion

Browse Source
This commit is contained in:
Kovid Goyal 2015-03-22 09:53:37 +05:30
parent e61b68347a
commit c0d63e85b4
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,7 +227,7 @@ class TextStyle(DOCXStyle):
class BlockStyle(DOCXStyle): class BlockStyle(DOCXStyle):
ALL_PROPS = tuple( ALL_PROPS = tuple(
'text_align page_break_before keep_lines css_text_indent text_indent line_height css_line_height background_color'.split() + 'text_align page_break_before keep_lines css_text_indent text_indent line_height background_color'.split() +
['margin_' + edge for edge in border_edges] + ['margin_' + edge for edge in border_edges] +
['css_margin_' + edge for edge in border_edges] + ['css_margin_' + edge for edge in border_edges] +
[x%edge for edge in border_edges for x in border_props] [x%edge for edge in border_edges for x in border_props]
@ -248,8 +248,7 @@ class BlockStyle(DOCXStyle):
setattr(self, 'border_%s_style' % edge, LINE_STYLES.get(css['border-%s-style' % edge].lower(), 'none')) setattr(self, 'border_%s_style' % edge, LINE_STYLES.get(css['border-%s-style' % edge].lower(), 'none'))
self.text_indent = max(0, int(css['text-indent'] * 20)) self.text_indent = max(0, int(css['text-indent'] * 20))
self.css_text_indent = css._get('text-indent') self.css_text_indent = css._get('text-indent')
self.line_height = max(0, int(css['line-height'] * 20)) self.line_height = max(0, int(css.lineHeight * 20))
self.css_line_height = css._get('line-height')
self.background_color = convert_color(css['background-color']) self.background_color = convert_color(css['background-color'])
self.text_align = {'start':'left', 'left':'left', 'end':'right', 'right':'right', 'center':'center', 'justify':'both', 'centre':'center'}.get( self.text_align = {'start':'left', 'left':'left', 'end':'right', 'right':'right', 'center':'center', 'justify':'both', 'centre':'center'}.get(
css['text-align'].lower(), 'left') css['text-align'].lower(), 'left')
@ -292,18 +291,9 @@ class BlockStyle(DOCXStyle):
if (self is normal_style and val > 0) or val != getter(normal_style): if (self is normal_style and val > 0) or val != getter(normal_style):
spacing.set(w(attr), str(val)) spacing.set(w(attr), str(val))
if (self is normal_style and self.css_line_height != 'normal') or self.css_line_height != normal_style.css_line_height: if self is normal_style or self.line_height != normal_style.line_height:
try: spacing.set(w('line'), str(self.line_height))
css_val, css_unit = float(self.css_line_height), 'ratio' spacing.set(w('lineRule'), 'atLeast')
except Exception:
css_val, css_unit = parse_css_length(self.css_line_height)
if css_unit in {'em', 'ex', '%', 'ratio'}:
mult = {'ex':0.5, '%':0.01}.get(css_unit, 1)
val = int(css_val * 240 * mult)
spacing.set(w('line'), str(val))
else:
spacing.set(w('line'), str(0 if self.css_line_height == 'normal' else self.line_height))
spacing.set(w('lineRule'), 'exactly')
if spacing.attrib: if spacing.attrib:
style.append(spacing) style.append(spacing)