improvements to /iacyrillic and /r.sc

2 files changed, 296 insertions, 301 deletions

diff --git a/src/Inter-Italic.glyphspackage/glyphs/iacyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/iacyrillic.glyph
index f862c063a..6d2ccc192 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/iacyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/iacyrillic.glyph
@@ -5,131 +5,133 @@ kernRight = a;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(898,0,l),
-(1086,1118,l),
-(626,1118,l),
-(384,1117,o),
-(217,991,o),
-(184,786,c),
-(149,580,o),
-(267,454,o),
-(494,454,c),
-(856,454,l),
-(882,614,l),
-(520,614,l),
-(400,614,o),
-(337,679,o),
-(354,786,c),
-(372,894,o),
-(465,960,o),
-(600,960,c),
-(896,960,l),
-(736,0,l)
+(1061,1118,l),
+(622,1118,ls),
+(326,1118,o),
+(164,972,o),
+(130,766,cs),
+(96,560,o),
+(212,422,o),
+(506,422,cs),
+(849,422,l),
+(873,568,l),
+(541,568,ls),
+(346,568,o),
+(279,641,o),
+(300,766,cs),
+(321,893,o),
+(412,968,o),
+(609,968,cs),
+(866,968,l),
+(706,0,l),
+(876,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(178,0,l),
-(588,556,l),
-(402,556,l),
-(-8,0,l)
+(541,505,l),
+(350,505,l),
+(-46,0,l),
+(151,0,l)
 );
 }
 );
-width = 1151;
+width = 1127;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(1024,0,l),
-(1210,1118,l),
-(686,1118,l),
-(364,1117,o),
-(134,954,o),
-(98,728,c),
-(61,518,o),
-(241,369,o),
-(570,370,c),
-(856,370,l),
-(896,610,l),
-(610,610,l),
-(503,611,o),
-(463,663,o),
-(474,712,c),
-(480,759,o),
-(535,817,o),
-(638,818,c),
-(788,818,l),
-(652,0,l)
+(1214,1118,l),
+(638,1118,ls),
+(342,1118,o),
+(131,964,o),
+(90,720,cs),
+(52,490,o),
+(220,346,o),
+(525,346,cs),
+(866,346,l),
+(910,612,l),
+(620,612,ls),
+(518,612,o),
+(474,646,o),
+(485,714,cs),
+(497,784,o),
+(550,818,o),
+(648,818,cs),
+(790,818,l),
+(655,0,l),
+(1029,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(334,0,l),
-(738,600,l),
-(370,600,l),
-(-34,0,l)
+(751,517,l),
+(332,517,l),
+(-73,0,l),
+(355,0,l)
 );
 }
 );
-width = 1219;
+width = 1224;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(824,0,l),
-(1010,1118,l),
-(634,1118,ls),
-(388,1117,o),
-(270,1031,o),
-(238,834,cs),
-(203,630,o),
-(301,535,o),
-(536,536,cs),
-(888,536,l),
-(898,582,l),
-(546,582,ls),
-(332,582,o),
-(254,647,o),
-(282,824,cs),
-(311,1001,o),
-(414,1070,o),
-(626,1070,cs),
-(954,1072,l),
-(776,0,l)
+(964,1118,l),
+(588,1118,ls),
+(372,1118,o),
+(201,988,o),
+(169,795,cs),
+(137,605,o),
+(266,476,o),
+(482,476,cs),
+(834,476,l),
+(841,522,l),
+(490,522,ls),
+(300,522,o),
+(187,630,o),
+(215,795,cs),
+(242,963,o),
+(391,1072,o),
+(581,1072,cs),
+(910,1072,l),
+(733,0,l),
+(779,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(66,0,l),
-(490,556,l),
-(432,556,l),
-(8,0,l)
+(425,508,l),
+(373,508,l),
+(-22,0,l),
+(31,0,l)
 );
 }
 );
