improvements to /Phi

2024-08-15 13:50:55 +03:00 · 2023-06-03 11:20:01 -07:00 · 2023-06-03 11:20:01 -07:00 · afca8f7072
commit afca8f7072
parent fc94385aec
3 changed files with 556 additions and 428 deletions
--- a/src/Inter-Italic.glyphspackage/glyphs/P_hi.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/P_hi.glyph
@ -1,7 +1,7 @@
 {
 glyphname = Phi;
-kernLeft = Omicrongreek;
-kernRight = Omicrongreek;
+kernLeft = C;
+kernRight = D;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@ -10,52 +10,52 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1195,125,o),
-(1505,383,o),
-(1565,745,c),
-(1625,1107,o),
-(1400,1365,o),
-(1026,1365,c),
-(896,1365,l),
-(523,1365,o),
-(212,1107,o),
-(152,745,c),
-(92,383,o),
-(318,125,o),
-(691,125,c),
-(821,125,l)
+(880,61,ls),
+(1295,61,o),
+(1638,343,o),
+(1704,745,cs),
+(1771,1147,o),
+(1522,1429,o),
+(1107,1429,cs),
+(977,1429,ls),
+(562,1429,o),
+(219,1147,o),
+(152,745,cs),
+(86,343,o),
+(335,61,o),
+(750,61,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(719,293,l),
-(430,293,o),
-(280,465,o),
-(326,745,c),
-(373,1025,o),
-(579,1197,o),
-(868,1197,c),
-(998,1197,l),
-(1288,1197,o),
-(1438,1025,o),
-(1391,745,c),
-(1345,465,o),
-(1139,293,o),
-(849,293,c)
+(450,218,o),
+(280,426,o),
+(332,745,cs),
+(385,1064,o),
+(625,1272,o),
+(951,1272,cs),
+(1081,1272,ls),
+(1407,1272,o),
+(1577,1064,o),
+(1524,745,cs),
+(1472,426,o),
+(1232,218,o),
+(906,218,cs),
+(776,218,ls)
 );
 },
 {
 closed = 1;
 nodes = (
-(645,0,l),
-(825,0,l),
-(1072,1490,l),
-(892,1490,l)
+(881,-64,l),
+(1149,1554,l),
+(975,1554,l),
+(707,-64,l)
 );
 }
 );
-width = 1655;
+width = 1794;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@ -64,52 +64,52 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1324,136,o),
-(1653,389,o),
-(1712,745,c),
-(1771,1101,o),
-(1525,1355,o),
-(1146,1355,c),
-(888,1355,l),
-(509,1355,o),
-(180,1101,o),
-(121,745,c),
-(62,389,o),
-(307,136,o),
-(686,136,c),
-(944,136,l)
+(993,63,ls),
+(1420,63,o),
+(1767,345,o),
+(1833,745,cs),
+(1900,1145,o),
+(1646,1427,o),
+(1219,1427,cs),
+(961,1427,ls),
+(534,1427,o),
+(188,1145,o),
+(121,745,cs),
+(55,345,o),
+(308,63,o),
+(735,63,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(739,451,l),
-(558,451,o),
-(486,534,o),
-(521,745,c),
-(556,956,o),
-(656,1040,o),
-(836,1040,c),
-(1094,1040,l),
-(1275,1040,o),
-(1347,956,o),
-(1312,745,c),
-(1277,534,o),
-(1177,451,o),
-(997,451,c)
+(584,387,o),
+(491,515,o),
+(529,745,cs),
+(567,975,o),
+(703,1103,o),
+(908,1103,cs),
+(1166,1103,ls),
+(1370,1103,o),
+(1463,975,o),
+(1425,745,cs),
+(1387,515,o),
+(1252,387,o),
+(1047,387,cs),
+(789,387,ls)
 );
 },
 {
 closed = 1;
 nodes = (
-(593,0,l),
-(993,0,l),
-(1240,1490,l),
-(840,1490,l)
+(1033,-80,l),
+(1306,1570,l),
+(922,1570,l),
+(649,-80,l)
 );
 }
 );
