From 75b6c13e2f5906bb4157e82539b3ccbd89181b8b Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Mon, 25 Mar 2024 18:12:24 -0700
Subject: Fixes design of /Tonesix & /tonesix per
 https://www.unicode.org/L2/L2021/21083-tone-six-glyphs.pdf Closes #680

---
 .../glyphs/T_onesix.glyph                          | 240 +++--------
 .../glyphs/tonesix.glyph                           | 396 +++---------------
 .../glyphs/T_onesix.glyph                          | 363 ++++++++--------
 src/Inter-Roman.glyphspackage/glyphs/tonesix.glyph | 464 ++++++++-------------
 4 files changed, 481 insertions(+), 982 deletions(-)

diff --git a/src/Inter-Italic.glyphspackage/glyphs/T_onesix.glyph b/src/Inter-Italic.glyphspackage/glyphs/T_onesix.glyph
index e1cb6cf78..942f0f63e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/T_onesix.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/T_onesix.glyph
@@ -2,251 +2,133 @@
 glyphname = Tonesix;
 layers = (
 {
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(175,1490,l),
-(148,1323,l),
-(685,1323,l),
-(712,1490,l)
-);
+alignment = -1;
+pos = (138,0);
+ref = "Softsign-cy";
 },
 {
 closed = 1;
 nodes = (
-(533,703,l),
-(954,703,l),
-(1154,703,o),
-(1246,586,o),
-(1222,445,c),
-(1199,301,o),
-(1065,164,o),
-(865,165,c),
-(495,165,l),
-(716,1490,l),
-(526,1490,l),
-(278,0,l),
-(836,0,l),
-(1159,0,o),
-(1367,181,o),
-(1410,443,c),
-(1454,703,o),
-(1302,870,o),
-(981,870,c),
-(560,870,l)
+(548,1490,l),
+(495,1490,l),
+(141,1011,l),
+(178,989,l)
 );
 }
 );
-width = 1472;
+width = 1420;
 },
 {
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+layerId = m012;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(184,1490,l),
-(128,1164,l),
-(812,1164,l),
-(866,1490,l)
-);
+alignment = -1;
+pos = (152,0);
+ref = "Softsign-cy";
 },
 {
 closed = 1;
 nodes = (
-(664,680,l),
-(972,680,l),
-(1116,681,o),
-(1183,605,o),
-(1166,504,c),
-(1148,396,o),
-(1055,317,o),
-(910,318,c),
-(760,318,l),
-(954,1490,l),
-(550,1490,l),
-(302,0,l),
-(858,0,l),
-(1233,0,o),
-(1518,204,o),
-(1568,500,c),
-(1617,797,o),
-(1399,989,o),
-(1024,990,c),
-(716,990,l)
+(507,1490,l),
+(454,1490,l),
+(100,1011,l),
+(137,989,l)
 );
 }
 );
-width = 1702;
+width = 1307;
 },
 {
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(172,1490,l),
-(162,1442,l),
-(542,1442,l),
-(540,1490,l)
-);
+alignment = -1;
+pos = (282,0);
+ref = "Softsign-cy";
 },
 {
 closed = 1;
 nodes = (
-(408,730,l),
-(940,730,ls),
-(1164,730,o),
-(1287,602,o),
-(1254,398,cs),
-(1216,180,o),
-(1059,47,o),
-(828,46,cs),
-(316,46,l),
-(552,1490,l),
-(508,1490,l),
-(260,0,l),
-(818,0,ls),
-(1084,0,o),
-(1259,147,o),
-(1300,396,cs),
-(1337,624,o),
-(1191,777,o),
-(948,776,cs),
-(416,776,l)
+(665,1490,l),
+(459,1490,l),
+(131,1037,l),
+(274,950,l)
 );
 }
 );
-width = 1290;
+width = 1611;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(142,1490,l),
-(116,1330,l),
-(646,1330,l),
-(672,1490,l)
-);
+alignment = -1;
+pos = (233,0);
+ref = "Softsign-cy";
 },
 {
 closed = 1;
 nodes = (
-(494,704,l),
-(920,704,l),
-(1123,704,o),
-(1216,585,o),
-(1192,442,c),
-(1169,297,o),
-(1033,157,o),
-(830,158,c),
-(450,158,l),
-(672,1490,l),
-(492,1490,l),
-(244,0,l),
-(802,0,l),
-(1123,0,o),
-(1327,180,o),
-(1370,440,c),
-(1414,698,o),
-(1265,864,o),
-(946,864,c),
-(520,864,l)
+(632,1490,l),
+(436,1490,l),
+(105,1042,l),
+(238,958,l)
 );
 }
 );
