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: When a list item contains a nested listed but no text, it should be output as an empty list item.

Browse Source
This commit is contained in:
Kovid Goyal 2020-02-06 14:20:29 +05:30
parent 2031404384
commit 4dc41f8929
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,6 +136,7 @@ class TextRun(object):
class Block(object): class Block(object):
def __init__(self, namespace, styles_manager, links_manager, html_block, style, is_table_cell=False, float_spec=None, is_list_item=False, parent_bg=None): def __init__(self, namespace, styles_manager, links_manager, html_block, style, is_table_cell=False, float_spec=None, is_list_item=False, parent_bg=None):
self.force_not_empty = False
self.namespace = namespace self.namespace = namespace
self.bookmarks = set() self.bookmarks = set()
self.list_tag = (html_block, style) if is_list_item else None self.list_tag = (html_block, style) if is_list_item else None
@ -242,6 +243,8 @@ class Block(object):
__str__ = __repr__ __str__ = __repr__
def is_empty(self): def is_empty(self):
if self.force_not_empty:
return False
for run in self.runs: for run in self.runs:
if not run.is_empty(): if not run.is_empty():
return False return False
@ -571,8 +574,11 @@ class Convert(object):
if tagname == 'img': if tagname == 'img':
self.images_manager.add_image(html_tag, block, stylizer, as_block=True) self.images_manager.add_image(html_tag, block, stylizer, as_block=True)
else: else:
if html_tag.text: text = html_tag.text
block.add_text(html_tag.text, tag_style, ignore_leading_whitespace=True, is_parent_style=True, link=self.current_link, lang=self.current_lang) if text:
block.add_text(text, tag_style, ignore_leading_whitespace=True, is_parent_style=True, link=self.current_link, lang=self.current_lang)
elif tagname == 'li' and len(html_tag) and barename(html_tag[0].tag) in ('ul', 'ol') and len(html_tag[0]):
block.force_not_empty = True
def add_inline_tag(self, tagname, html_tag, tag_style, stylizer): def add_inline_tag(self, tagname, html_tag, tag_style, stylizer):
anchor = html_tag.get('id') or html_tag.get('name') or None anchor = html_tag.get('id') or html_tag.get('name') or None