improved /ts

2 files changed, 629 insertions, 1436 deletions

diff --git a/src/Inter-Italic.glyphspackage/glyphs/ts.glyph b/src/Inter-Italic.glyphspackage/glyphs/ts.glyph
index f33d6391f..fde31bd8d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ts.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ts.glyph
@@ -5,841 +5,445 @@ layers = (
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(224,320,ls),
-(186,90,o),
-(288,0,o),
-(424,0,cs),
-(570,0,l),
-(600,168,l),
-(514,168,ls),
-(457,169,o),
-(407,201,o),
-(424,320,cs),
-(596,1342,l),
-(396,1342,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1152,204,o),
-(1071,169,o),
-(926,168,cs),
-(526,168,l),
-(498,0,l),
-(896,0,ls),
-(1149,0,o),
-(1338,113,o),
-(1370,306,cs),
-(1399,480,o),
-(1286,570,o),
-(1018,632,cs),
-(870,666,o),
-(803,698,o),
-(818,788,cs),
-(829,864,o),
-(902,943,o),
-(1048,942,cs),
-(1187,943,o),
-(1245,847,o),
-(1234,762,c),
-(1434,762,l),
-(1463,948,o),
-(1335,1103,o),
-(1074,1102,cs),
-(829,1103,o),
-(646,954,o),
-(616,782,cs),
-(588,605,o),
-(724,518,o),
-(962,468,cs),
-(1158,428,o),
-(1178,364,o),
-(1166,288,cs)
-);
+pos = (1,0);
+ref = t;
 },
 {
-closed = 1;
-nodes = (
-(154,1082,l),
-(128,934,l),
-(922,934,l),
-(948,1082,l)
-);
+pos = (486,0);
+ref = s;
 }
 );
 };
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(226,320,ls),
-(188,90,o),
-(289,0,o),
-(426,0,cs),
-(572,0,l),
-(600,168,l),
-(514,168,ls),
-(457,169,o),
-(407,201,o),
-(426,320,cs),
-(594,1342,l),
-(394,1342,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1151,199,o),
-(1071,169,o),
-(926,168,cs),
-(526,168,l),
-(498,0,l),
-(898,0,ls),
-(1150,0,o),
-(1337,113,o),
-(1370,310,cs),
-(1399,480,o),
-(1285,570,o),
-(1020,632,cs),
-(871,665,o),
-(803,698,o),
-(820,798,cs),
-(837,893,o),
-(914,972,o),
-(1048,972,cs),
-(1199,972,o),
-(1252,876,o),
-(1232,762,c),
-(1432,762,l),
-(1469,977,o),
-(1336,1132,o),
-(1080,1132,cs),
-(830,1132,o),
-(649,983,o),
-(618,794,cs),
-(587,605,o),
-(724,518,o),
-(962,468,cs),
-(1157,428,o),
-(1177,359,o),
-(1166,296,cs)
+(939,0,ls),
+(1207,0,o),
+(1381,123,o),
+(1415,324,cs),
+(1440,479,o),
+(1359,570,o),
+(1167,616,cs),
+(1007,654,ls),
+(880,684,o),
+(828,732,o),
+(842,818,cs),
+(858,913,o),
+(972,984,o),
+(1108,984,cs),
+(1259,984,o),
+(1306,900,o),
+(1323,824,c),
+(1484,866,l),
+(1458,1025,o),
+(1354,1132,o),
+(1132,1132,cs),
+(897,1132,o),
+(700,998,o),
+(669,808,cs),
+(643,655,o),
+(718,551,o),
+(916,504,cs),
+(1095,462,ls),
+(1203,437,o),
+(1250,392,o),
+(1237,314,cs),
+(1221,219,o),
+(1115,152,o),
+(948,152,cs),
+(485,152,ls),
+(381,152,o),
+(346,218,o),
+(365,334,cs),
+(539,1384,l),
+(369,1384,l),
+(188,288,ls),
+(159,117,o),
+(264,0,o),
+(444,0,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(160,1118,l),
-(136,968,l),
-(930,968,l),
-(954,1118,l)
+(842,972,l),
+(1090,1118,l),
+(157,1118,l),
+(133,972,l)
 );
 }
 );
