summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Andersson <rasmus@notion.se>2024-03-28 04:42:51 +0300
committerRasmus Andersson <rasmus@notion.se>2024-03-28 04:42:51 +0300
commit1cd81b8cfb2833561eaf54b8adaa3f4add6384e4 (patch)
treedf5e4889ee76e89495d18ba551821e76630f1ea6
parentbae1c01e9a4ab9a7ed7de9af241402911642d351 (diff)
downloadinter-master.tar.xz
New design of /finalkaf (LS digraph). Re #626HEADmaster
-rw-r--r--src/Inter-Italic.glyphspackage/fontinfo.plist18
-rw-r--r--src/Inter-Italic.glyphspackage/glyphs/finalkaf.glyph587
-rw-r--r--src/Inter-Roman.glyphspackage/fontinfo.plist28
-rw-r--r--src/Inter-Roman.glyphspackage/glyphs/finalkaf.glyph658
4 files changed, 791 insertions, 500 deletions
diff --git a/src/Inter-Italic.glyphspackage/fontinfo.plist b/src/Inter-Italic.glyphspackage/fontinfo.plist
index 480931e99..a21796d76 100644
--- a/src/Inter-Italic.glyphspackage/fontinfo.plist
+++ b/src/Inter-Italic.glyphspackage/fontinfo.plist
@@ -5849,9 +5849,6 @@ ampersand = -81;
icaron = 69;
icircumflex = 69;
};
-"@MMK_L_decyrillic" = {
-underscore = 93;
-};
"@MMK_L_deltagreek" = {
"@MMK_R_quotedblleft" = -128;
"@MMK_R_t" = -69;
@@ -7635,9 +7632,6 @@ ampersand = -81;
icaron = 69;
icircumflex = 69;
};
-"@MMK_L_decyrillic" = {
-underscore = 93;
-};
"@MMK_L_deltagreek" = {
"@MMK_R_quotedblleft" = -128;
"@MMK_R_t" = -69;
@@ -9499,9 +9493,6 @@ ampersand = -81;
icaron = 69;
icircumflex = 69;
};
-"@MMK_L_decyrillic" = {
-underscore = 93;
-};
"@MMK_L_deltagreek" = {
"@MMK_R_quotedblleft" = -128;
"@MMK_R_t" = -69;
@@ -11336,9 +11327,6 @@ uni1F8F = 30;
icaron = 220;
icircumflex = 200;
};
-"@MMK_L_decyrillic" = {
-underscore = 93;
-};
"@MMK_L_deltagreek" = {
"@MMK_R_quotedblleft" = -128;
"@MMK_R_t" = -69;
@@ -13247,9 +13235,6 @@ ampersand = -81;
icaron = 69;
icircumflex = 69;
};
-"@MMK_L_decyrillic" = {
-underscore = 93;
-};
"@MMK_L_deltagreek" = {
"@MMK_R_quotedblleft" = -128;
"@MMK_R_t" = -69;
@@ -15072,9 +15057,6 @@ ampersand = -81;
"@MMK_R_registered" = 34;
"@MMK_R_seven" = 93;
};
-"@MMK_L_decyrillic" = {
-underscore = 93;
-};
"@MMK_L_deltagreek" = {
"@MMK_R_quotedblleft" = -128;
"@MMK_R_t" = -69;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/finalkaf.glyph b/src/Inter-Italic.glyphspackage/glyphs/finalkaf.glyph
index dea6d8dad..4f4cee8ba 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/finalkaf.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/finalkaf.glyph
@@ -1,182 +1,348 @@
{
glyphname = finalkaf;
+kernLeft = B;
+kernRight = s;
layers = (
{
layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
-(936,206,o),
-(847,144,o),
-(705,144,cs),
-(590,144,o),
-(358,181,o),
-(174,375,c),
-(74,216,l),
-(240,27,o),
-(490,-20,o),
-(678,-20,cs),
-(935,-20,o),
-(1128,114,o),
-(1160,307,c),
-(1189,486,o),
-(1063,579,o),
-(811,633,cs),
-(648,668,o),
-(590,704,o),
-(604,787,c),
-(616,861,o),
-(687,938,o),
-(834,938,cs),
-(968,938,o),
-(1028,846,o),
-(1017,761,c),
-(1224,761,l),
-(1253,948,o),
-(1124,1102,o),
-(860,1102,cs),
-(612,1102,o),
-(429,953,o),
-(399,781,c),
-(371,604,o),
-(501,521,o),
-(745,465,cs),
-(915,426,o),
-(963,382,o),
-(949,291,cs)
+(876,0,ls),
+(1138,0,o),
+(1339,131,o),
+(1371,327,cs),
+(1396,480,o),
+(1317,575,o),
+(1122,623,cs),
+(960,663,ls),
+(834,694,o),
+(784,734,o),
+(797,817,cs),
+(813,910,o),
+(924,979,o),
+(1057,979,cs),
+(1201,979,o),
+(1251,901,o),
+(1269,821,c),
+(1439,863,l),
+(1414,1020,o),
+(1311,1132,o),
+(1081,1132,cs),
+(843,1132,o),
+(645,998,o),
+(613,806,cs),
+(587,649,o),
+(669,555,o),
+(864,507,cs),
+(1043,463,ls),
+(1148,437,o),
+(1195,392,o),
+(1182,315,cs),
+(1167,223,o),
+(1056,158,o),
+(900,158,cs),
+(452,158,ls),
+(335,158,o),
+(283,221,o),
+(302,338,cs),
+(493,1490,l),
+(313,1490,l),
+(127,370,ls),
+(88,130,o),
+(196,0,o),
+(436,0,cs)
);
+}
+);
+width = 1511;
},
{
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
closed = 1;
nodes = (
-(226,1490,l),
-(-20,0,l),
-(162,0,l),
-(408,1490,l)
+(1084,0,ls),
+(1383,0,o),
+(1679,143,o),
+(1679,421,cs),
+(1679,565,o),
+(1575,643,o),
+(1378,674,cs),
+(1156,709,ls),
+(1089,720,o),
+(1073,752,o),
+(1073,779,cs),
+(1073,848,o),
+(1168,868,o),
+(1231,868,cs),
+(1309,868,o),
+(1352,848,o),
+(1358,775,c),
+(1712,800,l),
+(1712,1028,o),
+(1493,1136,o),
+(1226,1136,cs),
+(929,1136,o),
+(670,1009,o),
+(670,739,cs),
+(670,592,o),
+(772,493,o),
+(967,462,cs),
+(1159,432,ls),
+(1236,420,o),
+(1264,390,o),
+(1264,355,cs),
+(1264,289,o),
+(1171,272,o),
+(1106,272,cs),
+(549,272,ls),
+(489,272,o),
+(462,304,o),
+(472,364,cs),
+(659,1490,l),
+(257,1490,l),
+(75,394,ls),
+(34,146,o),
+(148,0,o),
+(452,0,cs)
);
}
);
-width = 1306;
+width = 1759;
},
{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
-(1127,256,o),
-(1087,239,o),
-(936,238,cs),
-(778,239,o),
-(543,300,o),
-(352,442,c),
-(206,166,l),
-(458,29,o),
-(644,-20,o),
-(894,-20,cs),
-(1247,-20,o),
-(1465,125,o),
-(1498,318,c),
-(1532,524,o),
-(1404,617,o),
-(1152,664,cs),
-(1020,687,o),
-(938,704,o),
-(952,770,c),
-(961,832,o),
-(1028,858,o),
-(1086,858,cs),
-(1183,858,o),
-(1212,826,o),
-(1202,744,c),
-(1574,744,l),
-(1607,960,o),
-(1439,1103,o),
-(1128,1102,cs),
-(825,1103,o),
-(627,937,o),
-(596,750,c),
-(560,547,o),
-(743,454,o),
-(940,410,cs),
-(1092,375,o),
-(1145,358,o),
-(1138,312,cs)
+(724,0,ls),
+(950,0,o),
+(1114,108,o),
+(1144,290,cs),
+(1167,428,o),
+(1090,519,o),
+(937,559,cs),
+(768,603,ls),
+(615,643,o),
+(564,724,o),
+(583,840,cs),
+(608,989,o),
+(745,1088,o),
+(924,1088,cs),
+(1077,1088,o),
+(1163,1015,o),
+(1184,870,c),
+(1232,882,l),
+(1206,1049,o),
+(1096,1134,o),
+(932,1134,cs),
+(720,1134,o),
+(566,1016,o),
+(537,840,cs),
+(514,701,o),
+(591,602,o),
+(752,560,cs),
+(919,516,ls),
+(1063,478,o),
+(1117,406,o),
+(1098,290,cs),
+(1072,135,o),
+(917,46,o),
+(732,46,cs),
+(334,46,ls),
+(217,46,o),
+(169,103,o),
+(188,220,cs),
+(399,1490,l),
+(353,1490,l),
+(142,220,ls),
+(118,77,o),
+(183,0,o),
+(326,0,cs)
+);
+}
);
+width = 1323;
},
{
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
closed = 1;
nodes = (
-(270,1490,l),
-(24,0,l),
-(424,0,l),
-(672,1490,l)
+(780,0,ls),
+(1026,0,o),
+(1190,103,o),
+(1216,290,cs),
+(1239,456,o),
+(1135,545,o),
+(971,585,cs),
+(807,625,ls),
+(709,649,o),
+(654,693,o),
+(668,772,cs),
+(684,864,o),
+(780,934,o),
+(907,934,cs),
+(1044,934,o),
+(1117,853,o),
+(1101,740,c),
+(1267,740,l),
+(1293,960,o),
+(1136,1080,o),
+(918,1080,cs),
+(690,1080,o),
+(529,948,o),
+(498,772,cs),
+(471,619,o),
+(558,522,o),
+(747,476,cs),
+(910,436,ls),
+(1008,412,o),
+(1057,369,o),
+(1045,289,cs),
+(1031,195,o),
+(947,148,o),
+(801,148,cs),
+(387,148,ls),
+(275,148,o),
+(239,190,o),
+(258,304,cs),
+(455,1490,l),
+(285,1490,l),
+(90,312,ls),
+(54,96,o),
+(140,0,o),
+(370,0,cs)
);
}
);
-width = 1678;
+width = 1331;
},
{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+layerId = m010;
+name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
-(824,129,o),
-(677,23,o),
-(476,24,cs),
-(329,23,o),
-(123,85,o),
-(36,264,c),
-(-8,242,l),
-(105,35,o),
-(321,-23,o),
-(476,-24,cs),
-(694,-23,o),
-(865,95,o),
-(894,282,cs),
-(920,437,o),
-(835,524,o),
-(580,590,cs),
-(383,642,o),
-(316,712,o),
-(336,836,cs),
-(361,988,o),
-(495,1088,o),
-(682,1088,cs),
-(831,1088,o),
-(915,1018,o),
-(938,872,c),
-(984,882,l),
-(959,1047,o),
-(855,1135,o),
-(680,1134,cs),
-(479,1135,o),
-(318,1017,o),
-(290,846,cs),
-(264,697,o),
-(345,605,o),
-(578,542,cs),
-(794,484,o),
-(869,419,o),
-(850,290,cs)
+(1025,0,ls),
+(1341,0,o),
+(1569,129,o),
+(1607,352,cs),
+(1634,511,o),
+(1546,604,o),
+(1329,642,cs),
+(1110,680,ls),
+(1046,691,o),
+(1018,713,o),
+(1022,744,cs),
+(1027,783,o),
+(1080,813,o),
+(1149,813,cs),
+(1231,813,o),
+(1281,770,o),
+(1274,705,c),
+(1638,705,l),
+(1670,935,o),
+(1500,1077,o),
+(1179,1077,cs),
+(865,1077,o),
+(658,941,o),
+(621,724,cs),
+(592,552,o),
+(690,459,o),
+(899,433,cs),
+(1093,409,ls),
+(1173,399,o),
+(1205,377,o),
+(1199,340,cs),
+(1193,300,o),
+(1152,282,o),
+(1066,282,cs),
+(508,282,ls),
+(472,282,o),
+(451,300,o),
+(458,342,cs),
+(648,1490,l),
+(246,1490,l),
+(58,358,ls),
+(20,128,o),
+(79,0,o),
+(461,0,cs)
);
+}
+);
+width = 1671;
},
{
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
closed = 1;
nodes = (
-(194,1490,l),
-(-52,0,l),
-(-6,0,l),
-(240,1490,l)
+(629,0,ls),
+(864,0,o),
+(1025,98,o),
+(1050,277,cs),
+(1070,422,o),
+(984,495,o),
+(827,533,cs),
+(649,576,ls),
+(487,615,o),
+(424,664,o),
+(445,779,cs),
+(472,927,o),
+(610,1024,o),
+(800,1024,cs),
+(989,1024,o),
+(1081,928,o),
+(1067,740,c),
+(1112,740,l),
+(1130,954,o),
+(1013,1070,o),
+(801,1070,cs),
+(584,1070,o),
+(426,949,o),
+(399,777,cs),
+(377,636,o),
+(461,573,o),
+(634,532,cs),
+(810,490,ls),
+(961,454,o),
+(1023,393,o),
+(1004,277,cs),
+(978,122,o),
+(832,46,o),
+(637,46,cs),
+(245,46,ls),
+(148,46,o),
+(108,93,o),
+(124,190,cs),
+(340,1490,l),
+(294,1490,l),
+(78,190,ls),
+(58,67,o),
+(114,0,o),
+(237,0,cs)
);
}
);
-width = 1022;
+width = 1172;
},
{
-layerId = m008;
+associatedMasterId = m008;
+layerId = "7D6E6DBB-2E7F-48DF-8A4B-639D55782F9A";
+name = "Mar 27, 24, 16:13";
shapes = (
{
closed = 1;
@@ -234,122 +400,65 @@ nodes = (
width = 1228;
},
{
-layerId = m010;
+associatedMasterId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+layerId = "DFB33427-7854-419F-9A6C-219146CCD643";
+name = "Mar 27, 24, 18:30";
shapes = (
{
closed = 1;
nodes = (
-(1111,256,o),
-(1071,239,o),
-(920,238,cs),
-(762,239,o),
-(527,300,o),
-(336,442,c),
-(190,166,l),
-(442,29,o),
-(628,-20,o),
-(878,-20,cs),
-(1231,-20,o),
-(1449,125,o),
-(1482,318,c),
-(1516,524,o),
-(1388,617,o),
-(1136,664,cs),
-(1004,687,o),
-(922,704,o),
-(936,770,c),
-(945,832,o),
-(1012,858,o),
-(1070,858,cs),
-(1167,858,o),
-(1196,826,o),
-(1186,744,c),
-(1558,744,l),
-(1591,960,o),
-(1423,1103,o),
-(1112,1102,cs),
-(809,1103,o),
-(611,937,o),
-(580,750,c),
-(544,547,o),
-(727,454,o),
-(924,410,cs),
-(1076,375,o),
-(1129,358,o),
-(1122,312,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(254,1490,l),
-(8,0,l),
-(408,0,l),
-(656,1490,l)
-);
-}
-);
-width = 1646;
-},
-{
-layerId = m012;
-shapes = (
-{
-closed = 1;
-nodes = (
-(760,129,o),
-(613,23,o),
-(412,24,cs),
-(265,23,o),
-(59,85,o),
-(-28,264,c),
-(-72,242,l),
-(41,35,o),
-(257,-23,o),
-(412,-24,cs),
-(630,-23,o),
-(801,95,o),
-(830,282,cs),
-(856,437,o),
-(771,524,o),
-(516,590,cs),
-(319,642,o),
-(252,712,o),
-(272,836,cs),
-(297,988,o),
-(431,1088,o),
-(618,1088,cs),
-(767,1088,o),
-(851,1018,o),
-(874,872,c),
-(920,882,l),
-(895,1047,o),
-(791,1135,o),
-(616,1134,cs),
-(415,1135,o),
-(254,1017,o),
-(226,846,cs),
-(200,697,o),
-(281,605,o),
-(514,542,cs),
-(730,484,o),
-(805,419,o),
-(786,290,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(130,1490,l),
-(-116,0,l),
-(-70,0,l),
-(176,1490,l)
+(1063,0,ls),
+(1462,0,o),
+(1638,149,o),
+(1675,366,cs),
+(1707,554,o),
+(1607,632,o),
+(1385,672,cs),
+(1164,712,ls),
+(1080,727,o),
+(1066,762,o),
+(1071,791,cs),
+(1080,842,o),
+(1144,864,o),
+(1207,864,cs),
+(1285,864,o),
+(1344,831,o),
+(1349,758,c),
+(1712,809,l),
+(1710,1014,o),
+(1539,1132,o),
+(1240,1132,cs),
+(923,1132,o),
+(705,999,o),
+(667,768,cs),
+(638,592,o),
+(734,492,o),
+(956,460,cs),
+(1150,432,ls),
+(1240,419,o),
+(1268,392,o),
+(1264,349,cs),
+(1259,296,o),
+(1210,272,o),
+(1126,272,cs),
+(549,272,ls),
+(489,272,o),
+(462,304,o),
+(472,364,cs),
+(659,1490,l),
+(257,1490,l),
+(75,394,ls),
+(34,146,o),
+(148,0,o),
+(452,0,cs)
);
}
);
-width = 894;
+width = 1759;
}
);
+metricLeft = n;
+metricRight = s;
unicode = 682;
userData = {
interface.gridadjust.original = "{'width': 1874, 'leftMargin': 256, 'rightMargin': 135}";
diff --git a/src/Inter-Roman.glyphspackage/fontinfo.plist b/src/Inter-Roman.glyphspackage/fontinfo.plist
index f7093743f..da64d8c1c 100644
--- a/src/Inter-Roman.glyphspackage/fontinfo.plist
+++ b/src/Inter-Roman.glyphspackage/fontinfo.plist
@@ -3644,7 +3644,7 @@ stemValues = (
46
);
userData = {
-GSCornerRadius = 230;
+GSCornerRadius = 174;
GSOffsetHorizontal = 23;
GSOffsetKeepCompatible = 1;
GSOffsetMakeStroke = 1;
@@ -3793,7 +3793,7 @@ stemValues = (
46
);
userData = {
-GSCornerRadius = 426;
+GSCornerRadius = 144;
GSOffsetCapStyle = 4;
GSOffsetHorizontal = 23;
GSOffsetKeepCompatible = 1;
@@ -3935,7 +3935,7 @@ stemValues = (
185
);
userData = {
-GSCornerRadius = 250;
+GSCornerRadius = 180;
GSOffsetHorizontal = 75;
GSOffsetKeepCompatible = 1;
GSOffsetMakeStroke = 1;
@@ -4225,7 +4225,7 @@ stemValues = (
404
);
userData = {
-GSCornerRadius = 320;
+GSCornerRadius = 84;
GSOffsetHorizontal = 168;
GSOffsetKeepCompatible = 1;
GSOffsetMakeStroke = 1;
@@ -4374,7 +4374,7 @@ stemValues = (
400
);
userData = {
-GSCornerRadius = 500;
+GSCornerRadius = 60;
GSExtrudeAngle = 30;
GSExtrudeOffset = 15;
GSOffsetHorizontal = 180;
@@ -5742,9 +5742,6 @@ ampersand = -81;
icaron = 69;
icircumflex = 69;
};
-"@MMK_L_decyrillic" = {
-underscore = 93;
-};
"@MMK_L_deltagreek" = {
"@MMK_R_quotedblleft" = -128;
"@MMK_R_t" = -69;
@@ -7528,9 +7525,6 @@ ampersand = -81;
icaron = 69;
icircumflex = 69;
};
-"@MMK_L_decyrillic" = {
-underscore = 93;
-};
"@MMK_L_deltagreek" = {
"@MMK_R_quotedblleft" = -128;
"@MMK_R_t" = -69;
@@ -9392,9 +9386,6 @@ ampersand = -81;
icaron = 69;
icircumflex = 69;
};
-"@MMK_L_decyrillic" = {
-underscore = 93;
-};
"@MMK_L_deltagreek" = {
"@MMK_R_quotedblleft" = -128;
"@MMK_R_t" = -69;
@@ -11229,9 +11220,6 @@ uni1F8F = 30;
icaron = 220;
icircumflex = 200;
};
-"@MMK_L_decyrillic" = {
-underscore = 93;
-};
"@MMK_L_deltagreek" = {
"@MMK_R_quotedblleft" = -128;
"@MMK_R_t" = -69;
@@ -13140,9 +13128,6 @@ ampersand = -81;
icaron = 69;
icircumflex = 69;
};
-"@MMK_L_decyrillic" = {
-underscore = 93;
-};
"@MMK_L_deltagreek" = {
"@MMK_R_quotedblleft" = -128;
"@MMK_R_t" = -69;
@@ -14965,9 +14950,6 @@ ampersand = -81;
"@MMK_R_registered" = 34;
"@MMK_R_seven" = 93;
};
-"@MMK_L_decyrillic" = {
-underscore = 93;
-};
"@MMK_L_deltagreek" = {
"@MMK_R_quotedblleft" = -128;
"@MMK_R_t" = -69;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/finalkaf.glyph b/src/Inter-Roman.glyphspackage/glyphs/finalkaf.glyph
index 05fa663ef..fc9680b6a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/finalkaf.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/finalkaf.glyph
@@ -1,5 +1,7 @@
{
glyphname = finalkaf;
+kernLeft = B;
+kernRight = s;
layers = (
{
layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -7,176 +9,334 @@ shapes = (
{
closed = 1;
nodes = (
-(993,206,o),
-(916,144,o),
-(774,144,cs),
-(659,144,o),
-(421,181,o),
-(206,375,c),
-(130,216,l),
-(323,31,o),
-(577,-20,o),
-(774,-20,cs),
-(1031,-20,o),
-(1200,114,o),
-(1200,307,c),
-(1200,483,o),
-(1064,578,o),
-(799,633,cs),
-(635,667,o),
-(566,703,o),
-(566,787,c),
-(566,862,o),
-(625,938,o),
-(770,938,cs),
-(903,938,o),
-(982,847,o),
-(981,761,c),
-(1190,761,l),
-(1190,949,o),
-(1033,1102,o),
-(770,1102,cs),
-(522,1102,o),
-(361,953,o),
-(361,781,c),
-(361,604,o),
-(506,521,o),
-(755,466,cs),
-(936,426,o),
-(993,383,o),
-(993,289,cs)
+(968,0,ls),
+(1230,0,o),
+(1409,131,o),
+(1409,327,cs),
+(1409,480,o),
+(1314,575,o),
+(1111,623,cs),
+(942,663,ls),
+(811,694,o),
+(754,734,o),
+(754,817,cs),
+(754,910,o),
+(854,979,o),
+(987,979,cs),
+(1131,979,o),
+(1194,901,o),
+(1225,821,c),
+(1388,863,l),
+(1337,1020,o),
+(1216,1132,o),
+(986,1132,cs),
+(748,1132,o),
+(572,998,o),
+(572,806,cs),
+(572,649,o),
+(669,555,o),
+(872,507,cs),
+(1058,463,ls),
+(1168,437,o),
+(1222,392,o),
+(1222,315,cs),
+(1222,223,o),
+(1122,158,o),
+(966,158,cs),
+(518,158,ls),
+(401,158,o),
+(338,221,o),
+(338,338,cs),
+(338,1490,l),
+(158,1490,l),
+(158,370,ls),
+(158,130,o),
+(288,0,o),
+(528,0,cs)
+);
+}
);
+width = 1511;
},
{
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
closed = 1;
nodes = (
-(72,1490,l),
-(72,0,l),
-(254,0,l),
-(254,1490,l)
+(1155,0,ls),
+(1554,0,o),
+(1706,150,o),
+(1706,366,cs),
+(1706,555,o),
+(1594,632,o),
+(1366,672,cs),
+(1138,712,ls),
+(1054,727,o),
+(1032,759,o),
+(1032,792,cs),
+(1032,838,o),
+(1087,864,o),
+(1156,864,cs),
+(1234,864,o),
+(1298,831,o),
+(1316,758,c),
+(1670,809,l),
+(1635,1012,o),
+(1444,1132,o),
+(1148,1132,cs),
+(828,1132,o),
+(632,1001,o),
+(632,768,cs),
+(632,592,o),
+(744,492,o),
+(972,460,cs),
+(1170,432,ls),
+(1259,419,o),
+(1298,393,o),
+(1298,348,cs),
+(1298,295,o),
+(1260,272,o),
+(1173,272,cs),
+(596,272,ls),
+(536,272,o),
+(504,304,o),
+(504,364,cs),
+(504,1490,l),
+(102,1490,l),
+(102,394,ls),
+(102,146,o),
+(240,0,o),
+(544,0,cs)
);
}
);
-width = 1306;
+width = 1758;
},
{
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
shapes = (
{
closed = 1;
nodes = (
-(1177,256,o),
-(1139,238,o),
-(990,238,cs),
-(831,238,o),
-(586,300,o),
-(372,442,c),
-(270,166,l),
-(545,29,o),
-(740,-20,o),
-(990,-20,cs),
-(1343,-20,o),
-(1538,125,o),
-(1538,318,c),
-(1538,524,o),
-(1395,617,o),
-(1134,664,cs),
-(999,687,o),
-(916,704,o),
-(916,770,c),
-(916,832,o),
-(979,858,o),
-(1036,858,cs),
-(1133,858,o),
-(1168,826,o),
-(1170,744,c),
-(1542,744,l),
-(1540,960,o),
-(1348,1102,o),
-(1038,1102,cs),
-(735,1102,o),
-(564,937,o),
-(564,750,c),
-(564,547,o),
-(761,454,o),
-(962,410,cs),
-(1121,375,o),
-(1177,358,o),
-(1178,312,cs)
+(816,0,ls),
+(1034,0,o),
+(1188,108,o),
+(1188,290,cs),
+(1188,428,o),
+(1099,518,o),
+(936,559,cs),
+(760,603,ls),
+(609,641,o),
+(536,724,o),
+(536,840,cs),
+(536,989,o),
+(657,1088,o),
+(836,1088,cs),
+(989,1088,o),
+(1087,1015,o),
+(1132,870,c),
+(1178,882,l),
+(1124,1049,o),
+(1008,1134,o),
+(836,1134,cs),
+(632,1134,o),
+(490,1016,o),
+(490,840,cs),
+(490,701,o),
+(580,601,o),
+(752,558,cs),
+(926,514,ls),
+(1069,478,o),
+(1142,406,o),
+(1142,290,cs),
+(1142,135,o),
+(1009,46,o),
+(816,46,cs),
+(418,46,ls),
+(301,46,o),
+(244,103,o),
+(244,220,cs),
+(244,1490,l),
+(198,1490,l),
+(198,220,ls),
+(198,77,o),
+(275,0,o),
+(418,0,cs)
+);
+}
);
+width = 1322;
},
{
+layerId = m007;
+shapes = (
+{
closed = 1;
nodes = (
-(116,1490,l),
-(116,0,l),
-(518,0,l),
-(518,1490,l)
+(868,0,ls),
+(1098,0,o),
+(1256,96,o),
+(1256,292,cs),
+(1256,444,o),
+(1164,537,o),
+(962,585,cs),
+(792,625,ls),
+(690,649,o),
+(628,692,o),
+(628,772,cs),
+(628,862,o),
+(711,934,o),
+(841,934,cs),
+(977,934,o),
+(1064,852,o),
+(1066,740,c),
+(1232,740,l),
+(1226,950,o),
+(1061,1080,o),
+(841,1080,cs),
+(615,1080,o),
+(458,952,o),
+(458,772,cs),
+(458,618,o),
+(560,522,o),
+(756,476,cs),
+(926,436,ls),
+(1020,414,o),
+(1085,368,o),
+(1085,288,cs),
+(1085,194,o),
+(1010,148,o),
+(864,148,cs),
+(450,148,ls),
+(338,148,o),
+(296,190,o),
+(296,304,cs),
+(296,1490,l),
+(126,1490,l),
+(126,312,ls),
+(126,96,o),
+(228,0,o),
+(458,0,cs)
);
}
);
-width = 1678;
+width = 1330;
},
{
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+layerId = m009;
shapes = (
{
closed = 1;
nodes = (
-(893,120,o),
-(762,24,o),
-(568,24,cs),
-(329,24,o),
-(163,111,o),
-(82,278,c),
-(40,256,l),
-(122,77,o),
-(312,-24,o),
-(568,-24,cs),
-(788,-24,o),
-(940,94,o),
-(940,294,cs),
-(940,444,o),
-(854,521,o),
-(608,582,cs),
-(360,643,o),
-(288,702,o),
-(288,826,cs),
-(288,988,o),
-(409,1088,o),
-(588,1088,cs),
-(740,1088,o),
-(839,1016,o),
-(884,870,c),
-(930,882,l),
-(876,1049,o),
-(760,1134,o),
-(588,1134,cs),
-(383,1134,o),
-(242,1015,o),
-(242,826,cs),
-(242,677,o),
-(328,603,o),
-(596,536,cs),
-(824,479,o),
-(893,419,o),
-(894,294,cs)
+(1112,0,ls),
+(1428,0,o),
+(1636,129,o),
+(1636,353,cs),
+(1636,511,o),
+(1532,605,o),
+(1310,642,cs),
+(1084,680,ls),
+(1021,691,o),
+(986,712,o),
+(986,745,cs),
+(986,784,o),
+(1029,813,o),
+(1106,813,cs),
+(1183,813,o),
+(1242,766,o),
+(1244,705,c),
+(1608,705,l),
+(1602,934,o),
+(1409,1077,o),
+(1090,1077,cs),
+(774,1077,o),
+(588,941,o),
+(588,723,cs),
+(588,552,o),
+(701,459,o),
+(914,433,cs),
+(1112,409,ls),
+(1194,399,o),
+(1230,377,o),
+(1230,340,cs),
+(1230,300,o),
+(1192,282,o),
+(1106,282,cs),
+(548,282,ls),
+(509,282,o),
+(488,303,o),
+(488,342,cs),
+(488,1490,l),
+(86,1490,l),
+(86,358,ls),
+(86,128,o),
+(166,0,o),
+(548,0,cs)
+);
+}
);
+width = 1672;
},
{
+layerId = m011;
+shapes = (
+{
closed = 1;
nodes = (
-(38,1490,l),
-(38,0,l),
-(84,0,l),
-(84,1490,l)
+(716,0,ls),
+(945,0,o),
+(1091,95,o),
+(1091,277,cs),
+(1091,417,o),
+(997,493,o),
+(826,533,cs),
+(641,576,ls),
+(486,612,o),
+(403,661,o),
+(403,777,cs),
+(403,926,o),
+(528,1024,o),
+(717,1024,cs),
+(906,1024,o),
+(1012,926,o),
+(1030,740,c),
+(1076,740,l),
+(1061,949,o),
+(931,1070,o),
+(717,1070,cs),
+(502,1070,o),
+(357,953,o),
+(357,777,cs),
+(357,638,o),
+(452,574,o),
+(633,531,cs),
+(816,488,ls),
+(965,453,o),
+(1045,393,o),
+(1045,277,cs),
+(1045,122,o),
+(919,46,o),
+(716,46,cs),
+(324,46,ls),
+(227,46,o),
+(180,93,o),
+(180,190,cs),
+(180,1490,l),
+(134,1490,l),
+(134,190,ls),
+(134,67,o),
+(201,0,o),
+(324,0,cs)
);
}
);
-width = 1022;
+width = 1171;
},
{
-layerId = m007;
+associatedMasterId = m007;
+layerId = "739AD24F-118D-4C60-AC10-8C1F9B3DDF20";
+name = "Mar 27, 24, 16:13";
shapes = (
{
closed = 1;
@@ -234,122 +394,180 @@ nodes = (
width = 1228;
},
{
-layerId = m009;
+associatedMasterId = m007;
+layerId = "480E4101-DCE3-42FD-9E7A-E896F0A013E7";
+name = "Mar 27, 24, 16:16";
shapes = (
{
closed = 1;
nodes = (
-(1161,256,o),
-(1123,238,o),
-(974,238,cs),
-(815,238,o),
-(570,300,o),
-(356,442,c),
-(254,166,l),
-(529,29,o),
-(724,-20,o),
-(974,-20,cs),
-(1327,-20,o),
-(1522,125,o),
-(1522,318,c),
-(1522,524,o),
-(1379,617,o),
-(1118,664,cs),
-(983,687,o),
-(900,704,o),
-(900,770,c),
-(900,832,o),
-(963,858,o),
-(1020,858,cs),
-(1117,858,o),
-(1152,826,o),
-(1154,744,c),
-(1526,744,l),
-(1524,960,o),
-(1332,1102,o),
-(1022,1102,cs),
-(719,1102,o),
-(548,937,o),
-(548,750,c),
-(548,547,o),
-(745,454,o),
-(946,410,cs),
-(1105,375,o),
-(1161,358,o),
-(1162,312,cs)
+(212,1490,l),
+(40,1490,l),
+(40,383,ls),
+(40,-23,o),
+(388,-24,o),
+(782,-24,cs),
+(1012,-24,o),
+(1186,92,o),
+(1186,288,cs),
+(1186,440,o),
+(1094,533,o),
+(892,581,cs),
+(722,621,ls),
+(620,645,o),
+(558,692,o),
+(558,772,cs),
+(558,862,o),
+(641,934,o),
+(771,934,cs),
+(907,934,o),
+(994,852,o),
+(996,740,c),
+(1162,740,l),
+(1156,950,o),
+(991,1080,o),
+(771,1080,cs),
+(545,1080,o),
+(388,952,o),
+(388,772,cs),
+(388,618,o),
+(490,518,o),
+(686,472,cs),
+(856,432,ls),
+(950,410,o),
+(1015,364,o),
+(1015,284,cs),
+(1015,190,o),
+(924,122,o),
+(778,122,cs),
+(462,122,o),
+(212,80,o),
+(212,383,cs)
);
+}
+);
+width = 1228;
},
{
+associatedMasterId = m007;
+layerId = "F492CCD5-0A45-4A4C-B629-F722F764071F";
+name = "Mar 27, 24, 16:18";
+shapes = (
+{
closed = 1;
nodes = (
-(100,1490,l),
-(100,0,l),
-(502,0,l),
-(502,1490,l)
+(210,1490,l),
+(40,1490,l),
+(40,288,ls),
+(40,92,o),
+(214,-24,o),
+(444,-24,cs),
+(782,-24,ls),
+(1012,-24,o),
+(1186,92,o),
+(1186,288,cs),
+(1186,440,o),
+(1094,533,o),
+(892,581,cs),
+(722,621,ls),
+(620,645,o),
+(558,692,o),
+(558,772,cs),
+(558,862,o),
+(641,934,o),
+(771,934,cs),
+(907,934,o),
+(994,852,o),
+(996,740,c),
+(1162,740,l),
+(1156,950,o),
+(991,1080,o),
+(771,1080,cs),
+(545,1080,o),
+(388,952,o),
+(388,772,cs),
+(388,618,o),
+(490,518,o),
+(686,472,cs),
+(856,432,ls),
+(950,410,o),
+(1015,364,o),
+(1015,284,cs),
+(1015,190,o),
+(924,122,o),
+(778,122,cs),
+(448,122,ls),
+(302,122,o),
+(210,190,o),
+(210,284,cs)
);
}
);
-width = 1646;
+width = 1228;
},
{
-layerId = m011;
+associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+layerId = "3276A259-8410-4C91-AE10-220AFDE199E8";
+name = "Mar 27, 24, 16:20";
shapes = (
{
closed = 1;
nodes = (
-(829,120,o),
-(698,24,o),
-(504,24,cs),
-(265,24,o),
-(99,111,o),
-(18,278,c),
-(-24,256,l),
-(58,77,o),
-(248,-24,o),
-(504,-24,cs),
-(724,-24,o),
-(876,94,o),
-(876,294,cs),
-(876,444,o),
-(790,521,o),
-(544,582,cs),
-(296,643,o),
-(224,702,o),
-(224,826,cs),
-(224,988,o),
-(345,1088,o),
-(524,1088,cs),
-(676,1088,o),
-(775,1016,o),
-(820,870,c),
-(866,882,l),
-(812,1049,o),
-(696,1134,o),
-(524,1134,cs),
-(319,1134,o),
-(178,1015,o),
-(178,826,cs),
-(178,677,o),
-(264,603,o),
-(532,536,cs),
-(760,479,o),
-(829,419,o),
-(830,294,cs)
+(993,206,o),
+(916,144,o),
+(774,144,cs),
+(659,144,o),
+(421,181,o),
+(206,375,c),
+(130,216,l),
+(323,31,o),
+(577,-20,o),
+(774,-20,cs),
+(1031,-20,o),
+(1200,114,o),
+(1200,307,c),
+(1200,483,o),
+(1064,578,o),
+(799,633,cs),
+(635,667,o),
+(566,703,o),
+(566,787,c),
+(566,862,o),
+(625,938,o),
+(770,938,cs),
+(903,938,o),
+(982,847,o),
+(981,761,c),
+(1190,761,l),
+(1190,949,o),
+(1033,1102,o),
+(770,1102,cs),
+(522,1102,o),
+(361,953,o),
+(361,781,c),
+(361,604,o),
+(506,521,o),
+(755,466,cs),
+(936,426,o),
+(993,383,o),
+(993,289,cs)
);
},
{
closed = 1;
nodes = (
-(-26,1490,l),
-(-26,0,l),
-(20,0,l),
-(20,1490,l)
+(72,1490,l),
+(72,0,l),
+(254,0,l),
+(254,1490,l)
);
}
);
-width = 894;
+width = 1306;
}
);
+metricLeft = n;
+metricRight = s;
unicode = 682;
userData = {
interface.gridadjust.original = "{'width': 1874, 'leftMargin': 256, 'rightMargin': 135}";