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 bundled cssutils

Browse Source
This commit is contained in:
Kovid Goyal 2010-02-07 11:10:36 -07:00
parent 262b844595
commit 6248c2105f
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cssutils/__init__.py
View File

@ -88,11 +88,11 @@ Usage may be::
__all__ = ['css', 'stylesheets', 'CSSParser', 'CSSSerializer']
__docformat__ = 'restructuredtext'
__author__ = 'Christof Hoeke with contributions by Walter Doerwald'
__date__ = '$LastChangedDate:: 2009-11-26 16:31:32 -0700 #$:'
__date__ = '$LastChangedDate:: 2009-12-30 14:26:29 -0700 #$:'
VERSION = '0.9.7a1'
VERSION = '0.9.7a2'
__version__ = '%s $Id: __init__.py 1892 2009-11-26 23:31:32Z cthedot $' % VERSION
__version__ = '%s $Id: __init__.py 1902 2009-12-30 21:26:29Z cthedot $' % VERSION
import codec
import os.path

43
src/cssutils/css/cssvalue.py
View File

@ -5,10 +5,10 @@
- CSSValueList implements DOM Level 2 CSS CSSValueList
"""
__all__ = ['CSSValue', 'CSSPrimitiveValue', 'CSSValueList',
__all__ = ['CSSValue', 'CSSPrimitiveValue', 'CSSValueList',
'CSSVariable', 'RGBColor']
__docformat__ = 'restructuredtext'
__version__ = '$Id: cssvalue.py 1864 2009-10-11 15:11:39Z cthedot $'
__version__ = '$Id: cssvalue.py 1909 2010-01-04 19:28:52Z cthedot $'
from cssutils.prodparser import *
import cssutils
@ -152,21 +152,21 @@ class CSSValue(cssutils.util._NewBase):
)
)
operator = Choice(PreDef.S(),
PreDef.char('comma', ',',
PreDef.char('comma', ',',
toSeq=lambda t, tokens: ('operator', t[1])),
PreDef.char('slash', '/',
PreDef.char('slash', '/',
toSeq=lambda t, tokens: ('operator', t[1])),
optional=True)
# CSSValue PRODUCTIONS
valueprods = Sequence(term,
# TODO: only when setting via other class
PreDef.char('END', ';',
stopAndKeep=True,
PreDef.char('END', ';',
stopAndKeep=True,
optional=True),
Sequence(operator, # mayEnd this Sequence if whitespace
term,
PreDef.char('END', ';',
stopAndKeep=True,
PreDef.char('END', ';',
stopAndKeep=True,
optional=True),
minmax=lambda: (0, None)))
# parse
@ -861,25 +861,34 @@ class CSSFunction(CSSPrimitiveValue):
def _productiondefinition(self):
"""Return defintion used for parsing."""
types = self._prods # rename!
valueProd = Prod(name='PrimitiveValue',
match=lambda t, v: t in (types.DIMENSION,
types.IDENT,
types.NUMBER,
types.PERCENTAGE,
types.STRING),
toSeq=lambda t, tokens: (t[0], CSSPrimitiveValue(t[1])))
valueOrFunc = Choice(Prod(name='PrimitiveValue',
match=lambda t, v: t in (types.DIMENSION,
types.IDENT,
types.NUMBER,
types.PERCENTAGE,
types.STRING),
toSeq=lambda t, tokens: (t[0], CSSPrimitiveValue(t[1]))
),
# FUNC is actually not in spec but used in e.g. Prince
PreDef.function(toSeq=lambda t,
tokens: ('FUNCTION',
CSSFunction(
cssutils.helper.pushtoken(t, tokens))
)
)
)
funcProds = Sequence(Prod(name='FUNC',
match=lambda t, v: t == types.FUNCTION,
toSeq=lambda t, tokens: (t[0], cssutils.helper.normalize(t[1]))),
Choice(Sequence(PreDef.unary(),
valueProd,
valueOrFunc,
# more values starting with Comma
# should use store where colorType is saved to
# define min and may, closure?
Sequence(PreDef.comma(),
PreDef.unary(),
valueProd,
valueOrFunc,
minmax=lambda: (0, 3)),
PreDef.funcEnd(stop=True)),
PreDef.funcEnd(stop=True))