-width = 1771;
+width = 1892;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@ -118,106 +118,112 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1168,130,o),
-(1484,384,o),
-(1543,745,c),
-(1603,1106,o),
-(1371,1360,o),
-(985,1360,c),
-(939,1360,l),
-(554,1360,o),
-(238,1106,o),
-(178,745,c),
-(119,384,o),
-(350,130,o),
-(736,130,c),
-(782,130,l)
+(812,74,ls),
+(1242,74,o),
+(1590,351,o),
+(1655,745,cs),
+(1721,1139,o),
+(1464,1416,o),
+(1034,1416,cs),
+(1020,1416,ls),
+(591,1416,o),
+(244,1139,o),
+(178,745,cs),
+(113,351,o),
+(369,74,o),
+(798,74,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(735,176,l),
-(371,176,o),
-(168,407,o),
-(224,745,c),
-(280,1083,o),
-(576,1314,o),
-(940,1314,c),
-(986,1314,l),
-(1351,1314,o),
-(1553,1083,o),
-(1497,745,c),
-(1441,407,o),
-(1146,176,o),
-(781,176,c)
+(392,120,o),
+(164,378,o),
+(224,745,cs),
+(285,1112,o),
+(619,1370,o),
+(1023,1370,cs),
+(1037,1370,ls),
+(1442,1370,o),
+(1670,1112,o),
+(1609,745,cs),
+(1549,378,o),
+(1215,120,o),
+(810,120,cs),
+(796,120,ls)
 );
 },
 {
 closed = 1;
 nodes = (
-(714,0,l),
-(760,0,l),
-(1007,1490,l),
-(961,1490,l)
+(808,-48,l),
+(1071,1538,l),
+(1025,1538,l),
+(762,-48,l)
 );
 }
 );
-width = 1659;
+width = 1771;
 },
 {
+guides = (
+{
+angle = 80.6;
+pos = (867,1616);
+}
+);
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(1173,125,o),
-(1484,399,o),
-(1541,745,c),
-(1599,1091,o),
-(1379,1365,o),
-(1009,1365,c),
-(863,1365,l),
-(494,1365,o),
-(184,1091,o),
-(126,745,c),
-(69,399,o),
-(289,125,o),
-(658,125,c),
-(804,125,l)
+(862,61,ls),
+(1280,61,o),
+(1612,343,o),
+(1678,745,cs),
+(1745,1147,o),
+(1490,1429,o),
+(1073,1429,cs),
+(943,1429,ls),
+(525,1429,o),
+(193,1147,o),
+(126,745,cs),
+(60,343,o),
+(315,61,o),
+(732,61,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(686,293,l),
-(412,293,o),
-(258,480,o),
-(302,745,c),
-(346,1010,o),
-(578,1197,o),
-(851,1197,c),
-(981,1197,l),
-(1255,1197,o),
-(1409,1010,o),
-(1365,745,c),
-(1321,480,o),
-(1090,293,o),
-(816,293,c)
+(418,229,o),
+(254,428,o),
+(306,745,cs),
+(359,1062,o),
+(605,1261,o),
+(931,1261,cs),
+(1061,1261,ls),
+(1387,1261,o),
+(1551,1062,o),
+(1498,745,cs),
+(1446,428,o),
+(1200,229,o),
+(874,229,cs),
+(744,229,ls)
 );
 },
 {
 closed = 1;
 nodes = (
-(620,0,l),
-(800,0,l),
-(1047,1490,l),
-(867,1490,l)
+(858,-64,l),
+(1126,1554,l),
+(946,1554,l),
+(678,-64,l)
 );
 }
 );