-width = 1400;
+width = 1500;
 },
 {
-layerId = m010;
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(168,1490,l),
-(112,1164,l),
-(796,1164,l),
-(850,1490,l)
-);
+alignment = -1;
+pos = (462,0);
+ref = "Softsign-cy";
 },
 {
 closed = 1;
 nodes = (
-(648,680,l),
-(956,680,l),
-(1100,681,o),
-(1167,605,o),
-(1150,504,c),
-(1132,396,o),
-(1039,317,o),
-(894,318,c),
-(744,318,l),
-(938,1490,l),
-(534,1490,l),
-(286,0,l),
-(842,0,l),
-(1217,0,o),
-(1502,204,o),
-(1552,500,c),
-(1601,797,o),
-(1383,989,o),
-(1008,990,c),
-(700,990,l)
+(832.007,1490,l),
+(439,1490,l),
+(125.999,1045,l),
+(379,891,l)
 );
 }
 );
-width = 1670;
+width = 1840;
 },
 {
-layerId = m012;
+layerId = m010;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(108,1490,l),
-(98,1442,l),
-(478,1442,l),
-(476,1490,l)
-);
+alignment = -1;
+pos = (385,0);
+ref = "Softsign-cy";
 },
 {
 closed = 1;
 nodes = (
-(344,730,l),
-(876,730,ls),
-(1100,730,o),
-(1223,602,o),
-(1190,398,cs),
-(1152,180,o),
-(995,47,o),
-(764,46,cs),
-(252,46,l),
-(488,1490,l),
-(444,1490,l),
-(196,0,l),
-(754,0,ls),
-(1020,0,o),
-(1195,147,o),
-(1236,396,cs),
-(1273,624,o),
-(1127,777,o),
-(884,776,cs),
-(352,776,l)
+(800,1490,l),
+(407,1490,l),
+(88,1061,l),
+(355,891,l)
 );
 }
 );
-width = 1162;
+width = 1720;
 }
 );
+metricLeft = A;
+metricRight = o;
 unicode = 388;
-userData = {
-interface.gridadjust.original = "{'width': 1917, 'leftMargin': 136, 'rightMargin': 157}";
-"interface.width-adjustments" = (
--16
-);
-};
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tonesix.glyph b/src/Inter-Italic.glyphspackage/glyphs/tonesix.glyph
index 00b1a7418..c53ca8ffc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tonesix.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tonesix.glyph
@@ -2,407 +2,133 @@
 glyphname = tonesix;
 layers = (
 {
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(204,1334,l),
-(189,1247,l),
-(321,1048,l),
-(368,1048,l),
-(450,1536,l),
-(403,1536,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(296,168,l),
-(385,168,l),
-(412,107,o),
-(464,-24,o),
-(676,-24,cs),
-(952,-24,o),
-(1185,199,o),
-(1244,554,cs),
-(1303,909,o),
-(1145,1132,o),
-(864,1132,cs),
-(653,1132,o),
-(562,1004,o),
-(515,944,c),
-(425,944,l)
-);
+alignment = -1;
+pos = (203,0);
+ref = softsigncyrillic;
 },
 {
 closed = 1;
 nodes = (
-(1025,327,o),
-(889,137,o),
-(675,137,cs),
-(470,137,o),
-(390,310,o),
-(430,557,cs),
-(469,798,o),
-(601,971,o),
-(812,971,cs),
-(1026,971,o),
-(1101,791,o),
-(1063,559,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(160,0,l),
-(336,0,l),
-(371,211,l),
-(376,568,l),
-(485,857,l),
-(588,1490,l),
-(408,1490,l)
+(520,1118,l),
+(467,1118,l),
+(113,639,l),
+(149,617,l)
 );
 }
 );
-width = 1297;
+width = 1269;
 },
 {
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+layerId = m012;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(218,1384,l),
-(186,1192,l),
-(372,1048,l),
-(428,1048,l),
-(510,1536,l),
-(454,1536,l)
-);
+alignment = -1;
+pos = (152,0);
+ref = softsigncyrillic;
 },
 {
 closed = 1;
 nodes = (
-(440,90,l),
-(610,90,l),
-(633,0,o),
-(729,-15,o),
-(832,-14,cs),
-(1063,-15,o),
-(1302,169,o),
-(1368,558,cs),
-(1433,963,o),
-(1241,1132,o),
-(1024,1132,cs),
-(944,1132,o),
-(822,1120,o),
-(766,1022,c),
-(594,1022,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(961,384,o),
-(883,294,o),
-(756,294,cs),
-(607,294,o),
-(604,425,o),
-(628,558,cs),
-(650,695,o),
-(697,823,o),
-(844,824,cs),
-(970,823,o),
-(1020,733,o),
-(992,558,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(184,0,l),
-(582,0,l),
-(620,226,l),
-(524,530,l),
-(744,954,l),
-(832,1490,l),
-(430,1490,l)
+(399,1056,l),
+(346,1056,l),
+(57,663,l),
+(93,641,l)
 );
 }
 );
-width = 1420;
+width = 1091;
 },
 {
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(194,1300,l),
-(192,1286,l),
-(258,1048,l),
-(302,1048,l),
-(382,1536,l),
-(338,1536,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(174,280,l),
-(202,280,l),
-(231,93,o),
-(351,-23,o),
-(530,-24,cs),
-(796,-23,o),
-(1002,227,o),
-(1058,556,cs),
-(1113,884,o),
-(985,1135,o),
-(722,1134,cs),
-(545,1135,o),
-(383,1018,o),
-(296,832,c),
-(272,832,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(961,253,o),
-(767,23,o),
-(530,24,cs),
-(292,23,o),
-(193,253,o),
-(242,556,cs),
-(292,858,o),
-(487,1088,o),
-(722,1088,cs),
-(959,1088,o),
-(1060,858,o),
-(1010,556,cs)
-);
+alignment = -1;
+pos = (277,0);
+ref = softsigncyrillic;
 },
 {
 closed = 1;
 nodes = (
-(104,0,l),
-(150,0,l),
-(196,280,l),
-(232,558,l),
-(290,832,l),
-(398,1490,l),
-(350,1490,l)
+(581,1118,l),
+(385,1118,l),
+(78,702,l),
+(206,626,l)
 );
 }
 );
