From 98bdb267bd123c4132c34aef756555bf0e3c460a Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Fri, 15 Nov 2024 15:00:30 -0800
Subject: [PATCH] fixes design of /obarredcyrillic U+04E9 and related
 composites. Closes #743

---
 .../glyphs/braceleft.case.glyph               |   2 +-
 .../glyphs/braceleft.glyph                    |  76 ++++-----
 .../glyphs/l.sc.glyph                         | 144 +++++++++---------
 .../glyphs/obarredcyrillic.glyph              |  42 ++++-
 .../glyphs/obarreddieresis-cy.ss07.glyph      |  20 ++-
 .../glyphs/obarreddieresiscyrillic.glyph      |  18 ++-
 .../glyphs/obarredcyrillic.glyph              |  35 ++++-
 .../glyphs/obarreddieresis-cy.ss07.glyph      |  12 +-
 .../glyphs/obarreddieresiscyrillic.glyph      |  12 +-
 9 files changed, 213 insertions(+), 148 deletions(-)

diff --git a/src/Inter-Italic.glyphspackage/glyphs/braceleft.case.glyph b/src/Inter-Italic.glyphspackage/glyphs/braceleft.case.glyph
index 5a4d274713..b7585b0d88 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/braceleft.case.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/braceleft.case.glyph
@@ -14,7 +14,7 @@ pos = (16,94);
 ref = braceleft;
 }
 );
-width = 875;
+width = 874;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/braceleft.glyph b/src/Inter-Italic.glyphspackage/glyphs/braceleft.glyph
index ec072133e2..8ea143a921 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/braceleft.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/braceleft.glyph
@@ -7,7 +7,7 @@ layers = (
 guides = (
 {
 name = "Mid center";
-pos = (1,651);
+pos = (0,651);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -15,56 +15,56 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(485,646,o),
-(561,752,o),
-(586,901,cs),
-(634,1187,ls),
-(662,1354,o),
-(726,1431,o),
-(895,1430,c),
-(920,1581,l),
-(633,1581,o),
-(514,1462,o),
-(469,1190,cs),
-(431,960,ls),
-(405,803,o),
-(339,741,o),
-(175,741,c),
-(160,646,l)
+(484,646,o),
+(560,752,o),
+(585,901,cs),
+(633,1187,ls),
+(661,1354,o),
+(725,1431,o),
+(894,1430,c),
+(919,1581,l),
+(632,1581,o),
+(513,1462,o),
+(468,1190,cs),
+(430,960,ls),
+(404,803,o),
+(338,741,o),
+(174,741,c),
+(159,646,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(638,-130,l),
-(468,-130,o),
-(428,-54,o),
-(456,115,cs),
-(503,399,ls),
-(528,550,o),
-(483,656,o),
-(162,656,c),
-(146,561,l),
-(310,560,o),
-(354,496,o),
-(328,340,cs),
-(290,112,ls),
-(244,-164,o),
-(328,-279,o),
-(612,-279,c)
+(637,-130,l),
+(467,-130,o),
+(427,-54,o),
+(455,115,cs),
+(502,399,ls),
+(527,550,o),
+(482,656,o),
+(161,656,c),
+(145,561,l),
+(309,560,o),
+(353,496,o),
+(327,340,cs),
+(289,112,ls),
+(243,-164,o),
+(327,-279,o),
+(611,-279,c)
 );
 },
 {
 closed = 1;
 nodes = (
-(325,560,l),
-(356,742,l),
-(176,742,l),
-(146,560,l)
+(324,560,l),
+(355,742,l),
+(175,742,l),
+(145,560,l)
 );
 }
 );
-width = 875;
+width = 874;
 },
 {
 guides = (
diff --git a/src/Inter-Italic.glyphspackage/glyphs/l.sc.glyph b/src/Inter-Italic.glyphspackage/glyphs/l.sc.glyph
index 0731f3ee78..dc720be262 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/l.sc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/l.sc.glyph
@@ -9,23 +9,23 @@ layers = (
 anchors = (
 {
 name = bottom;
-pos = (367,0);
+pos = (406,0);
 },
 {
 name = cross;
-pos = (291,559);
+pos = (330,559);
 },
 {
 name = dot;
-pos = (464,611);
+pos = (503,611);
 },
 {
 name = raccent;
-pos = (573,1118);
+pos = (612,1118);
 },
 {
 name = top;
-pos = (302,1118);
+pos = (341,1118);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -34,12 +34,12 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(709,0,l),
-(734,153,l),
-(232,153,l),
-(392,1118,l),
-(212,1118,l),
-(27,0,l)
+(748,0,l),
+(773,153,l),
+(271,153,l),
+(431,1118,l),
+(251,1118,l),
+(66,0,l)
 );
 }
 );
@@ -50,29 +50,29 @@ weight = -12;
 width = 74.95;
 };
 };
