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

pep8

Browse Source
This commit is contained in:
Kovid Goyal 2013-08-22 10:00:44 +05:30
parent 521230ac85
commit 596f58bbcd
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,7 +252,8 @@ class Stylizer(object):
for rule in stylesheet.cssRules: for rule in stylesheet.cssRules:
if rule.type == rule.IMPORT_RULE: if rule.type == rule.IMPORT_RULE:
ihref = item.abshref(rule.href) ihref = item.abshref(rule.href)
if rule.media.mediaText == 'amzn-mobi': continue if rule.media.mediaText == 'amzn-mobi':
continue
hrefs = self.oeb.manifest.hrefs hrefs = self.oeb.manifest.hrefs
if ihref not in hrefs: if ihref not in hrefs:
self.logger.warn('Ignoring missing stylesheet in @import rule:', rule.href) self.logger.warn('Ignoring missing stylesheet in @import rule:', rule.href)
@ -353,7 +354,7 @@ class Stylizer(object):
x.insert(0, span) x.insert(0, span)
self.style(span)._update_cssdict(cssdict) self.style(span)._update_cssdict(cssdict)
break break
else: # Element pseudo-class else: # Element pseudo-class
for elem in matches: for elem in matches:
self.style(elem)._update_pseudo_class(fl, cssdict) self.style(elem)._update_pseudo_class(fl, cssdict)
else: else:
@ -431,8 +432,10 @@ class Stylizer(object):
style[name] = prop.value style[name] = prop.value
if 'font-size' in style: if 'font-size' in style:
size = style['font-size'] size = style['font-size']
if size == 'normal': size = 'medium' if size == 'normal':
if size == 'smallest': size = 'xx-small' size = 'medium'
if size == 'smallest':
size = 'xx-small'
if size in FONT_SIZE_NAMES: if size in FONT_SIZE_NAMES:
style['font-size'] = "%dpt" % self.profile.fnames[size] style['font-size'] = "%dpt" % self.profile.fnames[size]
return style return style
@ -476,7 +479,8 @@ class Stylizer(object):
for key in composition: for key in composition:
if cssprofiles.validate(key, value): if cssprofiles.validate(key, value):
style[key] = value style[key] = value
if not primitives: break if not primitives:
break
value = primitives.pop() value = primitives.pop()
for key in composition: for key in composition:
if key not in style: if key not in style:
@ -514,7 +518,8 @@ class Stylizer(object):
for key in composition: for key in composition:
if cssprofiles.validate(key, value): if cssprofiles.validate(key, value):
style[key] = value style[key] = value
if not primitives: break if not primitives:
break
value = primitives.pop() value = primitives.pop()
for key in composition: for key in composition:
if key not in style: if key not in style:
@ -532,7 +537,8 @@ class Stylizer(object):
def stylesheet(self, name, font_scale=None): def stylesheet(self, name, font_scale=None):
rules = [] rules = []
for _, _, style, selector, href in self.rules: for _, _, style, selector, href in self.rules:
if href != name: continue if href != name:
continue
if font_scale and 'font-size' in style and \ if font_scale and 'font-size' in style and \
style['font-size'].endswith('pt'): style['font-size'].endswith('pt'):
style = copy.copy(style) style = copy.copy(style)
@ -684,13 +690,15 @@ class Style(object):
elif value == 'smaller': elif value == 'smaller':
factor = 1.0/1.2 factor = 1.0/1.2
for _, _, size in self._profile.fsizes: for _, _, size in self._profile.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._profile.fsizes): for _, _, size in reversed(self._profile.fsizes):
if base >= size: break if base >= size:
break
factor = None factor = None
result = size result = size
else: else:
@ -839,8 +847,7 @@ class Style(object):
self._get('padding-bottom'), base=self.height) self._get('padding-bottom'), base=self.height)
def __str__(self): def __str__(self):
items = self._style.items() items = sorted(self._style.items())
items.sort()
return '; '.join("%s: %s" % (key, val) for key, val in items) return '; '.join("%s: %s" % (key, val) for key, val in items)
def cssdict(self): def cssdict(self):