-width = 1595;
+width = 1732;
 },
 {
 layerId = m010;
@ -226,52 +232,52 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1313,119,o),
-(1633,394,o),
-(1691,745,c),
-(1749,1096,o),
-(1504,1371,o),
-(1124,1371,c),
-(834,1371,l),
-(454,1371,o),
-(134,1096,o),
-(76,745,c),
-(18,394,o),
-(263,119,o),
-(643,119,c),
-(933,119,l)
+(988,63,ls),
+(1415,63,o),
+(1738,345,o),
+(1804,745,cs),
+(1871,1145,o),
+(1593,1427,o),
+(1166,1427,cs),
+(892,1427,ls),
+(465,1427,o),
+(143,1145,o),
+(76,745,cs),
+(10,345,o),
+(287,63,o),
+(714,63,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(708,467,l),
-(535,467,o),
-(455,567,o),
-(484,745,c),
-(514,923,o),
-(627,1023,o),
-(800,1023,c),
-(1058,1023,l),
-(1232,1023,o),
-(1313,923,o),
-(1283,745,c),
-(1254,567,o),
-(1140,467,o),
-(966,467,c)
+(532,387,o),
+(448,525,o),
+(484,745,cs),
+(521,965,o),
+(683,1103,o),
+(879,1103,cs),
+(1153,1103,ls),
+(1349,1103,o),
+(1433,965,o),
+(1396,745,cs),
+(1360,525,o),
+(1198,387,o),
+(1002,387,cs),
+(728,387,ls)
 );
 },
 {
 closed = 1;
 nodes = (
-(560,0,l),
-(960,0,l),
-(1207,1490,l),
-(807,1490,l)
+(1004,-80,l),
+(1277,1570,l),
+(877,1570,l),
+(604,-80,l)
 );
 }
 );
-width = 1695;
+width = 1808;
 },
 {
 layerId = m012;
@ -280,52 +286,52 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1112,130,o),
-(1443,400,o),
-(1500,745,c),
-(1557,1090,o),
-(1315,1360,o),
-(934,1360,c),
-(888,1360,l),
-(507,1360,o),
-(176,1090,o),
-(119,745,c),
-(62,400,o),
-(303,130,o),
-(685,130,c),
-(731,130,l)
+(753,74,ls),
+(1183,74,o),
+(1531,351,o),
+(1596,745,cs),
+(1662,1139,o),
+(1405,1416,o),
+(975,1416,cs),
+(961,1416,ls),
+(532,1416,o),
+(185,1139,o),
+(119,745,cs),
+(54,351,o),
+(310,74,o),
+(739,74,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(684,176,l),
-(326,176,o),
-(112,425,o),
-(165,745,c),
-(218,1065,o),
-(531,1314,o),
-(889,1314,c),
-(935,1314,l),
-(1293,1314,o),
-(1507,1065,o),
-(1454,745,c),
-(1401,425,o),
-(1088,176,o),
-(730,176,c)
+(331,120,o),
+(105,378,o),
+(165,745,cs),
+(226,1112,o),
+(560,1370,o),
+(964,1370,cs),
+(978,1370,ls),
+(1383,1370,o),
+(1611,1112,o),
+(1550,745,cs),
+(1490,378,o),
+(1154,120,o),
+(749,120,cs),
+(735,120,ls)
 );
 },
 {
 closed = 1;
 nodes = (
-(663,0,l),
-(709,0,l),
-(956,1490,l),
-(910,1490,l)
+(749,-48,l),
+(1012,1538,l),
+(966,1538,l),
+(703,-48,l)
 );
 }
 );
-width = 1547;
+width = 1643;
 }
 );
 metricLeft = O;
--- a/src/Inter-Roman.glyphspackage/glyphs/G_.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_.1.glyph
@ -37,9 +37,9 @@ shapes = (
 closed = 1;
 nodes = (
 (1119,-20,o),
-(1342,236,o),
-(1342,628,cs),
-(1342,636,l),
+(1334,236,o),
+(1334,628,cs),
+(1334,636,l),
 (1303,636,l),
 (1303,262,o),
 (1095,26,o),
@ -73,8 +73,8 @@ nodes = (
 (784,672,l),
 (784,626,l),
 (1312,626,l),
-(1300,279,l),
-(1300,0,l)
+(1304,459,l),
+(1308,0,l)
 );
 }
 );
