improvements to /sha-cy and /shcha-cy (upper and lower case)

6 files changed, 433 insertions, 427 deletions

diff --git a/src/Inter-Italic.glyphspackage/glyphs/S_ha-cy.glyph b/src/Inter-Italic.glyphspackage/glyphs/S_ha-cy.glyph
new file mode 100644
index 000000000..e7b62e2e2
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/S_ha-cy.glyph
@@ -0,0 +1,196 @@
+{
+glyphname = "Sha-cy";
+kernLeft = B;
+kernRight = H;
+layers = (
+{
+anchors = (
+{
+name = cyrtic;
+pos = (1675,0);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(87,0,l),
+(1675,0,l),
+(1922,1490,l),
+(1742,1490,l),
+(1521,160,l),
+(997,160,l),
+(1218,1490,l),
+(1038,1490,l),
+(817,160,l),
+(293,160,l),
+(514,1490,l),
+(334,1490,l)
+);
+}
+);
+width = 1948;
+},
+{
+anchors = (
+{
+name = cyrtic;
+pos = (1891,0);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(3,0,l),
+(1891,0,l),
+(2138,1490,l),
+(1734,1490,l),
+(1541,326,l),
+(1197,326,l),
+(1390,1490,l),
+(1000,1490,l),
+(807,326,l),
+(461,326,l),
+(654,1490,l),
+(250,1490,l)
+);
+}
+);
+width = 2080;
+},
+{
+anchors = (
+{
+name = cyrtic;
+pos = (1537,0);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(139,0,l),
+(1537,0,l),
+(1784,1490,l),
+(1738,1490,l),
+(1499,46,l),
+(869,46,l),
+(1108,1490,l),
+(1062,1490,l),
+(823,46,l),
+(193,46,l),
+(432,1490,l),
+(386,1490,l)
+);
+}
+);
+width = 1862;
+},
+{
+anchors = (
+{
+name = cyrtic;
+pos = (1649,0);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(61,0,l),
+(1649,0,l),
+(1896,1490,l),
+(1716,1490,l),
+(1495,160,l),
+(971,160,l),
+(1192,1490,l),
+(1012,1490,l),
+(791,160,l),
+(267,160,l),
+(488,1490,l),
+(308,1490,l)
+);
+}
+);
+width = 1885;
+},
+{
+anchors = (
+{
+name = cyrtic;
+pos = (1881,0);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(-7,0,l),
+(1881,0,l),
+(2128,1490,l),
+(1712,1490,l),
+(1523,352,l),
+(1201,352,l),
+(1390,1490,l),
+(980,1490,l),
+(791,352,l),
+(467,352,l),
+(656,1490,l),
+(240,1490,l)
+);
+}
+);
+width = 2049;
+},
+{
+anchors = (
+{
+name = cyrtic;
+pos = (1473,0);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(75,0,l),
+(1473,0,l),
+(1720,1490,l),
+(1674,1490,l),
+(1435,46,l),
+(805,46,l),
+(1044,1490,l),
+(998,1490,l),
+(759,46,l),
+(129,46,l),
+(368,1490,l),
+(322,1490,l)
+);
+}
+);
+width = 1734;
+}
+);
+metricLeft = H;
+metricRight = H;
+unicode = 1064;
+userData = {
+interface.gridadjust.original = "{'width': 2659, 'leftMargin': 241, 'rightMargin': 239}";
+"interface.width-adjustments" = (
+-16
+);
+};
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/S_hcha-cy.glyph b/src/Inter-Italic.glyphspackage/glyphs/S_hcha-cy.glyph
new file mode 100644
index 000000000..9422b2f92
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/S_hcha-cy.glyph
@@ -0,0 +1,105 @@
+{
+glyphname = "Shcha-cy";
+kernLeft = B;
+kernRight = Decyrillic;
+layers = (
+{
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+metricRight = "=+64";
+name = ital_gen;
+shapes = (
+{
+ref = "Sha-cy";
+},
+{
+pos = (1613,0);
+ref = _part.cyrtic;
+}
+);
+width = 2012;
+},
+{
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+metricRight = "=+80";
+name = ital_gen;
+shapes = (
+{
+ref = "Sha-cy";
+},
+{
+pos = (1584,0);
+ref = _part.cyrtic;
+}
+);
+width = 2160;
+},
+{
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+ref = "Sha-cy";
+},
+{
+pos = (1534,0);
+ref = _part.cyrtic;
+}
+);
+width = 1862;
+},
+{
+layerId = m008;
+metricRight = "=+64";
+name = ital_gen;
+shapes = (
+{
+ref = "Sha-cy";
+},
+{
+pos = (1582,0);
+ref = _part.cyrtic;
+}
+);
+width = 1949;
+},
+{
+layerId = m010;
+metricRight = "=+80";
+name = ital_gen;
+shapes = (
+{
+ref = "Sha-cy";
+},
+{
+pos = (1568,0);
+ref = _part.cyrtic;
+}
+);
+width = 2129;
+},
+{
+layerId = m012;
+metricRight = "=+32";
+name = ital_gen;
+shapes = (
+{
+ref = "Sha-cy";
+},
+{
+pos = (1470,0);
+ref = _part.cyrtic;
+}
+);
+width = 1766;
+}
+);
+metricLeft = afii10042;
+metricRight = t;
+unicode = 1065;
+userData = {
+interface.gridadjust.original = "{'width': 2745, 'leftMargin': 241, 'rightMargin': 120}";
+"interface.width-adjustments" = (
+-16
+);
+};
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/afii10042.glyph b/src/Inter-Italic.glyphspackage/glyphs/afii10042.glyph
deleted file mode 100644
index 162d4122b..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/afii10042.glyph
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-glyphname = afii10042;
-kernLeft = B;
-kernRight = H;
-layers = (
-{
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-closed = 1;
-nodes = (
-(88,0,l),
-(1676,0,l),
-(1922,1490,l),
-(1742,1490,l),
-(1524,166,l),
-(1000,166,l),
-(1218,1490,l),
-(1038,1490,l),
-(820,166,l),
-(296,166,l),
-(514,1490,l),
-(334,1490,l)
-);
-}
-);
-width = 1949;
-},
-{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-closed = 1;
-nodes = (
-(3,0,l),
-(1893,0,l),
-(2141,1490,l),
-(1751,1490,l),
-(1557,312,l),
-(1201,312,l),
-(1397,1490,l),
-(1007,1490,l),
-(811,312,l),
-(447,312,l),
-(643,1490,l),
-(251,1490,l)
-);
-}
-);
-width = 2083;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-closed = 1;
-nodes = (
-(139,0,l),
-(1539,0,l),
-(1785,1490,l),
-(1739,1490,l),
-(1501,46,l),
-(871,46,l),
-(1109,1490,l),
-(1063,1490,l),
-(825,46,l),
-(195,46,l),
-(433,1490,l),
-(387,1490,l)
-);
-}
-);
-width = 1864;
-},
-{
-layerId = m008;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(60.59,0,l),
-(1648.59,0,l),
-(1895.258,1490,l),
-(1715.258,1490,l),
-(1496.071,166,l),
-(972.071,166,l),
-(1191.258,1490,l),
-(1011.258,1490,l),
-(792.071,166,l),
-(268.071,166,l),
-(487.258,1490,l),
-(307.258,1490,l)
-);
-}
-);
-width = 1884;
-},
-{
-layerId = m010;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-7.41,0,l),
-(1884.59,0,l),
-(2131.258,1490,l),
-(1741.258,1490,l),
-(1546.241,312,l),
-(1192.241,312,l),
-(1387.258,1490,l),
-(997.258,1490,l),
-(802.241,312,l),
-(438.241,312,l),
-(633.258,1490,l),
-(239.258,1490,l)
-);
-}
-);
-width = 2052;
-},
-{
-layerId = m012;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(76,0,l),
-(1476,0,l),
-(1722,1490,l),
-(1676,1490,l),
-(1437,46,l),
-(807,46,l),
-(1046,1490,l),
-(1000,1490,l),
-(761,46,l),
-(131,46,l),
-(370,1490,l),
-(322,1490,l)
-);
-}
-);
-width = 1737;
-}
-);
-metricLeft = H;
-metricRight = H;
-unicode = 1064;
-userData = {
-interface.gridadjust.original = "{'width': 2659, 'leftMargin': 241, 'rightMargin': 239}";
-"interface.width-adjustments" = (
--16
-);
-};
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/afii10043.glyph b/src/Inter-Italic.glyphspackage/glyphs/afii10043.glyph
deleted file mode 100644
index 3502cb24c..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/afii10043.glyph
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-glyphname = afii10043;
-kernLeft = B;
-kernRight = Decyrillic;
-layers = (
-{
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1506,160,l),
-(1480,0,l),
-(1624,0,l),
-(1566,-352,l),
-(1742,-352,l),
-(1848,160,l)
-);
-},
-{
-ref = afii10042;
-}
-);
-width = 1995;
-},
-{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1728,300,l),
-(1678,0,l),
-(1786,0,l),
-(1728,-350,l),
-(2086,-350,l),
-(2214,300,l)
-);
-},
-{
-ref = afii10042;
-}
-);
-width = 2300;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1446,46,l),
-(1438,0,l),
-(1566,0,l),
-(1506,-352,l),
-(1536,-352,l),
-(1622,46,l)
-);
-},
-{
-alignment = -1;
-ref = afii10042;
-}
-);
-width = 1803;
-},
-{
-layerId = m008;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1481.078,160,l),
-(1454.59,0,l),
-(1596.59,0,l),
-(1538.317,-352,l),
-(1716.317,-352,l),
-(1821.078,160,l)
-);
-},
-{
-ref = afii10042;
-}
-);
-width = 1938;
-},
-{
-layerId = m010;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1718.255,300,l),
-(1668.59,0,l),
-(1776.59,0,l),
-(1718.648,-350,l),
-(2076.648,-350,l),
-(2204.255,300,l)
-);
-},
-{
-ref = afii10042;
-}
-);
-width = 2290;
-},
-{
-layerId = m012;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1386.205,46,l),
-(1378.59,0,l),
-(1506.59,0,l),
-(1448.317,-352,l),
-(1478.317,-352,l),
-(1562.205,46,l)
-);
-},
-{
-alignment = -1;
-ref = afii10042;
-}
-);
-width = 1685;
-}
-);
-metricLeft = afii10042;
-metricRight = t;
-unicode = 1065;
-userData = {
-interface.gridadjust.original = "{'width': 2745, 'leftMargin': 241, 'rightMargin': 120}";
-"interface.width-adjustments" = (
--16
-);
-};
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/shacyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/shacyrillic.glyph
index c831aab58..aa6c12505 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/shacyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/shacyrillic.glyph
@@ -4,75 +4,102 @@ kernLeft = m;
 kernRight = a;
 layers = (
 {
+anchors = (
+{
+name = cyrtic;
+pos = (1422,0);
+}
+);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(65,0,l),
-(1423,0,l),
-(1609,1118,l),
-(1439,1118,l),
-(1279,160,l),
-(857,160,l),
-(1017,1118,l),
-(845,1118,l),
+(66,0,l),
+(1422,0,l),
+(1607,1118,l),
+(1437,1118,l),
+(1278,160,l),
+(855,160,l),
+(1014,1118,l),
+(844,1118,l),
 (685,160,l),
-(263,160,l),
-(423,1118,l),
+(262,160,l),
+(421,1118,l),
 (251,1118,l)
 );
 }
 );
