Do away with kerning ayah numbers

Shift the number glyphs instead.
aliftype · Jan 4, 2024 · e8044d9 · e8044d9
1 parent b23e92b
commit e8044d9
Show file tree

Hide file tree

Showing 35 changed files with 461 additions and 175 deletions.
diff --git a/docs/assets/fonts/Raqq.woff2 b/docs/assets/fonts/Raqq.woff2
diff --git a/fonts/Raqq.ttf b/fonts/Raqq.ttf
diff --git a/fonts/Raqq.woff2 b/fonts/Raqq.woff2
diff --git a/scripts/build.py b/scripts/build.py
@@ -156,9 +156,6 @@ def getAnchorPos(font, glyph, default, name):
     return f"({' '.join(x)})", f"({' '.join(y)})"
 
 
-AYAH_ANCHORS = {"ayah"}
-
-
 def makeMark(font, glyphOrder):
     classes = ""
     mark2base = {}
@@ -177,13 +174,13 @@ def makeMark(font, glyphOrder):
         layer = glyph.layers[0]
         for anchor in layer.anchors:
             name = anchor.name
-            if name in AYAH_ANCHORS:
-                continue
             x, y = getAnchorPos(font, glyph, layer, name)
             if name.startswith("_"):
                 classes += f"markClass {gname} <anchor {x} {y}> @mark_{name[1:]};\n"
+            elif not name[0].isalpha():
+                continue
             elif name.startswith("caret_") or name in ("exit", "entry"):
-                pass
+                continue
             elif "_" in name:
                 name, index = name.split("_")
                 ligatures[gname][int(index)].append((name, (x, y)))
@@ -202,8 +199,6 @@ def makeMark(font, glyphOrder):
                 mark2liga += f" <anchor {x} {y}> mark @mark_{anchor}"
         mark2liga += ";\n"
 
-    ayah = makeAyah(font, glyphOrder)
-
     base = ""
     for name, code in mark2base.items():
         base += f"""
@@ -214,7 +209,6 @@ def makeMark(font, glyphOrder):
 """
 
     return f"""
-{ayah}
 {classes}
 {base}
 lookup mark2liga_auto {{
@@ -224,45 +218,6 @@ def makeMark(font, glyphOrder):
 """
 
 
-def makeAyah(font, glyphOrder):
-    bases = []
-    marks = {}
-    for gname in glyphOrder:
-        glyph = font.glyphs[gname]
-        if glyph is None:
-            continue
-
-        layer = glyph.layers[0]
-        for anchor in layer.anchors:
-            if anchor.name in AYAH_ANCHORS:
-                x = layer.width - anchor.position.x
-                y = anchor.position.y
-                bases.append((gname, (x, y)))
-                break
-            if anchor.name.startswith("_") and anchor.name[1:] in AYAH_ANCHORS:
-                x = anchor.position.x
-                y = anchor.position.y
-                marks.setdefault((x, y), []).append(gname)
-                break
-
-    ayah = ""
-    for base, (bx, by) in bases:
-        for mx, my in marks:
-            names = " ".join(marks[(mx, my)])
-            x = bx + mx
-            y = by - my
-            ayah += f"pos {base} <NULL> [{names}] <{-x} {y} 0 0>;\n"
-
-    if ayah:
-        return f"""
-lookup ayah_auto {{
-lookupflag 0;
-{ayah}
-}} ayah_auto;
-        """
-    return ""
-
-
 def makeCurs(font, glyphOrder):
     fea = ""
 
@@ -812,6 +767,13 @@ def prepare(args):
             elif (glyph.category, glyph.subCategory) == ("Mark", "Nonspacing"):
                 # Zero mark width
                 layer.width = 0
+                if origin := layer.anchors["*origin"]:
+                    for path in layer.paths:
+                        path.applyTransform([1, 0, 0, 1, -origin.position.x, 0])
+                    for component in layer.components:
+                        x = component.position.x - origin.position.x
+                        y = component.position.y
+                        component.position = (x, y)
             propagateAnchors(glyph, layer)
             removeOverlap(font, glyph, layer)
 