@ -111,33 +111,33 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1055,-20,o),
+(1055,-16,o),
 (1278,236,o),
 (1278,628,cs),
 (1278,636,l),
 (1239,636,l),
 (1239,262,o),
-(1031,26,o),
-(706,26,cs),
-(355,26,o),
+(1031,30,o),
+(706,30,cs),
+(355,30,o),
 (130,319,o),
 (130,744,cs),
 (130,1175,o),
-(359,1464,o),
-(702,1464,cs),
-(1007,1464,o),
+(359,1460,o),
+(702,1460,cs),
+(1007,1460,o),
 (1190,1227,o),
 (1225,1024,c),
 (1272,1024,l),
 (1236,1236,o),
-(1049,1510,o),
-(702,1510,cs),
-(332,1510,o),
+(1049,1506,o),
+(702,1506,cs),
+(332,1506,o),
 (84,1203,o),
 (84,744,cs),
 (84,289,o),
-(329,-20,o),
-(706,-20,cs)
+(329,-16,o),
+(706,-16,cs)
 );
 },
 {
@ -148,8 +148,8 @@ nodes = (
 (720,672,l),
 (720,626,l),
 (1248,626,l),
-(1236,279,l),
-(1236,0,l)
+(1236,448,l),
+(1244,0,l)
 );
 }
 );
@ -187,9 +187,9 @@ shapes = (
 closed = 1;
 nodes = (
 (1132,-20,o),
-(1290,242,o),
-(1290,484,cs),
-(1290,624,l),
+(1242,242,o),
+(1242,484,cs),
+(1242,624,l),
 (1220,624,l),
 (1220,330,o),
 (1054,148,o),
@ -223,7 +223,7 @@ nodes = (
 (825,745,l),
 (825,585,l),
 (1220,585,l),
-(1220,279,l),
+(1220,375,l),
 (1250,0,l)
 );
 }
@ -560,9 +560,9 @@ shapes = (
 closed = 1;
 nodes = (
 (1079,-20,o),
-(1258,172,o),
-(1258,444,cs),
-(1258,552,l),
+(1202,172,o),
+(1202,444,cs),
+(1202,552,l),
 (1100,552,l),
 (1100,417,o),
 (1001,332,o),
@ -595,8 +595,8 @@ nodes = (
 (1490,832,l),
 (830,832,l),
 (830,544,l),
-(1186,544,l),
-(1186,336,l),
+(1194,544,l),
+(1194,336,l),
 (1241,0,l)
 );
 }
--- a/src/Inter-Roman.glyphspackage/glyphs/P_hi.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/P_hi.glyph
@ -1,7 +1,7 @@
 {
 glyphname = Phi;
-kernLeft = Omicrongreek;
-kernRight = Omicrongreek;
+kernLeft = C;
+kernRight = D;
 layers = (
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@ -9,52 +9,52 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1267.006,125,o),
-(1535,383.213,o),
-(1535,745,c),
-(1535,1106.787,o),
-(1267.006,1365,o),
-(893,1365,c),
-(763,1365,l),
-(389.994,1365,o),
-(122,1106.787,o),
-(122,745,c),
-(122,383.213,o),
-(389.994,125,o),
-(763,125,c),
-(893,125,l)
+(963,61,ls),
+(1378,61,o),
+(1674,343,o),
+(1674,745,cs),
+(1674,1147,o),
+(1378,1429,o),
+(963,1429,cs),
+(833,1429,ls),
+(418,1429,o),
+(122,1147,o),
+(122,745,cs),
+(122,343,o),
+(418,61,o),
+(833,61,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(763,290,l),
-(474,290,o),
-(296,464.787,o),
-(296,745,c),
-(296,1025.213,o),
-(474,1200,o),
-(763,1200,c),
-(893,1200,l),
-(1183,1200,o),
-(1361,1025.213,o),
-(1361,745,c),
-(1361,464.787,o),
-(1183,290,o),
-(893,290,c)
+(507,218,o),
+(302,426,o),
+(302,745,cs),
+(302,1064,o),
+(507,1272,o),
+(833,1272,cs),
+(963,1272,ls),
+(1289,1272,o),
+(1494,1064,o),
+(1494,745,cs),
+(1494,426,o),
+(1289,218,o),
+(963,218,cs),
+(833,218,ls)
 );
 },
 {
 closed = 1;
 nodes = (
-(738,0,l),
-(918,0,l),
-(918,1490,l),
-(738,1490,l)
+(985,-64,l),
+(985,1554,l),
+(811,1554,l),
+(811,-64,l)
 );
 }
 );
-width = 1657;
+width = 1796;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@ -62,52 +62,52 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1393.161,135.5,o),
-(1681,389.224,o),
-(1681,745,c),
-(1681,1100.776,o),
-(1393.161,1354.5,o),
-(1014,1354.5,c),
-(756,1354.5,l),
-(376.922,1354.5,o),
-(90,1100.947,o),
-(90,745,c),
-(90,389.053,o),
-(376.922,135.5,o),
-(756,135.5,c),
-(1014,135.5,l)
+(1075,63,ls),
+(1502,63,o),
+(1802,345,o),
+(1802,745,cs),
+(1802,1145,o),
+(1502,1427,o),
+(1075,1427,cs),
+(817,1427,ls),
+(390,1427,o),
+(90,1145,o),
+(90,745,cs),
+(90,345,o),
+(390,63,o),
+(817,63,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(756,450.5,l),
-(575.678,450.5,o),
-(490,533.947,o),
-(490,745,c),
-(490,956.053,o),
-(575.678,1039.5,o),
-(756,1039.5,c),
-(1014,1039.5,l),
-(1194.639,1039.5,o),
-(1281,955.824,o),
-(1281,745,c),
-(1281,534.176,o),
-(1194.639,450.5,o),
-(1014,450.5,c)
+(612,387,o),
+(498,515,o),
+(498,745,cs),
+(498,975,o),
+(612,1103,o),
+(817,1103,cs),
+(1075,1103,ls),
+(1280,1103,o),
+(1394,975,o),
+(1394,745,cs),
+(1394,515,o),
+(1280,387,o),
+(1075,387,cs),
+(817,387,ls)
 );
 },
 {
 closed = 1;
 nodes = (
-(693,0,l),
-(1077,0,l),
-(1077,1490,l),
-(693,1490,l)
+(1138,-80,l),
+(1138,1570,l),
+(754,1570,l),
+(754,-80,l)
 );
 }
 );