-width = 1674;
+width = 1673;
 },
 {
+anchors = (
+{
+name = cyrtic;
+pos = (1632,0);
+}
+);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(9,0,l),
-(1631,0,l),
-(1819,1118,l),
-(1439,1118,l),
-(1303,302,l),
-(1059,302,l),
+(10,0,l),
+(1632,0,l),
+(1817,1118,l),
+(1415,1118,l),
+(1280,300,l),
+(1060,300,l),
 (1195,1118,l),
 (817,1118,l),
-(681,302,l),
-(437,302,l),
-(573,1118,l),
+(682,300,l),
+(462,300,l),
+(597,1118,l),
 (195,1118,l)
 );
 }
 );
-width = 1828;
+width = 1827;
 },
 {
+anchors = (
+{
+name = cyrtic;
+pos = (1304,0);
+}
+);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(105,0,l),
-(1305,0,l),
-(1491,1118,l),
+(106,0,l),
+(1304,0,l),
+(1489,1118,l),
 (1443,1118,l),
-(1267,46,l),
-(737,46,l),
-(915,1118,l),
+(1266,46,l),
+(736,46,l),
+(913,1118,l),
 (867,1118,l),
-(691,46,l),
-(161,46,l),
-(339,1118,l),
+(690,46,l),
+(160,46,l),
+(337,1118,l),
 (291,1118,l)
 );
 }
 );
