mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-08-11 09:13:57 -04:00
Merged upstream changes
This commit is contained in:
commit
c9f0d1591d
@ -1327,7 +1327,7 @@ class HTMLConverter(object, LoggingInterface):
|
|||||||
bls, ls = int(self.book.defaultTextStyle.attrs['baselineskip']), \
|
bls, ls = int(self.book.defaultTextStyle.attrs['baselineskip']), \
|
||||||
int(self.book.defaultTextStyle.attrs['linespace'])
|
int(self.book.defaultTextStyle.attrs['linespace'])
|
||||||
try: # See if line-height is a unitless number
|
try: # See if line-height is a unitless number
|
||||||
val = int(float(tag_css['line-height'].strip()) * (bls+ls))
|
val = int(float(tag_css['line-height'].strip()) * (ls))
|
||||||
fp['linespace'] = val
|
fp['linespace'] = val
|
||||||
except ValueError:
|
except ValueError:
|
||||||
val = self.unit_convert(tag_css['line-height'], pts=True, base_length='1pt')
|
val = self.unit_convert(tag_css['line-height'], pts=True, base_length='1pt')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user