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 handling of paragraph margins/indents

Browse Source
This commit is contained in:
Kovid Goyal 2015-05-02 12:41:52 +05:30
parent cab1e2cd50
commit 555463b229
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -420,15 +420,17 @@ class BlockStyle(DOCXStyle):
val = getter(self) val = getter(self)
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):
ind.set(w(edge), str(val)) ind.set(w(edge), str(val))
ind.set(w(edge + 'Chars'), '0') # This is needed to override any declaration in the parent style
css_val, css_unit = parse_css_length(self.css_text_indent) css_val, css_unit = parse_css_length(self.css_text_indent)
if css_unit in ('em', 'ex'): if css_unit in ('em', 'ex'):
chars = max(0, int(css_val * (50 if css_unit == 'ex' else 100))) chars = max(0, int(css_val * (50 if css_unit == 'ex' else 100)))
if (self is normal_style and chars > 0) or self.css_text_indent != normal_style.css_text_indent: if (self is normal_style and chars > 0) or self.css_text_indent != normal_style.css_text_indent:
ind.set('firstLineChars', str(chars)) ind.set(w('firstLineChars'), str(chars))
else: else:
val = self.text_indent val = self.text_indent
if (self is normal_style and val > 0) or self.text_indent != normal_style.text_indent: if (self is normal_style and val > 0) or self.text_indent != normal_style.text_indent:
ind.set('firstLine', str(val)) ind.set(w('firstLine'), str(val))
ind.set(w('firstLineChars'), '0') # This is needed to override any declaration in the parent style
if ind.attrib: if ind.attrib:
style.append(ind) style.append(ind)