Merge pull request #97 from BlackFoundryCom/fix-issue94

Fix SVG clip path transform
BlackFoundryCom · Jun 9, 2022 · 82d64a4 · 82d64a4
2 parents 5538aab + 5775a71
commit 82d64a4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Lib/blackrenderer/backends/svg.py b/Lib/blackrenderer/backends/svg.py
@@ -136,6 +136,8 @@ def _addElement(self, fillPath, fillTransform, paint, gradientTransform):
                 logger.warning(
                     "SVG canvas does not support more than two nested clip paths"
                 )
+            if clipTransform is not None:
+                clipTransform = fillTransform.inverse().transform(clipTransform)
         self.elements.append(
             (fillPath, fillTransform, clipPath, clipTransform, paint, gradientTransform)
         )
@@ -280,7 +282,7 @@ def writeSVGElements(elements, viewBox, stream):
             attrs.append(("fill", f"url(#{gradients[paint, paintT]})"))
         attrs.append(("transform", formatMatrix(fillT)))
         if clipPath is not None:
-            clipKey = clipPath, clipTransform
+            clipKey = clipPath, clipT
             attrs.append(("clip-path", f"url(#{clipPaths[clipKey]})"))
         ET.SubElement(root, "path", dict(attrs))
 

diff --git a/Tests/expectedOutput/glyph_nested_paintglyph_A_svg.svg b/Tests/expectedOutput/glyph_nested_paintglyph_A_svg.svg