Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-08-11 09:13:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert part of previous commit, to fix font size handling

Browse Source
This commit is contained in:
Kovid Goyal 2008-03-13 09:41:47 +00:00
parent f790f21133
commit f0df46b333
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1079,7 +1079,7 @@ class HTMLConverter(object):
''' '''
Convert the font propertiess in css to the Xylog equivalents. If the CSS Convert the font propertiess in css to the Xylog equivalents. If the CSS
does not contain a particular font property, the default from self.book.defaultTextSytle does not contain a particular font property, the default from self.book.defaultTextSytle
is used. is used. Assumes 1em = 10pt
@return: dict, key, variant. The dict contains the Xlog equivalents. key indicates @return: dict, key, variant. The dict contains the Xlog equivalents. key indicates
the font type (i.e. bold, bi, normal) and variant is None or 'small-caps' the font type (i.e. bold, bi, normal) and variant is None or 'small-caps'
''' '''
@ -1128,7 +1128,7 @@ class HTMLConverter(object):
return key return key
def font_size(val): def font_size(val):
normal = int(self.current_block.textStyle.attrs['fontsize']) normal = 100
normpts = str(normal/10) + 'pt' normpts = str(normal/10) + 'pt'
ans = self.unit_convert(val, pts=True, base_length=normpts) ans = self.unit_convert(val, pts=True, base_length=normpts)
@ -1233,6 +1233,7 @@ class HTMLConverter(object):
except ValueError: except ValueError:
pass pass
m = re.search(r"\s*(-*[0-9]*\.?[0-9]*)\s*(%|em|px|mm|cm|in|pt|pc)", val) m = re.search(r"\s*(-*[0-9]*\.?[0-9]*)\s*(%|em|px|mm|cm|in|pt|pc)", val)
if m is not None and m.group(1): if m is not None and m.group(1):
unit = float(m.group(1)) unit = float(m.group(1))
if m.group(2) == '%': if m.group(2) == '%':
@ -1245,8 +1246,7 @@ class HTMLConverter(object):
elif m.group(2) == 'pt': elif m.group(2) == 'pt':
result = unit * dpi/72. result = unit * dpi/72.
elif m.group(2) == 'em': elif m.group(2) == 'em':
normal = float(self.current_block.textStyle.attrs['fontsize']) result = unit * 100 * (dpi/720.)
result = unit * normal * (dpi/720.)
elif m.group(2) == 'pc': elif m.group(2) == 'pc':
result = unit * (dpi/72.) * 12 result = unit * (dpi/72.) * 12
elif m.group(2) == 'mm': elif m.group(2) == 'mm':
@ -1255,7 +1255,7 @@ class HTMLConverter(object):
result = unit * 0.40 * (dpi/72.) result = unit * 0.40 * (dpi/72.)
if result is not None: if result is not None:
if pts: if pts:
result = int(round(result / dpi * 720)) result = int(round(result * (720./dpi)))
else: else:
result = int(round(result)) result = int(round(result))
return result return result