-width = 1478;
+width = 1556;
 },
 {
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(222,392,ls),
-(167,90,o),
-(307,0,o),
-(526,0,cs),
-(730,0,l),
-(780,302,l),
-(696,302,ls),
-(592,303,o),
-(583,335,o),
-(596,392,cs),
-(756,1358,l),
-(382,1358,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1363,317,o),
-(1313,303,o),
-(1228,302,cs),
-(734,302,l),
-(684,0,l),
-(1166,0,ls),
-(1473,0,o),
-(1692,125,o),
-(1728,322,cs),
-(1759,521,o),
-(1628,620,o),
-(1376,664,cs),
-(1258,684,o),
-(1165,701,o),
-(1178,770,cs),
-(1188,832,o),
-(1249,858,o),
-(1312,858,cs),
-(1407,858,o),
-(1436,826,o),
-(1426,744,c),
-(1800,744,l),
-(1834,960,o),
-(1660,1103,o),
-(1352,1102,cs),
-(1046,1103,o),
-(851,937,o),
-(820,750,cs),
-(790,579,o),
-(921,457,o),
-(1166,410,cs),
-(1328,378,o),
-(1375,387,o),
-(1370,346,cs)
-);
+pos = (1,0);
+ref = t;
 },
 {
-closed = 1;
-nodes = (
-(200,1082,l),
-(158,814,l),
-(1170,814,l),
-(1214,1082,l)
-);
+pos = (704,0);
+ref = s;
 }
 );
 };
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(220,392,ls),
-(169,90,o),
-(308,0,o),
-(528,0,cs),
-(732,0,l),
-(782,302,l),
-(696,302,ls),
-(593,303,o),
-(585,335,o),
-(594,392,cs),
-(754,1358,l),
-(380,1358,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1364,317,o),
-(1315,303,o),
-(1230,302,cs),
-(734,302,l),
-(686,0,l),
-(1168,0,ls),
-(1474,0,o),
-(1693,125,o),
-(1726,322,cs),
-(1760,521,o),
-(1629,618,o),
-(1376,664,cs),
-(1259,684,o),
-(1166,701,o),
-(1182,792,cs),
-(1193,861,o),
-(1255,887,o),
-(1318,888,cs),
-(1399,887,o),
-(1439,842,o),
-(1424,744,c),
-(1800,744,l),
-(1839,989,o),
-(1665,1132,o),
-(1358,1132,cs),
-(1051,1132,o),
-(855,966,o),
-(824,772,cs),
-(792,579,o),
-(913,457,o),
-(1166,410,cs),
-(1286,388,o),
-(1375,387,o),
-(1368,346,cs)
+(1225,0,ls),
+(1534,0,o),
+(1786,136,o),
+(1825,376,cs),
+(1853,541,o),
+(1757,640,o),
+(1535,676,cs),
+(1313,712,ls),
+(1231,725,o),
+(1215,759,o),
+(1220,792,cs),
+(1228,838,o),
+(1287,864,o),
+(1356,864,cs),
+(1435,864,o),
+(1495,822,o),
+(1490,754,c),
+(1858,754,l),
+(1888,990,o),
+(1714,1132,o),
+(1392,1132,cs),
+(1072,1132,o),
+(855,1001,o),
+(816,768,cs),
+(787,592,o),
+(881,477,o),
+(1102,440,cs),
+(1295,408,ls),
+(1380,394,o),
+(1416,371,o),
+(1409,328,cs),
+(1402,282,o),
+(1346,271,o),
+(1272,271,cs),
+(638,271,ls),
+(559,271,o),
+(535,300,o),
+(547,377,cs),
+(714,1384,l),
+(312,1384,l),
+(139,340,ls),
+(100,104,o),
+(207,0,o),
+(483,0,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(206,1118,l),
-(162,850,l),
-(1174,850,l),
-(1218,1118,l)
+(937,826,l),
+(1322,1118,l),
+(125,1118,l),
+(77,826,l)
 );
 }
 );
-width = 1870;
-},
-{
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(148,256,ls),
-(121,96,o),
-(183,0,o),
-(310,0,c),
-(386,0,l),
-(392,46,l),
-(318,46,l),
-(211,47,o),
-(171,116,o),
-(194,256,cs),
-(376,1332,l),
-(328,1332,l)
-);
+width = 1907;
 },
 {
-closed = 1;
-nodes = (
-(969,138,o),
-(827,47,o),
-(628,46,cs),
-(330,46,l),
-(322,0,l),
-(622,0,l),
-(854,0,o),
-(1012,106,o),
-(1040,282,cs),
-(1066,444,o),
-(996,514,o),
-(734,588,cs),
-(514,649,o),
-(459,705,o),
-(482,840,cs),
-(503,967,o),
-(636,1056,o),
-(808,1056,cs),
-(990,1056,o),
-(1085,948,o),
-(1058,774,c),
-(1104,774,l),
-(1128,977,o),
-(1016,1103,o),
-(814,1102,cs),
-(610,1103,o),
-(461,999,o),
-(434,840,cs),
-(410,687,o),
-(488,603,o),
-(714,542,cs),
-(961,476,o),
-(1017,424,o),
-(994,282,cs)
-);
-},
+guides = (
 {
-closed = 1;
-nodes = (
-(120,1070,l),
-(114,1022,l),
-(614,1022,l),
-(636,1070,l)
-);
+pos = (259,1926);
 }
 );
-};
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(148,256,ls),
-(121,92,o),
-(180,0,o),
-(310,0,c),
-(386,0,l),
-(394,46,l),
-(318,46,l),
-(214,47,o),
-(172,118,o),
-(194,256,cs),
-(386,1400,l),
-(338,1400,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(970,128,o),
-(828,47,o),
-(630,46,cs),
-(332,46,l),
-(322,0,l),
-(622,0,l),
-(846,0,o),
-(1010,102,o),
-(1042,292,cs),
-(1067,435,o),
-(991,524,o),
-(752,590,cs),
-(524,654,o),
-(463,727,o),
-(482,850,cs),
-(509,1011,o),
-(645,1088,o),
-(808,1088,cs),
-(998,1088,o),
-(1089,974,o),
-(1058,774,c),
-(1104,774,l),
-(1134,1007,o),
-(1031,1135,o),
-(818,1134,cs),
-(628,1135,o),
-(468,1037,o),
-(436,850,cs),
-(412,704,o),
-(487,614,o),
-(742,542,cs),
-(951,484,o),
-(1015,412,o),
-(996,292,cs)
+(897,0,ls),
+(1131,0,o),
+(1287,108,o),
+(1317,290,cs),
+(1340,428,o),
+(1266,518,o),
+(1110,559,cs),
+(941,603,ls),
+(796,641,o),
+(737,724,o),
+(756,840,cs),
+(781,989,o),
+(918,1088,o),
+(1097,1088,cs),
+(1250,1088,o),
+(1336,1015,o),
+(1357,870,c),
+(1405,882,l),
+(1379,1049,o),
+(1277,1134,o),
+(1105,1134,cs),
+(901,1134,o),
+(739,1016,o),
+(710,840,cs),
+(687,701,o),
+(760,601,o),
+(925,558,cs),
+(1092,514,ls),
+(1229,478,o),
+(1290,406,o),
+(1271,290,cs),
+(1245,135,o),
+(1114,46,o),
+(905,46,cs),
+(440,46,ls),
+(328,46,o),
+(243,125,o),
+(264,256,cs),
+(451,1384,l),
+(405,1384,l),
+(218,256,ls),
+(192,99,o),
+(294,0,o),
+(432,0,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(128,1118,l),
-(120,1070,l),
-(622,1070,l),
-(686,1118,l)
+(915,1072,l),
+(1057,1118,l),
+(197,1118,l),
+(189,1072,l)
 );
 }
 );