-width = 1108;
+width = 1422;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(172,1332,l),
-(158,1250,l),
-(288,1048,l),
-(334,1048,l),
-(416,1536,l),
-(370,1536,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(258,172,l),
-(344,172,l),
-(372,111,o),
-(422,-23,o),
-(638,-24,cs),
-(916,-23,o),
-(1149,201,o),
-(1208,556,cs),
-(1265,908,o),
-(1108,1132,o),
-(826,1132,cs),
-(608,1132,o),
-(518,998,o),
-(472,940,c),
-(386,940,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(995,320,o),
-(855,131,o),
-(640,130,cs),
-(433,131,o),
-(349,305,o),
-(390,558,cs),
-(431,809,o),
-(570,977,o),
-(780,978,cs),
-(998,977,o),
-(1073,794,o),
-(1036,558,cs)
-);
+alignment = -1;
+pos = (216,0);
+ref = softsigncyrillic;
 },
 {
 closed = 1;
 nodes = (
-(128,0,l),
-(294,0,l),
-(328,210,l),
-(338,570,l),
-(442,852,l),
-(546,1490,l),
-(376,1490,l)
+(515,1056,l),
+(331,1056,l),
+(56,684,l),
+(181,604,l)
 );
 }
 );
-width = 1228;
+width = 1285;
 },
 {
-layerId = m010;
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(202,1384,l),
-(170,1192,l),
-(356,1048,l),
-(412,1048,l),
-(494,1536,l),
-(438,1536,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(424,90,l),
-(594,90,l),
-(617,0,o),
-(713,-15,o),
-(816,-14,cs),
-(1047,-15,o),
-(1286,169,o),
-(1352,558,cs),
-(1417,963,o),
-(1225,1132,o),
-(1008,1132,cs),
-(928,1132,o),
-(806,1120,o),
-(750,1022,c),
-(578,1022,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(945,384,o),
-(867,294,o),
-(740,294,cs),
-(591,294,o),
-(588,425,o),
-(612,558,cs),
-(634,695,o),
-(681,823,o),
-(828,824,cs),
-(954,823,o),
-(1004,733,o),
-(976,558,cs)
-);
+alignment = -1;
+pos = (380,0);
+ref = softsigncyrillic;
 },
 {
 closed = 1;
 nodes = (
-(168,0,l),
-(566,0,l),
-(604,226,l),
-(508,530,l),
-(728,954,l),
-(816,1490,l),
-(414,1490,l)
+(692,1118,l),
+(328,1118,l),
+(31,673,l),
+(251,551,l)
 );
 }
 );
