mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-06-23 15:30:45 -04:00
Dont flatten head
This commit is contained in:
parent
fb1051476c
commit
dad962b176
@ -351,7 +351,7 @@ class CSSFlattener(object):
|
|||||||
value = 0.0
|
value = 0.0
|
||||||
cssdict[property] = "%0.5fem" % (value / fsize)
|
cssdict[property] = "%0.5fem" % (value / fsize)
|
||||||
|
|
||||||
def flatten_node(self, node, stylizer, names, styles, pseudo_styles, psize, item_id):
|
def flatten_node(self, node, stylizer, names, styles, pseudo_styles, psize, item_id, recurse=True):
|
||||||
if not isinstance(node.tag, string_or_bytes) \
|
if not isinstance(node.tag, string_or_bytes) \
|
||||||
or namespace(node.tag) != XHTML_NS:
|
or namespace(node.tag) != XHTML_NS:
|
||||||
return
|
return
|
||||||
@ -569,8 +569,9 @@ class CSSFlattener(object):
|
|||||||
del node.attrib['class']
|
del node.attrib['class']
|
||||||
if 'style' in node.attrib:
|
if 'style' in node.attrib:
|
||||||
del node.attrib['style']
|
del node.attrib['style']
|
||||||
for child in node:
|
if recurse:
|
||||||
self.flatten_node(child, stylizer, names, styles, pseudo_styles, psize, item_id)
|
for child in node:
|
||||||
|
self.flatten_node(child, stylizer, names, styles, pseudo_styles, psize, item_id)
|
||||||
|
|
||||||
def flatten_head(self, item, href, global_href):
|
def flatten_head(self, item, href, global_href):
|
||||||
html = item.data
|
html = item.data
|
||||||
@ -661,7 +662,8 @@ class CSSFlattener(object):
|
|||||||
if self.specializer is not None:
|
if self.specializer is not None:
|
||||||
self.specializer(item, stylizer)
|
self.specializer(item, stylizer)
|
||||||
fsize = self.context.dest.fbase
|
fsize = self.context.dest.fbase
|
||||||
self.flatten_node(html, stylizer, names, styles, pseudo_styles, fsize, item.id)
|
self.flatten_node(html, stylizer, names, styles, pseudo_styles, fsize, item.id, recurse=False)
|
||||||
|
self.flatten_node(html.find(XHTML('body')), stylizer, names, styles, pseudo_styles, fsize, item.id)
|
||||||
items = sorted(((key, val) for (val, key) in iteritems(styles)), key=lambda x:numeric_sort_key(x[0]))
|
items = sorted(((key, val) for (val, key) in iteritems(styles)), key=lambda x:numeric_sort_key(x[0]))
|
||||||
# :hover must come after link and :active must come after :hover
|
# :hover must come after link and :active must come after :hover
|
||||||
psels = sorted(pseudo_styles, key=lambda x :
|
psels = sorted(pseudo_styles, key=lambda x :
|
||||||
|
Loading…
x
Reference in New Issue
Block a user