-width = 1128;
-},
-{
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(224,320,ls),
-(186,90,o),
-(288,0,o),
-(424,0,cs),
-(570,0,l),
-(600,168,l),
-(514,168,ls),
-(457,169,o),
-(407,201,o),
-(424,320,cs),
-(596,1342,l),
-(396,1342,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1152,204,o),
-(1071,169,o),
-(926,168,cs),
-(526,168,l),
-(498,0,l),
-(896,0,ls),
-(1149,0,o),
-(1338,113,o),
-(1370,306,cs),
-(1399,480,o),
-(1286,570,o),
-(1018,632,cs),
-(870,666,o),
-(803,698,o),
-(818,788,cs),
-(829,864,o),
-(902,943,o),
-(1048,942,cs),
-(1187,943,o),
-(1245,847,o),
-(1234,762,c),
-(1434,762,l),
-(1463,948,o),
-(1335,1103,o),
-(1074,1102,cs),
-(829,1103,o),
-(646,954,o),
-(616,782,cs),
-(588,605,o),
-(724,518,o),
-(962,468,cs),
-(1158,428,o),
-(1178,364,o),
-(1166,288,cs)
-);
+width = 1496;
 },
 {
-closed = 1;
-nodes = (
-(154,1082,l),
-(128,934,l),
-(922,934,l),
-(948,1082,l)
-);
-}
-);
-};
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(194,320,ls),
-(156,90,o),
-(257,0,o),
-(394,0,cs),
-(540,0,l),
-(568,168,l),
-(482,168,ls),
-(425,169,o),
-(375,201,o),
-(394,320,cs),
-(562,1342,l),
-(362,1342,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1119,199,o),
-(1039,169,o),
-(894,168,cs),
-(494,168,l),
-(466,0,l),
-(866,0,ls),
-(1118,0,o),
-(1305,113,o),
-(1338,310,cs),
-(1367,480,o),
-(1253,570,o),
-(988,632,cs),
-(839,665,o),
-(771,698,o),
-(788,798,cs),
-(805,893,o),
-(882,972,o),
-(1016,972,cs),
-(1167,972,o),
-(1220,876,o),
-(1200,762,c),
-(1400,762,l),
-(1437,977,o),
-(1304,1132,o),
-(1048,1132,cs),
-(798,1132,o),
-(617,983,o),
-(586,794,cs),
-(555,605,o),
-(692,518,o),
-(930,468,cs),
-(1125,428,o),
-(1145,359,o),
-(1134,296,cs)
+(816,0,ls),
+(1046,0,o),
+(1235,92,o),
+(1268,288,cs),
+(1293,440,o),
+(1216,533,o),
+(1022,581,cs),
+(859,621,ls),
+(761,645,o),
+(707,692,o),
+(720,772,cs),
+(735,862,o),
+(830,934,o),
+(960,934,cs),
+(1096,934,o),
+(1169,852,o),
+(1153,740,c),
+(1319,740,l),
+(1347,950,o),
+(1204,1080,o),
+(984,1080,cs),
+(758,1080,o),
+(580,952,o),
+(550,772,cs),
+(524,618,o),
+(610,518,o),
+(798,472,cs),
+(962,432,ls),
+(1052,410,o),
+(1109,364,o),
+(1096,284,cs),
+(1080,190,o),
+(982,146,o),
+(836,146,cs),
+(416,146,ls),
+(326,146,o),
+(298,181,o),
+(313,272,cs),
+(490,1344,l),
+(320,1344,l),
+(139,246,ls),
+(114,95,o),
+(205,0,o),
+(376,0,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(128,1118,l),
-(104,968,l),
-(898,968,l),
-(922,1118,l)
+(665,910,l),
+(934,1056,l),
+(119,1056,l),
+(95,910,l)
 );
 }
 );
-width = 1414;
+width = 1382;
 },
 {
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(222,392,ls),
-(167,90,o),
-(307,0,o),
-(526,0,cs),
-(730,0,l),
-(780,302,l),
-(696,302,ls),
-(592,303,o),
-(583,335,o),
-(596,392,cs),
-(756,1358,l),
-(382,1358,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1363,317,o),
-(1313,303,o),
-(1228,302,cs),
-(734,302,l),
-(684,0,l),
-(1166,0,ls),
-(1473,0,o),
-(1692,125,o),
-(1728,322,cs),
-(1759,521,o),
-(1628,620,o),
-(1376,664,cs),
-(1258,684,o),
-(1165,701,o),
-(1178,770,cs),
-(1188,832,o),
-(1249,858,o),
-(1312,858,cs),
-(1407,858,o),
-(1436,826,o),
-(1426,744,c),
-(1800,744,l),
-(1834,960,o),
-(1660,1103,o),
-(1352,1102,cs),
-(1046,1103,o),
-(851,937,o),
-(820,750,cs),
-(790,579,o),
-(921,457,o),
-(1166,410,cs),
-(1328,378,o),
-(1375,387,o),
-(1370,346,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(200,1082,l),
-(158,814,l),
-(1170,814,l),
-(1214,1082,l)
-);
+pos = (656,0);
+ref = s;
 }
 );
 };
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(204,392,ls),
-(153,90,o),
-(292,0,o),
-(512,0,cs),
-(716,0,l),
-(766,302,l),
-(680,302,ls),
-(577,303,o),
-(569,335,o),
-(578,392,cs),
-(738,1358,l),
-(364,1358,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1348,317,o),
-(1299,303,o),
-(1214,302,cs),
-(718,302,l),
-(670,0,l),
 (1152,0,ls),