-width = 1596;
+width = 1595;
 },
 {
+anchors = (
+{
+name = cyrtic;
+pos = (1395,0);
+}
+);
 layerId = m008;
 name = ital_gen;
 shapes = (
@@ -80,47 +107,59 @@ shapes = (
 closed = 1;
 nodes = (
 (39,0,l),
-(1397,0,l),
-(1582,1118,l),
-(1410,1118,l),
+(1395,0,l),
+(1570,1056,l),
+(1400,1056,l),
 (1251,160,l),
-(829,160,l),
-(988,1118,l),
-(816,1118,l),
-(657,160,l),
+(828,160,l),
+(977,1056,l),
+(807,1056,l),
+(658,160,l),
 (235,160,l),
-(394,1118,l),
-(224,1118,l)
+(384,1056,l),
+(214,1056,l)
 );
 }
 );
-width = 1612;
+width = 1609;
 },
 {
+anchors = (
+{
+name = cyrtic;
+pos = (1621,0);
+}
+);
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(-1.41,0,l),
-(1622.59,0,l),
-(1807.674,1118,l),
-(1427.674,1118,l),
-(1292.586,302,l),
-(1048.586,302,l),
-(1183.674,1118,l),
-(805.674,1118,l),
-(670.586,302,l),
-(426.586,302,l),
-(561.674,1118,l),
-(183.674,1118,l)
+(-1,0,l),
+(1621,0,l),
+(1796,1056,l),
+(1396,1056,l),
+(1274,320,l),
+(1054,320,l),
+(1176,1056,l),
+(794,1056,l),
+(672,320,l),
+(452,320,l),
+(574,1056,l),
+(174,1056,l)
 );
 }
 );