diff --git a/sources/Raqq.glyphspackage/glyphs/ayah.005.glyph b/sources/Raqq.glyphspackage/glyphs/ayah.005.glyph
@@ -4,8 +4,8 @@ layers = (
 {
 anchors = (
 {
-name = _ayah;
-pos = (556,183);
+name = "*origin";
+pos = (1117,0);
 }
 );
 backgroundImage = {
@@ -29,6 +29,12 @@ ref = _ayah.decoration1;
 width = 1117;
 },
 {
+anchors = (
+{
+name = "*origin";
+pos = (1117,0);
+}
+);
 associatedMasterId = m01;
 attr = {
 colorPalette = 4;
@@ -48,6 +54,12 @@ ref = _ayah.decoration1.1;
 width = 1117;
 },
 {
+anchors = (
+{
+name = "*origin";
+pos = (1117,0);
+}
+);
 associatedMasterId = m01;
 attr = {
 colorPalette = 1;

diff --git a/sources/Raqq.glyphspackage/glyphs/ayah.010.glyph b/sources/Raqq.glyphspackage/glyphs/ayah.010.glyph
@@ -4,8 +4,8 @@ layers = (
 {
 anchors = (
 {
-name = _ayah;
-pos = (556,183);
+name = "*origin";
+pos = (1117,0);
 }
 );
 layerId = m01;
@@ -23,6 +23,12 @@ ref = _ayah.decoration1;
 width = 1117;
 },
 {
+anchors = (
+{
+name = "*origin";
+pos = (1117,0);
+}
+);
 associatedMasterId = m01;
 attr = {
 colorPalette = 4;
@@ -43,6 +49,12 @@ ref = _ayah.decoration1.1;
 width = 1117;
 },
 {
+anchors = (
+{
+name = "*origin";
+pos = (1117,0);
+}
+);
 associatedMasterId = m01;
 attr = {
 colorPalette = 1;

diff --git a/sources/Raqq.glyphspackage/glyphs/ayah.020.glyph b/sources/Raqq.glyphspackage/glyphs/ayah.020.glyph
@@ -4,8 +4,8 @@ layers = (
 {
 anchors = (
 {
-name = _ayah;
-pos = (556,183);
+name = "*origin";
+pos = (1117,0);
 }
 );
 layerId = m01;
@@ -29,6 +29,12 @@ ref = _ayah.noon;
 width = 1117;
 },
 {
+anchors = (
+{
+name = "*origin";
+pos = (1117,0);
+}
+);
 associatedMasterId = m01;
 attr = {
 colorPalette = 4;
@@ -55,6 +61,12 @@ ref = _ayah.noon.1;
 width = 1117;
 },
 {
+anchors = (
+{
+name = "*origin";
+pos = (1117,0);
+}
+);
 associatedMasterId = m01;
 attr = {
 colorPalette = 1;

diff --git a/sources/Raqq.glyphspackage/glyphs/ayah.030.glyph b/sources/Raqq.glyphspackage/glyphs/ayah.030.glyph
@@ -4,8 +4,8 @@ layers = (
 {
 anchors = (
 {
-name = _ayah;
-pos = (556,183);
+name = "*origin";
+pos = (1117,0);
 }
 );
 layerId = m01;
@@ -24,6 +24,12 @@ ref = _ayah.noon;
 width = 1117;
 },
 {
+anchors = (
+{
+name = "*origin";
+pos = (1117,0);
+}
+);
 associatedMasterId = m01;
 attr = {
 colorPalette = 4;
@@ -45,6 +51,12 @@ ref = _ayah.noon.1;
 width = 1117;
 },
 {
+anchors = (
+{
+name = "*origin";
+pos = (1117,0);
+}
+);
 associatedMasterId = m01;
 attr = {
 colorPalette = 1;

diff --git a/sources/Raqq.glyphspackage/glyphs/ayah.040.glyph b/sources/Raqq.glyphspackage/glyphs/ayah.040.glyph
@@ -4,8 +4,8 @@ layers = (
 {
 anchors = (
 {
-name = _ayah;
-pos = (556,183);
+name = "*origin";
+pos = (1117,0);
 }
 );
 layerId = m01;
@@ -37,6 +37,12 @@ scale = (0.7,0.8);
 width = 1117;
 },
 {
+anchors = (
+{
+name = "*origin";
+pos = (1117,0);
+}
+);
 associatedMasterId = m01;
 attr = {
 colorPalette = 4;
@@ -73,8 +79,8 @@ width = 1117;
 {
 anchors = (
 {
-name = _ayah;
-pos = (556,183);
+name = "*origin";
+pos = (1117,0);
 }
 );
 associatedMasterId = m01;

diff --git a/sources/Raqq.glyphspackage/glyphs/ayah.050.glyph b/sources/Raqq.glyphspackage/glyphs/ayah.050.glyph
@@ -4,8 +4,8 @@ layers = (
 {
 anchors = (
 {
-name = _ayah;
-pos = (556,183);
+name = "*origin";
+pos = (1117,0);
 }
 );
 layerId = m01;
@@ -25,6 +25,12 @@ ref = _ayah.noon;
 width = 1117;
 },
 {
+anchors = (
+{
+name = "*origin";
+pos = (1117,0);
+}
+);
 associatedMasterId = m01;
 attr = {
 colorPalette = 4;
@@ -48,6 +54,12 @@ visible = 1;
 width = 1117;
 },
 {
+anchors = (
+{
+name = "*origin";
+pos = (1117,0);
+}
+);
 associatedMasterId = m01;
 attr = {
 colorPalette = 1;

diff --git a/sources/Raqq.glyphspackage/glyphs/ayah.060.glyph b/sources/Raqq.glyphspackage/glyphs/ayah.060.glyph
@@ -4,8 +4,8 @@ layers = (
 {
 anchors = (
 {
-name = _ayah;
-pos = (556,183);
+name = "*origin";
+pos = (1117,0);
 }
 );
 layerId = m01;
@@ -24,6 +24,12 @@ ref = _ayah.noon;
 width = 1117;
 },
 {
+anchors = (
+{
+name = "*origin";
+pos = (1117,0);
+}
+);
 associatedMasterId = m01;
 attr = {
 colorPalette = 4;
@@ -46,6 +52,12 @@ visible = 1;
 width = 1117;
 },
 {
+anchors = (
+{
+name = "*origin";
+pos = (1117,0);
+}
+);
 associatedMasterId = m01;
 attr = {
 colorPalette = 1;

diff --git a/sources/Raqq.glyphspackage/glyphs/ayah.070.glyph b/sources/Raqq.glyphspackage/glyphs/ayah.070.glyph
@@ -4,8 +4,8 @@ layers = (
 {
 anchors = (
 {
-name = _ayah;
-pos = (556,183);
+name = "*origin";
+pos = (1117,0);
 }
 );
 layerId = m01;
@@ -24,6 +24,12 @@ ref = _ayah.noon;
 width = 1117;
 },
 {
+anchors = (
+{
+name = "*origin";
+pos = (1117,0);
+}
+);
 associatedMasterId = m01;
 attr = {
 colorPalette = 4;
@@ -45,6 +51,12 @@ ref = _ayah.noon.1;
 width = 1117;
 },
 {
+anchors = (
+{
+name = "*origin";
+pos = (1117,0);
+}
+);
 associatedMasterId = m01;
 attr = {
 colorPalette = 1;