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

Make algorithm non recursive to avoid failure on deeply nested tags

Browse Source
This commit is contained in:
Kovid Goyal 2019-12-02 18:42:37 +05:30
parent 7f85f0b531
commit 6625560e81
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calibre/utils/hyphenation/hyphenate.py
View File

@ -94,7 +94,7 @@ def add_soft_hyphens_to_words(words, dictionary, hyphen_char='\u00ad'):
return ''.join(parts) return ''.join(parts)
def process_tag(elem, locale, hyphen_char): def add_to_tag(stack, elem, locale, hyphen_char):
name = barename(elem.tag) name = barename(elem.tag)
if name in tags_not_to_hyphenate: if name in tags_not_to_hyphenate:
return return
@ -106,8 +106,20 @@ def process_tag(elem, locale, hyphen_char):
if dictionary is not None and child.tail and not child.tail.isspace(): if dictionary is not None and child.tail and not child.tail.isspace():
child.tail = add_soft_hyphens_to_words(child.tail, dictionary, hyphen_char) child.tail = add_soft_hyphens_to_words(child.tail, dictionary, hyphen_char)
if not callable(getattr(child, 'tag', None)): if not callable(getattr(child, 'tag', None)):
process_tag(child, locale, hyphen_char) stack.append((child, tl))
def add_soft_hyphens_to_html(root, locale='en', hyphen_char='\u00ad'): def add_soft_hyphens_to_html(root, locale='en', hyphen_char='\u00ad'):
process_tag(root, locale, hyphen_char) stack = [(root, locale)]
while stack:
elem, locale = stack.pop()
add_to_tag(stack, elem, locale, hyphen_char)
def remove_soft_hyphens_from_html(root, hyphen_char='\u00ad'):
for elem in root.iterdescendants():
if elem.tail:
elem.tail = elem.tail.replace(hyphen_char, '')
text = getattr(elem, 'text', None)
if text:
elem.text = elem.text.replace(hyphen_char, '')