-(1458,0,o),
-(1677,125,o),
-(1710,322,cs),
-(1744,521,o),
-(1613,618,o),
-(1360,664,cs),
-(1243,684,o),
-(1150,701,o),
-(1166,792,cs),
-(1177,861,o),
-(1239,887,o),
-(1302,888,cs),
-(1383,887,o),
-(1423,842,o),
-(1408,744,c),
-(1784,744,l),
-(1823,989,o),
-(1649,1132,o),
-(1342,1132,cs),
-(1035,1132,o),
-(839,966,o),
-(808,772,cs),
-(776,579,o),
-(897,457,o),
-(1150,410,cs),
-(1270,388,o),
-(1359,387,o),
-(1352,346,cs)
+(1468,0,o),
+(1700,145,o),
+(1737,369,cs),
+(1763,527,o),
+(1675,617,o),
+(1457,647,cs),
+(1236,677,ls),
+(1175,685,o),
+(1143,712,o),
+(1149,745,cs),
+(1155,784,o),
+(1203,813,o),
+(1280,813,cs),
+(1357,813,o),
+(1408,766,o),
+(1400,705,c),
+(1764,705,l),
+(1796,934,o),
+(1627,1077,o),
+(1308,1077,cs),
+(992,1077,o),
+(783,941,o),
+(747,723,cs),
+(719,552,o),
+(818,459,o),
+(1024,425,cs),
+(1217,393,ls),
+(1295,380,o),
+(1330,365,o),
+(1325,331,cs),
+(1318,290,o),
+(1270,271,o),
+(1191,271,cs),
+(652,271,ls),
+(573,271,o),
+(549,300,o),
+(561,377,cs),
+(721,1344,l),
+(321,1344,l),
+(155,340,ls),
+(116,104,o),
+(221,0,o),
+(497,0,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(190,1118,l),
-(146,850,l),
-(1158,850,l),
-(1202,1118,l)
+(841,752,l),
+(1236,1056,l),
+(112,1056,l),
+(61,752,l)
 );
 }
 );
-width = 1838;
+width = 1799;
 },
 {
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(148,256,ls),
-(121,96,o),
-(183,0,o),
-(310,0,c),
-(386,0,l),
-(392,46,l),
-(318,46,l),
-(211,47,o),
-(171,116,o),
-(194,256,cs),
-(376,1332,l),
-(328,1332,l)
-);
+pos = (1,0);
+ref = t;
 },
 {
-closed = 1;
-nodes = (
-(969,138,o),
-(827,47,o),
-(628,46,cs),
-(330,46,l),
-(322,0,l),
-(622,0,l),
-(854,0,o),
-(1012,106,o),
-(1040,282,cs),
-(1066,444,o),
-(996,514,o),
-(734,588,cs),
-(514,649,o),
-(459,705,o),
-(482,840,cs),
-(503,967,o),
-(636,1056,o),
-(808,1056,cs),
-(990,1056,o),
-(1085,948,o),
-(1058,774,c),
-(1104,774,l),
-(1128,977,o),
-(1016,1103,o),
-(814,1102,cs),
-(610,1103,o),
-(461,999,o),
-(434,840,cs),
-(410,687,o),
-(488,603,o),
-(714,542,cs),
-(961,476,o),
-(1017,424,o),
-(994,282,cs)
+pos = (486,0);
+ref = s;
+}
 );
-},
+};
+guides = (
 {
-closed = 1;
-nodes = (
-(120,1070,l),
-(114,1022,l),
-(614,1022,l),
-(636,1070,l)
-);
+pos = (67,1926);
 }
 );
-};
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(84,256,ls),
-(57,92,o),
-(116,0,o),
-(246,0,c),
-(322,0,l),
-(330,46,l),
-(254,46,l),
-(150,47,o),
-(108,118,o),
-(130,256,cs),
-(322,1400,l),
-(274,1400,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(906,128,o),
-(764,47,o),
-(566,46,cs),
-(268,46,l),
-(258,0,l),
-(558,0,l),
-(782,0,o),
-(946,102,o),
-(978,292,cs),
-(1003,435,o),
-(927,524,o),
-(688,590,cs),
-(460,654,o),
-(399,727,o),
-(418,850,cs),
-(445,1011,o),
-(581,1088,o),
-(744,1088,cs),
-(934,1088,o),
-(1025,974,o),
-(994,774,c),
-(1040,774,l),
-(1070,1007,o),
-(967,1135,o),
-(754,1134,cs),
-(564,1135,o),
-(404,1037,o),
-(372,850,cs),
-(348,704,o),
-(423,614,o),
-(678,542,cs),
-(887,484,o),
-(951,412,o),
-(932,292,cs)
+(833,0,ls),
+(1067,0,o),
+(1223,108,o),
+(1253,290,cs),
+(1276,428,o),
+(1202,518,o),
+(1046,559,cs),
+(877,603,ls),
+(732,641,o),
+(673,724,o),
+(692,840,cs),
+(717,989,o),
+(854,1088,o),
+(1033,1088,cs),
+(1186,1088,o),
+(1272,1015,o),
+(1293,870,c),
+(1341,882,l),
+(1315,1049,o),
+(1213,1134,o),
+(1041,1134,cs),
+(837,1134,o),
+(675,1016,o),
+(646,840,cs),
+(623,701,o),
+(697,601,o),
+(861,558,cs),
+(1028,514,ls),
+(1165,478,o),
+(1226,406,o),
+(1207,290,cs),
+(1181,135,o),
+(1050,46,o),
+(841,46,cs),
+(376,46,ls),
+(264,46,o),
+(179,125,o),
+(200,256,cs),
+(387,1384,l),
+(341,1384,l),
+(154,256,ls),
+(128,99,o),
+(230,0,o),
+(368,0,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(64,1118,l),
-(56,1070,l),
-(558,1070,l),
-(622,1118,l)
+(851,1072,l),
+(993,1118,l),
+(133,1118,l),
+(125,1072,l)
 );
 }
 );
-width = 1000;
+width = 1368;
 }
 );
 unicode = 678;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ts.glyph b/src/Inter-Roman.glyphspackage/glyphs/ts.glyph
