improvements to Cyrillic /Ghemiddlehookcyrillic & /Pemiddlehookcyrillic

6 files changed, 280 insertions, 210 deletions

diff --git a/src/Inter-Roman.glyphspackage/fontinfo.plist b/src/Inter-Roman.glyphspackage/fontinfo.plist
index a2587f630..01f12560c 100644
--- a/src/Inter-Roman.glyphspackage/fontinfo.plist
+++ b/src/Inter-Roman.glyphspackage/fontinfo.plist
@@ -3168,11 +3168,11 @@ stemValues = (
 );
 userData = {
 GSCornerRadius = 320;
-GSOffsetHorizontal = 79;
+GSOffsetHorizontal = 90;
 GSOffsetKeepCompatible = 1;
 GSOffsetMakeStroke = 1;
-GSOffsetProportional = 1;
-GSOffsetVertical = 100;
+GSOffsetPosition = 1;
+GSOffsetVertical = 84;
 };
 },
 {
@@ -3460,11 +3460,13 @@ stemValues = (
 );
 userData = {
 GSCornerRadius = 16;
-GSOffsetHorizontal = 74;
+GSExtrudeAngle = 30;
+GSExtrudeOffset = 15;
+GSOffsetHorizontal = 210;
 GSOffsetKeepCompatible = 1;
 GSOffsetMakeStroke = 1;
-GSOffsetProportional = 1;
-GSOffsetVertical = 200;
+GSOffsetPosition = 1;
+GSOffsetVertical = 180;
 };
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_hemiddlehookcyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_hemiddlehookcyrillic.glyph
index ce99f8c75..486987290 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_hemiddlehookcyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_hemiddlehookcyrillic.glyph
@@ -11,11 +11,11 @@ ref = "Ge-cy";
 },
 {
 alignment = -1;
-pos = (302,0);
+pos = (212,0);
 ref = largerighthook;
 }
 );
-width = 1272;
+width = 1332;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -26,11 +26,11 @@ ref = "Ge-cy";
 },
 {
 alignment = -1;
-pos = (422,0);
+pos = (232,0);
 ref = largerighthook;
 }
 );
-width = 1488;
+width = 1382;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -41,11 +41,11 @@ ref = "Ge-cy";
 },
 {
 alignment = -1;
-pos = (190,0);
+pos = (174,0);
 ref = largerighthook;
 }
 );
-width = 1222;
+width = 1410;
 },
 {
 layerId = m007;
@@ -56,11 +56,11 @@ ref = "Ge-cy";
 },
 {
 alignment = -1;
-pos = (302,0);
+pos = (180,0);
 ref = largerighthook;
 }
 );
-width = 1208;
+width = 1268;
 },
 {
 layerId = m009;
@@ -71,11 +71,11 @@ ref = "Ge-cy";
 },
 {
 alignment = -1;
-pos = (422,0);
+pos = (228,0);
 ref = largerighthook;
 }
 );
-width = 1456;
+width = 1362;
 },
 {
 layerId = m011;
@@ -86,11 +86,11 @@ ref = "Ge-cy";
 },
 {
 alignment = -1;
-pos = (190,0);
+pos = (110,0);
 ref = largerighthook;
 }
 );
-width = 1094;
+width = 1282;
 }
 );
 metricLeft = B;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/P_emiddlehookcyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/P_emiddlehookcyrillic.glyph
index 54d3a4069..f06617a5c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/P_emiddlehookcyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/P_emiddlehookcyrillic.glyph
@@ -1,104 +1,107 @@
 {
 glyphname = Pemiddlehookcyrillic;
 kernLeft = B;
+kernRight = o;
 layers = (
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-58,0);
+pos = (-4,0);
 ref = Pi;
 },
 {
 alignment = -1;
-pos = (1182,0);
+pos = (1142,0);
 ref = largerighthook;
 }
 );
-width = 2222;
+width = 2262;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-30,0);
+pos = (-66,0);
 ref = Pi;
 },
 {
 alignment = -1;
-pos = (1250,-2);
+pos = (1130,-2);
 ref = largerighthook;
 }
 );