-width = 1771;
+width = 1892;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@ -115,158 +115,170 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1239,130,o),
-(1513,384,o),
-(1513,745,c),
-(1513,1106,o),
-(1239,1360,o),
-(853,1360,c),
-(807,1360,l),
-(422,1360,o),
-(148,1106,o),
-(148,745,c),
-(148,384,o),
-(422,130,o),
-(807,130,c),
-(853,130,l)
+(893,74,ls),
+(1323,74,o),
+(1625,351,o),
+(1625,745,cs),
+(1625,1139,o),
+(1323,1416,o),
+(893,1416,cs),
+(879,1416,ls),
+(450,1416,o),
+(148,1139,o),
+(148,745,cs),
+(148,351,o),
+(450,74,o),
+(879,74,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(807,176,l),
-(443,176,o),
-(194,407,o),
-(194,745,c),
-(194,1083,o),
-(443,1314,o),
-(807,1314,c),
-(853,1314,l),
-(1218,1314,o),
-(1467,1083,o),
-(1467,745,c),
-(1467,407,o),
-(1218,176,o),
-(853,176,c)
+(475,120,o),
+(194,378,o),
+(194,745,cs),
+(194,1112,o),
+(475,1370,o),
+(879,1370,cs),
+(893,1370,ls),
+(1298,1370,o),
+(1579,1112,o),
+(1579,745,cs),
+(1579,378,o),
+(1298,120,o),
+(893,120,cs),
+(879,120,ls)
 );
 },
 {
 closed = 1;
 nodes = (
-(807,0,l),
-(853,0,l),
-(853,1490,l),
-(807,1490,l)
+(909,-48,l),
+(909,1538,l),
+(863,1538,l),
+(863,-48,l)
 );
 }
 );