index f13874256..d54485f32 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ts.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ts.glyph
@@ -1,73 +1,17 @@
 {
 glyphname = ts;
+kernLeft = t;
+kernRight = s;
 layers = (
 {
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(264,320,ls),
-(265,90,o),
-(381,0,o),
-(518,0,cs),
-(664,0,l),
-(664,168,l),
-(578,168,ls),
-(521,169,o),
-(465,201,o),
-(466,320,cs),
-(466,1342,l),
-(264,1342,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1210,204,o),
-(1135,169,o),
-(990,168,cs),
-(590,168,l),
-(590,0,l),
-(990,0,ls),
-(1242,0,o),
-(1411,113,o),
-(1410,306,cs),
-(1411,480,o),
-(1283,570,o),
-(1006,632,cs),
-(852,666,o),
-(780,698,o),
-(780,788,cs),
-(780,864,o),
-(838,943,o),
-(984,942,cs),
-(1123,943,o),
-(1199,847,o),
-(1198,762,c),
-(1400,762,l),
-(1399,948,o),
-(1245,1103,o),
-(984,1102,cs),
-(739,1103,o),
-(579,954,o),
-(578,782,cs),
-(579,605,o),
-(730,518,o),
-(978,468,cs),
-(1178,428,o),
-(1210,364,o),
-(1210,288,cs)
-);
+ref = t;
 },
 {
-closed = 1;
-nodes = (
-(66,1082,l),
-(66,934,l),
-(862,934,l),
-(862,1082,l)
-);
+pos = (485,0);
+ref = s;
 }
 );
 };
@@ -76,138 +20,73 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(264,320,ls),
-(265,90,o),
-(381,0,o),
-(518,0,cs),
-(664,0,l),
-(664,168,l),
-(578,168,ls),
-(521,169,o),
-(465,201,o),
-(466,320,cs),
-(466,1342,l),
-(264,1342,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1210,199,o),
-(1135,169,o),
-(990,168,cs),
-(590,168,l),
-(590,0,l),
-(990,0,ls),
-(1242,0,o),
-(1411,113,o),
-(1410,310,cs),
-(1411,480,o),
-(1283,570,o),
-(1006,632,cs),
-(852,666,o),
-(780,698,o),
-(780,798,cs),
-(780,893,o),
-(845,972,o),
-(980,972,cs),
-(1130,972,o),
-(1199,876,o),
-(1198,762,c),
-(1400,762,l),
-(1399,977,o),
-(1241,1132,o),
-(984,1132,cs),
-(735,1132,o),
-(579,983,o),
-(578,794,cs),
-(579,605,o),
-(730,518,o),
-(978,468,cs),
-(1178,428,o),
-(1210,359,o),
-(1210,296,cs)
+(1031,0,ls),
+(1299,0,o),
+(1453,123,o),
+(1453,324,cs),
+(1453,479,o),
+(1356,570,o),
+(1157,616,cs),
+(991,654,ls),
+(859,684,o),
+(799,732,o),
+(799,818,cs),
+(799,913,o),
+(901,984,o),
+(1037,984,cs),
+(1188,984,o),
+(1249,900,o),
+(1279,824,c),
+(1433,866,l),
+(1380,1025,o),
+(1259,1132,o),
+(1037,1132,cs),
+(802,1132,o),
+(627,998,o),
+(627,808,cs),
+(627,655,o),
+(719,551,o),
+(925,504,cs),
+(1111,462,ls),
+(1223,437,o),
+(1277,392,o),
+(1277,314,cs),
+(1277,219,o),
+(1182,152,o),
+(1015,152,cs),
+(552,152,ls),
+(448,152,o),
+(402,218,o),
+(402,334,cs),
+(402,1384,l),
+(232,1384,l),
+(232,288,ls),
+(232,117,o),
+(356,0,o),
+(536,0,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(66,1118,l),
-(66,968,l),
-(862,968,l),
-(862,1118,l)
+(774,972,l),
+(997,1118,l),
+(64,1118,l),
+(64,972,l)
 );
 }
 );
-width = 1478;
+width = 1555;
 },
 {
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(248,392,ls),
-(246,90,o),
-(400,0,o),
-(620,0,cs),
-(824,0,l),
-(824,302,l),
-(738,302,ls),
-(636,303,o),
-(621,335,o),
-(622,392,cs),
-(622,1358,l),
-(248,1358,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1404,317,o),
-(1357,303,o),
-(1272,302,cs),
-(776,302,l),
-(776,0,l),
-(1260,0,ls),
-(1567,0,o),
-(1764,125,o),
-(1766,322,cs),
-(1764,521,o),
-(1619,620,o),
-(1358,664,cs),
-(1238,684,o),
-(1142,701,o),
-(1144,770,cs),
-(1142,832,o),
-(1200,858,o),
-(1262,858,cs),
-(1357,858,o),
-(1392,826,o),
-(1394,744,c),
-(1768,744,l),
-(1767,960,o),
-(1569,1103,o),
-(1262,1102,cs),
-(956,1103,o),
-(787,937,o),
-(788,750,cs),
-(787,579,o),
-(938,457,o),
-(1190,410,cs),
-(1357,378,o),
-(1404,387,o),
-(1406,346,cs)
-);
+ref = t;
 },
 {
-closed = 1;
-nodes = (
-(114,1082,l),
-(114,814,l),
-(1126,814,l),
-(1126,1082,l)
-);
+pos = (703,0);
+ref = s;
 }
 );
 };
