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

Conversion: Fix a bug processing the CSS font shorthand property when the line-height is specified in em or percentage units. Fixes #1348173 [ebook-convert doesn't handle composite font-sizes](https://bugs.launchpad.net/calibre/+bug/1348173)

Browse Source
This commit is contained in:
Kovid Goyal 2014-07-24 22:11:34 +05:30
parent 5dabfbd549
commit e70fd3a759
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/calibre/ebooks/oeb/normalize_css.py
View File

@ -132,15 +132,19 @@ def normalize_font(cssvalue, font_family_as_list=False):
if not families and text == 'inherit': if not families and text == 'inherit':
families.append(text) families.append(text)
continue continue
if cssprofiles.validate('font-size', text): if cssprofiles.validate('line-height', text):
style['font-size'] = text if not vals or not cssprofiles.validate('font-size', vals[-1]):
if cssprofiles.validate('font-size', text):
style['font-size'] = text
found_font_size = True
break
return {} # must have font-size here
style['line-height'] = text
style['font-size'] = vals.pop()
found_font_size = True found_font_size = True
break break
if cssprofiles.validate('line-height', text): if cssprofiles.validate('font-size', text):
style['line-height'] = text style['font-size'] = text
if not vals or not cssprofiles.validate('font-size', vals[-1]):
return {} # must have font-size here
style['font-size'] = vals.pop()
found_font_size = True found_font_size = True
break break
if families == ['inherit']: if families == ['inherit']:
@ -293,6 +297,7 @@ def test_normalization(): # {{{
'1.2pt/1.4 A_Font': {'font-family':'A_Font', 'font-size':'1.2pt', 'line-height':'1.4'}, '1.2pt/1.4 A_Font': {'font-family':'A_Font', 'font-size':'1.2pt', 'line-height':'1.4'},
'bad font': {}, '10% serif': {'font-family':'serif', 'font-size':'10%'}, 'bad font': {}, '10% serif': {'font-family':'serif', 'font-size':'10%'},
'12px "My Font", serif': {'font-family':'"My Font", serif', 'font-size': '12px'}, '12px "My Font", serif': {'font-family':'"My Font", serif', 'font-size': '12px'},
'normal 0.6em/135% arial,sans-serif': {'font-family': 'arial, sans-serif', 'font-size': '0.6em', 'line-height':'135%', 'font-style':'normal'},
'bold italic large serif': {'font-family':'serif', 'font-weight':'bold', 'font-style':'italic', 'font-size':'large'}, 'bold italic large serif': {'font-family':'serif', 'font-weight':'bold', 'font-style':'italic', 'font-size':'large'},
'bold italic small-caps larger/normal serif': 'bold italic small-caps larger/normal serif':
{'font-family':'serif', 'font-weight':'bold', 'font-style':'italic', 'font-size':'larger', {'font-family':'serif', 'font-weight':'bold', 'font-style':'italic', 'font-size':'larger',