-width = 1661;
+width = 1773;
 },
 {
+guides = (
+{
+angle = 90;
+pos = (866,1616);
+}
+);
 layerId = m007;
 shapes = (
 {
 closed = 1;
 nodes = (
-(1240,125,o),
-(1505,399.481,o),
-(1505,745,c),
-(1505,1090.519,o),
-(1240,1365,o),
-(870,1365,c),
-(724,1365,l),
-(355,1365,o),
-(90,1090.519,o),
-(90,745,c),
-(90,399.481,o),
-(355,125,o),
-(724,125,c),
-(870,125,l)
+(931,61,ls),
+(1348,61,o),
+(1642,343,o),
+(1642,745,cs),
+(1642,1147,o),
+(1348,1429,o),
+(931,1429,cs),
+(801,1429,ls),
+(384,1429,o),
+(90,1147,o),
+(90,745,cs),
+(90,343,o),
+(384,61,o),
+(801,61,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(732,290,l),
-(458,290,o),
-(266,480,o),
-(266,745,c),
-(266,1010,o),
-(458,1200,o),
-(732,1200,c),
-(862,1200,l),
-(1136,1200,o),
-(1329,1010,o),
-(1329,745,c),
-(1329,480,o),
-(1136,290,o),
-(862,290,c)
+(475,229,o),
+(270,428,o),
+(270,745,cs),
+(270,1062,o),
+(475,1261,o),
+(801,1261,cs),
+(931,1261,ls),
+(1257,1261,o),
+(1462,1062,o),
+(1462,745,cs),
+(1462,428,o),
+(1257,229,o),
+(931,229,cs),
+(801,229,ls)
 );
 },
 {
 closed = 1;
 nodes = (
-(709,0,l),
-(885,0,l),
-(885,1490,l),
-(709,1490,l)
+(956,-64,l),
+(956,1554,l),
+(776,1554,l),
+(776,-64,l)
 );
 }
 );
-width = 1595;
+width = 1732;
 },
 {
+guides = (
+{
+angle = 90;
+pos = (904,1597);
+}
+);
 layerId = m009;
 shapes = (
 {
 closed = 1;
 nodes = (
-(1372,119,o),
-(1655,394,o),
-(1655,745,c),
-(1655,1096,o),
-(1372,1371,o),
-(992,1371,c),
-(702,1371,l),
-(322,1371,o),
-(40,1096,o),
-(40,745,c),
-(40,394,o),
-(322,119,o),
-(702,119,c),
-(992,119,l)
+(1041,63,ls),
+(1468,63,o),
+(1768,345,o),
+(1768,745,cs),
+(1768,1145,o),
+(1468,1427,o),
+(1041,1427,cs),
+(767,1427,ls),
+(340,1427,o),
+(40,1145,o),
+(40,745,cs),
+(40,345,o),
+(340,63,o),
+(767,63,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(718,467,l),
-(545,467,o),
-(448,567,o),
-(448,745,c),
-(448,923,o),
-(545,1023,o),
-(718,1023,c),
-(976,1023,l),
-(1150,1023,o),
-(1247,923,o),
-(1247,745,c),
-(1247,567,o),
-(1150,467,o),
-(976,467,c)
+(571,387,o),
+(448,525,o),
+(448,745,cs),
+(448,965,o),
+(571,1103,o),
+(767,1103,cs),
+(1041,1103,ls),
+(1237,1103,o),
+(1360,965,o),
+(1360,745,cs),
+(1360,525,o),
+(1237,387,o),
+(1041,387,cs),
+(767,387,ls)
 );
 },
 {
 closed = 1;
 nodes = (
-(655,0,l),
-(1039,0,l),
-(1039,1490,l),
-(655,1490,l)
+(1104,-80,l),
+(1104,1570,l),
+(704,1570,l),
+(704,-80,l)
 );
 }
 );
-width = 1695;
+width = 1808;
 },
 {
 layerId = m011;
@ -274,52 +286,52 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1178.127,130,o),
-(1465,400.068,o),
-(1465,745,c),
-(1465,1089.932,o),
-(1178.127,1360,o),
-(797,1360,c),
-(751,1360,l),
-(369.849,1360,o),
-(84,1089.907,o),
-(84,745,c),
-(84,400.093,o),
-(369.849,130,o),
-(751,130,c),
-(797,130,l)
+(829,74,ls),
+(1259,74,o),
+(1561,351,o),
+(1561,745,cs),
+(1561,1139,o),
+(1259,1416,o),
+(829,1416,cs),
+(815,1416,ls),
+(386,1416,o),
+(84,1139,o),
+(84,745,cs),
+(84,351,o),
+(386,74,o),
+(815,74,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(751,176,l),
-(393,176,o),
-(130,425,o),
-(130,745,c),
-(130,1065,o),
-(393,1314,o),
-(751,1314,c),
-(797,1314,l),
-(1155,1314,o),
-(1419,1065,o),
-(1419,745,c),
-(1419,425,o),
-(1155,176,o),
-(797,176,c)
+(411,120,o),
+(130,378,o),
+(130,745,cs),
+(130,1112,o),
+(411,1370,o),
+(815,1370,cs),
+(829,1370,ls),
+(1234,1370,o),
+(1515,1112,o),
+(1515,745,cs),
+(1515,378,o),
+(1234,120,o),
+(829,120,cs),
+(815,120,ls)
 );
 },
 {
 closed = 1;
 nodes = (
-(751,0,l),
-(797,0,l),
-(797,1490,l),
-(751,1490,l)
+(845,-48,l),
+(845,1538,l),
+(799,1538,l),
+(799,-48,l)
 );
 }
 );
