Skip to content

Add support for calc() within a calc. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaraco merged 4 commits into from
May 24, 2021
+19 −2
Merged

Add support for calc() within a calc. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c4ea60
Add support for `calc()` within a calc.
Apr 26, 2021
2489eb0
⚫ Fade to black.
jaraco May 24, 2021
7a953f3
👹 Feed the hobgoblins (delint).
jaraco May 24, 2021
64ac80f
Update changelog.
jaraco May 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
v2.3.0
======

#7: Add support for a ``calc()`` within a ``calc()``.

v2.2.0
======

Expand Down
2 changes: 1 addition & 1 deletion cssutils/css/csspagerule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def S(expected, seq, token, tokenizer=None):
return expected

def IDENT(expected, seq, token, tokenizer=None):
""
""" """
val = self._tokenvalue(token)
if 'page' == expected:
if self._normalize(val) == 'auto':
Expand Down
4 changes: 3 additions & 1 deletion cssutils/css/value.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,9 @@ def _setCssText(self, cssText):
),
)

_operant = lambda: Choice(_DimensionProd(self), _CSSVariableProd(self)) # noqa
_operant = lambda: Choice( # noqa:E731
_DimensionProd(self), _CalcValueProd(self), _CSSVariableProd(self)
)

prods = Sequence(
Prod(
Expand Down
10 changes: 10 additions & 0 deletions cssutils/tests/test_value.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,16 @@ def test_cssText(self):
'calc(1 / 1px )': ('calc(1 / 1px)', 1, 'calc(1 / 1px)'),
'calc( 1*1px )': ('calc(1 * 1px)', 1, 'calc(1 * 1px)'),
'calc( 1 / 1px )': ('calc(1 / 1px)', 1, 'calc(1 / 1px)'),
'calc(calc(1px + 5px) * 4)': (
'calc(calc(1px + 5px) * 4)',
1,
'calc(calc(1px + 5px) * 4)',
),
'calc( calc(1px + 5px)*4 )': (
'calc(calc(1px + 5px) * 4)',
1,
'calc(calc(1px + 5px) * 4)',
),
'calc(var(X))': (None, 1, None),
'calc(2 * var(X))': (None, 1, None),
'calc(2px + var(X))': (None, 1, None),
Expand Down