diff --git a/src/html_epub_preprocessor.py b/src/html_epub_preprocessor.py index 0002c8e..6915b41 100644 --- a/src/html_epub_preprocessor.py +++ b/src/html_epub_preprocessor.py @@ -346,7 +346,10 @@ def get_tags_between_chapter_marks(first_id, href, html_soup): next_tag = marked_tags.next_sibling tags = [] while next_tag: - if next_tag.attrs.get('class') == 'converter-chapter-mark': + # TODO: why we hve there NavString + + if not isinstance(next_tag, NavigableString) and\ + (next_tag.attrs.get('class') == 'converter-chapter-mark'): break tags.append(next_tag) next_tag = next_tag.next_sibling diff --git a/src/livecarta_config.py b/src/livecarta_config.py index 31acc5e..8e12b9d 100644 --- a/src/livecarta_config.py +++ b/src/livecarta_config.py @@ -103,9 +103,9 @@ class LawCartaConfig: 'olive': 'darkGreen', 'silver': 'lightGray', 'white': 'white', - 'maroon': '#800000', - 'gray': '#808080', - 'grey': '#808080' + 'maroon': 'darkRed', # '#800000', + 'gray': 'darkGray', + 'grey': 'darkGray', } INDENT = '30px' diff --git a/src/util/color_reader.py b/src/util/color_reader.py index 812577e..fddab09 100644 --- a/src/util/color_reader.py +++ b/src/util/color_reader.py @@ -62,7 +62,7 @@ def str2color_name(s: str): if s in ['#FFD472', '#F47B4D', '#FFFBEF', '#F47B4D']: return 'olive' if s in ['#B0DFD7', '#EFF8F6', '#5CC4B7']: - return 'teal2' + return 'teal' name = get_hex_color_name(s) if (name == 'white') and (s.lower() not in ['#ffffff', '#fff']): name = 'gray'