@@ -216,144 +95,68 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(248,392,ls),
-(246,90,o),
-(400,0,o),
-(620,0,cs),
-(824,0,l),
-(824,302,l),
-(738,302,ls),
-(636,303,o),
-(621,335,o),
-(622,392,cs),
-(622,1358,l),
-(248,1358,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1404,317,o),
-(1357,303,o),
-(1272,302,cs),
-(776,302,l),
-(776,0,l),
-(1260,0,ls),
-(1567,0,o),
-(1764,125,o),
-(1766,322,cs),
-(1764,521,o),
-(1619,620,o),
-(1358,664,cs),
-(1238,684,o),
-(1142,701,o),
-(1142,792,cs),
-(1142,861,o),
-(1200,887,o),
-(1262,888,cs),
-(1345,887,o),
-(1392,842,o),
-(1394,744,c),
-(1768,744,l),
-(1767,989,o),
-(1569,1132,o),
-(1262,1132,cs),
-(956,1132,o),
-(787,966,o),
-(786,772,cs),
-(787,579,o),
-(929,457,o),
-(1190,410,cs),
-(1313,388,o),
-(1404,387,o),
-(1404,346,cs)
+(1317,0,ls),
+(1626,0,o),
+(1855,136,o),
+(1855,376,cs),
+(1855,541,o),
+(1743,640,o),
+(1515,676,cs),
+(1287,712,ls),
+(1203,725,o),
+(1181,759,o),
+(1181,792,cs),
+(1181,838,o),
+(1236,864,o),
+(1305,864,cs),
+(1384,864,o),
+(1451,822,o),
+(1457,754,c),
+(1825,754,l),
+(1816,990,o),
+(1619,1132,o),
+(1297,1132,cs),
+(977,1132,o),
+(781,1001,o),
+(781,768,cs),
+(781,592,o),
+(894,477,o),
+(1121,440,cs),
+(1319,408,ls),
+(1407,394,o),
+(1447,371,o),
+(1447,328,cs),
+(1447,282,o),
+(1393,271,o),
+(1319,271,cs),
+(685,271,ls),
+(606,271,o),
+(577,300,o),
+(577,377,cs),
+(577,1384,l),
+(175,1384,l),
+(175,340,ls),
+(175,104,o),
+(299,0,o),
+(575,0,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(114,1118,l),
-(114,850,l),
-(1126,850,l),
-(1126,1118,l)
+(892,826,l),
+(1229,1118,l),
+(32,1118,l),
+(32,826,l)
 );
 }
 );
