Merged upstream changes

This commit is contained in:
Marshall T. Vandegrift 2008-07-22 17:49:57 -04:00
commit c9f0d1591d

View File

@ -1327,7 +1327,7 @@ class HTMLConverter(object, LoggingInterface):
bls, ls = int(self.book.defaultTextStyle.attrs['baselineskip']), \
int(self.book.defaultTextStyle.attrs['linespace'])
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
except ValueError:
val = self.unit_convert(tag_css['line-height'], pts=True, base_length='1pt')