Merge pull request #1130 from googlefonts/fix-propagate-cursive-anchors

[propagate_anchors] Fix propagating cursive anchors

Author: anthrotype

Lib/glyphsLib/builder/transformations/propagate_anchors.py

@@ -247,13 +247,13 @@ def anchors_traversing_components(
         comb_has_underscore = any(
             len(a.name) >= 2 and a.name.startswith("_") for a in anchors
         )
-        comb_has_exit = any(a.name.endswith("exit") for a in anchors)
+        comb_has_exit = any(a.name.startswith("exit") for a in anchors)
         if not (comb_has_underscore or comb_has_exit):
             # delete exit anchors we may have taken from earlier components
             # (since a glyph should only have one exit anchor, and logically its
             # at the end)
             all_anchors = {
-                n: a for n, a in all_anchors.items() if not n.endswith("exit")
+                n: a for n, a in all_anchors.items() if not n.startswith("exit")
             }
 
         component_transform = Transform(*component.transform)
@@ -263,7 +263,7 @@ def anchors_traversing_components(
             if (component_idx > 0 or has_underscore) and new_has_underscore:
                 continue
             # skip entry anchors on non-first glyphs
-            if component_idx > 0 and anchor.name.endswith("entry"):
+            if component_idx > 0 and anchor.name.startswith("entry"):
                 continue
 
             new_anchor_name = rename_anchor_for_scale(anchor.name, xscale, yscale)
@@ -272,8 +272,8 @@ def anchors_traversing_components(
                 and component_number_of_base_glyphs > 0
                 and not new_has_underscore
                 and not (
-                    new_anchor_name.endswith("exit")
-                    or new_anchor_name.endswith("entry")
+                    new_anchor_name.startswith("exit")
+                    or new_anchor_name.startswith("entry")
                 )
             ):
                 # dealing with marks like top_1 on a ligature
@@ -305,7 +305,7 @@ def anchors_traversing_components(
             not is_ligature
             and number_of_base_glyphs == 0
             and not name.startswith("_")
-            and not (name.endswith("exit") or name.endswith("entry"))
+            and not (name.startswith("exit") or name.startswith("entry"))
             and "_" in name
         ):
             suffix = name[name.index("_") + 1 :]

tests/builder/transformations/propagate_anchors_test.py

@@ -861,6 +861,60 @@ def test_propagate_anchors_after_aligining_alternates(test_file):
     assert tuple(master_bottom.position) == (301, 0)
 
 
+def test_entry_anchor_on_non_first_component():
+    glyphs = (
+        GlyphSetBuilder()
+        .add_glyph(
+            "part1",
+            lambda glyph: (glyph.add_anchor("top", (10, 0))),
+        )
+        .add_glyph(
+            "part2",
+            lambda glyph: (glyph.add_anchor("entry.2", (10, 0))),
+        )
+        .add_glyph(
+            "combo",
+            lambda glyph: (
+                glyph.add_component("part1", (0, 0)).add_component("part2", (100, 0))
+            ),
+        )
+        .build()
+    )
+    propagate_all_anchors_impl(glyphs)
+
+    new_glyph = glyphs["combo"]
+    assert_anchors(new_glyph.layers[0].anchors, [("top", (10, 0))])
+
+
+def test_cursive_anchors_ligature():
+    glyphs = (
+        GlyphSetBuilder()
+        .add_glyph(
+            "part1_part2",
+            lambda glyph: (
+                glyph.add_anchor("entry.1", (10, 0)).add_anchor("exit.1", (100, 0))
+            ),
+        )
+        .add_glyph(
+            "combo",
+            lambda glyph: (
+                glyph.set_subCategory("Ligature").add_component("part1_part2", (0, 0))
+            ),
+        )
+        .build()
+    )
+    propagate_all_anchors_impl(glyphs)
+
+    new_glyph = glyphs["combo"]
+    assert_anchors(
+        new_glyph.layers[0].anchors,
+        [
+            ("entry.1", (10, 0)),
+            ("exit.1", (100, 0)),
+        ],
+    )
+
+
 def test_smart_component_anchors():
     glyphs = (
         GlyphSetBuilder()