-width = 1115;
+width = 1070;
 },
 {
 background = {
 shapes = (
 {
-pos = (1580,0);
-ref = vecyrillic;
-scale = (-1,1);
+pos = (-70,0);
+ref = n;
 }
 );
 };
@@ -139,89 +141,80 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(872.59,0,l),
-(1057.674,1118,l),
-(597.674,1118,l),
-(357.508,1117,o),
-(189.649,991,o),
-(156.712,786,c),
-(121.609,580,o),
-(239.749,454,o),
-(467.749,454,c),
-(827.749,454,l),
-(854.237,614,l),
-(494.237,614,l),
-(373.237,614,o),
-(309.998,679,o),
-(328.712,786,c),
-(345.591,894,o),
-(438.517,960,o),
-(571.517,960,c),
-(869.517,960,l),
-(710.59,0,l)
+(1032,1056,l),
+(565,1056,ls),
+(306,1056,o),
+(141,937,o),
+(106,723,cs),
+(71,514,o),
+(200,397,o),
+(463,397,cs),
+(827,397,l),
+(851,541,l),
+(501,541,ls),
+(322,541,o),
+(252,596,o),
+(273,723,cs),
+(294,850,o),
+(380,906,o),
+(554,906,cs),
+(837,906,l),
+(687,0,l),
+(857,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(150.59,0,l),
-(560.635,556,l),
-(374.635,556,l),
-(-35.41,0,l)
+(516,476,l),
+(327,476,l),
+(-64,0,l),
+(132,0,l)
 );
 }
 );
-width = 1088;
+width = 1071;
 },
 {
-background = {
-shapes = (
-{
-pos = (1676,0);
-ref = vecyrillic;
-scale = (-1,1);
-}
-);
-};
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(1014.59,0,l),
-(1199.674,1118,l),
-(675.674,1118,l),
-(352.508,1117,o),
-(122.524,954,o),
-(87.11,728,c),
-(50.345,518,o),
-(231.678,369,o),
-(559.843,370,c),
-(845.843,370,l),
-(885.575,610,l),
-(599.575,610,l),
-(492.741,611,o),
-(452.349,663,o),
-(462.461,712,c),
-(468.242,759,o),
-(523.844,817,o),
-(626.009,818,c),
-(776.009,818,l),
-(640.59,0,l)
+(1198,1056,l),
+(622,1056,ls),
+(326,1056,o),
+(116,910,o),
+(75,666,cs),
+(37,436,o),
+(207,300,o),
+(512,300,cs),
+(853,300,l),
+(897,566,l),
+(607,566,ls),
+(505,566,o),
+(459,592,o),
+(470,660,cs),
+(482,730,o),
+(534,756,o),
+(632,756,cs),
+(774,756,l),
+(649,0,l),
+(1023,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(324.59,0,l),
-(729.92,600,l),
-(359.92,600,l),
-(-45.41,0,l)
+(734,455,l),
+(315,455,l),
+(-79,0,l),
+(349,0,l)
 );
 }
 );
-width = 1188;
+width = 1197;
 },
 {
 layerId = m012;
@@ -230,42 +223,43 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(764.59,0,l),
-(949.674,1118,l),
-(575.674,1118,ls),
-(332.508,1117,o),
-(210.774,1028,o),
-(177.334,826,cs),
-(144.224,626,o),
-(237.159,535,o),
-(479.324,536,cs),
-(831.324,536,l),
-(838.94,582,l),
-(486.94,582,ls),
-(274.94,582,o),
-(195.031,649,o),
-(223.334,826,cs),
-(253.801,1004,o),
-(352.728,1070,o),
-(567.728,1070,cs),
-(896.059,1072,l),
-(718.59,0,l)
+(916,1118,l),
+(540,1118,ls),
+(324,1118,o),
+(153,988,o),
+(121,795,cs),
+(89,605,o),
+(218,476,o),
+(434,476,cs),
+(786,476,l),
+(793,522,l),
+(442,522,ls),
+(252,522,o),
+(139,630,o),
+(167,795,cs),
+(194,963,o),
+(343,1072,o),
+(533,1072,cs),
+(862,1072,l),
+(685,0,l),
+(731,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(4.59,0,l),
-(426.635,556,l),
-(372.635,556,l),
-(-49.41,0,l)
+(377,508,l),
+(325,508,l),
+(-70,0,l),
+(-17,0,l)
 );
 }
 );
