[flatten] record position of contour's starting point and restore if possible

Author: Cosimo Lupo

Lib/booleanOperations/flatten.py

@@ -306,6 +306,7 @@ class ContourPointDataPen:
 
     def __init__(self):
         self._points = None
+        self._foundStartingPoint = False
 
     def getData(self):
         """
@@ -343,6 +344,8 @@ def endPath(self):
 
     def addPoint(self, pt, segmentType=None, smooth=False, name=None, **kwargs):
         assert segmentType != "move"
+        if not self._foundStartingPoint and segmentType is not None:
+            kwargs['startingPoint'] = self._foundStartingPoint = True
         data = InputPoint(
             coordinates=pt,
             segmentType=segmentType,
@@ -970,11 +973,16 @@ def drawPoints(self, pointPen):
             points.extend(segment.points)
 
         hasOnCurve = False
-        for point in points:
+        foundOriginalStartingPoint = False
+        for index, point in enumerate(points):
             if point.segmentType is not None:
                 hasOnCurve = True
-                break
-        if hasOnCurve:
+                if point.kwargs is not None and point.kwargs.get("startingPoint"):
+                    foundOriginalStartingPoint = True
+                    break
+        if foundOriginalStartingPoint:
+            points = points[index:] + points[:index]
+        elif hasOnCurve:
             while points[0].segmentType is None:
                 p = points.pop(0)
                 points.append(p)