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

EPUB Output: Pass through font-face rules. Fixes #3042 (Calibre ignores extra_css in recipe)

Browse Source
This commit is contained in:
Kovid Goyal 2009-08-03 11:30:08 -06:00
parent 4fedde3f21
commit d182cbbb79
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ from weakref import WeakKeyDictionary
from xml.dom import SyntaxErr as CSSSyntaxError from xml.dom import SyntaxErr as CSSSyntaxError
import cssutils import cssutils
from cssutils.css import CSSStyleRule, CSSPageRule, CSSStyleDeclaration, \ from cssutils.css import CSSStyleRule, CSSPageRule, CSSStyleDeclaration, \
CSSValueList, cssproperties CSSValueList, CSSFontFaceRule, cssproperties
from cssutils import profile as cssprofiles from cssutils import profile as cssprofiles
from lxml import etree from lxml import etree
from lxml.cssselect import css_to_xpath, ExpressionError, SelectorSyntaxError from lxml.cssselect import css_to_xpath, ExpressionError, SelectorSyntaxError
@ -119,6 +119,7 @@ class Stylizer(object):
head = xpath(tree, '/h:html/h:head')[0] head = xpath(tree, '/h:html/h:head')[0]
parser = cssutils.CSSParser(fetcher=self._fetch_css_file, parser = cssutils.CSSParser(fetcher=self._fetch_css_file,
log=logging.getLogger('calibre.css')) log=logging.getLogger('calibre.css'))
self.font_face_rules = []
for elem in head: for elem in head:
if elem.tag == XHTML('style') and elem.text \ if elem.tag == XHTML('style') and elem.text \
and elem.get('type', CSS_MIME) in OEB_STYLES: and elem.get('type', CSS_MIME) in OEB_STYLES:
@ -210,6 +211,8 @@ class Stylizer(object):
elif isinstance(rule, CSSPageRule): elif isinstance(rule, CSSPageRule):
style = self.flatten_style(rule.style) style = self.flatten_style(rule.style)
self.page_rule.update(style) self.page_rule.update(style)
elif isinstance(rule, CSSFontFaceRule):
self.font_face_rules.append(rule)
return results return results
def flatten_style(self, cssstyle): def flatten_style(self, cssstyle):

5
src/calibre/ebooks/oeb/transforms/flatcss.py
View File

@ -317,7 +317,10 @@ class CSSFlattener(object):
items.sort() items.sort()
css = '; '.join("%s: %s" % (key, val) for key, val in items) css = '; '.join("%s: %s" % (key, val) for key, val in items)
style = etree.SubElement(head, XHTML('style'), type=CSS_MIME) style = etree.SubElement(head, XHTML('style'), type=CSS_MIME)
style.text = "@page { %s; }" % css style.text = "\n\t\t@page { %s; }" % css
rules = [r.cssText for r in stylizer.font_face_rules]
for r in rules:
style.text += '\n\t\t'+r+'\n'
def replace_css(self, css): def replace_css(self, css):
manifest = self.oeb.manifest manifest = self.oeb.manifest