Merge pull request #231 from googlefonts/evenodd-to-nonzero-on-shapes

allow to run evenodd_to_nonzero_winding method in isolation

src/picosvg/svg.py

@@ -672,9 +672,11 @@ def evenodd_to_nonzero_winding(self, inplace=False):
             svg.evenodd_to_nonzero_winding(inplace=True)
             return svg
 
-        for shape in self.shapes():
+        for idx, (el, (shape,)) in enumerate(self._elements()):
             if shape.fill_rule == "evenodd":
-                shape.remove_overlaps(inplace=True)
+                path = shape.as_path().remove_overlaps(inplace=True)
+                self._set_element(idx, el, (path,))
+
         return self
 
     def round_floats(self, ndigits: int, inplace=False):

tests/svg_test.py

@@ -577,3 +577,17 @@ def test_tostring_pretty_print():
         </svg>
         """
     )
+
+
+@pytest.mark.parametrize(
+    "actual, expected_result",
+    [
+        ("fill-rule-evenodd-before.svg", "fill-rule-evenodd-after.svg"),
+    ],
+)
+def test_evenodd_to_nonzero_winding(actual, expected_result):
+    _test(
+        actual,
+        expected_result,
+        lambda svg: svg.evenodd_to_nonzero_winding().round_floats(3, inplace=True),
+    )