-width = 1388;
+width = 1642;
 },
 {
-layerId = m012;
+layerId = m010;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(130,1300,l),
-(128,1286,l),
-(194,1048,l),
-(238,1048,l),
-(318,1536,l),
-(274,1536,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(110,280,l),
-(138,280,l),
-(167,93,o),
-(287,-23,o),
-(466,-24,cs),
-(732,-23,o),
-(938,227,o),
-(994,556,cs),
-(1049,884,o),
-(921,1135,o),
-(658,1134,cs),
-(481,1135,o),
-(319,1018,o),
-(232,832,c),
-(208,832,l)
-);
+alignment = -1;
+pos = (308,0);
+ref = softsigncyrillic;
 },
 {
 closed = 1;
 nodes = (
-(897,253,o),
-(703,23,o),
-(466,24,cs),
-(228,23,o),
-(129,253,o),
-(178,556,cs),
-(228,858,o),
-(423,1088,o),
-(658,1088,cs),
-(895,1088,o),
-(996,858,o),
-(946,556,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(40,0,l),
-(86,0,l),
-(132,280,l),
-(168,558,l),
-(226,832,l),
-(334,1490,l),
-(286,1490,l)
+(649,1056,l),
+(280,1056,l),
+(27,714,l),
+(277,554,l)
 );
 }
 );
-width = 980;
+width = 1440;
 }
 );
+metricLeft = v;
+metricRight = o;
 unicode = 389;
-userData = {
-interface.gridadjust.original = "{'width': 1759, 'leftMargin': 138, 'rightMargin': 50}";
-"interface.width-adjustments" = (
--16
-);
-};
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/T_onesix.glyph b/src/Inter-Roman.glyphspackage/glyphs/T_onesix.glyph
index 7498e2bdb..a83c500ca 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/T_onesix.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/T_onesix.glyph
@@ -2,251 +2,278 @@
 glyphname = Tonesix;
 layers = (
 {
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = -1;
+pos = (137,0);
+ref = "Softsign-cy";
+},
+{
 closed = 1;
 nodes = (
-(20,1490,l),
-(20,1323,l),
-(557,1323,l),
-(557,1490,l)
+(393.514,1490,l),
+(340.486,1490,l),
+(66.048,1011.442,l),
+(105.952,988.558,l)
+);
+}
 );
+width = 1419;
+},
+{
+layerId = m011;
+shapes = (
+{
+alignment = -1;
+pos = (151,0);
+ref = "Softsign-cy";
 },
 {
 closed = 1;
 nodes = (
-(510,703,l),
-(929,703,l),
-(1130,703,o),
-(1242,586,o),
-(1242,445,c),
-(1242,301,o),
-(1130,164,o),
-(929,165,c),
-(561,165,l),
-(561,1490,l),
-(371,1490,l),
-(371,0,l),
-(929,0,l),
-(1251,0,o),
-(1428,181,o),
-(1428,443,c),
-(1428,703,o),
-(1251,870,o),
-(929,870,c),
-(510,870,l)
+(347.514,1490,l),
+(294.486,1490,l),
+(20.048,1011.442,l),
+(59.952,988.558,l)
 );
 }
 );
-width = 1470;
+width = 1305;
 },
 {
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
+alignment = -1;
+pos = (281,0);
+ref = "Softsign-cy";
+},
+{
 closed = 1;
 nodes = (
-(30,1490,l),
-(30,1164,l),
-(712,1164,l),
-(712,1490,l)
+(510.038,1490,l),
+(303.962,1490,l),
+(51.568,1037.208,l),
+(208.792,949.568,l)
 );
+}
+);
+width = 1611;
+},
+{
+layerId = m007;
+shapes = (
+{
+alignment = -1;
+pos = (233,0);
+ref = "Softsign-cy";
 },
 {
 closed = 1;
 nodes = (
-(642,680,l),
-(952,680,l),
-(1097,680,o),
-(1176,605,o),
-(1176,504,c),
-(1176,396,o),
-(1097,317,o),
-(952,318,c),
-(800,318,l),
-(800,1490,l),
-(396,1490,l),
-(396,0,l),
-(952,0,l),
-(1327,0,o),
-(1576,204,o),
-(1576,500,c),
-(1576,797,o),
-(1327,989,o),
-(952,990,c),
-(642,990,l)
+(472.985,1490,l),
+(277.015,1490,l),
+(20.264,1042.285,l),
+(167.736,957.715,l)
 );
 }
 );
-width = 1702;
+width = 1501;
 },
 {
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+alignment = -1;
+pos = (462,0);
+ref = "Softsign-cy";
+},
+{
 closed = 1;
 nodes = (
-(16,1490,l),
-(16,1442,l),
-(402,1442,l),
-(402,1490,l)
+(678,1490,l),
+(286,1490,l),
+(46,1045,l),
+(324,891,l)
+);
+}
 );
