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

Edit Book: Fix the remove unused css tool changing the namespace prefix used for the XHTML namespace in the CSS sheet, if any

Browse Source
This commit is contained in:
Kovid Goyal 2014-01-31 21:04:00 +05:30
parent 24eea15a5f
commit e35586fd00
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/calibre/ebooks/oeb/polish/css.py
View File

@ -103,13 +103,26 @@ def filter_used_rules(root, rules, log, pseudo_pat, cache):
if not used: if not used:
yield rule yield rule
def process_namespaces(sheet):
# Find the namespace prefix (if any) for the XHTML namespace, so that we
# can preserve it after processing
for prefix in sheet.namespaces:
if sheet.namespaces[prefix] == XHTML_NS:
return prefix
def preserve_htmlns_prefix(sheet, prefix):
if prefix is None:
while 'h' in sheet.namespaces:
del sheet.namespaces['h']
else:
sheet.namespaces[prefix] = XHTML_NS
def remove_unused_css(container, report): def remove_unused_css(container, report):
from cssutils.css import CSSRule from cssutils.css import CSSRule
sheets = {name:container.parsed(name) for name, mt in container.mime_map.iteritems() if mt in OEB_STYLES} sheets = {name:container.parsed(name) for name, mt in container.mime_map.iteritems() if mt in OEB_STYLES}
namespaced_sheets = set() sheet_namespace = {}
for sheet in sheets.itervalues(): for sheet in sheets.itervalues():
if 'h' not in sheet.namespaces: sheet_namespace[sheet] = process_namespaces(sheet)
namespaced_sheets.add(sheet)
sheet.namespaces['h'] = XHTML_NS sheet.namespaces['h'] = XHTML_NS
style_rules = {name:tuple(sheet.cssRules.rulesOfType(CSSRule.STYLE_RULE)) for name, sheet in sheets.iteritems()} style_rules = {name:tuple(sheet.cssRules.rulesOfType(CSSRule.STYLE_RULE)) for name, sheet in sheets.iteritems()}
@ -124,15 +137,14 @@ def remove_unused_css(container, report):
for style in root.xpath('//*[local-name()="style"]'): for style in root.xpath('//*[local-name()="style"]'):
if style.get('type', 'text/css') == 'text/css' and style.text: if style.get('type', 'text/css') == 'text/css' and style.text:
sheet = container.parse_css(style.text) sheet = container.parse_css(style.text)
ns = 'h' not in sheet.namespaces ns = process_namespaces(sheet)
sheet.namespaces['h'] = XHTML_NS sheet.namespaces['h'] = XHTML_NS
rules = tuple(sheet.cssRules.rulesOfType(CSSRule.STYLE_RULE)) rules = tuple(sheet.cssRules.rulesOfType(CSSRule.STYLE_RULE))
unused_rules = tuple(filter_used_rules(root, rules, container.log, pseudo_pat, cache)) unused_rules = tuple(filter_used_rules(root, rules, container.log, pseudo_pat, cache))
if unused_rules: if unused_rules:
num_of_removed_rules += len(unused_rules) num_of_removed_rules += len(unused_rules)
[sheet.cssRules.remove(r) for r in unused_rules] [sheet.cssRules.remove(r) for r in unused_rules]
if ns: preserve_htmlns_prefix(sheet, ns)
del sheet.namespaces['h']
style.text = force_unicode(sheet.cssText, 'utf-8') style.text = force_unicode(sheet.cssText, 'utf-8')
pretty_script_or_style(container, style) pretty_script_or_style(container, style)
container.dirty(name) container.dirty(name)
@ -143,8 +155,7 @@ def remove_unused_css(container, report):
style_rules[sname] = tuple(filter_used_rules(root, style_rules[sname], container.log, pseudo_pat, cache)) style_rules[sname] = tuple(filter_used_rules(root, style_rules[sname], container.log, pseudo_pat, cache))
for name, sheet in sheets.iteritems(): for name, sheet in sheets.iteritems():
if sheet in namespaced_sheets: preserve_htmlns_prefix(sheet, sheet_namespace[sheet])
del sheet.namespaces['h']
unused_rules = style_rules[name] unused_rules = style_rules[name]
if unused_rules: if unused_rules:
num_of_removed_rules += len(unused_rules) num_of_removed_rules += len(unused_rules)