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

Fix style problem with span

Browse Source
This commit is contained in:
Kiryl
2022-06-21 16:16:42 +03:00
parent c62192d028
commit dcec9bad2e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/epub_converter/tag_css_style_converter.py
View File

@@ -16,7 +16,7 @@ class TagStyleConverter:
def __init__(self, tag_inline_style): def __init__(self, tag_inline_style):
# tag with inline style + style parsed from css file # tag with inline style + style parsed from css file
self.tag_inline_style = tag_inline_style self.tag_inline_style = tag_inline_style
self.style = self.process_inline_style() self.tag_inline_style.attrs['style'] = self.process_inline_style()
@staticmethod @staticmethod
def remove_white_if_no_bgcolor(style_, tag): def remove_white_if_no_bgcolor(style_, tag):
@@ -76,7 +76,7 @@ class TagStyleConverter:
processed style with counted indent processed style with counted indent
""" """
processed_style = ";".join(split_style) processed_style = ";".join(split_style)+';'
margin_left_regexp = re.compile( margin_left_regexp = re.compile(
r"((margin-left|margin): *(-*\w+);*)") r"((margin-left|margin): *(-*\w+);*)")
@@ -142,7 +142,7 @@ class TagStyleConverter:
# 3. Duplicate styles check - if the tag had duplicate styles # 3. Duplicate styles check - if the tag had duplicate styles
split_inline_style = self.duplicate_styles_check(split_inline_style) split_inline_style = self.duplicate_styles_check(split_inline_style)
# 4. Processing indents# # 4. Processing indents
inline_style: str = self.indents_processing(split_inline_style) inline_style: str = self.indents_processing(split_inline_style)
return inline_style return inline_style
@@ -170,7 +170,7 @@ class TagStyleConverter:
def change_attrs_with_corresponding_tags(self): def change_attrs_with_corresponding_tags(self):
# adds <strong>, <u>, <sup> instead of styles # adds <strong>, <u>, <sup> instead of styles
styles_to_remove = self.check_style_to_be_tag(self.style) styles_to_remove = self.check_style_to_be_tag(self.tag_inline_style.attrs['style'])
for i, (attr, value) in enumerate(styles_to_remove): for i, (attr, value) in enumerate(styles_to_remove):
self.tag_inline_style.attrs["style"] = self.tag_inline_style.attrs["style"]\ self.tag_inline_style.attrs["style"] = self.tag_inline_style.attrs["style"]\
.replace(f"{attr}:{value};", "").strip() .replace(f"{attr}:{value};", "").strip()
@@ -184,10 +184,10 @@ class TagStyleConverter:
@staticmethod @staticmethod
def wrap_span_in_tag_to_save_style_attrs(initial_tag): def wrap_span_in_tag_to_save_style_attrs(initial_tag):
"""Function designed to save style attrs that cannot be in tag.name -> span""" """Function designed to save style attrs that cannot be in tag.name -> span"""
dictkeys_pattern = re.compile("|".join(LiveCartaConfig.LIVECARTA_STYLES_CANT_BE_IN_TAG)) dictkeys_pattern = re.compile("|".join(LiveCartaConfig.LIVECARTA_STYLES_CAN_BE_IN_TAG))
if re.findall(dictkeys_pattern, initial_tag.name) and initial_tag.attrs.get("style"): if re.findall(dictkeys_pattern, initial_tag.name) and initial_tag.attrs.get("style"):
styles_can_be_in_tag = [style styles_can_be_in_tag = [style
for tag, styles in LiveCartaConfig.LIVECARTA_STYLES_CANT_BE_IN_TAG.items() for tag, styles in LiveCartaConfig.LIVECARTA_STYLES_CAN_BE_IN_TAG.items()
if re.match(tag, initial_tag.name) if re.match(tag, initial_tag.name)
for style in styles] for style in styles]
styles_cant_be_in_tag = [attr for attr in LIVECARTA_STYLE_ATTRS styles_cant_be_in_tag = [attr for attr in LIVECARTA_STYLE_ATTRS
@@ -201,7 +201,7 @@ class TagStyleConverter:
# if we find styles that cannot be in <tag.name> -> wrap them in span # if we find styles that cannot be in <tag.name> -> wrap them in span
tag = BeautifulSoup(features="lxml").new_tag(f"{initial_tag.name}") tag = BeautifulSoup(features="lxml").new_tag(f"{initial_tag.name}")
style = "" style = ""
possible_attrs_regexp = [re.compile(fr"({style}: *(\w+);)") for style in styles_can_be_in_tag] possible_attrs_regexp = [re.compile(fr"{style}: *\w+;") for style in styles_can_be_in_tag]
for possible_attr_regexp in possible_attrs_regexp: for possible_attr_regexp in possible_attrs_regexp:
has_style_attrs = re.search( has_style_attrs = re.search(
possible_attr_regexp, span_style) possible_attr_regexp, span_style)

2
src/livecarta_config.py
View File

@@ -117,7 +117,7 @@ class LiveCartaConfig:
("vertical-align", "super"): "sup" ("vertical-align", "super"): "sup"
} }
LIVECARTA_STYLES_CANT_BE_IN_TAG = { LIVECARTA_STYLES_CAN_BE_IN_TAG = {
"p": ["text-align", "text-indent", "border-bottom", "border-top"], "p": ["text-align", "text-indent", "border-bottom", "border-top"],
"li": ["text-align", "list-style-type"], "li": ["text-align", "list-style-type"],
"ul": ["list-style-type"], "ul": ["list-style-type"],