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

Support line-height

Browse Source
This commit is contained in:
Kovid Goyal 2007-10-27 21:41:38 +00:00
parent 59de78af3e
commit dd1c2b80a8
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libprs500/ebooks/lrf/html/convert_from.py
View File

@ -409,7 +409,8 @@ class HTMLConverter(object):
# however we need to as we don't do alignment at a block level. # however we need to as we don't do alignment at a block level.
# float is removed by the process_alignment function. # float is removed by the process_alignment function.
if chk.startswith('font') or chk == 'text-align' or \ if chk.startswith('font') or chk == 'text-align' or \
chk == 'float' or chk == 'white-space' or chk == 'color': chk == 'float' or chk == 'white-space' or chk == 'color' or \
chk == 'line-height':
temp[key] = pcss[key] temp[key] = pcss[key]
prop.update(temp) prop.update(temp)
@ -1130,7 +1131,7 @@ class HTMLConverter(object):
t['baselineskip'] = fs + 20 t['baselineskip'] = fs + 20
return t, key, variant return t, key, variant
def unit_convert(self, val, pts=False): def unit_convert(self, val, pts=False, base_length='10pt'):
''' '''
Tries to convert html units in C{val} to pixels. Tries to convert html units in C{val} to pixels.
Assumes: 1em = 100% = 10pts Assumes: 1em = 100% = 10pts
@ -1147,7 +1148,7 @@ class HTMLConverter(object):
if m is not None: if m is not None:
unit = float(m.group(1)) unit = float(m.group(1))
if m.group(2) == '%': if m.group(2) == '%':
normal = self.unit_convert('10pt') normal = self.unit_convert(base_length)
result = int((unit/100.0)*normal) result = int((unit/100.0)*normal)
elif m.group(2) == 'px': elif m.group(2) == 'px':
result = int(unit) result = int(unit)
@ -1179,6 +1180,12 @@ class HTMLConverter(object):
fp = self.font_properties(tag_css)[0] fp = self.font_properties(tag_css)[0]
fp['parindent'] = indent fp['parindent'] = indent
if tag_css.has_key('line-height'):
val = self.unit_convert(tag_css['line-height'], pts=True, base_length='1pt')
if val is not None:
fp['linespace'] = val
return fp return fp