-width = 822;
+width = 861;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (348,0);
+pos = (416,0);
 },
 {
 name = cross;
-pos = (257,559);
+pos = (325,559);
 },
 {
 name = dot;
-pos = (474,688);
+pos = (542,688);
 },
 {
 name = raccent;
-pos = (649,1117);
+pos = (717,1117);
 },
 {
 name = top;
-pos = (322,1117);
+pos = (390,1117);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -81,12 +81,12 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(753,0,l),
-(806,319,l),
-(394,319,l),
-(527,1117,l),
-(126,1117,l),
-(-59,0,l)
+(821,0,l),
+(874,319,l),
+(462,319,l),
+(595,1117,l),
+(194,1117,l),
+(9,0,l)
 );
 }
 );
@@ -97,29 +97,29 @@ weight = -2;
 width = 74.95;
 };
 };
-width = 866;
+width = 934;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (378,0);
+pos = (406,0);
 },
 {
 name = cross;
-pos = (289,559);
+pos = (317,559);
 },
 {
 name = dot;
-pos = (456,565);
+pos = (484,565);
 },
 {
 name = raccent;
-pos = (562,1117);
+pos = (590,1117);
 },
 {
 name = top;
-pos = (286,1117);
+pos = (314,1117);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -128,12 +128,12 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(679,0,l),
-(686,44,l),
-(132,44,l),
-(310,1117,l),
-(262,1117,l),
-(77,0,l)
+(707,0,l),
+(714,44,l),
+(160,44,l),
+(338,1117,l),
+(290,1117,l),
+(105,0,l)
 );
 }
 );
@@ -144,29 +144,29 @@ weight = -1;
 width = 75.1;
 };
 };
-width = 782;
+width = 810;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (331,0);
+pos = (363,0);
 },
 {
 name = cross;
-pos = (255,528);
+pos = (287,528);
 },
 {
 name = dot;
-pos = (422,577);
+pos = (454,577);
 },
 {
 name = raccent;
-pos = (523,1056);
+pos = (555,1056);
 },
 {
 name = top;
-pos = (267,1056);
+pos = (299,1056);
 }
 );
 layerId = m008;
@@ -175,12 +175,12 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(675,0,l),
-(700,147,l),
-(200,147,l),
-(351,1056,l),
-(182,1056,l),
-(7,0,l)
+(707,0,l),
+(732,147,l),
+(232,147,l),
+(383,1056,l),
+(214,1056,l),
+(39,0,l)
 );
 }
 );
@@ -191,29 +191,29 @@ weight = -28;
 width = 71.35;
 };
 };
-width = 778;
+width = 810;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (336,0);
+pos = (392,0);
 },
 {
 name = cross;
-pos = (285,528);
+pos = (341,528);
 },
 {
 name = dot;
-pos = (456,653);
+pos = (512,653);
 },
 {
 name = raccent;
-pos = (624,1056);
+pos = (680,1056);
 },
 {
 name = top;
-pos = (318,1056);
+pos = (374,1056);
 }
 );
 layerId = m010;
@@ -222,12 +222,12 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(766,0,l),
-(821,335,l),
-(398,335,l),
-(517,1056,l),
-(118,1056,l),
-(-57,0,l)
+(822,0,l),
+(877,335,l),
+(454,335,l),
+(573,1056,l),
+(174,1056,l),
+(-1,0,l)
 );
 }
 );
@@ -238,29 +238,29 @@ weight = -38;
 width = 71.3;
 };
 };
-width = 873;
+width = 929;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (338,0);
+pos = (348,0);
 },
 {
 name = cross;
-pos = (255,528);
+pos = (265,528);
 },
 {
 name = dot;
-pos = (411,535);
+pos = (421,535);
 },
 {
 name = raccent;
-pos = (512,1056);
+pos = (522,1056);
 },
 {
 name = top;
-pos = (236,1056);
+pos = (246,1056);
 }
 );
 layerId = m012;
@@ -269,12 +269,12 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(657,0,l),
-(665,44,l),
-(92,44,l),
-(260,1056,l),
-(212,1056,l),
-(37,0,l)
+(667,0,l),
+(675,44,l),
+(102,44,l),
+(270,1056,l),
+(222,1056,l),
+(47,0,l)
 );
 }
 );
@@ -285,7 +285,7 @@ weight = 2;
 width = 75.1;
 };
 };
-width = 745;
+width = 755;
 }
 );
 metricLeft = h.sc;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/obarredcyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/obarredcyrillic.glyph
index 080cd088b1..707d42569a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/obarredcyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/obarredcyrillic.glyph
@@ -5,54 +5,84 @@ kernRight = o;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = o;
+},
+{
+pos = (4,1);
+ref = _part.obar;
 }
 );
 width = 1229;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = o;
+},
+{
+pos = (-1,0);
+ref = _part.obar;
 }
 );
 width = 1280;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = o;
+},
+{
+pos = (-2,0);
+ref = _part.obar;
 }
 );
 width = 1186;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = o;
+},
+{
+pos = (-18,0);
+ref = _part.obar;
 }
 );
 width = 1123;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = o;
