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

Update Stylizer to use new cssutils property value validator.

Browse Source
This commit is contained in:
Marshall T. Vandegrift 2009-02-18 14:40:09 -05:00
parent 78cadc9c3a
commit 04fba1d71a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ 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, cssproperties
from cssutils.profiles import profiles as cssprofiles
from lxml import etree from lxml import etree
from lxml.cssselect import css_to_xpath, ExpressionError from lxml.cssselect import css_to_xpath, ExpressionError
from calibre.ebooks.oeb.base import XHTML, XHTML_NS, CSS_MIME, OEB_STYLES from calibre.ebooks.oeb.base import XHTML, XHTML_NS, CSS_MIME, OEB_STYLES
@ -241,7 +242,7 @@ class Stylizer(object):
primitives.reverse() primitives.reverse()
value = primitives.pop() value = primitives.pop()
for key in composition: for key in composition:
if cssproperties.cssvalues[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()