+width = 1842;
+},
+{
+layerId = m009;
+shapes = (
+{
+alignment = -1;
+pos = (384,0);
+ref = "Softsign-cy";
 },
 {
 closed = 1;
 nodes = (
-(382,730,l),
-(914,730,ls),
-(1137,730,o),
-(1284,602,o),
-(1282,408,cs),
-(1282,180,o),
-(1146,47,o),
-(914,46,cs),
-(402,46,l),
-(402,1490,l),
-(354,1490,l),
-(354,0,l),
-(914,0,ls),
-(1170,0,o),
-(1330,155,o),
-(1330,404,cs),
-(1330,631,o),
-(1166,777,o),
-(914,776,cs),
-(382,776,l)
+(640.339,1490,l),
+(247.661,1490,l),
+(-0.194,1061.052,l),
+(294.194,890.948,l)
 );
 }
 );
-width = 1290;
+width = 1720;
 },
 {
-layerId = m007;
+associatedMasterId = m007;
+guides = (
+{
+angle = 90;
+pos = (471,1551);
+}
+);
+layerId = "85A729C2-E8A6-4C68-A532-A553558972D5";
+name = "Mar 25, 24, 18:08";
 shapes = (
 {
-closed = 1;
+alignment = -1;
+pos = (233,0);
+ref = "Softsign-cy";
+},
+{
+attr = {
+lineCapStart = 4;
+strokeWidth = 170;
+};
+closed = 0;
 nodes = (
-(-12,1490,l),
-(-12,1330,l),
-(518,1330,l),
-(518,1490,l)
+(375,1490,l),
+(94,1000,l)
 );
+}
+);
+width = 1501;
 },
 {
-closed = 1;
+associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+layerId = "9EFB449F-9226-45B4-8193-80579AF16E1B";
+name = "Mar 25, 24, 18:08";
+shapes = (
+{
+alignment = -1;
+pos = (281,0);
+ref = "Softsign-cy";
+},
+{
+attr = {
+lineCapEnd = 3;
+lineCapStart = "4";
+strokeWidth = 180;
+};
+closed = 0;
 nodes = (
-(472,704,l),
-(896,704,l),
-(1100,704,o),
-(1214,585,o),
-(1214,442,c),
-(1214,297,o),
-(1100,157,o),
-(896,158,c),
-(518,158,l),
-(518,1490,l),
-(338,1490,l),
-(338,0,l),
-(896,0,l),
-(1216,0,o),
-(1390,180,o),
-(1390,440,c),
-(1390,698,o),
-(1216,864,o),
-(896,864,c),
-(472,864,l)
+(407,1490,l),
+(174,1072,l)
 );
 }
 );
-width = 1400;
+width = 1611;
 },
 {
-layerId = m009;
+associatedMasterId = m011;
+layerId = "272644E9-AE43-4DAB-897C-8EC6C4DD2649";
+name = "Mar 25, 24, 18:08";
 shapes = (
 {
-closed = 1;
+alignment = -1;
+pos = (151,0);
+ref = "Softsign-cy";
+},
+{
+attr = {
+lineCapStart = "4";
+strokeWidth = 46;
+};
+closed = 0;
 nodes = (
-(14,1490,l),
-(14,1164,l),
-(696,1164,l),
-(696,1490,l)
+(321,1490,l),
+(40,1000,l)
 );
+}
+);
+width = 1305;
 },
 {
-closed = 1;
+associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+layerId = "29C75D2C-437F-4550-BAE8-9CBE630267E1";
+name = "Mar 25, 24, 18:08";
+shapes = (
+{
+alignment = -1;
+pos = (137,0);
+ref = "Softsign-cy";
+},
+{
+attr = {
+lineCapStart = "4";
+strokeWidth = 46;
+};
+closed = 0;
 nodes = (
-(626,680,l),
-(936,680,l),
-(1081,680,o),
-(1160,605,o),
-(1160,504,c),
-(1160,396,o),
-(1081,317,o),
-(936,318,c),
-(784,318,l),
-(784,1490,l),
-(380,1490,l),
-(380,0,l),
-(936,0,l),
-(1311,0,o),
-(1560,204,o),
-(1560,500,c),
-(1560,797,o),
-(1311,989,o),
-(936,990,c),
-(626,990,l)
+(367,1490,l),
+(86,1000,l)
 );
 }
 );
-width = 1670;
+width = 1419;
 },
 {
-layerId = m011;
+associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+layerId = "6CCC7B38-9E65-4620-9216-75401B117DA8";
+name = "Mar 25, 24, 18:08";
 shapes = (
 {
-closed = 1;
+alignment = -1;
+pos = (470,0);
+ref = "Softsign-cy";
+},
+{
+attr = {
+lineCapStart = "4";
+strokeWidth = 340;
+};
+closed = 0;
 nodes = (
-(-48,1490,l),
-(-48,1442,l),
-(338,1442,l),
-(338,1490,l)
+(490,1490,l),
+(193,976,l)
 );
+}
+);
+width = 1850;
 },
 {
-closed = 1;
+associatedMasterId = m009;
+layerId = "D0A02BC5-0599-41A0-A59F-8C9915F17844";
+name = "Mar 25, 24, 18:08";
+shapes = (
+{
+alignment = -1;
+pos = (384,0);
+ref = "Softsign-cy";
+},
+{
+attr = {
+lineCapStart = "4";
+strokeWidth = 340;
+};
+closed = 0;
 nodes = (
-(318,730,l),
-(850,730,ls),
-(1073,730,o),
-(1220,602,o),
-(1218,408,cs),
-(1218,180,o),
-(1082,47,o),
-(850,46,cs),
-(338,46,l),
-(338,1490,l),
-(290,1490,l),
-(290,0,l),
-(850,0,ls),
-(1106,0,o),
-(1266,155,o),
-(1266,404,cs),
-(1266,631,o),
-(1102,777,o),
-(850,776,cs),
-(318,776,l)
+(444,1490,l),
+(147,976,l)
 );
 }
 );
-width = 1162;
+width = 1720;
 }
 );