-width = 2408;
+width = 2280;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-76,0);
+pos = (38,0);
 ref = Pi;
 },
 {
 alignment = -1;
-pos = (1024,2);
+pos = (1126,2);
 ref = largerighthook;
 }
 );
-width = 1994;
+width = 2362;
 },
 {
 layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-58,0);
+pos = (-4,0);
 ref = Pi;
 },
 {
 alignment = -1;
-pos = (1182,0);
+pos = (1110,0);
 ref = largerighthook;
 }
 );
-width = 2158;
+width = 2198;
 },
 {
 layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-30,0);
+pos = (-66,0);
 ref = Pi;
 },
 {
 alignment = -1;
-pos = (1250,-2);
+pos = (1114,-2);
 ref = largerighthook;
 }
 );
-width = 2376;
+width = 2248;
 },
 {
 layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-76,0);
+pos = (38,0);
 ref = Pi;
 },
 {
 alignment = -1;
-pos = (1024,2);
+pos = (1062,2);
 ref = largerighthook;
 }
 );
-width = 1866;
+width = 2234;
 }
 );
+metricLeft = H;
+metricRight = b;
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/P_i.glyph b/src/Inter-Roman.glyphspackage/glyphs/P_i.glyph
index 3cea2dbdb..78c3fa462 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/P_i.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/P_i.glyph
@@ -3,12 +3,6 @@ glyphname = Pi;
 kernLeft = B;
 layers = (
 {
-anchors = (
-{
-name = right;
-pos = (1292,0);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
@@ -28,12 +22,6 @@ nodes = (
 width = 1478;
 },
 {
-anchors = (
-{
-name = right;
-pos = (1460,0);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
@@ -53,12 +41,6 @@ nodes = (
 width = 1626;
 },
 {
-anchors = (
-{
-name = right;
-pos = (1190,0);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
@@ -78,12 +60,6 @@ nodes = (
 width = 1390;
 },
 {
-anchors = (
-{
-name = right;
-pos = (1260,0);
-}
-);
 layerId = m007;
 shapes = (
 {
@@ -103,12 +79,6 @@ nodes = (
 width = 1414;
 },
 {
-anchors = (
-{
-name = right;
-pos = (1444,0);
-}
-);
 layerId = m009;
 shapes = (
 {
@@ -128,12 +98,6 @@ nodes = (
 width = 1594;
 },
 {
-anchors = (
-{
-name = right;
-pos = (1126,0);
-}
-);
 layerId = m011;
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/largerighthook.glyph b/src/Inter-Roman.glyphspackage/glyphs/largerighthook.glyph
index 0a96d1ce0..9b7cb2ed8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/largerighthook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/largerighthook.glyph
@@ -2,202 +2,303 @@
 glyphname = largerighthook;
 layers = (
 {
-anchors = (
-{
-name = _right;
-pos = (146,0);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 closed = 1;
 nodes = (
-(264,670,ls),
-(538,669,o),
-(689,544,o),
-(690,256,cs),
-(689,29,o),
-(596,-137,o),
-(386,-136,c),
-(390,-294,l),
-(698,-294,o),
-(867,-81,o),
-(866,256,cs),
-(867,643,o),
-(646,829,o),
-(264,830,cs),
-(56,830,l),
-(56,670,l)
+(492,-87,ls),
+(800,-87,o),
+(1016,116,o),
+(1016,413,cs),
+(1016,711,o),
+(800,920,o),
+(492,920,cs),
+(208,920,o),
+(64,739,o),
+(64,389,c),
+(148,389,l),
+(148,613,o),
+(280,752,o),
+(492,752,cs),
+(701,752,o),
+(836,619,o),
+(836,413,cs),
+(836,209,o),
+(703,81,o),
+(492,81,cs),
+(385,81,l),
+(385,-87,l)
 );
 }
 );
-width = 920;
+width = 1080;
 },
 {
-anchors = (
-{
-name = _right;
-pos = (120,0);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
-(370,538,ls),
-(528,538,o),
-(624,436,o),
-(622,216,cs),
-(624,160,o),
-(630,-108,o),
-(382,-108,c),
-(378,-386,l),
-(877,-387,o),
-(1005,9,o),
-(1004,244,cs),
-(1005,660,o),
-(735,841,o),
-(370,840,cs),
-(12,840,l),
-(12,538,l)
+(468,-135,ls),
+(832,-135,o),
+(1088,77,o),
+(1088,389,cs),
+(1088,701,o),
+(833,920,o),
+(532,920,cs),
+(228,920,o),
+(64,701,o),
+(64,389,c),
+(268,389,l),
+(268,494,o),
+(345,560,o),
+(468,560,cs),
+(591,560,o),
+(668,494,o),
+(668,389,cs),
+(668,283,o),
+(591,217,o),
+(468,217,cs),
+(361,217,l),
+(361,-135,l)
 );
 }
 );
-width = 1016;
+width = 1152;
 },
 {
-anchors = (
-{
-name = _right;
-pos = (280,0);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 closed = 1;
 nodes = (
-(320,776,ls),
-(672,777,o),
-(855,609,o),
-(856,268,cs),
-(856,-15,o),
-(725,-192,o),
-(510,-192,c),
-(514,-238,l),
-(751,-238,o),
-(900,-43,o),
-(902,266,cs),
-(903,632,o),
-(702,823,o),
-(320,824,cs),
-(82,824,l),
-(82,776,l)
+(582,-23,ls),
+(903,-23,o),
+(1106,160,o),
+(1106,440,cs),
+(1106,726,o),
+(894,920,o),
+(582,920,cs),
+(250,920,o),
+(64,714,o),
+(64,389,c),
+(104,389,l),
+(104,695,o),
+(280,874,o),
+(582,874,cs),
+(876,874,o),
+(1060,706,o),
+(1060,440,cs),
+(1060,180,o),
+(885,23,o),
+(582,23,cs),
+(475,23,l),
+(475,-23,l)
 );
 }
 );
-width = 978;
+width = 1170;
 },
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _right;
-pos = (114,0);
+closed = 1;
+nodes = (
+(428,-135,ls),
+(792,-135,o),
+(1048,77,o),
+(1048,389,cs),
+(1048,701,o),
+(793,920,o),
+(492,920,cs),
+(188,920,o),
+(24,701,o),
+(24,389,c),
+(228,389,l),
+(228,494,o),
+(305,560,o),
+(428,560,cs),
+(551,560,o),
+(628,494,o),
+(628,389,cs),
+(628,283,o),
+(551,217,o),
+(428,217,cs),
+(321,217,l),
+(321,-135,l)
+);
 }
 );
+};
 layerId = m007;
 shapes = (
 {
 closed = 1;
 nodes = (
-(232,670,ls),
-(506,669,o),
-(657,544,o),
-(658,256,cs),
-(657,29,o),
-(564,-137,o),
-(354,-136,c),
-(358,-294,l),
-(666,-294,o),
-(835,-81,o),
-(834,256,cs),
-(835,643,o),
-(614,829,o),
-(232,830,cs),
-(24,830,l),
-(24,670,l)
+(492,-87,ls),
+(800,-87,o),
+(1016,116,o),
+(1016,413,cs),
+(1016,711,o),
+(800,920,o),
+(492,920,cs),
+(208,920,o),
+(64,739,o),
+(64,389,c),
+(148,389,l),
+(148,613,o),
+(280,752,o),
+(492,752,cs),
+(701,752,o),
+(836,619,o),
+(836,413,cs),
+(836,209,o),
+(703,81,o),
+(492,81,cs),
+(385,81,l),
+(385,-87,l)
 );
 }
 );
-width = 856;
+width = 1080;
 },
 {
-anchors = (
+layerId = m009;
+shapes = (
 {
-name = _right;
-pos = (104,0);
+closed = 1;
+nodes = (
+(468,-135,ls),
+(832,-135,o),
+(1088,77,o),
+(1088,389,cs),
+(1088,701,o),
+(833,920,o),
+(532,920,cs),
+(228,920,o),
+(64,701,o),
+(64,389,c),
+(268,389,l),
+(268,494,o),
+(345,560,o),
+(468,560,cs),
+(591,560,o),
+(668,494,o),
+(668,389,cs),
+(668,283,o),
+(591,217,o),
+(468,217,cs),
+(361,217,l),
+(361,-135,l)
+);
 }
 );
-layerId = m009;
+width = 1152;
+},
+{
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(582,-87,ls),
+(890,-87,o),
+(1106,116,o),
+(1106,413,cs),
+(1106,711,o),
+(890,920,o),
+(582,920,cs),
+(298,920,o),
+(58,739,o),
+(58,389,c),
+(238,389,l),
+(238,613,o),
+(370,752,o),
+(582,752,cs),
+(791,752,o),
+(926,619,o),
+(926,413,cs),
+(926,209,o),
+(793,81,o),
+(582,81,cs),
+(475,81,l),
+(475,-87,l)
+);
+}
+);
+};
+layerId = m011;
 shapes = (
 {
 closed = 1;
 nodes = (
-(354,538,ls),
-(512,538,o),
-(608,436,o),
-(606,216,cs),
-(608,160,o),
-(614,-108,o),
-(366,-108,c),
-(362,-386,l),
-(861,-387,o),
-(989,9,o),
-(988,244,cs),
-(989,660,o),
-(719,841,o),
-(354,840,cs),
-(-4,840,l),
-(-4,538,l)
+(582,-23,ls),
+(903,-23,o),
+(1106,160,o),
+(1106,440,cs),
+(1106,726,o),
+(894,920,o),
+(582,920,cs),
+(250,920,o),
+(64,714,o),
+(64,389,c),
+(104,389,l),
+(104,695,o),
+(280,874,o),
+(582,874,cs),
+(876,874,o),
+(1060,706,o),
+(1060,440,cs),
+(1060,180,o),
+(885,23,o),
+(582,23,cs),
+(475,23,l),
+(475,-23,l)
 );
 }
 );
-width = 984;
+width = 1170;
 },
 {
 anchors = (
 {
+name = _rhook;
+pos = (80,689);
+},
+{
 name = _right;
-pos = (216,0);
+pos = (108,0);
 }
 );
-layerId = m011;
+associatedMasterId = m009;
+layerId = "7074E49E-2819-452F-A138-B53E960D6B0C";
+name = "Oct 15, 22, 17:25";
 shapes = (
 {
 closed = 1;
 nodes = (
-(256,776,ls),
-(608,777,o),
-(791,609,o),
-(792,268,cs),
-(792,-15,o),
-(661,-192,o),
-(446,-192,c),
-(450,-238,l),
-(687,-238,o),
-(836,-43,o),
-(838,266,cs),
-(839,632,o),
-(638,823,o),
-(256,824,cs),
-(18,824,l),
-(18,776,l)
+(318,529,ls),
+(518,529,o),
+(610,422,o),
+(610,236,cs),
+(610,44,o),
+(513,-76,o),
+(358,-76,c),
+(358,-386,l),
+(745,-386,o),
+(1000,-139,o),
+(1000,236,cs),
+(1000,608,o),
+(748,849,o),
+(358,849,cs),
+(80,849,l),
+(80,529,l)
 );
 }
 );
-width = 850;
+width = 992;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/shacyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/shacyrillic.glyph
index 4c01dece8..c92f1862b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/shacyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/shacyrillic.glyph
@@ -10,12 +10,12 @@ shapes = (
 closed = 1;
 nodes = (
 (158,0,l),
-(1516,0,l),
-(1516,1118,l),
-(1344,1118,l),
-(1344,160,l),
-(922,160,l),
-(922,1118,l),
+(1512,0,l),
+(1512,1118,l),
+(1342,1118,l),
+(1342,160,l),
+(920,160,l),
+(920,1118,l),
 (750,1118,l),
 (750,160,l),
 (328,160,l),
@@ -24,7 +24,7 @@ nodes = (
 );
 }
 );
-width = 1674;
+width = 1670;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -142,8 +142,8 @@ nodes = (
 width = 1466;
 }
 );
-metricLeft = m;
-metricRight = a;
+metricLeft = n;
+metricRight = n;
 tags = (
 "TODO-opsz"
 );