-width = 998;
+width = 958;
 }
 );
-metricRight = a;
+metricLeft = "=|r.sc";
+metricRight = n;
 unicode = 1103;
 userData = {
 interface.gridadjust.original = "{'width': 1550, 'leftMargin': 51, 'rightMargin': 213}";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/r.sc.glyph b/src/Inter-Italic.glyphspackage/glyphs/r.sc.glyph
index d3ac9cef7..e2e96f6ae 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/r.sc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/r.sc.glyph
@@ -8,39 +8,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(222,0,l),
-(382,968,l),
-(639,968,ls),
-(836,968,o),
-(903,893,o),
-(882,766,cs),
-(861,641,o),
-(770,568,o),
-(575,568,cs),
-(243,568,l),
-(219,422,l),
-(562,422,ls),
-(856,422,o),
-(1018,560,o),
-(1052,766,cs),
-(1086,972,o),
-(972,1118,o),
-(676,1118,cs),
-(237,1118,l),
-(52,0,l)
+(236,0,l),
+(396,968,l),
+(653,968,ls),
+(850,968,o),
+(917,893,o),
+(896,766,cs),
+(875,641,o),
+(784,568,o),
+(589,568,cs),
+(257,568,l),
+(233,422,l),
+(576,422,ls),
+(870,422,o),
+(1032,560,o),
+(1066,766,cs),
+(1100,972,o),
+(986,1118,o),
+(690,1118,cs),
+(251,1118,l),
+(66,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(974,0,l),
-(746,505,l),
-(555,505,l),
-(777,0,l)
+(988,0,l),
+(760,505,l),
+(569,505,l),
+(791,0,l)
 );
 }
 );
-width = 1117;
+width = 1128;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -49,39 +49,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(359,0,l),
-(494,818,l),
-(636,818,ls),
-(734,818,o),
-(777,784,o),
-(765,714,cs),
-(754,646,o),
-(698,612,o),
-(596,612,cs),
-(306,612,l),
-(262,346,l),
-(603,346,ls),
-(909,346,o),
-(1124,490,o),
-(1162,720,cs),
-(1203,964,o),
-(1042,1118,o),
-(746,1118,cs),
-(170,1118,l),
-(-15,0,l)
+(384,0,l),
+(519,818,l),
+(661,818,ls),
+(759,818,o),
+(802,784,o),
+(790,714,cs),
+(779,646,o),
+(723,612,o),
+(621,612,cs),
+(331,612,l),
+(287,346,l),
+(628,346,ls),
+(933,346,o),
+(1149,490,o),
+(1187,720,cs),
+(1228,964,o),
+(1067,1118,o),
+(771,1118,cs),
+(195,1118,l),
+(10,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(1087,0,l),
-(854,517,l),
-(435,517,l),
-(659,0,l)
+(1112,0,l),
+(879,517,l),
+(460,517,l),
+(684,0,l)
 );
 }
 );
-width = 1201;
+width = 1225;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -90,39 +90,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(140,0,l),
-(318,1074,l),
-(647,1074,ls),
-(837,1074,o),
-(949,963,o),
-(921,795,cs),
-(894,630,o),
-(745,521,o),
-(555,521,cs),
-(204,521,l),
-(197,477,l),
-(549,477,ls),
-(765,477,o),
-(936,605,o),
-(967,795,cs),
-(999,988,o),
-(871,1118,o),
-(655,1118,cs),
-(279,1118,l),
-(94,0,l)
+(152,0,l),
+(329,1072,l),
+(658,1072,ls),
+(848,1072,o),
+(961,963,o),
+(934,795,cs),
+(906,630,o),
+(757,522,o),
+(567,522,cs),
+(216,522,l),
+(209,476,l),
+(561,476,ls),
+(777,476,o),
+(948,605,o),
+(980,795,cs),
+(1012,988,o),
+(883,1118,o),
+(667,1118,cs),
+(291,1118,l),
+(106,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(895,0,l),
-(668,508,l),
-(616,508,l),
-(842,0,l)
+(907,0,l),
+(680,508,l),
+(628,508,l),
+(854,0,l)
 );
 }
 );