-width = 1870;
-},
-{
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(204,256,ls),
-(204,92,o),
-(276,0,o),
-(408,0,c),
-(482,0,l),
-(482,46,l),
-(408,46,l),
-(303,47,o),
-(250,118,o),
-(250,256,cs),
-(250,1332,l),
-(204,1332,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1044,138,o),
-(917,47,o),
-(718,46,cs),
-(420,46,l),
-(420,0,l),
-(718,0,l),
-(943,0,o),
-(1091,112,o),
-(1090,282,cs),
-(1091,445,o),
-(1000,523,o),
-(734,588,cs),
-(514,641,o),
-(439,705,o),
-(440,840,cs),
-(439,972,o),
-(556,1056,o),
-(730,1056,cs),
-(909,1056,o),
-(1025,942,o),
-(1026,774,c),
-(1074,774,l),
-(1064,975,o),
-(935,1103,o),
-(734,1102,cs),
-(531,1103,o),
-(393,998,o),
-(392,840,cs),
-(393,682,o),
-(484,600,o),
-(722,542,cs),
-(967,483,o),
-(1044,423,o),
-(1044,282,cs)
-);
+width = 1907;
 },
 {
-closed = 1;
-nodes = (
-(40,1070,l),
-(40,1022,l),
-(542,1022,l),
-(556,1070,l)
-);
-}
-);
-};
 guides = (
 {
-pos = (194,1926);
+pos = (258,1926);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -361,278 +164,134 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(204,256,ls),
-(204,92,o),
-(276,0,o),
-(408,0,c),
-(482,0,l),
-(482,46,l),
-(408,46,l),
-(303,47,o),
-(250,118,o),
-(250,256,cs),
-(250,1400,l),
-(204,1400,l)
+(989,0,ls),
+(1223,0,o),
+(1361,108,o),
+(1361,290,cs),
+(1361,428,o),
+(1272,518,o),
+(1109,559,cs),
+(933,603,ls),
+(782,641,o),
+(709,724,o),
+(709,840,cs),
+(709,989,o),
+(830,1088,o),
+(1009,1088,cs),
+(1162,1088,o),
+(1260,1015,o),
+(1305,870,c),
+(1351,882,l),
+(1297,1049,o),
+(1181,1134,o),
+(1009,1134,cs),
+(805,1134,o),
+(663,1016,o),
+(663,840,cs),
+(663,701,o),
+(753,601,o),
+(925,558,cs),
+(1099,514,ls),
+(1242,478,o),
+(1315,406,o),
+(1315,290,cs),
+(1315,135,o),
+(1198,46,o),
+(989,46,cs),
+(524,46,ls),
+(412,46,o),
+(314,125,o),
+(314,256,cs),
+(314,1384,l),
+(268,1384,l),
+(268,256,ls),
+(268,99,o),
+(386,0,o),
+(524,0,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(1044,128,o),
-(917,47,o),
-(718,46,cs),
-(420,46,l),
-(420,0,l),
-(718,0,l),
-(943,0,o),
-(1091,102,o),
-(1090,292,cs),
-(1091,442,o),
-(1000,530,o),
-(750,590,cs),
-(514,648,o),
-(439,720,o),
-(440,844,cs),
-(439,1011,o),
-(562,1088,o),
-(724,1088,cs),
-(915,1088,o),
-(1025,974,o),
-(1026,774,c),
-(1074,774,l),
-(1064,1007,o),
-(940,1135,o),
-(728,1134,cs),
-(537,1135,o),
-(393,1037,o),
-(392,844,cs),
-(393,697,o),
-(484,607,o),
-(750,542,cs),
-(967,490,o),
-(1044,420,o),
-(1044,292,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(40,1118,l),
-(40,1070,l),
-(542,1070,l),
-(600,1118,l)
+(830,1072,l),
+(964,1118,l),
+(104,1118,l),
+(104,1072,l)
 );
 }
 );
-width = 1134;
-},
-{
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(264,320,ls),
-(265,90,o),
-(381,0,o),
-(518,0,cs),
-(664,0,l),
-(664,168,l),
-(578,168,ls),
-(521,169,o),
-(465,201,o),
-(466,320,cs),
-(466,1342,l),
-(264,1342,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1210,204,o),
-(1135,169,o),
-(990,168,cs),
-(590,168,l),
-(590,0,l),
-(990,0,ls),
-(1242,0,o),
-(1411,113,o),
-(1410,306,cs),
-(1411,480,o),
-(1283,570,o),
-(1006,632,cs),
-(852,666,o),
-(780,698,o),
-(780,788,cs),
-(780,864,o),
-(838,943,o),
-(984,942,cs),
-(1123,943,o),
-(1199,847,o),
-(1198,762,c),
-(1400,762,l),
-(1399,948,o),
-(1245,1103,o),
-(984,1102,cs),
-(739,1103,o),
-(579,954,o),
-(578,782,cs),
-(579,605,o),
-(730,518,o),
-(978,468,cs),
-(1178,428,o),
-(1210,364,o),
-(1210,288,cs)
-);
+width = 1495;
 },
 {
-closed = 1;
-nodes = (
-(66,1082,l),
-(66,934,l),
-(862,934,l),
-(862,1082,l)
-);
-}
-);
-};
 layerId = m007;
 shapes = (
 {
 closed = 1;
 nodes = (
-(232,320,ls),
-(233,90,o),
-(349,0,o),
-(486,0,cs),
-(632,0,l),
-(632,168,l),
-(546,168,ls),
-(489,169,o),
-(433,201,o),
-(434,320,cs),
-(434,1342,l),
-(232,1342,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1178,199,o),
-(1103,169,o),
-(958,168,cs),
-(558,168,l),
-(558,0,l),
-(958,0,ls),
-(1210,0,o),
-(1379,113,o),
-(1378,310,cs),
-(1379,480,o),
-(1251,570,o),
-(974,632,cs),
-(820,666,o),
-(748,698,o),
-(748,798,cs),
-(748,893,o),
-(813,972,o),
-(948,972,cs),
-(1098,972,o),
-(1167,876,o),
-(1166,762,c),
-(1368,762,l),
-(1367,977,o),
-(1209,1132,o),
-(952,1132,cs),
-(703,1132,o),
-(547,983,o),
-(546,794,cs),
-(547,605,o),
-(698,518,o),
-(946,468,cs),
-(1146,428,o),
-(1178,359,o),
-(1178,296,cs)
+(904,0,ls),
+(1134,0,o),
+(1308,92,o),
+(1308,288,cs),
+(1308,440,o),
+(1216,533,o),
+(1014,581,cs),
+(844,621,ls),
+(742,645,o),
+(680,692,o),
+(680,772,cs),
+(680,862,o),
+(763,934,o),
+(893,934,cs),
+(1029,934,o),
+(1116,852,o),
+(1118,740,c),
+(1284,740,l),
+(1278,950,o),
+(1113,1080,o),
+(893,1080,cs),
+(667,1080,o),
+(510,952,o),
+(510,772,cs),
+(510,618,o),
+(612,518,o),
+(808,472,cs),
+(978,432,ls),
+(1072,410,o),
+(1137,364,o),
+(1137,284,cs),
+(1137,190,o),
+(1046,146,o),
+(900,146,cs),
+(480,146,ls),
+(390,146,o),
+(356,181,o),
+(356,272,cs),
+(356,1344,l),
+(186,1344,l),
+(186,246,ls),
+(186,95,o),
+(293,0,o),
+(464,0,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(34,1118,l),
-(34,968,l),
-(830,968,l),
-(830,1118,l)
+(603,910,l),
+(847,1056,l),
+(32,1056,l),
+(32,910,l)
 );
 }
 );
-width = 1414;
+width = 1382;
 },
 {
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(248,392,ls),
-(246,90,o),
-(400,0,o),
-(620,0,cs),
-(824,0,l),
-(824,302,l),
-(738,302,ls),
-(636,303,o),
-(621,335,o),
-(622,392,cs),
-(622,1358,l),
-(248,1358,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1404,317,o),
-(1357,303,o),
-(1272,302,cs),
-(776,302,l),
-(776,0,l),
-(1260,0,ls),
-(1567,0,o),
-(1764,125,o),
-(1766,322,cs),
-(1764,521,o),
-(1619,620,o),
-(1358,664,cs),
-(1238,684,o),
-(1142,701,o),
-(1144,770,cs),
-(1142,832,o),
-(1200,858,o),
-(1262,858,cs),
-(1357,858,o),
-(1392,826,o),
-(1394,744,c),
-(1768,744,l),
-(1767,960,o),
-(1569,1103,o),
-(1262,1102,cs),
-(956,1103,o),
-(787,937,o),
-(788,750,cs),
-(787,579,o),
-(938,457,o),
-(1190,410,cs),
-(1357,378,o),
-(1404,387,o),
-(1406,346,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(114,1082,l),
-(114,814,l),
-(1126,814,l),
-(1126,1082,l)
-);
+pos = (655,0);
+ref = s;
 }
 );
 };
