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 table rows without enclosing table body

Browse Source
This commit is contained in:
Kovid Goyal 2015-05-14 17:21:26 +05:30
parent 2320365fd0
commit 6e09039c08
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/from_html.py
View File

@ -322,8 +322,9 @@ class Blocks(object):
pos = self.pos if pos is None else pos pos = self.pos if pos is None else pos
block = self.all_blocks[pos] block = self.all_blocks[pos]
del self.all_blocks[pos] del self.all_blocks[pos]
if self.block_map: bpos = self.block_map.pop(block, None)
del self.items[self.block_map.pop(block)] if bpos is not None:
del self.items[bpos]
else: else:
items = self.items if block.parent_items is None else block.parent_items items = self.items if block.parent_items is None else block.parent_items
items.remove(block) items.remove(block)
@ -410,6 +411,7 @@ class Convert(object):
self.current_link = self.current_lang = None self.current_link = self.current_lang = None
for item in self.oeb.spine: for item in self.oeb.spine:
self.log.debug('Processing', item.href)
self.process_item(item) self.process_item(item)
if self.add_toc: if self.add_toc:
self.links_manager.process_toc_links(self.oeb) self.links_manager.process_toc_links(self.oeb)