-width = 1549;
+width = 1645;
 },
 {
 associatedMasterId = m009;
@ -935,6 +947,116 @@ nodes = (
 }
 );
 width = 1677;
+},
+{
+associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+layerId = "1730E719-5F8F-455B-8E04-9A5686275616";
+name = "Jun 3, 23, 11:07";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1422,119,o),
+(1705,394,o),
+(1705,745,cs),
+(1705,1096,o),
+(1422,1371,o),
+(1042,1371,c),
+(752,1371,l),
+(372,1371,o),
+(90,1096,o),
+(90,745,cs),
+(90,394,o),
+(372,119,o),
+(752,119,c),
+(1042,119,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(768,443,ls),
+(580,443,o),
+(498,552,o),
+(498,745,cs),
+(498,938,o),
+(580,1047,o),
+(768,1047,cs),
+(1026,1047,ls),
+(1215,1047,o),
+(1297,938,o),
+(1297,745,cs),
+(1297,552,o),
+(1215,443,o),
+(1026,443,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(729,0,l),
+(1065,0,l),
+(1065,1490,l),
+(729,1490,l)
+);
+}
+);
+width = 1795;
+},
+{
+associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+layerId = "203B2BE9-00DB-4F61-8CB1-13FA90088D6D";
+name = "Jun 3, 23, 11:14";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1239,130,o),
+(1513,384,o),
+(1513,745,c),
+(1513,1106,o),
+(1239,1360,o),
+(853,1360,c),
+(807,1360,l),
+(422,1360,o),
+(148,1106,o),
+(148,745,c),
+(148,384,o),
+(422,130,o),
+(807,130,c),
+(853,130,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(807,176,l),
+(443,176,o),
+(194,407,o),
+(194,745,c),
+(194,1083,o),
+(443,1314,o),
+(807,1314,c),
+(853,1314,l),
+(1218,1314,o),
+(1467,1083,o),
+(1467,745,c),
+(1467,407,o),
+(1218,176,o),
+(853,176,c)
+);
+},
+{
+closed = 1;
+nodes = (
+(807,0,l),
+(853,0,l),
+(853,1490,l),
+(807,1490,l)
+);
+}
+);
+width = 1661;
 }
 );
 metricLeft = O;