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

Fix handling of tails around tables

Browse Source
This commit is contained in:
Kovid Goyal 2015-04-09 08:50:10 +05:30
parent 136cfc6b3a
commit d410da77e2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,6 +293,7 @@ class Convert(object):
elif display == 'table-row': elif display == 'table-row':
self.blocks.start_new_row(html_tag, tag_style) self.blocks.start_new_row(html_tag, tag_style)
elif display in {'table', 'inline-table'}: elif display in {'table', 'inline-table'}:
self.blocks.end_current_block()
self.blocks.start_new_table(html_tag, tag_style) self.blocks.start_new_table(html_tag, tag_style)
else: else:
if tagname == 'img' and tag_style['float'] in {'left', 'right'}: if tagname == 'img' and tag_style['float'] in {'left', 'right'}:
@ -312,7 +313,8 @@ class Convert(object):
if display == 'table-row': if display == 'table-row':
return # We ignore the tail for these tags return # We ignore the tail for these tags
if not is_first_tag and html_tag.tail and (not is_block or not html_tag.tail.isspace()): ignore_whitespace_tail = is_block or display.startswith('table')
if not is_first_tag and html_tag.tail and (not ignore_whitespace_tail or not html_tag.tail.isspace()):
# Ignore trailing space after a block tag, as otherwise it will # Ignore trailing space after a block tag, as otherwise it will
# become a new empty paragraph # become a new empty paragraph
block = self.blocks.current_or_new_block(html_tag.getparent(), stylizer.style(html_tag.getparent())) block = self.blocks.current_or_new_block(html_tag.getparent(), stylizer.style(html_tag.getparent()))