Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-08 17:34:04 +02:00
Code Issues Projects Releases Wiki Activity

Revert #572

Browse source
This commit is contained in:
Kovid Goyal 2008-03-15 19:59:49 +00:00
parent 44e08bbdff
commit 0e18d26960
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libprs500/ebooks/lrf/html/convert_from.py
View file

@ -1248,10 +1248,11 @@ def unit_convert(self, val, pts=False, base_length='10pt'):
except ValueError:
pass
m = re.search(r"\s*(-*[0-9]*\.?[0-9]*)\s*(%|em|px|mm|cm|in|dpt|pt|pc)", val)
normal = self.unit_convert(base_length)
if m is not None and m.group(1):
unit = float(m.group(1))
if m.group(2) == '%':
if m.group(2) == '%':
normal = self.unit_convert(base_length)
result = (unit/100.0) * normal
elif m.group(2) == 'px':
result = unit
@ -1262,6 +1263,7 @@ def unit_convert(self, val, pts=False, base_length='10pt'):
elif m.group(2) == 'dpt':
result = unit * dpi/720.
elif m.group(2) == 'em':
normal = self.unit_convert(base_length)
result = unit * normal
elif m.group(2) == 'pc':
result = unit * (dpi/72.) * 12