Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use implicit styling for character styles where possible

Browse Source
This commit is contained in:
Kovid Goyal 2019-07-02 13:41:03 +05:30
parent dca67dae61
commit a737b0e786
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/calibre/gui2/comments_editor.py
View File

@ -99,6 +99,22 @@ def remove_heading_font_styles(tag, style):
del style['font-weight'] del style['font-weight']
def use_implicit_styling_for_span(span, style):
is_italic = style.get('font-style') == 'italic'
is_bold = style.get('font-weight') == '600'
if is_italic and not is_bold:
del style['font-style']
span.tag = 'em'
elif is_bold and not is_italic:
del style['font-weight']
span.tag = 'strong'
if span.tag == 'span' and style.get('text-decoration') == 'underline':
span.tag = 'u'
del style['text-decoration']
if span.tag == 'span' and style.get('vertical-align') in ('sub', 'super'):
span.tag = 'sub' if style.pop('vertical-align') == 'sub' else 'sup'
def cleanup_qt_markup(root): def cleanup_qt_markup(root):
from calibre.ebooks.docx.cleanup import lift from calibre.ebooks.docx.cleanup import lift
style_map = defaultdict(dict) style_map = defaultdict(dict)
@ -112,6 +128,8 @@ def cleanup_qt_markup(root):
remove_zero_indents(tag_style) remove_zero_indents(tag_style)
if tag.tag.startswith('h'): if tag.tag.startswith('h'):
remove_heading_font_styles(tag, tag_style) remove_heading_font_styles(tag, tag_style)
for child in tag.iterdescendants('span'):
use_implicit_styling_for_span(child, style_map[child])
for style in itervalues(style_map): for style in itervalues(style_map):
filter_qt_styles(style) filter_qt_styles(style)
for tag, style in iteritems(style_map): for tag, style in iteritems(style_map):
@ -1025,6 +1043,6 @@ if __name__ == '__main__':
w.resize(800, 600) w.resize(800, 600)
w.show() w.show()
w.html = '''<h1>Test Heading</h1><blockquote>Test blockquote</blockquote><p><span style="background-color: rgb(0, 255, 255); ">He hadn't w.html = '''<h1>Test Heading</h1><blockquote>Test blockquote</blockquote><p><span style="background-color: rgb(0, 255, 255); ">He hadn't
set out to have an <em>affair</em>, <span style="font-style:italic; background-color:red">much</span> less a long-term, devoted one.</span>''' set <u>out</u> to have an <em>affair</em>, <span style="font-style:italic; background-color:red">much</span> less a long-term, <b>devoted</b> one.</span>'''
app.exec_() app.exec_()
# print w.html # print w.html