Stop infinite loop in .segments with quadratic curves (#951)

* Allow .segments to work on cubic curves, fixes #949 * Tests for #949 * Fixup test * Lint fix
googlefonts · Oct 25, 2023 · cb8a4a9 · cb8a4a9
1 parent 217564d
commit cb8a4a9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/Lib/glyphsLib/classes.py b/Lib/glyphsLib/classes.py
@@ -2314,7 +2314,7 @@ def wrap(i):
                 newSegment.appendNode(nodes[wrap(nodeCount + 1)])
                 newSegment.appendNode(nodes[wrap(nodeCount + 2)])
                 nodeCount += 3
-            elif nodes[nodeCount].type == "line":
+            elif nodes[nodeCount].type == "line" or nodes[nodeCount].type == "qcurve":
                 newSegment.appendNode(nodes[nodeCount])
                 nodeCount += 1
 

diff --git a/tests/classes_test.py b/tests/classes_test.py
@@ -1596,6 +1596,28 @@ def test_segments_2(self):
         ]
         self.assertEqual(len(p.segments), 4)
 
+    def test_segments_3(self):
+        p = GSPath()
+        p.nodes = [
+            GSNode((327, 185), "offcurve"),
+            GSNode((299, 210), "offcurve"),
+            GSNode((297, 266), "curve"),
+            GSNode((294, 351), "offcurve"),
+            GSNode((297, 434), "qcurve"),
+            GSNode((299, 490), "offcurve"),
+            GSNode((328, 515), "offcurve"),
+            GSNode((371, 515), "curve"),
+            GSNode((414, 515), "offcurve"),
+            GSNode((443, 490), "offcurve"),
+            GSNode((445, 434), "curve"),
+            GSNode((448, 351), "offcurve"),
+            GSNode((445, 266), "qcurve"),
+            GSNode((443, 210), "offcurve"),
+            GSNode((415, 185), "offcurve"),
+            GSNode((371, 185), "curve"),
+        ]
+        self.assertEqual(len(p.segments), 6)
+
     def test_bounds(self):
         bounds = self.path.bounds
         self.assertEqual(bounds.origin.x, 80)