-width = 1063;
+width = 1071;
 },
 {
 layerId = m008;
@@ -131,39 +131,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(201,0,l),
-(351,906,l),
-(634,906,ls),
-(809,906,o),
-(876,850,o),
-(855,723,cs),
-(834,596,o),
-(746,541,o),
-(567,541,cs),
-(217,541,l),
-(193,397,l),
-(557,397,ls),
-(820,397,o),
-(987,514,o),
-(1022,723,cs),
-(1057,937,o),
-(932,1056,o),
-(673,1056,cs),
-(206,1056,l),
-(31,0,l)
+(209,0,l),
+(359,906,l),
+(642,906,ls),
+(816,906,o),
+(884,850,o),
+(863,723,cs),
+(842,596,o),
+(754,541,o),
+(575,541,cs),
+(225,541,l),
+(201,397,l),
+(565,397,ls),
+(828,397,o),
+(995,514,o),
+(1030,723,cs),
+(1065,937,o),
+(940,1056,o),
+(681,1056,cs),
+(214,1056,l),
+(39,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(952,0,l),
-(719,476,l),
-(530,476,l),
-(756,0,l)
+(960,0,l),
+(727,476,l),
+(538,476,l),
+(764,0,l)
 );
 }
 );
-width = 1063;
+width = 1070;
 },
 {
 layerId = m010;
@@ -172,39 +172,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(351,0,l),
-(476,756,l),
-(618,756,ls),
-(716,756,o),
-(760,730,o),
-(748,660,cs),
-(737,592,o),
-(683,566,o),
-(581,566,cs),
-(291,566,l),
-(247,300,l),
-(588,300,ls),
-(893,300,o),
-(1107,436,o),
-(1145,666,cs),
-(1186,910,o),
-(1024,1056,o),
-(728,1056,cs),
-(152,1056,l),
-(-23,0,l)
+(373,0,l),
+(498,756,l),
+(640,756,ls),
+(738,756,o),
+(782,730,o),
+(770,660,cs),
+(759,592,o),
+(705,566,o),
+(603,566,cs),
+(313,566,l),
+(269,300,l),
+(610,300,ls),
+(915,300,o),
+(1129,436,o),
+(1167,666,cs),
+(1208,910,o),
+(1046,1056,o),
+(750,1056,cs),
+(174,1056,l),
+(-1,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(1079,0,l),
-(835,455,l),
-(416,455,l),
-(651,0,l)
+(1101,0,l),
+(857,455,l),
+(438,455,l),
+(673,0,l)
 );
 }
 );
-width = 1174;
+width = 1196;
 },
 {
 layerId = m012;
@@ -214,19 +214,19 @@ shapes = (
 closed = 1;
 nodes = (
 (88,0,l),
-(266,1074,l),
-(595,1074,ls),
-(785,1074,o),
-(898,963,o),
+(265,1072,l),
+(594,1072,ls),
+(784,1072,o),
+(897,963,o),
 (870,795,cs),
-(843,630,o),
-(694,521,o),
-(504,521,cs),
-(153,521,l),
-(145,477,l),
-(497,477,ls),
-(713,477,o),
-(885,605,o),
+(842,630,o),
+(693,522,o),
+(503,522,cs),
+(152,522,l),
+(145,476,l),
+(497,476,ls),
+(713,476,o),
+(884,605,o),
 (916,795,cs),
 (948,988,o),
 (819,1118,o),
@@ -245,9 +245,10 @@ nodes = (
 );
 }
 );
-width = 960;
+width = 959;
 }
 );
+metricLeft = n;
 userData = {
 interface.gridadjust.original = "{'width': 1555, 'leftMargin': 147, 'rightMargin': 122}";
 "interface.width-adjustments" = (