mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Fix #589
This commit is contained in:
parent
4b9a9a2421
commit
45b8b375c4
@ -1052,11 +1052,11 @@ class HTMLConverter(object):
|
|||||||
def set(default, one, two):
|
def set(default, one, two):
|
||||||
fval = None
|
fval = None
|
||||||
if one is not None:
|
if one is not None:
|
||||||
val = self.unit_convert(one, base_length=bl)
|
val = self.unit_convert(one, base_length='10pt' if 'em' in one else bl)
|
||||||
if val is not None:
|
if val is not None:
|
||||||
fval = val
|
fval = val
|
||||||
if two is not None:
|
if two is not None:
|
||||||
val = self.unit_convert(two, base_length=bl)
|
val = self.unit_convert(two, base_length='10pt' if 'em' in two else bl)
|
||||||
if val is not None:
|
if val is not None:
|
||||||
fval = val if fval is None else fval + val
|
fval = val if fval is None else fval + val
|
||||||
if fval is None:
|
if fval is None:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user