+metricLeft = A;
+metricRight = o;
 unicode = 388;
-userData = {
-interface.gridadjust.original = "{'width': 1917, 'leftMargin': 136, 'rightMargin': 157}";
-"interface.width-adjustments" = (
--16
-);
-};
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tonesix.glyph b/src/Inter-Roman.glyphspackage/glyphs/tonesix.glyph
index 8011abecd..c463429f4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tonesix.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tonesix.glyph
@@ -2,407 +2,271 @@
 glyphname = tonesix;
 layers = (
 {
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(76,1334,l),
-(76,1247,l),
-(240,1048,l),
-(288,1048,l),
-(288,1536,l),
-(240,1536,l)
-);
+alignment = -1;
+pos = (203,0);
+ref = softsigncyrillic;
 },
 {
 closed = 1;
 nodes = (
-(361,168,l),
-(451,168,l),
-(490,103,o),
-(563,-24,o),
-(773,-24,cs),
-(1048,-24,o),
-(1245,199,o),
-(1245,556,cs),
-(1245,910,o),
-(1048,1132,o),
-(769,1132,cs),
-(558,1132,o),
-(490,1006,o),
-(451,944,c),
-(361,944,l)
+(427.514,1118,l),
+(374.486,1118,l),
+(100.048,639.442,l),
+(139.952,616.558,l)
+);
+}
 );
+width = 1269;
 },
 {
-closed = 1;
-nodes = (
-(1064,323,o),
-(955,137,o),
-(744,137,cs),
-(540,137,o),
-(431,310,o),
-(431,558,cs),
-(431,803,o),
-(537,971,o),
-(744,971,cs),
-(958,971,o),
-(1064,791,o),
-(1064,558,cs)
-);
+layerId = m011;
+shapes = (
+{
+alignment = -1;
+pos = (152,0);
+ref = softsigncyrillic;
 },
 {
 closed = 1;
 nodes = (
-(255,0,l),
-(429,0,l),
-(429,211,l),
-(373,568,l),
-(435,857,l),
-(435,1490,l),
-(255,1490,l)
+(312.494,1056,l),
+(259.506,1056,l),
+(35.033,663.417,l),
+(74.967,640.583,l)
 );
 }
 );
-width = 1297;
+width = 1090;
 },
 {
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(82,1384,l),
-(82,1192,l),
-(290,1048,l),
-(346,1048,l),
-(346,1536,l),
-(290,1536,l)
-);
+alignment = -1;
+pos = (276,0);
+ref = softsigncyrillic;
 },
 {
 closed = 1;
 nodes = (
-(518,90,l),
-(690,90,l),
-(726,0,o),
-(825,-14,o),
-(928,-14,cs),
-(1159,-14,o),
-(1366,169,o),
-(1368,558,cs),
-(1366,963,o),
-(1145,1132,o),
-(928,1132,cs),
-(848,1132,o),
-(729,1120,o),
-(690,1022,c),
-(518,1022,l)
+(487.925,1118,l),
+(292,1118,l),
+(54,702,l),
+(194,626,l)
 );
+}
+);
+width = 1420;
 },
 {
-closed = 1;
-nodes = (
-(991,384,o),
-(927,294,o),
-(800,294,cs),
-(650,294,o),
-(628,425,o),
-(628,558,cs),
-(628,695,o),
-(653,824,o),
-(800,824,cs),
-(927,824,o),
-(991,733,o),
-(992,558,cs)
-);
+layerId = m007;
+shapes = (
+{
+alignment = -1;
+pos = (215,0);
+ref = softsigncyrillic;
 },
 {
 closed = 1;
 nodes = (
-(276,0,l),
-(674,0,l),
-(674,226,l),
-(530,530,l),
-(678,954,l),
-(678,1490,l),
-(276,1490,l)
+(427,1056,l),
+(242.805,1056,l),
+(29.582,683.764,l),
+(168.418,604.236,l)
 );
 }
 );
-width = 1420;
+width = 1285;
 },
 {
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(72,1300,l),
-(72,1286,l),
-(178,1048,l),
-(222,1048,l),
-(222,1536,l),
-(178,1536,l)
-);
+alignment = -1;
+pos = (379,0);
+ref = softsigncyrillic;
 },
 {
 closed = 1;
 nodes = (
-(216,280,l),
-(248,280,l),
-(309,94,o),
-(447,-24,o),
-(626,-24,cs),
-(891,-24,o),
-(1058,225,o),
-(1058,556,cs),
-(1058,884,o),
-(889,1134,o),
-(626,1134,cs),
-(449,1134,o),
-(307,1018,o),
-(248,832,c),
-(216,832,l)
+(599,1118,l),
+(235,1118,l),
+(12,673,l),
+(252,551,l)
+);
+}
 );
