Merge pull request #7 from Hazzard13/main

Add support for `calc()` within a calc.
jaraco · May 24, 2021 · 70820c0 · 70820c0
2 parents f026f8d + 64ac80f
commit 70820c0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,8 @@
+v2.3.0
+======
+
+#7: Add support for a ``calc()`` within a ``calc()``.
+
 v2.2.0
 ======
 

diff --git a/cssutils/css/value.py b/cssutils/css/value.py
@@ -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(

diff --git a/cssutils/tests/test_value.py b/cssutils/tests/test_value.py
@@ -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),
-Original file 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 @@