forked from LiveCarta/BookConverter
Merge pull request #304 from Teqniksoft/kiryl/converter_fix
Kiryl/converter fix
This commit is contained in:
@@ -99,11 +99,13 @@ class HtmlEpubProcessor:
|
|||||||
return text
|
return text
|
||||||
|
|
||||||
title_of_chapter: str = title_of_chapter.lower()
|
title_of_chapter: str = title_of_chapter.lower()
|
||||||
title_in_text: List[Tag] = chapter_tag.find_all(lambda tag: title_of_chapter == text_preparing(tag) or \
|
title_in_text: List[Tag] = chapter_tag.find_all(lambda tag: (title_of_chapter in text_preparing(tag) and
|
||||||
(title_of_chapter in text_preparing(tag) and
|
len(text_preparing(tag)) != 0 and
|
||||||
re.findall(r"^h[1-3]$", tag.name or chapter_tag.name)))
|
re.findall(r"^h[1-5]$", tag.name or chapter_tag.name)))
|
||||||
|
|
||||||
text_in_title: List[Tag] = chapter_tag.find_all(lambda tag: (text_preparing(tag) in title_of_chapter))
|
text_in_title: List[Tag] = chapter_tag.find_all(lambda tag: (text_preparing(tag) in title_of_chapter) and
|
||||||
|
len(text_preparing(tag)) != 0 and
|
||||||
|
re.findall(r"^h[1-5]$", tag.name or chapter_tag.name))
|
||||||
if title_in_text:
|
if title_in_text:
|
||||||
self.html_preprocessor._add_span_to_save_ids_for_links(
|
self.html_preprocessor._add_span_to_save_ids_for_links(
|
||||||
title_in_text[-1], chapter_tag)
|
title_in_text[-1], chapter_tag)
|
||||||
|
|||||||
@@ -27,8 +27,14 @@ class HtmlPresetsProcessor:
|
|||||||
kwargs["rule"]["tag_to_wrap"]))
|
kwargs["rule"]["tag_to_wrap"]))
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _decompose_tag(**kwargs):
|
def set_attrs_to_parent(tag, parent_tag):
|
||||||
kwargs["tag"].parent.attrs.update(kwargs["tag"].attrs)
|
for key in tag.attrs:
|
||||||
|
if key not in parent_tag.attrs:
|
||||||
|
parent_tag.attrs[key] = tag.attrs[key]
|
||||||
|
|
||||||
|
def _decompose_tag(self, **kwargs):
|
||||||
|
if kwargs["tag"].parent:
|
||||||
|
self.set_attrs_to_parent(kwargs["tag"], kwargs["tag"].parent)
|
||||||
kwargs["tag"].decompose()
|
kwargs["tag"].decompose()
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@@ -111,9 +117,9 @@ class HtmlPresetsProcessor:
|
|||||||
elif attr:
|
elif attr:
|
||||||
del kwargs["tag"][attr]
|
del kwargs["tag"][attr]
|
||||||
|
|
||||||
@staticmethod
|
def _unwrap_tag(self, **kwargs):
|
||||||
def _unwrap_tag(**kwargs):
|
if kwargs["tag"].parent:
|
||||||
kwargs["tag"].parent.attrs.update(kwargs["tag"].attrs)
|
self.set_attrs_to_parent(kwargs["tag"], kwargs["tag"].parent)
|
||||||
kwargs["tag"].unwrap()
|
kwargs["tag"].unwrap()
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
|||||||
Reference in New Issue
Block a user