lxbfYeaa/BookConverter
Archived
Template
1
0
Fork 0
forked from LiveCarta/BookConverter
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: code is transferred incorrectly

Browse Source
This commit is contained in:
Kiryl
2022-04-29 17:46:19 +03:00
parent 37533e9b67
commit c1cebf32b9
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/epub_converter/html_epub_preprocessor.py
View File

@@ -593,18 +593,22 @@ def preprocess_pre_tags(chapter_tag: BeautifulSoup):
for pre in chapter_tag.find_all("pre"): for pre in chapter_tag.find_all("pre"):
new_tag = BeautifulSoup(features='lxml').new_tag("span") new_tag = BeautifulSoup(features='lxml').new_tag("span")
new_tag.attrs = pre.attrs.copy() new_tag.attrs = pre.attrs.copy()
spans = pre.find_all("span") new_tag.attrs['style'] = "font-family: courier new,courier,monospace; " \
"font-size: 14px; white-space: nowrap;"
# if in <pre> there are multiple <span>, we need to add <br> after each content # if in <pre> there are multiple <span>, we need to add <br> after each content
to_add_br = len(spans) > 1 to_add_br = len(pre.find_all("span")) > 1
copy_contents = pre.contents[:] copy_contents = pre.contents[:]
for child in copy_contents: for child in copy_contents:
# Navigable String
if isinstance(child, NavigableString): if isinstance(child, NavigableString):
cleaned_text = prepare_formatted(str(child)) cleaned_text = prepare_formatted(str(child))
sub_strings = re.split('\r\n|\n|\r', cleaned_text) sub_strings = re.split('\r\n|\n|\r', cleaned_text)
for string in sub_strings: for string in sub_strings[:-1]:
new_tag.append(NavigableString(string)) new_tag.append(NavigableString(string))
new_tag.append(BeautifulSoup( new_tag.append(BeautifulSoup(
features='lxml').new_tag('br')) features='lxml').new_tag('br'))
new_tag.append(NavigableString(sub_strings[-1]))
# Tag
else: else:
for sub_child in child.children: for sub_child in child.children:
if isinstance(sub_child, NavigableString): if isinstance(sub_child, NavigableString):
@@ -617,9 +621,6 @@ def preprocess_pre_tags(chapter_tag: BeautifulSoup):
if to_add_br: if to_add_br:
new_tag.append(BeautifulSoup( new_tag.append(BeautifulSoup(
features='lxml').new_tag('br')) features='lxml').new_tag('br'))
new_tag.attrs['style'] = "font-family: courier new,courier,monospace; " \
"font-size: 14px; white-space: nowrap;"
pre.replace_with(new_tag) pre.replace_with(new_tag)
table = wrap_preformatted_span_with_table(chapter_tag, new_tag) table = wrap_preformatted_span_with_table(chapter_tag, new_tag)
# add <p> to save brs # add <p> to save brs