@@ -641,138 +300,73 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(232,392,ls),
-(230,90,o),
-(384,0,o),
-(604,0,cs),
-(808,0,l),
-(808,302,l),
-(722,302,ls),
-(620,303,o),
-(605,335,o),
-(606,392,cs),
-(606,1358,l),
-(232,1358,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1388,317,o),
-(1341,303,o),
-(1256,302,cs),
-(760,302,l),
-(760,0,l),
-(1244,0,ls),
-(1551,0,o),
-(1748,125,o),
-(1750,322,cs),
-(1748,521,o),
-(1603,620,o),
-(1342,664,cs),
-(1222,684,o),
-(1126,701,o),
-(1126,792,cs),
-(1126,861,o),
-(1184,887,o),
-(1246,888,cs),
-(1329,887,o),
-(1376,842,o),
-(1378,744,c),
-(1752,744,l),
-(1751,989,o),
-(1553,1132,o),
-(1246,1132,cs),
-(940,1132,o),
-(771,966,o),
-(770,772,cs),
-(771,579,o),
-(913,457,o),
-(1174,410,cs),
-(1297,388,o),
-(1388,387,o),
-(1388,346,cs)
+(1239,0,ls),
+(1555,0,o),
+(1763,145,o),
+(1763,369,cs),
+(1763,527,o),
+(1660,617,o),
+(1437,647,cs),
+(1211,677,ls),
+(1148,685,o),
+(1113,712,o),
+(1113,745,cs),
+(1113,784,o),
+(1156,813,o),
+(1233,813,cs),
+(1310,813,o),
+(1369,766,o),
+(1371,705,c),
+(1735,705,l),
+(1729,934,o),
+(1536,1077,o),
+(1217,1077,cs),
+(901,1077,o),
+(715,941,o),
+(715,723,cs),
+(715,552,o),
+(829,459,o),
+(1041,425,cs),
+(1239,393,ls),
+(1319,380,o),
+(1357,365,o),
+(1357,331,cs),
+(1357,290,o),
+(1312,271,o),
+(1233,271,cs),
+(694,271,ls),
+(615,271,o),
+(586,300,o),
+(586,377,cs),
+(586,1344,l),
+(186,1344,l),
+(186,340,ls),
+(186,104,o),
+(308,0,o),
+(584,0,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(98,1118,l),
-(98,850,l),
-(1110,850,l),
-(1110,1118,l)
+(804,752,l),
+(1148,1056,l),
+(24,1056,l),
+(24,752,l)
 );
 }
 );
-width = 1838;
+width = 1799;
 },
 {
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(204,256,ls),
-(204,92,o),
-(276,0,o),
-(408,0,c),
-(482,0,l),
-(482,46,l),
-(408,46,l),
-(303,47,o),
-(250,118,o),
-(250,256,cs),
-(250,1332,l),
-(204,1332,l)
-);
+ref = t;
 },
 {
-closed = 1;
-nodes = (
-(1044,138,o),
-(917,47,o),
-(718,46,cs),
-(420,46,l),
-(420,0,l),
-(718,0,l),
-(943,0,o),
-(1091,112,o),
-(1090,282,cs),
-(1091,445,o),
-(1000,523,o),
-(734,588,cs),
-(514,641,o),
-(439,705,o),
-(440,840,cs),
-(439,972,o),
-(556,1056,o),
-(730,1056,cs),
-(909,1056,o),
-(1025,942,o),
-(1026,774,c),
-(1074,774,l),
-(1064,975,o),
-(935,1103,o),
-(734,1102,cs),
-(531,1103,o),
-(393,998,o),
-(392,840,cs),
-(393,682,o),
-(484,600,o),
-(722,542,cs),
-(967,483,o),
-(1044,423,o),
-(1044,282,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(40,1070,l),
-(40,1022,l),
-(542,1022,l),
-(556,1070,l)
-);
+pos = (485,0);
+ref = s;
 }
 );
 };
@@ -786,72 +380,67 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(140,256,ls),
-(140,92,o),
-(212,0,o),
-(344,0,c),
-(418,0,l),
-(418,46,l),
-(344,46,l),
-(239,47,o),
-(186,118,o),
-(186,256,cs),
-(186,1400,l),
-(140,1400,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(980,128,o),
-(853,47,o),
-(654,46,cs),
-(356,46,l),
-(356,0,l),
-(654,0,l),
-(879,0,o),
-(1027,102,o),
-(1026,292,cs),
-(1027,442,o),
-(936,530,o),
-(686,590,cs),
-(450,648,o),
-(375,720,o),
-(376,844,cs),
-(375,1011,o),
-(498,1088,o),
-(660,1088,cs),
-(851,1088,o),
-(961,974,o),
-(962,774,c),
-(1010,774,l),
-(1000,1007,o),
-(876,1135,o),
-(664,1134,cs),
-(473,1135,o),
-(329,1037,o),
-(328,844,cs),
-(329,697,o),
-(420,607,o),
-(686,542,cs),
-(903,490,o),
-(980,420,o),
-(980,292,cs)
+(925,0,ls),
+(1159,0,o),
+(1297,108,o),
+(1297,290,cs),
+(1297,428,o),
+(1208,518,o),
+(1045,559,cs),
+(869,603,ls),
+(718,641,o),
+(645,724,o),
+(645,840,cs),
+(645,989,o),
+(766,1088,o),
+(945,1088,cs),
+(1098,1088,o),
+(1196,1015,o),
+(1241,870,c),
+(1287,882,l),
+(1233,1049,o),
+(1117,1134,o),
+(945,1134,cs),
+(741,1134,o),
+(599,1016,o),
+(599,840,cs),
+(599,701,o),
+(689,601,o),
+(861,558,cs),
+(1035,514,ls),
+(1178,478,o),
+(1251,406,o),
+(1251,290,cs),
+(1251,135,o),
+(1134,46,o),
+(925,46,cs),
+(460,46,ls),
+(348,46,o),
+(250,125,o),
+(250,256,cs),
+(250,1384,l),
+(204,1384,l),
+(204,256,ls),
+(204,99,o),
+(322,0,o),
+(460,0,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(-24,1118,l),
-(-24,1070,l),
-(478,1070,l),
-(536,1118,l)
+(766,1072,l),
+(900,1118,l),
+(40,1118,l),
+(40,1072,l)
 );
 }
 );
-width = 1006;
+width = 1367;
 }
 );
+metricLeft = t;
+metricRight = s;
 tags = (
 "TODO-opsz"
 );