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

Conversion pipeline: Fix @import rules in CSS stylesheets that have comments on their first few lines being ignored. Also use cssutils to process @import rules instead of doing it ourselves.

Browse Source
This commit is contained in:
Kovid Goyal 2012-03-10 14:57:42 +05:30
parent 17c01d5c97
commit 33a1617f89
2 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/ebooks/conversion/preprocess.py
View File

@ -289,10 +289,17 @@ class CSSPreProcessor(object):
data = self.MS_PAT.sub(self.ms_sub, data) data = self.MS_PAT.sub(self.ms_sub, data)
if not add_namespace: if not add_namespace:
return data return data
# Remove comments as the following namespace logic will break if there
# are commented lines before the first @import or @charset rule. Since
# the conversion will remove all stylesheets anyway, we don't lose
# anything
data = re.sub(ur'/\*.*?\*/', u'', data, flags=re.DOTALL)
ans, namespaced = [], False ans, namespaced = [], False
for line in data.splitlines(): for line in data.splitlines():
ll = line.lstrip() ll = line.lstrip()
if not (namespaced or ll.startswith('@import') or if not (namespaced or ll.startswith('@import') or not ll or
ll.startswith('@charset')): ll.startswith('@charset')):
ans.append(XHTML_CSS_NAMESPACE.strip()) ans.append(XHTML_CSS_NAMESPACE.strip())
namespaced = True namespaced = True

32
src/calibre/ebooks/oeb/base.py
View File

@ -832,22 +832,8 @@ class Manifest(object):
def _parse_css(self, data): def _parse_css(self, data):
from cssutils.css import CSSRule from cssutils import CSSParser, log, resolveImports
from cssutils import CSSParser, log
log.setLevel(logging.WARN) log.setLevel(logging.WARN)
def get_style_rules_from_import(import_rule):
ans = []
if not import_rule.styleSheet:
return ans
rules = import_rule.styleSheet.cssRules
for rule in rules:
if rule.type == CSSRule.IMPORT_RULE:
ans.extend(get_style_rules_from_import(rule))
elif rule.type in (CSSRule.FONT_FACE_RULE,
CSSRule.STYLE_RULE):
ans.append(rule)
return ans
self.oeb.log.debug('Parsing', self.href, '...') self.oeb.log.debug('Parsing', self.href, '...')
data = self.oeb.decode(data) data = self.oeb.decode(data)
data = self.oeb.css_preprocessor(data, add_namespace=True) data = self.oeb.css_preprocessor(data, add_namespace=True)
@ -855,19 +841,8 @@ class Manifest(object):
fetcher=self.override_css_fetch or self._fetch_css, fetcher=self.override_css_fetch or self._fetch_css,
log=_css_logger) log=_css_logger)
data = parser.parseString(data, href=self.href) data = parser.parseString(data, href=self.href)
data = resolveImports(data)
data.namespaces['h'] = XHTML_NS data.namespaces['h'] = XHTML_NS
import_rules = list(data.cssRules.rulesOfType(CSSRule.IMPORT_RULE))
rules_to_append = []
insert_index = None
for r in data.cssRules.rulesOfType(CSSRule.STYLE_RULE):
insert_index = data.cssRules.index(r)
break
for rule in import_rules:
rules_to_append.extend(get_style_rules_from_import(rule))
for r in reversed(rules_to_append):
data.insertRule(r, index=insert_index)
for rule in import_rules:
data.deleteRule(rule)
return data return data
def _fetch_css(self, path): def _fetch_css(self, path):
@ -880,7 +855,8 @@ class Manifest(object):
self.oeb.logger.warn('CSS import of non-CSS file %r' % path) self.oeb.logger.warn('CSS import of non-CSS file %r' % path)
return (None, None) return (None, None)
data = item.data.cssText data = item.data.cssText
return ('utf-8', data) enc = None if isinstance(data, unicode) else 'utf-8'
return (enc, data)
# }}} # }}}