+},
+{
+pos = (-3,0);
+ref = _part.obar;
 }
 );
 width = 1244;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = o;
+},
+{
+pos = (-2,0);
+ref = _part.obar;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/obarreddieresis-cy.ss07.glyph b/src/Inter-Italic.glyphspackage/glyphs/obarreddieresis-cy.ss07.glyph
index d6e471374e..2487e6743d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/obarreddieresis-cy.ss07.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/obarreddieresis-cy.ss07.glyph
@@ -6,9 +6,10 @@ kernRight = o;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (9,0);
@@ -19,9 +20,10 @@ width = 1229;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (-24,0);
@@ -32,12 +34,13 @@ width = 1280;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
-pos = (-3,0);
+pos = (-4,0);
 ref = dieresiscomb.ss07;
 }
 );
@@ -45,9 +48,10 @@ width = 1186;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (2,0);
@@ -58,9 +62,10 @@ width = 1123;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (-11,0);
@@ -71,9 +76,10 @@ width = 1244;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (-4,0);
diff --git a/src/Inter-Italic.glyphspackage/glyphs/obarreddieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/obarreddieresiscyrillic.glyph
index 7a06edf884..ac7d7f4717 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/obarreddieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/obarreddieresiscyrillic.glyph
@@ -5,9 +5,10 @@ kernRight = o;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (8,0);
@@ -18,9 +19,10 @@ width = 1229;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (-25,0);
@@ -31,9 +33,10 @@ width = 1280;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (-4,0);
@@ -44,9 +47,10 @@ width = 1186;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (1,0);
@@ -57,9 +61,10 @@ width = 1123;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (-11,0);
@@ -70,9 +75,10 @@ width = 1244;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (-5,0);
diff --git a/src/Inter-Roman.glyphspackage/glyphs/obarredcyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/obarredcyrillic.glyph
index 08cec82320..bf2d206d55 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/obarredcyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/obarredcyrillic.glyph
@@ -7,7 +7,11 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-ref = fitacyrillic;
+ref = o;
+},
+{
+pos = (4,1);
+ref = _part.obar;
 }
 );
 width = 1228;
@@ -16,7 +20,10 @@ width = 1228;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-ref = fitacyrillic;
+ref = o;
+},
+{
+ref = _part.obar;
 }
 );
 width = 1280;
@@ -25,7 +32,11 @@ width = 1280;
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-ref = fitacyrillic;
+ref = o;
+},
+{
+pos = (-1,0);
+ref = _part.obar;
 }
 );
 width = 1186;
@@ -34,7 +45,11 @@ width = 1186;
 layerId = m007;
 shapes = (
 {
-ref = fitacyrillic;
+ref = o;
+},
+{
+pos = (-17,0);
+ref = _part.obar;
 }
 );
 width = 1124;
@@ -43,7 +58,11 @@ width = 1124;
 layerId = m009;
 shapes = (
 {
-ref = fitacyrillic;
+ref = o;
+},
+{
+pos = (-2,0);
+ref = _part.obar;
 }
 );
 width = 1244;
@@ -52,7 +71,11 @@ width = 1244;
 layerId = m011;
 shapes = (
 {
-ref = fitacyrillic;
+ref = o;
+},
+{
+pos = (-1,0);
+ref = _part.obar;
 }
 );
 width = 1058;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/obarreddieresis-cy.ss07.glyph b/src/Inter-Roman.glyphspackage/glyphs/obarreddieresis-cy.ss07.glyph
index bf3480fa1e..bd2ac89cde 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/obarreddieresis-cy.ss07.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/obarreddieresis-cy.ss07.glyph
@@ -8,7 +8,7 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (8,0);
@@ -21,7 +21,7 @@ width = 1228;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (-25,0);
@@ -34,7 +34,7 @@ width = 1280;
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (-4,0);
@@ -47,7 +47,7 @@ width = 1186;
 layerId = m007;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (2,0);
@@ -60,7 +60,7 @@ width = 1124;
 layerId = m009;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (-11,0);
@@ -73,7 +73,7 @@ width = 1244;
 layerId = m011;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (-4,0);
diff --git a/src/Inter-Roman.glyphspackage/glyphs/obarreddieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/obarreddieresiscyrillic.glyph
index fd1e7792ef..ee54edab05 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/obarreddieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/obarreddieresiscyrillic.glyph
@@ -7,7 +7,7 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (8,0);
@@ -20,7 +20,7 @@ width = 1228;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (-25,0);
@@ -33,7 +33,7 @@ width = 1280;
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (-4,0);
@@ -46,7 +46,7 @@ width = 1186;
 layerId = m007;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (2,0);
@@ -59,7 +59,7 @@ width = 1124;
 layerId = m009;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (-11,0);
@@ -72,7 +72,7 @@ width = 1244;
 layerId = m011;
 shapes = (
 {
-ref = fitacyrillic;
+ref = obarredcyrillic;
 },
 {
 pos = (-4,0);