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

Remove unnecessary level of attribute-resolution.

Browse Source
This commit is contained in:
Marshall T. Vandegrift 2008-12-19 08:58:37 -05:00
parent 30c2325913
commit 479385ea34
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/ebooks/oeb/stylizer.py
View File

@ -363,18 +363,18 @@ class Style(object):
factor = None factor = None
if value == 'inherit': if value == 'inherit':
# We should only see this if the root element # We should only see this if the root element
value = self._stylizer.page.fbase value = self._page.fbase
if value in FONT_SIZE_NAMES: if value in FONT_SIZE_NAMES:
result = self._stylizer.page.fnames[value] result = self._page.fnames[value]
elif value == 'smaller': elif value == 'smaller':
factor = 1.0/1.2 factor = 1.0/1.2
for _, _, size in self._stylizer.page.fsizes: for _, _, size in self._page.fsizes:
if base <= size: break if base <= size: break
factor = None factor = None
result = size result = size
elif value == 'larger': elif value == 'larger':
factor = 1.2 factor = 1.2
for _, _, size in reversed(self._stylizer.page.fsizes): for _, _, size in reversed(self._page.fsizes):
if base >= size: break if base >= size: break
factor = None factor = None
result = size result = size
@ -390,7 +390,7 @@ class Style(object):
styles = self._stylizer._styles styles = self._stylizer._styles
base = styles[self._element.getparent()].fontSize base = styles[self._element.getparent()].fontSize
else: else:
base = self._stylizer.page.fbase base = self._page.fbase
if 'font-size' in self._style: if 'font-size' in self._style:
size = self._style['font-size'] size = self._style['font-size']
result = normalize_fontsize(size, base) result = normalize_fontsize(size, base)