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: Support floating tables

Browse Source
This commit is contained in:
Kovid Goyal 2015-04-15 10:05:54 +05:30
parent d04f347d73
commit a00d7b4457
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/ebooks/docx/writer/tables.py
View File

@ -248,10 +248,15 @@ class Table(object):
self.width = convert_width(tag_style) self.width = convert_width(tag_style)
self.background_color = None if tag_style is None else convert_color(tag_style.backgroundColor) self.background_color = None if tag_style is None else convert_color(tag_style.backgroundColor)
self.jc = None self.jc = None
self.float = None
self.margin_left = self.margin_right = self.margin_top = self.margin_bottom = None
if tag_style is not None: if tag_style is not None:
ml, mr = tag_style._get('margin-left'), tag_style.get('margin-right') ml, mr = tag_style._get('margin-left'), tag_style.get('margin-right')
if ml == 'auto': if ml == 'auto':
self.jc = 'center' if mr == 'auto' else 'right' self.jc = 'center' if mr == 'auto' else 'right'
self.float = tag_style['float']
for edge in border_edges:
setattr(self, 'margin_' + edge, tag_style['margin-' + edge])
read_css_block_borders(self, tag_style) read_css_block_borders(self, tag_style)
@property @property
@ -328,6 +333,14 @@ class Table(object):
tbl = makeelement(parent, 'w:tbl') tbl = makeelement(parent, 'w:tbl')
tblPr = makeelement(tbl, 'w:tblPr') tblPr = makeelement(tbl, 'w:tblPr')
makeelement(tblPr, 'w:tblW', w_type=self.width[0], w_w=str(self.width[1])) makeelement(tblPr, 'w:tblW', w_type=self.width[0], w_w=str(self.width[1]))
if self.float in {'left', 'right'}:
kw = {'w_vertAnchor':'text', 'w_horzAnchor':'text', 'w_tblpXSpec':self.float}
for edge in border_edges:
val = getattr(self, 'margin_' + edge) or 0
if {self.float, edge} == {'left', 'right'}:
val = max(val, 2)
kw['w_' + edge + 'FromText'] = str(max(0, int(val *20)))
makeelement(tblPr, 'w:tblpPr', **kw)
if self.jc is not None: if self.jc is not None:
makeelement(tblPr, 'w:jc', w_val=self.jc) makeelement(tblPr, 'w:jc', w_val=self.jc)
for row in rows: for row in rows: