Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid unnecessary color: currentColor for body

Browse Source
This commit is contained in:
Kovid Goyal 2020-07-30 18:05:34 +05:30
parent d0a5b4b2a5
commit a697d27e2f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/ebooks/docx/styles.py
View File

@ -453,7 +453,7 @@ class Styles(object):
ef = self.fonts.embed_fonts(dest_dir, docx) ef = self.fonts.embed_fonts(dest_dir, docx)
s = '''\ s = '''\
body { font-family: %s; font-size: %s; color: %s } body { font-family: %s; font-size: %s; %s }
/* In word all paragraphs have zero margins unless explicitly specified in a style */ /* In word all paragraphs have zero margins unless explicitly specified in a style */
p, h1, h2, h3, h4, h5, h6, div { margin: 0; padding: 0 } p, h1, h2, h3, h4, h5, h6, div { margin: 0; padding: 0 }
@ -496,7 +496,10 @@ class Styles(object):
sub { vertical-align: bottom } sub { vertical-align: bottom }
''' '''
prefix = textwrap.dedent(s) % (self.body_font_family, self.body_font_size, self.body_color) body_color = ''
if self.body_color.lower() not in ('currentcolor', 'inherit'):
body_color = 'color: {};'.format(self.body_color)
prefix = textwrap.dedent(s) % (self.body_font_family, self.body_font_size, body_color)
if ef: if ef:
prefix = ef + '\n' + prefix prefix = ef + '\n' + prefix