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: Partially handle vertical align with nested tags

Browse Source
This commit is contained in:
Kovid Goyal 2015-05-03 10:22:35 +05:30
parent b2eac6f919
commit 95ebc11105
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,15 @@ class TextStyle(DOCXStyle):
self.spacing = int(float(css['letter-spacing']) * 20) self.spacing = int(float(css['letter-spacing']) * 20)
except (ValueError, TypeError, AttributeError): except (ValueError, TypeError, AttributeError):
self.spacing = None self.spacing = None
self.vertical_align = css['vertical-align'] va = css.first_vertical_align
if isinstance(va, (int, float)):
self.vertical_align = str(int(self.vertical_align * 2))
else:
val = {
'top':'superscript', 'text-top':'superscript', 'sup':'superscript', 'super':'superscript',
'bottom':'subscript', 'text-bottom':'subscript', 'sub':'subscript'}.get(va)
self.vertical_align = val or 'baseline'
self.padding = self.border_color = self.border_width = self.border_style = None self.padding = self.border_color = self.border_width = self.border_style = None
if not is_parent_style: if not is_parent_style:
# DOCX does not support individual borders/padding for inline content # DOCX does not support individual borders/padding for inline content
@ -274,16 +282,11 @@ class TextStyle(DOCXStyle):
style.append(makeelement(style, 'shadow', val=bmap(self.shadow))) style.append(makeelement(style, 'shadow', val=bmap(self.shadow)))
if check_attr('spacing'): if check_attr('spacing'):
style.append(makeelement(style, 'spacing', val=str(self.spacing or 0))) style.append(makeelement(style, 'spacing', val=str(self.spacing or 0)))
if isinstance(self.vertical_align, (int, float)): if (self is normal_style and self.vertical_align in {'superscript', 'subscript'}) or self.vertical_align != normal_style.vertical_align:
val = int(self.vertical_align * 2) if self.vertical_align in {'superscript', 'subscript', 'baseline'}:
style.append(makeelement(style, 'position', val=str(val))) style.append(makeelement(style, 'vertAlign', val=self.vertical_align))
elif isinstance(self.vertical_align, basestring): else:
val = { style.append(makeelement(style, 'position', val=self.vertical_align))
'top':'superscript', 'text-top':'superscript', 'sup':'superscript', 'super':'superscript',
'bottom':'subscript', 'text-bottom':'subscript', 'sub':'subscript'}.get(
self.vertical_align.lower())
if 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 bdr.attrib: if bdr.attrib:

12
src/calibre/ebooks/oeb/stylizer.py
View File

@ -645,6 +645,18 @@ class Style(object):
return pcss return pcss
return css return css
@property
def first_vertical_align(self):
''' For docx output where tags are not nested, we cannot directly
simulate the HTML vertical-align rendering model. Instead use the
approximation of considering the first non-default vertical-align '''
val = self['vertical-align']
if val != 'baseline':
return val
parent = self._get_parent()
if parent is not None:
return parent.first_vertical_align
@property @property
def marginTop(self): def marginTop(self):
return self._unit_convert( return self._unit_convert(