diff --git a/src/epub_converter/html_epub_preprocessor.py b/src/epub_converter/html_epub_processor.py similarity index 99% rename from src/epub_converter/html_epub_preprocessor.py rename to src/epub_converter/html_epub_processor.py index 3ddc532..8193285 100644 --- a/src/epub_converter/html_epub_preprocessor.py +++ b/src/epub_converter/html_epub_processor.py @@ -229,7 +229,6 @@ class HtmlEpubPreprocessor: Chapter Tag with inserted tags """ - def insert(tag, tag_to_insert): # insert all items that was in tag to subtag and remove from tag for content in reversed(tag.contents): diff --git a/src/epub_converter/tag_inline_style_processor.py b/src/epub_converter/tag_inline_style_processor.py index c4e0b45..30d7e50 100644 --- a/src/epub_converter/tag_inline_style_processor.py +++ b/src/epub_converter/tag_inline_style_processor.py @@ -48,15 +48,18 @@ class TagInlineStyleProcessor: style_ = style_.replace("color:white;", "") return style_ - @staticmethod - def duplicate_styles_check(split_style: list) -> list: - style_name2style_value = {} - for list_item in split_style: - key, val = list_item.split(":") - if val not in style_name2style_value.keys(): - style_name2style_value[key] = val - split_style = [k + ":" + v for k, v in style_name2style_value.items()] - return split_style + # @staticmethod + # def duplicate_styles_check(split_style: list) -> list: + # style_name2style_value = {} + # # {key: val for for list_item in split_style} + # splitstrs = (list_item.split(":") for list_item in split_style) + # d = {key: val for key, val in splitstrs} + # for list_item in split_style: + # key, val = list_item.split(":") + # if key not in style_name2style_value.keys(): + # style_name2style_value[key] = val + # split_style = [k + ":" + v for k, v in style_name2style_value.items()] + # return split_style @staticmethod def indents_processing(split_style: list) -> str: @@ -130,16 +133,13 @@ class TagInlineStyleProcessor: inline_style, self.tag_inline_style) inline_style = inline_style.replace( "list-style-image", "list-style-type") - # 2. Create list of styles from inline style # replace all spaces between "; & letter" to ";" style = re.sub(r"; *", ";", inline_style) # when we split style by ";", last element of the list is "" - None (remove it) split_inline_style: list = list(filter(None, style.split(";"))) - # 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 inline_style: str = self.indents_processing(split_inline_style) return inline_style