+width = 1641;
 },
 {
-closed = 1;
-nodes = (
-(1011,253,o),
-(864,24,o),
-(626,24,cs),
-(390,24,o),
-(242,253,o),
-(242,556,cs),
-(242,858,o),
-(391,1088,o),
-(626,1088,cs),
-(863,1088,o),
-(1011,858,o),
-(1010,556,cs)
-);
+layerId = m009;
+shapes = (
+{
+alignment = -1;
+pos = (308,0);
+ref = softsigncyrillic;
 },
 {
 closed = 1;
 nodes = (
-(196,0,l),
-(242,0,l),
-(242,280,l),
-(230,558,l),
-(242,832,l),
-(242,1490,l),
-(196,1490,l)
+(539,1056,l),
+(193.369,1056,l),
+(-3.655,713.842,l),
+(273.655,554.158,l)
 );
 }
 );
-width = 1108;
+width = 1440;
 },
 {
-layerId = m007;
+associatedMasterId = m009;
+layerId = "38E03CFA-3728-4104-B5B6-361CC736E38B";
+name = "Mar 25, 24, 18:08";
 shapes = (
 {
-closed = 1;
-nodes = (
-(44,1332,l),
-(44,1250,l),
-(206,1048,l),
-(254,1048,l),
-(254,1536,l),
-(206,1536,l)
-);
+alignment = -1;
+pos = (308,0);
+ref = softsigncyrillic;
 },
 {
-closed = 1;
+attr = {
+lineCapStart = "4";
+strokeWidth = 320;
+};
+closed = 0;
 nodes = (
-(322,172,l),
-(408,172,l),
-(445,111,o),
-(518,-24,o),
-(734,-24,cs),
-(1012,-24,o),
-(1208,201,o),
-(1208,556,cs),
-(1208,908,o),
-(1012,1132,o),
-(730,1132,cs),
-(512,1132,o),
-(445,998,o),
-(408,940,c),
-(322,940,l)
+(378,1056,l),
+(135,634,l)
+);
+}
 );
+width = 1440;
 },
 {
-closed = 1;
-nodes = (
-(1036,320,o),
-(925,130,o),
-(710,130,cs),
-(503,130,o),
-(390,305,o),
-(390,558,cs),
-(390,809,o),
-(500,978,o),
-(710,978,cs),
-(928,978,o),
-(1036,794,o),
-(1036,558,cs)
-);
+associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+layerId = "C79241C6-845B-4B36-8968-9651DD20945E";
+name = "Mar 25, 24, 18:08";
+shapes = (
+{
+alignment = -1;
+pos = (395,0);
+ref = softsigncyrillic;
 },
 {
-closed = 1;
+attr = {
+lineCapStart = "4";
+strokeWidth = 320;
+};
+closed = 0;
 nodes = (
-(222,0,l),
-(386,0,l),
-(386,210,l),
-(334,570,l),
-(392,852,l),
-(392,1490,l),
-(222,1490,l)
+(433,1118,l),
+(152,604,l)
 );
 }
 );
-width = 1228;
+width = 1657;
 },
 {
-layerId = m009;
+associatedMasterId = m007;
+layerId = "29B1C931-BCB6-4DA9-AD7B-D94750EBB6B5";
+name = "Mar 25, 24, 18:08";
 shapes = (
 {
-closed = 1;
-nodes = (
-(66,1384,l),
-(66,1192,l),
-(274,1048,l),
-(330,1048,l),
-(330,1536,l),
-(274,1536,l)
-);
+alignment = -1;
+pos = (215,0);
+ref = softsigncyrillic;
 },
 {
-closed = 1;
+attr = {
+lineCapStart = "4";
+strokeWidth = 160;
+};
+closed = 0;
 nodes = (
-(502,90,l),
-(674,90,l),
-(710,0,o),
-(809,-14,o),
-(912,-14,cs),
-(1143,-14,o),
-(1350,169,o),
-(1352,558,cs),
-(1350,963,o),
-(1129,1132,o),
-(912,1132,cs),
-(832,1132,o),
-(713,1120,o),
-(674,1022,c),
-(502,1022,l)
+(335,1056,l),
+(99,644,l)
 );
+}
+);
+width = 1285;
 },
 {
-closed = 1;
-nodes = (
-(975,384,o),
-(911,294,o),
-(784,294,cs),
-(634,294,o),
-(612,425,o),
-(612,558,cs),
-(612,695,o),
-(637,824,o),
-(784,824,cs),
-(911,824,o),
-(975,733,o),
-(976,558,cs)
-);
+associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+layerId = "45BF07D3-38F5-4AD6-B61E-F9954CB3181A";
+name = "Mar 25, 24, 18:08";
+shapes = (
+{
+alignment = -1;
+pos = (276,0);
+ref = softsigncyrillic;
 },
 {
-closed = 1;
+attr = {
+lineCapStart = "4";
+strokeWidth = 170;
+};
+closed = 0;
 nodes = (
-(260,0,l),
-(658,0,l),
-(658,226,l),
-(514,530,l),
-(662,954,l),
-(662,1490,l),
-(260,1490,l)
+(390,1118,l),
+(128,660,l)
 );
 }
 );
-width = 1388;
+width = 1420;
 },
 {
-layerId = m011;
+associatedMasterId = m011;
+layerId = "3D1E45EA-9941-4364-8661-806AFA4D77F2";
+name = "Mar 25, 24, 18:08";
 shapes = (
 {
-closed = 1;
-nodes = (
-(8,1300,l),
-(8,1286,l),
-(114,1048,l),
-(158,1048,l),
-(158,1536,l),
-(114,1536,l)
-);
+alignment = -1;
+pos = (152,0);
+ref = softsigncyrillic;
 },
 {
-closed = 1;
+attr = {
+lineCapStart = "4";
+strokeWidth = 46;
+};
+closed = 0;
 nodes = (
-(152,280,l),
-(184,280,l),
-(245,94,o),
-(383,-24,o),
-(562,-24,cs),
-(827,-24,o),
-(994,225,o),
-(994,556,cs),
-(994,884,o),
-(825,1134,o),
-(562,1134,cs),
-(385,1134,o),
-(243,1018,o),
-(184,832,c),
-(152,832,l)
+(286,1056,l),
+(55,652,l)
 );
+}
+);
+width = 1090;
 },
 {
-closed = 1;
-nodes = (
-(947,253,o),
-(800,24,o),
-(562,24,cs),
-(326,24,o),
-(178,253,o),
-(178,556,cs),
-(178,858,o),
-(327,1088,o),
-(562,1088,cs),
-(799,1088,o),
-(947,858,o),
-(946,556,cs)
-);
+associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+layerId = "74AE7E4F-B061-47F3-87E7-8C0074935808";
+name = "Mar 25, 24, 18:08";
+shapes = (
+{
+alignment = -1;
+pos = (203,0);
+ref = softsigncyrillic;
 },
 {
-closed = 1;
+attr = {
+lineCapStart = "4";
+strokeWidth = 46;
+};
+closed = 0;
 nodes = (
-(132,0,l),
-(178,0,l),
-(178,280,l),
-(166,558,l),
-(178,832,l),
-(178,1490,l),
-(132,1490,l)
+(401,1118,l),
+(120,628,l)
 );
 }
 );
-width = 980;
+width = 1269;
 }
 );
+metricLeft = v;
+metricRight = o;
 unicode = 389;
-userData = {
-interface.gridadjust.original = "{'width': 1759, 'leftMargin': 138, 'rightMargin': 50}";
-"interface.width-adjustments" = (
--16
-);
-};
 }
-- 
cgit v1.2.3