-width = 1796;
+width = 1795;
 },
 {
+anchors = (
+{
+name = cyrtic;
+pos = (1240,0);
+}
+);
 layerId = m012;
 name = ital_gen;
 shapes = (
@@ -131,22 +170,22 @@ nodes = (
 (1240,0,l),
 (1425,1118,l),
 (1379,1118,l),
-(1201,46,l),
-(671,46,l),
+(1202,46,l),
+(672,46,l),
 (849,1118,l),
 (803,1118,l),
-(625,46,l),
-(95,46,l),
+(626,46,l),
+(96,46,l),
 (273,1118,l),
 (227,1118,l)
 );
 }
 );
-width = 1473;
+width = 1467;
 }
 );
-metricLeft = m;
-metricRight = a;
+metricLeft = n;
+metricRight = n;
 unicode = 1096;
 userData = {
 interface.gridadjust.original = "{'width': 2288.0, 'leftMargin': 213, 'rightMargin': 213.0}";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/shchacyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/shchacyrillic.glyph
index 9da56def3..3d2d60cb1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/shchacyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/shchacyrillic.glyph
@@ -5,128 +5,92 @@ kernRight = t;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+metricRight = "=+64";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1266,160,l),
-(1240,0,l),
-(1384,0,l),
-(1332,-320,l),
-(1510,-320,l),
-(1608,160,l)
-);
+ref = shacyrillic;
 },
 {
-ref = shacyrillic;
+pos = (1360,0);
+ref = _part.cyrtic;
 }
 );
-width = 1755;
+width = 1737;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+metricRight = "=+80";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1480,300,l),
-(1432,0,l),
-(1542,0,l),
-(1490,-320,l),
-(1844,-320,l),
-(1970,300,l)
-);
+ref = shacyrillic;
 },
 {
-ref = shacyrillic;
+pos = (1325,0);
+ref = _part.cyrtic;
 }
 );
-width = 2056;
+width = 1907;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1226,46,l),
-(1218,0,l),
-(1346,0,l),
-(1294,-322,l),
-(1322,-322,l),
-(1402,46,l)
-);
+ref = shacyrillic;
 },
 {
-alignment = -1;
-ref = shacyrillic;
+pos = (1301,0);
+ref = _part.cyrtic;
 }
 );
-width = 1583;
+width = 1595;
 },
 {
 layerId = m008;
+metricRight = "=+64";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1245.078,160,l),
-(1218.59,0,l),
-(1364.59,0,l),
-(1311.615,-320,l),
-(1489.615,-320,l),
-(1589.078,160,l)
-);
+ref = shacyrillic;
 },
 {
-ref = shacyrillic;
+pos = (1328,0);
+ref = _part.cyrtic;
 }
 );
-width = 1706;
+width = 1673;
 },
 {
 layerId = m010;
+metricRight = "=+80";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1468.255,300,l),
-(1418.59,0,l),
-(1528.59,0,l),
-(1475.615,-320,l),
-(1829.615,-320,l),
-(1956.255,300,l)
-);
+ref = shacyrillic;
 },
 {
-ref = shacyrillic;
+pos = (1308,0);
+ref = _part.cyrtic;
 }
 );
-width = 2042;
+width = 1875;
 },
 {
 layerId = m012;
+metricRight = "=+32";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1162.205,46,l),
-(1154.59,0,l),
-(1282.59,0,l),
-(1229.283,-322,l),
-(1259.283,-322,l),
-(1338.205,46,l)
-);
+ref = shacyrillic;
 },
 {
-alignment = -1;
-ref = shacyrillic;
+pos = (1237,0);
+ref = _part.cyrtic;
 }
 );
-width = 1461;
+width = 1499;
 }
 );
 metricLeft = shacyrillic;