diff options
author | Rasmus Andersson <rasmus@notion.se> | 2022-06-07 02:56:51 +0300 |
---|---|---|
committer | Rasmus Andersson <rasmus@notion.se> | 2022-06-07 02:56:51 +0300 |
commit | 79cb466182e322e770cabb9c98745e26dcd07d9c (patch) | |
tree | ce22c0bc7180653b269f177087e84b3f9014d123 /src/Inter.glyphspackage/glyphs | |
parent | edec0881b9a3b1c61ab98e68c5b19d9ed6bde7ca (diff) | |
download | inter-79cb466182e322e770cabb9c98745e26dcd07d9c.tar.xz |
digits for opsz
Diffstat (limited to 'src/Inter.glyphspackage/glyphs')
20 files changed, 3539 insertions, 3388 deletions
diff --git a/src/Inter.glyphspackage/glyphs/Z_edescendercyrillic.glyph b/src/Inter.glyphspackage/glyphs/Z_edescendercyrillic.glyph index 8286e0be8..08d2ced86 100644 --- a/src/Inter.glyphspackage/glyphs/Z_edescendercyrillic.glyph +++ b/src/Inter.glyphspackage/glyphs/Z_edescendercyrillic.glyph @@ -91,7 +91,7 @@ pos = (412,0); ref = cedilla; } ); -width = 1240; +width = 1232; }, { layerId = m008; @@ -117,7 +117,7 @@ pos = (256,0); ref = cedilla; } ); -width = 1350; +width = 1344; }, { layerId = m010; diff --git a/src/Inter.glyphspackage/glyphs/Z_edieresiscyrillic.glyph b/src/Inter.glyphspackage/glyphs/Z_edieresiscyrillic.glyph index d7285d6b4..087bbeade 100644 --- a/src/Inter.glyphspackage/glyphs/Z_edieresiscyrillic.glyph +++ b/src/Inter.glyphspackage/glyphs/Z_edieresiscyrillic.glyph @@ -90,7 +90,7 @@ pos = (84,372); ref = dieresis; } ); -width = 1240; +width = 1232; }, { layerId = m008; @@ -116,7 +116,7 @@ pos = (198,414); ref = dieresis; } ); -width = 1350; +width = 1344; }, { layerId = m010; diff --git a/src/Inter.glyphspackage/glyphs/afii10025.glyph b/src/Inter.glyphspackage/glyphs/afii10025.glyph index 6f40c3d85..8759e4e44 100644 --- a/src/Inter.glyphspackage/glyphs/afii10025.glyph +++ b/src/Inter.glyphspackage/glyphs/afii10025.glyph @@ -191,7 +191,7 @@ alignment = 1; ref = three; } ); -width = 1240; +width = 1232; }, { anchors = ( @@ -255,7 +255,7 @@ alignment = 1; ref = three; } ); -width = 1350; +width = 1344; }, { anchors = ( diff --git a/src/Inter.glyphspackage/glyphs/eight.glyph b/src/Inter.glyphspackage/glyphs/eight.glyph index 5666828ad..3b8d8f127 100644 --- a/src/Inter.glyphspackage/glyphs/eight.glyph +++ b/src/Inter.glyphspackage/glyphs/eight.glyph @@ -5,117 +5,83 @@ kernLeft = eight; kernRight = eight; layers = ( { -guides = ( -{ -orientation = center; -angle = 90; -pos = (924,568); -}, +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( { -angle = 90; -pos = (1168,1148); +closed = 1; +nodes = ( +(925,-20,o), +(1134,153,o), +(1134,396,cs), +(1134,584,o), +(1006,744,o), +(846,774,c), +(846,782,l), +(985,819,o), +(1078,956,o), +(1078,1114,cs), +(1078,1341,o), +(886,1510,o), +(628,1510,cs), +(365,1510,o), +(176,1341,o), +(176,1114,cs), +(176,956,o), +(267,819,o), +(410,782,c), +(410,774,l), +(245,744,o), +(122,584,o), +(122,396,cs), +(122,153,o), +(327,-20,o), +(628,-20,cs) +); }, { -angle = 90; -pos = (568,1148); -} +closed = 1; +nodes = ( +(423,140,o), +(298,244,o), +(298,404,cs), +(298,572,o), +(436,692,o), +(628,692,cs), +(816,692,o), +(956,572,o), +(956,404,cs), +(956,244,o), +(829,140,o), +(628,140,cs) ); -layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; -shapes = ( +}, { closed = 1; nodes = ( -(929,-20,o), -(1136,153,o), -(1138,396,cs), -(1136,584,o), -(1010,744,o), -(850,774,c), -(850,782,l), -(989,819,o), -(1081,956,o), -(1082,1114,cs), -(1081,1341,o), -(890,1510,o), -(632,1510,cs), -(369,1510,o), -(179,1341,o), -(180,1114,cs), -(179,956,o), -(271,819,o), -(414,782,c), -(414,774,l), -(249,744,o), -(124,584,o), -(126,396,cs), -(124,153,o), -(331,-20,o), -(632,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(427,140,o), -(301,244,o), -(302,404,cs), -(301,572,o), -(440,692,o), -(632,692,cs), -(820,692,o), -(959,572,o), -(960,404,cs), -(959,244,o), -(833,140,o), -(632,140,cs) -); -}, -{ -closed = 1; -nodes = ( -(468,847,o), -(353,948,o), -(354,1102,cs), -(353,1254,o), -(464,1353,o), -(632,1352,cs), -(796,1353,o), -(906,1254,o), -(908,1102,cs), -(906,948,o), -(791,847,o), -(632,846,cs) +(464,846,o), +(350,948,o), +(350,1102,cs), +(350,1254,o), +(460,1352,o), +(628,1352,cs), +(792,1352,o), +(904,1254,o), +(904,1102,cs), +(904,948,o), +(787,846,o), +(628,846,cs) ); } ); -width = 1262; +width = 1256; }, { guides = ( { -pos = (-24,1480); -}, -{ -pos = (-24,1060); -}, -{ -pos = (208,588); -}, -{ -pos = (-24,2076); +pos = (-16,1480); }, { -orientation = center; -angle = 90; -pos = (1008,508); -}, -{ -angle = 90; -pos = (1356,508); -}, -{ -angle = 90; -pos = (588,508); +pos = (-16,2076); } ); layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; @@ -123,70 +89,70 @@ shapes = ( { closed = 1; nodes = ( -(1068,-20,o), -(1332,163,o), -(1332,404,cs), -(1332,588,o), -(1177,736,o), -(986,766,c), -(986,776,l), -(1153,806,o), -(1277,939,o), -(1278,1106,cs), -(1277,1338,o), -(1036,1510,o), -(706,1510,cs), -(378,1510,o), -(137,1339,o), -(136,1106,cs), -(137,940,o), -(258,806,o), -(428,776,c), -(428,766,l), -(233,736,o), -(81,588,o), -(82,404,cs), -(81,163,o), -(346,-20,o), -(706,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(593,259,o), -(509,336,o), -(510,440,cs), -(509,543,o), -(593,617,o), -(706,616,cs), -(821,617,o), -(905,542,o), -(904,440,cs), -(905,335,o), -(821,259,o), -(706,258,cs) -); -}, -{ -closed = 1; -nodes = ( -(606,896,o), -(532,966,o), -(532,1058,cs), -(532,1152,o), -(606,1219,o), -(706,1218,cs), -(808,1219,o), -(881,1151,o), -(882,1058,cs), -(881,965,o), -(808,896,o), -(706,896,cs) +(1076,-20,o), +(1340,163,o), +(1340,404,cs), +(1340,588,o), +(1185,736,o), +(994,766,c), +(994,776,l), +(1161,806,o), +(1286,939,o), +(1286,1106,cs), +(1286,1338,o), +(1044,1510,o), +(714,1510,cs), +(386,1510,o), +(144,1339,o), +(144,1106,cs), +(144,940,o), +(266,806,o), +(436,776,c), +(436,766,l), +(241,736,o), +(90,588,o), +(90,404,cs), +(90,163,o), +(354,-20,o), +(714,-20,cs) +); +}, +{ +closed = 1; +nodes = ( +(601,258,o), +(518,336,o), +(518,440,cs), +(518,543,o), +(601,616,o), +(714,616,cs), +(829,616,o), +(912,542,o), +(912,440,cs), +(912,335,o), +(829,258,o), +(714,258,cs) +); +}, +{ +closed = 1; +nodes = ( +(614,896,o), +(540,966,o), +(540,1058,cs), +(540,1152,o), +(614,1218,o), +(714,1218,cs), +(816,1218,o), +(890,1151,o), +(890,1058,cs), +(890,965,o), +(816,896,o), +(714,896,cs) ); } ); -width = 1414; +width = 1432; }, { layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; @@ -194,78 +160,78 @@ shapes = ( { closed = 1; nodes = ( -(837,-20,o), -(1068,146,o), -(1108,384,cs), -(1141,577,o), -(1036,742,o), -(878,774,c), -(878,780,l), -(1021,815,o), -(1144,937,o), -(1172,1102,cs), -(1212,1335,o), -(1041,1510,o), -(776,1510,cs), -(521,1510,o), -(316,1351,o), -(274,1126,cs), -(242,963,o), -(305,817,o), -(442,780,c), -(442,774,l), -(276,745,o), -(129,591,o), -(98,408,cs), -(58,164,o), -(241,-20,o), -(546,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(356,140,o), -(252,236,o), -(276,392,cs), -(304,567,o), -(468,692,o), -(664,692,cs), -(847,692,o), -(963,582,o), -(936,416,cs), -(911,250,o), -(763,140,o), -(552,140,cs) -); -}, -{ -closed = 1; -nodes = ( -(514,847,o), -(417,938,o), -(442,1090,cs), -(468,1248,o), -(598,1353,o), -(774,1352,cs), -(936,1353,o), -(1028,1265,o), -(1000,1114,cs), -(973,956,o), -(839,847,o), -(670,846,cs) +(835,-20,o), +(1066,146,o), +(1106,384,cs), +(1139,577,o), +(1034,742,o), +(876,774,c), +(876,780,l), +(1019,815,o), +(1142,937,o), +(1170,1102,cs), +(1210,1335,o), +(1039,1510,o), +(774,1510,cs), +(519,1510,o), +(314,1351,o), +(272,1126,cs), +(240,963,o), +(303,817,o), +(440,780,c), +(440,774,l), +(274,745,o), +(127,591,o), +(96,408,cs), +(56,164,o), +(239,-20,o), +(544,-20,cs) +); +}, +{ +closed = 1; +nodes = ( +(354,140,o), +(250,236,o), +(274,392,cs), +(302,567,o), +(466,692,o), +(662,692,cs), +(845,692,o), +(961,582,o), +(934,416,cs), +(909,250,o), +(761,140,o), +(550,140,cs) +); +}, +{ +closed = 1; +nodes = ( +(512,847,o), +(415,938,o), +(440,1090,cs), +(466,1248,o), +(596,1353,o), +(772,1352,cs), +(934,1353,o), +(1026,1265,o), +(998,1114,cs), +(971,956,o), +(837,847,o), +(668,846,cs) ); } ); -width = 1262; +width = 1258; }, { guides = ( { -pos = (440,1240); +pos = (454,1240); }, { -pos = (-28,764); +pos = (-14,764); } ); layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; @@ -273,70 +239,70 @@ shapes = ( { closed = 1; nodes = ( -(969,-20,o), -(1263,164,o), -(1304,404,cs), -(1335,589,o), -(1206,736,o), -(1018,766,c), -(1018,776,l), -(1194,806,o), -(1337,939,o), -(1364,1106,cs), -(1401,1337,o), -(1190,1510,o), -(862,1510,cs), -(532,1510,o), -(262,1339,o), -(224,1106,cs), -(198,940,o), -(298,806,o), -(460,776,c), -(460,766,l), -(263,736,o), -(84,587,o), -(52,404,cs), -(11,162,o), -(248,-20,o), -(608,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(542,259,o), -(468,335,o), -(486,440,cs), -(503,542,o), -(598,617,o), -(712,616,cs), -(828,617,o), -(899,543,o), -(882,440,cs), -(864,337,o), -(769,259,o), -(654,258,cs) -); -}, -{ -closed = 1; -nodes = ( -(657,896,o), -(595,966,o), -(610,1058,cs), -(627,1152,o), -(714,1219,o), -(814,1218,cs), -(915,1219,o), -(976,1153,o), -(960,1058,cs), -(944,967,o), -(861,896,o), -(760,896,cs) +(983,-20,o), +(1277,164,o), +(1318,404,cs), +(1349,589,o), +(1220,736,o), +(1032,766,c), +(1032,776,l), +(1208,806,o), +(1351,939,o), +(1378,1106,cs), +(1415,1337,o), +(1204,1510,o), +(876,1510,cs), +(546,1510,o), +(276,1339,o), +(238,1106,cs), +(212,940,o), +(312,806,o), +(474,776,c), +(474,766,l), +(277,736,o), +(98,587,o), +(66,404,cs), +(25,162,o), +(262,-20,o), +(622,-20,cs) +); +}, +{ +closed = 1; +nodes = ( +(556,259,o), +(482,335,o), +(500,440,cs), +(517,542,o), +(612,617,o), +(726,616,cs), +(842,617,o), +(913,543,o), +(896,440,cs), +(878,337,o), +(783,259,o), +(668,258,cs) +); +}, +{ +closed = 1; +nodes = ( +(671,896,o), +(609,966,o), +(624,1058,cs), +(641,1152,o), +(728,1219,o), +(828,1218,cs), +(929,1219,o), +(990,1153,o), +(974,1058,cs), +(958,967,o), +(875,896,o), +(774,896,cs) ); } ); -width = 1410; +width = 1434; }, { associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; @@ -611,70 +577,70 @@ shapes = ( { closed = 1; nodes = ( -(873,-20,o), -(1079,160,o), -(1080,384,cs), -(1079,561,o), -(948,728,o), -(766,768,c), -(766,774,l), -(922,826,o), -(1030,969,o), -(1030,1132,cs), -(1030,1345,o), -(842,1510,o), -(616,1510,cs), -(388,1510,o), -(204,1343,o), -(204,1132,cs), -(204,968,o), -(314,827,o), -(468,774,c), -(468,768,l), -(285,726,o), -(154,561,o), -(154,384,cs), -(154,160,o), -(361,-20,o), -(616,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(385,26,o), -(201,189,o), -(200,386,cs), -(201,585,o), -(384,748,o), -(616,748,cs), -(849,748,o), -(1033,585,o), -(1032,386,cs), -(1033,189,o), -(849,26,o), -(616,26,cs) -); -}, -{ -closed = 1; -nodes = ( -(415,788,o), -(250,946,o), -(250,1132,cs), -(250,1318,o), -(415,1463,o), -(616,1464,cs), -(818,1463,o), -(983,1318,o), -(984,1132,cs), -(983,946,o), -(818,788,o), -(616,788,cs) +(867,-20,o), +(1073,160,o), +(1074,384,cs), +(1073,561,o), +(942,728,o), +(760,768,c), +(760,774,l), +(916,826,o), +(1024,969,o), +(1024,1132,cs), +(1024,1345,o), +(836,1510,o), +(610,1510,cs), +(382,1510,o), +(198,1343,o), +(198,1132,cs), +(198,968,o), +(308,827,o), +(462,774,c), +(462,768,l), +(279,726,o), +(148,561,o), +(148,384,cs), +(148,160,o), +(355,-20,o), +(610,-20,cs) +); +}, +{ +closed = 1; +nodes = ( +(379,26,o), +(195,189,o), +(194,386,cs), +(195,585,o), +(378,748,o), +(610,748,cs), +(843,748,o), +(1027,585,o), +(1026,386,cs), +(1027,189,o), +(843,26,o), +(610,26,cs) +); +}, +{ +closed = 1; +nodes = ( +(409,788,o), +(244,946,o), +(244,1132,cs), +(244,1318,o), +(409,1463,o), +(610,1464,cs), +(812,1463,o), +(977,1318,o), +(978,1132,cs), +(977,946,o), +(812,788,o), +(610,788,cs) ); } ); -width = 1234; +width = 1222; }, { layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; @@ -682,70 +648,70 @@ shapes = ( { closed = 1; nodes = ( -(777,-20,o), -(1012,160,o), -(1050,384,cs), -(1079,561,o), -(977,727,o), -(800,768,c), -(800,774,l), -(966,826,o), -(1097,969,o), -(1126,1132,cs), -(1161,1344,o), -(1001,1510,o), -(774,1510,cs), -(547,1510,o), -(335,1344,o), -(300,1132,cs), -(271,969,o), -(358,826,o), -(504,774,c), -(504,768,l), -(314,727,o), -(154,561,o), -(126,384,cs), -(87,160,o), -(265,-20,o), -(520,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(285,26,o), -(140,189,o), -(172,386,cs), -(204,585,o), -(431,748,o), -(664,748,cs), -(896,748,o), -(1036,585,o), -(1004,386,cs), -(972,189,o), -(751,26,o), -(518,26,cs) -); -}, -{ -closed = 1; -nodes = ( -(442,788,o), -(314,945,o), -(346,1132,cs), -(375,1318,o), -(576,1463,o), -(776,1464,cs), -(980,1463,o), -(1108,1318,o), -(1080,1132,cs), -(1047,945,o), -(844,788,o), -(642,788,cs) +(769,-20,o), +(1004,160,o), +(1042,384,cs), +(1071,561,o), +(969,727,o), +(792,768,c), +(792,774,l), +(958,826,o), +(1089,969,o), +(1118,1132,cs), +(1153,1344,o), +(993,1510,o), +(766,1510,cs), +(539,1510,o), +(327,1344,o), +(292,1132,cs), +(263,969,o), +(350,826,o), +(496,774,c), +(496,768,l), +(306,727,o), +(146,561,o), +(118,384,cs), +(79,160,o), +(257,-20,o), +(512,-20,cs) +); +}, +{ +closed = 1; +nodes = ( +(277,26,o), +(132,189,o), +(164,386,cs), +(196,585,o), +(423,748,o), +(656,748,cs), +(888,748,o), +(1028,585,o), +(996,386,cs), +(964,189,o), +(743,26,o), +(510,26,cs) +); +}, +{ +closed = 1; +nodes = ( +(434,788,o), +(306,945,o), +(338,1132,cs), +(367,1318,o), +(568,1463,o), +(768,1464,cs), +(972,1463,o), +(1100,1318,o), +(1072,1132,cs), +(1039,945,o), +(836,788,o), +(634,788,cs) ); } ); -width = 1234; +width = 1222; }, { associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; @@ -1085,15 +1051,7 @@ guides = ( { orientation = center; angle = 90; -pos = (-4897,568); -}, -{ -angle = 90; -pos = (876,1148); -}, -{ -angle = 90; -pos = (276,1148); +pos = (-5500,568); } ); layerId = m007; @@ -1101,70 +1059,70 @@ shapes = ( { closed = 1; nodes = ( -(897,-20,o), -(1104,153,o), -(1106,396,cs), -(1104,584,o), -(978,744,o), -(818,774,c), -(818,782,l), -(957,819,o), -(1049,956,o), -(1050,1114,cs), -(1049,1341,o), -(858,1510,o), -(600,1510,cs), -(337,1510,o), -(147,1341,o), -(148,1114,cs), -(147,956,o), -(239,819,o), -(382,782,c), -(382,774,l), -(217,744,o), -(92,584,o), -(94,396,cs), -(92,153,o), -(299,-20,o), -(600,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(395,140,o), -(269,244,o), -(270,404,cs), -(269,572,o), -(408,692,o), -(600,692,cs), -(788,692,o), -(927,572,o), -(928,404,cs), -(927,244,o), -(801,140,o), -(600,140,cs) -); -}, -{ -closed = 1; -nodes = ( -(436,847,o), -(321,948,o), -(322,1102,cs), -(321,1254,o), -(432,1353,o), -(600,1352,cs), -(764,1353,o), -(874,1254,o), -(876,1102,cs), -(874,948,o), -(759,847,o), -(600,846,cs) +(891,-24,o), +(1102,151,o), +(1102,396,cs), +(1102,582,o), +(978,746,o), +(814,777,c), +(814,779,l), +(950,815,o), +(1046,953,o), +(1046,1114,cs), +(1046,1344,o), +(854,1514,o), +(596,1514,cs), +(336,1514,o), +(144,1344,o), +(144,1114,cs), +(144,952,o), +(239,815,o), +(378,779,c), +(378,777,l), +(213,747,o), +(90,584,o), +(90,396,cs), +(90,151,o), +(300,-24,o), +(596,-24,cs) +); +}, +{ +closed = 1; +nodes = ( +(396,136,o), +(266,242,o), +(266,404,cs), +(266,571,o), +(404,692,o), +(596,692,cs), +(787,692,o), +(924,571,o), +(924,404,cs), +(924,241,o), +(795,136,o), +(596,136,cs) +); +}, +{ +closed = 1; +nodes = ( +(431,846,o), +(318,950,o), +(318,1102,cs), +(318,1254,o), +(430,1356,o), +(596,1356,cs), +(761,1356,o), +(872,1254,o), +(872,1102,cs), +(872,949,o), +(760,846,o), +(596,846,cs) ); } ); -width = 1198; +width = 1192; }, { associatedMasterId = m007; @@ -1255,97 +1213,80 @@ shapes = ( { closed = 1; nodes = ( -(805,-20,o), -(1036,146,o), -(1076,384,cs), -(1109,577,o), -(1004,742,o), -(846,774,c), -(846,780,l), -(989,815,o), -(1112,937,o), -(1140,1102,cs), -(1180,1335,o), -(1009,1510,o), -(744,1510,cs), -(489,1510,o), -(284,1351,o), -(242,1126,cs), -(210,963,o), -(273,817,o), -(410,780,c), -(410,774,l), -(244,745,o), -(97,591,o), -(66,408,cs), -(26,164,o), -(209,-20,o), -(514,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(324,140,o), -(220,236,o), -(244,392,cs), -(272,567,o), -(436,692,o), -(632,692,cs), -(815,692,o), -(931,582,o), -(904,416,cs), -(879,250,o), -(731,140,o), -(520,140,cs) -); -}, -{ -closed = 1; -nodes = ( -(482,847,o), -(385,938,o), -(410,1090,cs), -(436,1248,o), -(566,1353,o), -(742,1352,cs), -(904,1353,o), -(996,1265,o), -(968,1114,cs), -(941,956,o), -(807,847,o), -(638,846,cs) +(803,-20,o), +(1034,146,o), +(1074,384,cs), +(1107,577,o), +(1002,742,o), +(844,774,c), +(844,780,l), +(987,815,o), +(1110,937,o), +(1138,1102,cs), +(1178,1335,o), +(1007,1510,o), +(742,1510,cs), +(487,1510,o), +(282,1351,o), +(240,1126,cs), +(208,963,o), +(271,817,o), +(408,780,c), +(408,774,l), +(242,745,o), +(95,591,o), +(64,408,cs), +(24,164,o), +(207,-20,o), +(512,-20,cs) +); +}, +{ +closed = 1; +nodes = ( +(322,140,o), +(218,236,o), +(242,392,cs), +(270,567,o), +(434,692,o), +(630,692,cs), +(813,692,o), +(929,582,o), +(902,416,cs), +(877,250,o), +(729,140,o), +(518,140,cs) +); +}, +{ +closed = 1; +nodes = ( +(480,847,o), +(383,938,o), +(408,1090,cs), +(434,1248,o), +(564,1353,o), +(740,1352,cs), +(902,1353,o), +(994,1265,o), +(966,1114,cs), +(939,956,o), +(805,847,o), +(636,846,cs) ); } ); -width = 1198; +width = 1194; }, { guides = ( { -pos = (-120,1480); -}, -{ -pos = (-120,1060); -}, -{ -pos = (112,588); -}, -{ pos = (-120,2076); }, { orientation = center; angle = 90; pos = (-2567,508); -}, -{ -angle = 90; -pos = (1260,508); -}, -{ -angle = 90; -pos = (492,508); } ); layerId = m009; @@ -1353,66 +1294,66 @@ shapes = ( { closed = 1; nodes = ( -(1052,-20,o), -(1316,163,o), -(1316,404,cs), -(1316,588,o), -(1161,736,o), -(970,766,c), -(970,776,l), -(1137,806,o), -(1261,939,o), +(1063,-24,o), +(1308,146,o), +(1308,404,cs), +(1308,593,o), +(1174,738,o), +(970,770,c), +(970,772,l), +(1148,804,o), +(1262,935,o), (1262,1106,cs), -(1261,1338,o), -(1020,1510,o), -(690,1510,cs), -(362,1510,o), -(121,1339,o), +(1262,1355,o), +(1039,1514,o), +(690,1514,cs), +(349,1514,o), +(120,1350,o), (120,1106,cs), -(121,940,o), -(242,806,o), -(412,776,c), -(412,766,l), -(217,736,o), -(65,588,o), -(66,404,cs), -(65,163,o), -(330,-20,o), -(690,-20,cs) +(120,935,o), +(235,803,o), +(412,772,c), +(412,770,l), +(208,738,o), +(74,593,o), +(74,404,cs), +(74,146,o), +(318,-24,o), +(690,-24,cs) ); }, { closed = 1; nodes = ( -(577,259,o), -(493,336,o), -(494,440,cs), -(493,543,o), -(577,617,o), +(576,254,o), +(494,330,o), +(494,436,cs), +(494,541,o), +(576,616,o), (690,616,cs), -(805,617,o), -(889,542,o), -(888,440,cs), -(889,335,o), -(805,259,o), -(690,258,cs) +(805,616,o), +(888,541,o), +(888,436,cs), +(888,331,o), +(804,254,o), +(690,254,cs) ); }, { closed = 1; nodes = ( -(590,896,o), -(516,966,o), -(516,1058,cs), -(516,1152,o), -(590,1219,o), -(690,1218,cs), -(792,1219,o), -(865,1151,o), -(866,1058,cs), -(865,965,o), -(792,896,o), -(690,896,cs) +(584,907,o), +(516,969,o), +(516,1066,cs), +(516,1163,o), +(584,1225,o), +(690,1225,cs), +(797,1225,o), +(866,1163,o), +(866,1066,cs), +(866,969,o), +(797,907,o), +(690,907,cs) ); } ); @@ -1605,10 +1546,10 @@ width = 1396; { guides = ( { -pos = (408,1240); +pos = (422,1240); }, { -pos = (-60,764); +pos = (-46,764); } ); layerId = m010; @@ -1616,141 +1557,141 @@ shapes = ( { closed = 1; nodes = ( -(953,-20,o), -(1247,164,o), -(1288,404,cs), -(1319,589,o), -(1190,736,o), -(1002,766,c), -(1002,776,l), -(1178,806,o), -(1321,939,o), -(1348,1106,cs), -(1385,1337,o), -(1174,1510,o), -(846,1510,cs), -(516,1510,o), -(246,1339,o), -(208,1106,cs), -(182,940,o), -(282,806,o), -(444,776,c), -(444,766,l), -(247,736,o), -(68,587,o), -(36,404,cs), -(-5,162,o), -(232,-20,o), -(592,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(526,259,o), -(452,335,o), -(470,440,cs), -(487,542,o), -(582,617,o), -(696,616,cs), -(812,617,o), -(883,543,o), -(866,440,cs), -(848,337,o), -(753,259,o), -(638,258,cs) +(967,-20,o), +(1261,164,o), +(1302,404,cs), +(1333,589,o), +(1204,736,o), +(1016,766,c), +(1016,776,l), +(1192,806,o), +(1335,939,o), +(1362,1106,cs), +(1399,1337,o), +(1188,1510,o), +(860,1510,cs), +(530,1510,o), +(260,1339,o), +(222,1106,cs), +(196,940,o), +(296,806,o), +(458,776,c), +(458,766,l), +(261,736,o), +(82,587,o), +(50,404,cs), +(9,162,o), +(246,-20,o), +(606,-20,cs) +); +}, +{ +closed = 1; +nodes = ( +(540,259,o), +(466,335,o), +(484,440,cs), +(501,542,o), +(596,617,o), +(710,616,cs), +(826,617,o), +(897,543,o), +(880,440,cs), +(862,337,o), +(767,259,o), +(652,258,cs) +); +}, +{ +closed = 1; +nodes = ( +(655,896,o), +(593,966,o), +(608,1058,cs), +(625,1152,o), +(712,1219,o), +(812,1218,cs), +(913,1219,o), +(974,1153,o), +(958,1058,cs), +(942,967,o), +(859,896,o), +(758,896,cs) ); +} +); +width = 1402; }, { +layerId = m011; +shapes = ( +{ closed = 1; nodes = ( -(641,896,o), -(579,966,o), -(594,1058,cs), -(611,1152,o), -(698,1219,o), -(798,1218,cs), -(899,1219,o), -(960,1153,o), -(944,1058,cs), -(928,967,o), -(845,896,o), -(744,896,cs) -); -} +(803,-20,o), +(1009,160,o), +(1010,384,cs), +(1009,561,o), +(878,728,o), +(696,768,c), +(696,774,l), +(852,826,o), +(960,969,o), +(960,1132,cs), +(960,1345,o), +(772,1510,o), +(546,1510,cs), +(318,1510,o), +(134,1343,o), +(134,1132,cs), +(134,968,o), +(244,827,o), +(398,774,c), +(398,768,l), +(215,726,o), +(84,561,o), +(84,384,cs), +(84,160,o), +(291,-20,o), +(546,-20,cs) ); -width = 1378; }, { -layerId = m011; -shapes = ( +closed = 1; +nodes = ( +(315,26,o), +(131,189,o), +(130,386,cs), +(131,585,o), +(314,748,o), +(546,748,cs), +(779,748,o), +(963,585,o), +(962,386,cs), +(963,189,o), +(779,26,o), +(546,26,cs) +); +}, { closed = 1; nodes = ( -(809,-20,o), -(1015,160,o), -(1016,384,cs), -(1015,561,o), -(884,728,o), -(702,768,c), -(702,774,l), -(858,826,o), -(966,969,o), -(966,1132,cs), -(966,1345,o), -(778,1510,o), -(552,1510,cs), -(324,1510,o), -(140,1343,o), -(140,1132,cs), -(140,968,o), -(250,827,o), -(404,774,c), -(404,768,l), -(221,726,o), -(90,561,o), -(90,384,cs), -(90,160,o), -(297,-20,o), -(552,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(321,26,o), -(137,189,o), -(136,386,cs), -(137,585,o), -(320,748,o), -(552,748,cs), -(785,748,o), -(969,585,o), -(968,386,cs), -(969,189,o), -(785,26,o), -(552,26,cs) -); -}, -{ -closed = 1; -nodes = ( -(351,788,o), -(186,946,o), -(186,1132,cs), -(186,1318,o), -(351,1463,o), -(552,1464,cs), -(754,1463,o), -(919,1318,o), -(920,1132,cs), -(919,946,o), -(754,788,o), -(552,788,cs) +(345,788,o), +(180,946,o), +(180,1132,cs), +(180,1318,o), +(345,1463,o), +(546,1464,cs), +(748,1463,o), +(913,1318,o), +(914,1132,cs), +(913,946,o), +(748,788,o), +(546,788,cs) ); } ); -width = 1106; +width = 1094; }, { associatedMasterId = m011; @@ -2091,72 +2032,74 @@ shapes = ( { closed = 1; nodes = ( -(713,-20,o), -(948,160,o), -(986,384,cs), -(1015,561,o), -(913,727,o), -(736,768,c), -(736,774,l), -(902,826,o), -(1033,969,o), -(1062,1132,cs), -(1097,1344,o), -(937,1510,o), -(710,1510,cs), -(483,1510,o), -(271,1344,o), -(236,1132,cs), -(207,969,o), -(294,826,o), -(440,774,c), -(440,768,l), -(250,727,o), -(90,561,o), -(62,384,cs), -(23,160,o), -(201,-20,o), -(456,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(221,26,o), -(76,189,o), -(108,386,cs), -(140,585,o), -(367,748,o), -(600,748,cs), -(832,748,o), -(972,585,o), -(940,386,cs), -(908,189,o), -(687,26,o), -(454,26,cs) -); -}, -{ -closed = 1; -nodes = ( -(378,788,o), -(250,945,o), -(282,1132,cs), -(311,1318,o), -(512,1463,o), -(712,1464,cs), -(916,1463,o), -(1044,1318,o), -(1016,1132,cs), -(983,945,o), -(780,788,o), -(578,788,cs) +(705,-20,o), +(940,160,o), +(978,384,cs), +(1007,561,o), +(905,727,o), +(728,768,c), +(728,774,l), +(894,826,o), +(1025,969,o), +(1054,1132,cs), +(1089,1344,o), +(929,1510,o), +(702,1510,cs), +(475,1510,o), +(263,1344,o), +(228,1132,cs), +(199,969,o), +(286,826,o), +(432,774,c), +(432,768,l), +(242,727,o), +(82,561,o), +(54,384,cs), +(15,160,o), +(193,-20,o), +(448,-20,cs) +); +}, +{ +closed = 1; +nodes = ( +(213,26,o), +(68,189,o), +(100,386,cs), +(132,585,o), +(359,748,o), +(592,748,cs), +(824,748,o), +(964,585,o), +(932,386,cs), +(900,189,o), +(679,26,o), +(446,26,cs) +); +}, +{ +closed = 1; +nodes = ( +(370,788,o), +(242,945,o), +(274,1132,cs), +(303,1318,o), +(504,1463,o), +(704,1464,cs), +(908,1463,o), +(1036,1318,o), +(1008,1132,cs), +(975,945,o), +(772,788,o), +(570,788,cs) ); } ); -width = 1106; +width = 1094; } ); +metricLeft = zero; +metricRight = zero; note = "essentially two conjoined \"three\" glyphs"; tags = ( "TODO-opsz" diff --git a/src/Inter.glyphspackage/glyphs/five.glyph b/src/Inter.glyphspackage/glyphs/five.glyph index 8a2009af3..129b8d6b2 100644 --- a/src/Inter.glyphspackage/glyphs/five.glyph +++ b/src/Inter.glyphspackage/glyphs/five.glyph @@ -3,223 +3,6 @@ color = (227,245,235,1); glyphname = five; layers = ( { -background = { -shapes = ( -{ -ref = three; -} -); -}; -guides = ( -{ -angle = 90; -pos = (1436,1656); -} -); -layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; -shapes = ( -{ -closed = 1; -nodes = ( -(903,-20,o), -(1111,189,o), -(1112,474,cs), -(1111,763,o), -(911,975,o), -(638,974,cs), -(537,975,o), -(439,939,o), -(378,890,c), -(370,890,l), -(422,1330,l), -(1044,1330,l), -(1044,1490,l), -(270,1490,l), -(180,756,l), -(350,736,l), -(411,780,o), -(516,812,o), -(608,812,cs), -(798,810,o), -(937,666,o), -(936,472,cs), -(937,280,o), -(803,140,o), -(620,140,cs), -(467,140,o), -(345,238,o), -(332,372,c), -(158,372,l), -(168,145,o), -(364,-20,o), -(620,-20,cs) -); -} -); -width = 1246; -}, -{ -background = { -shapes = ( -{ -pos = (28,0); -ref = three; -} -); -}; -guides = ( -{ -pos = (-52,2280); -}, -{ -pos = (-52,2396); -}, -{ -angle = 90; -pos = (264,0); -} -); -layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; -shapes = ( -{ -closed = 1; -nodes = ( -(1058,-20,o), -(1295,200,o), -(1294,512,cs), -(1295,795,o), -(1097,995,o), -(832,994,cs), -(681,995,o), -(559,928,o), -(512,838,c), -(504,838,l), -(532,1166,l), -(1202,1166,l), -(1202,1490,l), -(200,1490,l), -(142,670,l), -(498,600,l), -(532,672,o), -(609,716,o), -(696,716,cs), -(819,716,o), -(905,631,o), -(904,500,cs), -(905,370,o), -(819,285,o), -(696,286,cs), -(588,285,o), -(500,351,o), -(498,454,c), -(104,454,l), -(107,176,o), -(352,-20,o), -(696,-20,cs) -); -} -); -width = 1370; -}, -{ -layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; -shapes = ( -{ -closed = 1; -nodes = ( -(809,-20,o), -(1050,189,o), -(1096,474,cs), -(1146,762,o), -(980,975,o), -(706,974,cs), -(605,975,o), -(503,940,o), -(434,890,c), -(424,890,l), -(550,1330,l), -(1172,1330,l), -(1198,1490,l), -(424,1490,l), -(212,756,l), -(378,736,l), -(448,780,o), -(559,812,o), -(648,812,cs), -(841,812,o), -(954,666,o), -(922,472,cs), -(890,279,o), -(733,140,o), -(550,140,cs), -(399,140,o), -(291,239,o), -(300,372,c), -(126,372,l), -(99,145,o), -(268,-20,o), -(524,-20,cs) -); -} -); -width = 1246; -}, -{ -guides = ( -{ -pos = (2764,2280); -}, -{ -pos = (2976,2396); -}, -{ -angle = 90; -pos = (-1068,0); -} -); -layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; -shapes = ( -{ -closed = 1; -nodes = ( -(964,-20,o), -(1237,201,o), -(1286,512,cs), -(1333,794,o), -(1170,995,o), -(904,994,cs), -(754,995,o), -(620,928,o), -(558,838,c), -(550,838,l), -(634,1166,l), -(1304,1166,l), -(1356,1490,l), -(354,1490,l), -(160,670,l), -(504,600,l), -(551,672,o), -(635,716,o), -(722,716,cs), -(844,716,o), -(917,631,o), -(896,500,cs), -(873,369,o), -(775,285,o), -(648,286,cs), -(542,285,o), -(466,352,o), -(480,454,c), -(88,454,l), -(44,177,o), -(257,-20,o), -(600,-20,cs) -); -} -); -width = 1370; -}, -{ guides = ( { angle = 90; @@ -232,9 +15,9 @@ shapes = ( closed = 1; nodes = ( (822,-20,o), -(1005,186,o), +(1006,186,o), (1006,462,cs), -(1008,751,o), +(1006,751,o), (801,940,o), (562,940,cs), (442,940,o), @@ -248,68 +31,25 @@ nodes = ( (210,786,l), (280,774,l), (348,844,o), -(444,893,o), +(444,894,o), (562,894,cs), -(775,893,o), -(959,727,o), +(775,894,o), +(960,727,o), (960,462,cs), -(961,215,o), +(960,215,o), (799,26,o), (564,26,cs), (356,26,o), -(217,169,o), +(218,169,o), (218,372,c), (172,372,l), -(170,143,o), +(172,143,o), (333,-20,o), (564,-20,cs) ); } ); -width = 1170; -}, -{ -layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; -shapes = ( -{ -closed = 1; -nodes = ( -(726,-20,o), -(943,186,o), -(992,462,cs), -(1043,750,o), -(865,940,o), -(626,940,cs), -(505,940,o), -(397,896,o), -(312,826,c), -(306,826,l), -(482,1442,l), -(1102,1442,l), -(1112,1490,l), -(450,1490,l), -(248,786,l), -(314,774,l), -(394,844,o), -(508,893,o), -(626,894,cs), -(839,893,o), -(988,727,o), -(946,462,cs), -(906,217,o), -(700,26,o), -(468,26,cs), -(260,26,o), -(153,169,o), -(186,372,c), -(140,372,l), -(100,143,o), -(237,-20,o), -(468,-20,cs) -); -} -); -width = 1170; +width = 1154; }, { associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; @@ -459,223 +199,6 @@ nodes = ( width = 1170; }, { -background = { -shapes = ( -{ -ref = three; -} -); -}; -guides = ( -{ -angle = 90; -pos = (1144,1656); -} -); -layerId = m007; -shapes = ( -{ -closed = 1; -nodes = ( -(871,-20,o), -(1079,189,o), -(1080,474,cs), -(1079,763,o), -(879,975,o), -(606,974,cs), -(505,975,o), -(407,939,o), -(346,890,c), -(338,890,l), -(390,1330,l), -(1012,1330,l), -(1012,1490,l), -(238,1490,l), -(148,756,l), -(318,736,l), -(379,780,o), -(484,812,o), -(576,812,cs), -(766,810,o), -(905,666,o), -(904,472,cs), -(905,280,o), -(771,140,o), -(588,140,cs), -(435,140,o), -(313,238,o), -(300,372,c), -(126,372,l), -(136,145,o), -(332,-20,o), -(588,-20,cs) -); -} -); -width = 1182; -}, -{ -layerId = m008; -shapes = ( -{ -closed = 1; -nodes = ( -(777,-20,o), -(1018,189,o), -(1064,474,cs), -(1114,762,o), -(948,975,o), -(674,974,cs), -(573,975,o), -(471,940,o), -(402,890,c), -(392,890,l), -(518,1330,l), -(1140,1330,l), -(1166,1490,l), -(392,1490,l), -(180,756,l), -(346,736,l), -(416,780,o), -(527,812,o), -(616,812,cs), -(809,812,o), -(922,666,o), -(890,472,cs), -(858,279,o), -(701,140,o), -(518,140,cs), -(367,140,o), -(259,239,o), -(268,372,c), -(94,372,l), -(67,145,o), -(236,-20,o), -(492,-20,cs) -); -} -); -width = 1182; -}, -{ -background = { -shapes = ( -{ -pos = (28,0); -ref = three; -} -); -}; -guides = ( -{ -pos = (-148,2280); -}, -{ -pos = (-148,2396); -}, -{ -angle = 90; -pos = (168,0); -} -); -layerId = m009; -shapes = ( -{ -closed = 1; -nodes = ( -(1042,-20,o), -(1279,200,o), -(1278,512,cs), -(1279,795,o), -(1081,995,o), -(816,994,cs), -(665,995,o), -(543,928,o), -(496,838,c), -(488,838,l), -(516,1166,l), -(1186,1166,l), -(1186,1490,l), -(184,1490,l), -(126,670,l), -(482,600,l), -(516,672,o), -(593,716,o), -(680,716,cs), -(803,716,o), -(889,631,o), -(888,500,cs), -(889,370,o), -(803,285,o), -(680,286,cs), -(572,285,o), -(484,351,o), -(482,454,c), -(88,454,l), -(91,176,o), -(336,-20,o), -(680,-20,cs) -); -} -); -width = 1338; -}, -{ -guides = ( -{ -pos = (2732,2280); -}, -{ -pos = (2944,2396); -}, -{ -angle = 90; -pos = (-1100,0); -} -); -layerId = m010; -shapes = ( -{ -closed = 1; -nodes = ( -(948,-20,o), -(1221,201,o), -(1270,512,cs), -(1317,794,o), -(1154,995,o), -(888,994,cs), -(738,995,o), -(604,928,o), -(542,838,c), -(534,838,l), -(618,1166,l), -(1288,1166,l), -(1340,1490,l), -(338,1490,l), -(144,670,l), -(488,600,l), -(535,672,o), -(619,716,o), -(706,716,cs), -(828,716,o), -(901,631,o), -(880,500,cs), -(857,369,o), -(759,285,o), -(632,286,cs), -(526,285,o), -(450,352,o), -(464,454,c), -(72,454,l), -(28,177,o), -(241,-20,o), -(584,-20,cs) -); -} -); -width = 1338; -}, -{ guides = ( { angle = 90; @@ -688,9 +211,9 @@ shapes = ( closed = 1; nodes = ( (758,-20,o), -(941,186,o), +(942,186,o), (942,462,cs), -(944,751,o), +(942,751,o), (737,940,o), (498,940,cs), (378,940,o), @@ -704,25 +227,25 @@ nodes = ( (146,786,l), (216,774,l), (284,844,o), -(380,893,o), +(380,894,o), (498,894,cs), -(711,893,o), -(895,727,o), +(711,894,o), +(896,727,o), (896,462,cs), -(897,215,o), +(896,215,o), (735,26,o), (500,26,cs), (292,26,o), -(153,169,o), +(154,169,o), (154,372,c), (108,372,l), -(106,143,o), +(108,143,o), (269,-20,o), (500,-20,cs) ); } ); -width = 1042; +width = 1026; }, { associatedMasterId = m011; @@ -872,6 +395,430 @@ nodes = ( width = 1170; }, { +background = { +shapes = ( +{ +ref = three; +} +); +}; +guides = ( +{ +angle = 90; +pos = (1436,1656); +} +); +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( +{ +closed = 1; +nodes = ( +(903,-20,o), +(1112,189,o), +(1112,474,cs), +(1112,763,o), +(911,974,o), +(638,974,cs), +(537,974,o), +(439,939,o), +(378,890,c), +(370,890,l), +(422,1330,l), +(1044,1330,l), +(1044,1490,l), +(270,1490,l), +(180,756,l), +(350,736,l), +(411,780,o), +(516,812,o), +(608,812,cs), +(798,812,o), +(936,666,o), +(936,472,cs), +(936,280,o), +(803,140,o), +(620,140,cs), +(467,140,o), +(345,238,o), +(332,372,c), +(158,372,l), +(168,145,o), +(364,-20,o), +(620,-20,cs) +); +} +); +width = 1234; +}, +{ +background = { +shapes = ( +{ +pos = (8,0); +ref = six; +} +); +}; +layerId = m007; +shapes = ( +{ +closed = 1; +nodes = ( +(919,-20,o), +(1119,190,o), +(1119,490,cs), +(1119,785,o), +(930,996,o), +(656,996,cs), +(516,996,o), +(400,948,o), +(306,847,c), +(304,847,l), +(340,1330,l), +(1037,1330,l), +(1037,1490,l), +(177,1490,l), +(127,640,l), +(300,640,l), +(346,767,o), +(470,834,o), +(634,834,cs), +(819,834,o), +(945,689,o), +(945,488,cs), +(945,286,o), +(814,140,o), +(621,140,cs), +(439,140,o), +(304,263,o), +(288,432,c), +(108,432,l), +(119,174,o), +(334,-20,o), +(621,-20,cs) +); +} +); +width = 1209; +}, +{ +associatedMasterId = m007; +background = { +shapes = ( +{ +ref = six; +} +); +}; +layerId = "D9785A56-1BC0-4F0E-B604-1F63AE52FD82"; +name = "Jun 6, 22, 16:14"; +shapes = ( +{ +closed = 1; +nodes = ( +(919,-20,o), +(1127,190,o), +(1127,490,cs), +(1127,785,o), +(930,996,o), +(656,996,cs), +(516,996,o), +(392,948,o), +(298,847,c), +(296,847,l), +(332,1330,l), +(1037,1330,l), +(1037,1490,l), +(169,1490,l), +(119,640,l), +(292,640,l), +(338,767,o), +(470,834,o), +(634,834,cs), +(819,834,o), +(953,689,o), +(953,488,cs), +(953,286,o), +(814,140,o), +(621,140,cs), +(439,140,o), +(296,263,o), +(280,432,c), +(100,432,l), +(111,174,o), +(334,-20,o), +(621,-20,cs) +); +} +); +width = 1217; +}, +{ +associatedMasterId = m007; +guides = ( +{ +angle = 90; +pos = (1144,1656); +} +); +layerId = "E89F2BC9-65FC-45C4-8100-B671C8B1D31A"; +name = "Jun 6, 22, 15:55"; +shapes = ( +{ +closed = 1; +nodes = ( +(876,-20,o), +(1080,185,o), +(1080,474,cs), +(1080,762,o), +(879,974,o), +(606,974,cs), +(495,974,o), +(401,939,o), +(340,890,c), +(338,890,l), +(390,1330,l), +(1012,1330,l), +(1012,1490,l), +(238,1490,l), +(145,736,l), +(318,736,l), +(379,780,o), +(487,812,o), +(576,812,cs), +(766,812,o), +(904,669,o), +(904,472,cs), +(904,279,o), +(771,140,o), +(588,140,cs), +(434,140,o), +(313,237,o), +(300,372,c), +(126,372,l), +(136,145,o), +(331,-20,o), +(588,-20,cs) +); +} +); +width = 1182; +}, +{ +background = { +shapes = ( +{ +pos = (28,0); +ref = three; +} +); +}; +guides = ( +{ +pos = (-52,2280); +}, +{ +pos = (-52,2396); +} +); +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +closed = 1; +nodes = ( +(1058,-20,o), +(1294,200,o), +(1294,512,cs), +(1294,795,o), +(1097,994,o), +(832,994,cs), +(681,994,o), +(559,928,o), +(512,838,c), +(504,838,l), +(532,1166,l), +(1202,1166,l), +(1202,1490,l), +(200,1490,l), +(142,670,l), +(498,600,l), +(532,672,o), +(609,716,o), +(696,716,cs), +(819,716,o), +(904,631,o), +(904,500,cs), +(904,370,o), +(819,286,o), +(696,286,cs), +(588,286,o), +(498,351,o), +(498,454,c), +(104,454,l), +(107,176,o), +(352,-20,o), +(696,-20,cs) +); +} +); +width = 1386; +}, +{ +guides = ( +{ +pos = (-162,2280); +}, +{ +pos = (-162,2396); +}, +{ +angle = 90; +pos = (154,0); +} +); +layerId = m009; +shapes = ( +{ +closed = 1; +nodes = ( +(1028,-24,o), +(1264,200,o), +(1264,512,cs), +(1264,795,o), +(1014,1017,o), +(749,1017,cs), +(639,1017,o), +(546,985,o), +(485,925,c), +(483,925,l), +(502,1166,l), +(1172,1166,l), +(1172,1490,l), +(138,1490,l), +(96,600,l), +(468,600,l), +(491,674,o), +(566,724,o), +(669,724,cs), +(789,724,o), +(874,631,o), +(874,500,cs), +(874,370,o), +(791,282,o), +(669,282,cs), +(549,282,o), +(459,366,o), +(459,480,c), +(74,480,l), +(94,166,o), +(322,-24,o), +(666,-24,cs) +); +} +); +width = 1338; +}, +{ +associatedMasterId = m009; +guides = ( +{ +pos = (-148,2280); +}, +{ +pos = (-148,2396); +}, +{ +angle = 90; +pos = (168,0); +} +); +layerId = "CFB47429-ABF1-4DBD-A441-26BAF2E777A2"; +name = "Jun 6, 22, 15:17"; +shapes = ( +{ +closed = 1; +nodes = ( +(1042,-24,o), +(1278,200,o), +(1278,512,cs), +(1278,795,o), +(1081,994,o), +(816,994,cs), +(665,994,o), +(537,930,o), +(490,838,c), +(488,838,l), +(516,1166,l), +(1186,1166,l), +(1186,1490,l), +(184,1490,l), +(126,670,l), +(482,600,l), +(516,672,o), +(593,716,o), +(680,716,cs), +(803,716,o), +(888,631,o), +(888,500,cs), +(888,370,o), +(803,282,o), +(680,282,cs), +(572,282,o), +(482,351,o), +(482,454,c), +(88,454,l), +(91,176,o), +(336,-24,o), +(680,-24,cs) +); +} +); +width = 1338; +}, +{ +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +shapes = ( +{ +closed = 1; +nodes = ( +(726,-20,o), +(943,186,o), +(992,462,cs), +(1043,750,o), +(865,940,o), +(626,940,cs), +(505,940,o), +(397,896,o), +(312,826,c), +(306,826,l), +(482,1442,l), +(1102,1442,l), +(1112,1490,l), +(450,1490,l), +(248,786,l), +(314,774,l), +(394,844,o), +(508,893,o), +(626,894,cs), +(839,893,o), +(988,727,o), +(946,462,cs), +(906,217,o), +(700,26,o), +(468,26,cs), +(260,26,o), +(153,169,o), +(186,372,c), +(140,372,l), +(100,143,o), +(237,-20,o), +(468,-20,cs) +); +} +); +width = 1159; +}, +{ layerId = m012; shapes = ( { @@ -912,9 +859,206 @@ nodes = ( ); } ); -width = 1042; +width = 1031; +}, +{ +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +shapes = ( +{ +closed = 1; +nodes = ( +(809,-20,o), +(1050,189,o), +(1096,474,cs), +(1146,762,o), +(980,975,o), +(706,974,cs), +(605,975,o), +(503,940,o), +(434,890,c), +(424,890,l), +(550,1330,l), +(1172,1330,l), +(1198,1490,l), +(424,1490,l), +(212,756,l), +(378,736,l), +(448,780,o), +(559,812,o), +(648,812,cs), +(841,812,o), +(954,666,o), +(922,472,cs), +(890,279,o), +(733,140,o), +(550,140,cs), +(399,140,o), +(291,239,o), +(300,372,c), +(126,372,l), +(99,145,o), +(268,-20,o), +(524,-20,cs) +); +} +); +width = 1233; +}, +{ +layerId = m008; +shapes = ( +{ +closed = 1; +nodes = ( +(777,-20,o), +(1018,189,o), +(1064,474,cs), +(1114,762,o), +(948,975,o), +(674,974,cs), +(573,975,o), +(471,940,o), +(402,890,c), +(392,890,l), +(518,1330,l), +(1140,1330,l), +(1166,1490,l), +(392,1490,l), +(180,756,l), +(346,736,l), +(416,780,o), +(527,812,o), +(616,812,cs), +(809,812,o), +(922,666,o), +(890,472,cs), +(858,279,o), +(701,140,o), +(518,140,cs), +(367,140,o), +(259,239,o), +(268,372,c), +(94,372,l), +(67,145,o), +(236,-20,o), +(492,-20,cs) +); +} +); +width = 1169; +}, +{ +guides = ( +{ +pos = (2764,2280); +}, +{ +pos = (2976,2396); +}, +{ +angle = 90; +pos = (-1068,0); +} +); +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +shapes = ( +{ +closed = 1; +nodes = ( +(964,-20,o), +(1237,201,o), +(1286,512,cs), +(1333,794,o), +(1170,995,o), +(904,994,cs), +(754,995,o), +(620,928,o), +(558,838,c), +(550,838,l), +(634,1166,l), +(1304,1166,l), +(1356,1490,l), +(354,1490,l), +(160,670,l), +(504,600,l), +(551,672,o), +(635,716,o), +(722,716,cs), +(844,716,o), +(917,631,o), +(896,500,cs), +(873,369,o), +(775,285,o), +(648,286,cs), +(542,285,o), +(466,352,o), +(480,454,c), +(88,454,l), +(44,177,o), +(257,-20,o), +(600,-20,cs) +); +} +); +width = 1384; +}, +{ +guides = ( +{ +pos = (2732,2280); +}, +{ +pos = (2944,2396); +}, +{ +angle = 90; +pos = (-1100,0); +} +); +layerId = m010; +shapes = ( +{ +closed = 1; +nodes = ( +(948,-20,o), +(1221,201,o), +(1270,512,cs), +(1317,794,o), +(1154,995,o), +(888,994,cs), +(738,995,o), +(604,928,o), +(542,838,c), +(534,838,l), +(618,1166,l), +(1288,1166,l), +(1340,1490,l), +(338,1490,l), +(144,670,l), +(488,600,l), +(535,672,o), +(619,716,o), +(706,716,cs), +(828,716,o), +(901,631,o), +(880,500,cs), +(857,369,o), +(759,285,o), +(632,286,cs), +(526,285,o), +(450,352,o), +(464,454,c), +(72,454,l), +(28,177,o), +(241,-20,o), +(584,-20,cs) +); +} +); +width = 1352; } ); +metricRight = zero; tags = ( "TODO-opsz" ); diff --git a/src/Inter.glyphspackage/glyphs/four.glyph b/src/Inter.glyphspackage/glyphs/four.glyph index 00b0aa736..097ed068f 100644 --- a/src/Inter.glyphspackage/glyphs/four.glyph +++ b/src/Inter.glyphspackage/glyphs/four.glyph @@ -226,31 +226,31 @@ shapes = ( { closed = 1; nodes = ( -(1164,306,l), -(1164,466,l), -(282,466,l), -(282,478,l), -(776,1260,l), -(850,1260,l), -(850,1490,l), -(742,1490,l), -(88,454,l), -(88,306,l) +(1213,360,l), +(1213,520,l), +(256,520,l), +(256,522,l), +(811,1288,l), +(875,1288,l), +(875,1490,l), +(765,1490,l), +(52,508,l), +(52,360,l) ); }, { closed = 1; nodes = ( -(960,0,l), -(960,1490,l), -(788,1490,l), -(788,420,l), -(788,350,l), -(788,0,l) +(985,0,l), +(985,1490,l), +(813,1490,l), +(813,474,l), +(813,404,l), +(813,0,l) ); } ); -width = 1250; +width = 1265; }, { layerId = m008; @@ -285,52 +285,36 @@ nodes = ( width = 1250; }, { -background = { -shapes = ( -{ -pos = (-28,0); -ref = A; -} -); -}; -guides = ( -{ -pos = (8,320); -}, -{ -pos = (8,752); -} -); layerId = m009; shapes = ( { closed = 1; nodes = ( -(1352,232,l), -(1352,546,l), -(466,546,l), -(466,558,l), -(790,1070,l), -(952,1070,l), -(952,1490,l), -(668,1490,l), -(68,546,l), -(68,232,l) +(1350,288,l), +(1350,594,l), +(439,594,l), +(439,596,l), +(791,1118,l), +(934,1118,l), +(934,1490,l), +(671,1490,l), +(64,602,l), +(64,288,l) ); }, { closed = 1; nodes = ( -(1180,0,l), -(1180,1490,l), -(802,1490,l), -(802,466,l), -(792,328,l), +(1184,0,l), +(1184,1490,l), +(792,1490,l), +(792,522,l), +(792,384,l), (792,0,l) ); } ); -width = 1406; +width = 1414; }, { guides = ( diff --git a/src/Inter.glyphspackage/glyphs/four.tf.glyph b/src/Inter.glyphspackage/glyphs/four.tf.glyph index 97f825dc8..146b91467 100644 --- a/src/Inter.glyphspackage/glyphs/four.tf.glyph +++ b/src/Inter.glyphspackage/glyphs/four.tf.glyph @@ -89,7 +89,7 @@ shapes = ( ref = four; } ); -width = 1406; +width = 1414; }, { layerId = m010; diff --git a/src/Inter.glyphspackage/glyphs/nine.glyph b/src/Inter.glyphspackage/glyphs/nine.glyph index 872bdd727..b5aac9917 100644 --- a/src/Inter.glyphspackage/glyphs/nine.glyph +++ b/src/Inter.glyphspackage/glyphs/nine.glyph @@ -9,61 +9,61 @@ shapes = ( { closed = 1; nodes = ( -(326,1513,o), -(131,1286,o), -(130,1012,cs), -(131,724,o), -(343,518,o), -(600,518,cs), -(753,518,o), -(884,593,o), -(966,716,c), -(978,716,l), -(977,349,o), -(835,140,o), -(606,140,cs), -(448,140,o), -(352,239,o), -(320,376,c), -(142,376,l), -(177,140,o), -(355,-20,o), -(606,-20,cs), -(940,-20,o), -(1146,276,o), -(1146,806,cs), -(1146,1353,o), -(873,1507,o), -(628,1510,cs) +(318,1513,o), +(123,1286,o), +(122,1012,cs), +(123,724,o), +(335,518,o), +(592,518,cs), +(745,518,o), +(876,593,o), +(958,716,c), +(970,716,l), +(969,349,o), +(827,140,o), +(598,140,cs), +(440,140,o), +(344,239,o), +(312,376,c), +(134,376,l), +(169,140,o), +(347,-20,o), +(598,-20,cs), +(932,-20,o), +(1138,276,o), +(1138,806,cs), +(1138,1353,o), +(865,1507,o), +(620,1510,cs) ); }, { closed = 1; nodes = ( -(815,1350,o), -(951,1190,o), -(952,1016,cs), -(951,838,o), -(806,678,o), -(622,678,cs), -(439,678,o), -(305,826,o), -(306,1012,cs), -(305,1199,o), -(445,1350,o), -(628,1350,cs) +(807,1350,o), +(943,1190,o), +(944,1016,cs), +(943,838,o), +(798,678,o), +(614,678,cs), +(431,678,o), +(297,826,o), +(298,1012,cs), +(297,1199,o), +(437,1350,o), +(620,1350,cs) ); } ); -width = 1278; +width = 1260; }, { guides = ( { -pos = (12,764); +pos = (18,764); }, { -pos = (12,1240); +pos = (18,1240); } ); layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; @@ -71,53 +71,53 @@ shapes = ( { closed = 1; nodes = ( -(327,1510,o), -(83,1297,o), -(84,980,cs), -(86,710,o), -(266,512,o), -(536,512,cs), -(705,512,o), -(860,593,o), -(916,730,c), -(926,730,l), -(924,483,o), -(848,323,o), -(678,322,cs), -(592,323,o), -(519,361,o), -(500,450,c), -(102,450,l), -(127,189,o), -(348,-20,o), -(678,-20,cs), -(1069,-20,o), -(1328,279,o), -(1326,768,cs), -(1325,1303,o), -(1028,1510,o), -(680,1510,cs) +(335,1514,o), +(90,1299,o), +(90,978,cs), +(90,705,o), +(271,506,o), +(542,506,cs), +(711,506,o), +(865,588,o), +(922,724,c), +(930,724,l), +(930,484,o), +(854,320,o), +(684,320,cs), +(599,320,o), +(524,361,o), +(506,446,c), +(108,446,l), +(133,191,o), +(355,-24,o), +(684,-24,cs), +(1074,-24,o), +(1332,280,o), +(1332,762,cs), +(1332,1304,o), +(1034,1514,o), +(686,1514,cs) ); }, { closed = 1; nodes = ( -(801,1204,o), -(889,1114,o), -(890,994,cs), -(892,876,o), -(801,785,o), -(684,786,cs), -(563,785,o), -(479,876,o), -(478,994,cs), -(476,1114,o), -(563,1204,o), -(684,1204,cs) +(809,1204,o), +(896,1114,o), +(896,992,cs), +(896,870,o), +(809,780,o), +(690,780,cs), +(570,780,o), +(482,869,o), +(482,992,cs), +(482,1114,o), +(571,1204,o), +(690,1204,cs) ); } ); -width = 1402; +width = 1424; }, { layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; @@ -125,53 +125,53 @@ shapes = ( { closed = 1; nodes = ( -(480,1513,o), -(256,1295,o), -(210,1024,cs), -(160,730,o), -(343,518,o), -(606,518,cs), -(756,518,o), -(893,588,o), -(994,710,c), -(1006,722,l), -(943,340,o), -(756,140,o), -(526,140,cs), -(367,140,o), -(294,236,o), -(288,376,c), -(116,376,l), -(113,140,o), -(273,-20,o), -(520,-20,cs), -(852,-20,o), -(1100,271,o), -(1186,794,cs), -(1280,1350,o), -(1027,1507,o), -(776,1510,cs) +(468,1513,o), +(244,1295,o), +(198,1024,cs), +(148,730,o), +(331,518,o), +(594,518,cs), +(744,518,o), +(881,588,o), +(982,710,c), +(994,722,l), +(931,340,o), +(744,140,o), +(514,140,cs), +(355,140,o), +(282,236,o), +(276,376,c), +(104,376,l), +(101,140,o), +(261,-20,o), +(508,-20,cs), +(840,-20,o), +(1088,271,o), +(1174,794,cs), +(1268,1350,o), +(1015,1507,o), +(764,1510,cs) ); }, { closed = 1; nodes = ( -(954,1350,o), -(1059,1199,o), -(1030,1026,cs), -(1001,844,o), -(823,678,o), -(634,678,cs), -(457,678,o), -(352,823,o), -(382,1000,cs), -(413,1196,o), -(585,1350,o), -(770,1350,cs) +(942,1350,o), +(1047,1199,o), +(1018,1026,cs), +(989,844,o), +(811,678,o), +(622,678,cs), +(445,678,o), +(340,823,o), +(370,1000,cs), +(401,1196,o), +(573,1350,o), +(758,1350,cs) ); } ); -width = 1278; +width = 1258; }, { background = { @@ -179,59 +179,59 @@ shapes = ( { closed = 1; nodes = ( -(482,1516,o), -(212,1315,o), -(160,1004,cs), -(113,721,o), -(267,512,o), -(544,512,cs), -(709,512,o), -(869,585,o), -(948,722,c), -(960,742,l), -(916,495,o), -(802,323,o), -(626,322,cs), -(546,323,o), -(479,355,o), -(480,448,c), -(88,448,l), -(72,186,o), -(267,-20,o), -(600,-20,cs), -(983,-20,o), -(1279,268,o), -(1358,748,cs), -(1451,1297,o), -(1180,1516,o), -(824,1516,cs) +(487,1516,o), +(217,1315,o), +(165,1004,cs), +(118,721,o), +(272,512,o), +(549,512,cs), +(714,512,o), +(874,585,o), +(953,722,c), +(965,742,l), +(921,495,o), +(807,323,o), +(631,322,cs), +(551,323,o), +(484,355,o), +(485,448,c), +(93,448,l), +(77,186,o), +(272,-20,o), +(605,-20,cs), +(988,-20,o), +(1284,268,o), +(1363,748,cs), +(1456,1297,o), +(1185,1516,o), +(829,1516,cs) ); }, { closed = 1; nodes = ( -(921,1210,o), -(985,1135,o), -(968,1018,cs), -(948,884,o), -(834,785,o), -(706,786,cs), -(593,785,o), -(529,864,o), -(546,978,cs), -(564,1111,o), -(680,1210,o), -(808,1210,cs) +(926,1210,o), +(990,1135,o), +(973,1018,cs), +(953,884,o), +(839,785,o), +(711,786,cs), +(598,785,o), +(534,864,o), +(551,978,cs), +(569,1111,o), +(685,1210,o), +(813,1210,cs) ); } ); }; guides = ( { -pos = (12,764); +pos = (17,764); }, { -pos = (168,1240); +pos = (173,1240); } ); layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; @@ -239,53 +239,53 @@ shapes = ( { closed = 1; nodes = ( -(482,1510,o), -(212,1309,o), -(160,1000,cs), -(113,721,o), -(267,512,o), -(544,512,cs), -(709,512,o), -(869,585,o), -(948,722,c), -(960,742,l), -(916,495,o), -(802,323,o), -(626,322,cs), -(546,323,o), -(479,355,o), -(480,448,c), -(88,448,l), -(72,186,o), -(267,-20,o), -(600,-20,cs), -(983,-20,o), -(1278,268,o), -(1358,748,cs), -(1451,1292,o), -(1180,1510,o), -(824,1510,cs) +(487,1510,o), +(217,1309,o), +(165,1000,cs), +(118,721,o), +(272,512,o), +(549,512,cs), +(714,512,o), +(874,585,o), +(953,722,c), +(965,742,l), +(921,495,o), +(807,323,o), +(631,322,cs), +(551,323,o), +(484,355,o), +(485,448,c), +(93,448,l), +(77,186,o), +(272,-20,o), +(605,-20,cs), +(988,-20,o), +(1283,268,o), +(1363,748,cs), +(1456,1292,o), +(1185,1510,o), +(829,1510,cs) ); }, { closed = 1; nodes = ( -(921,1204,o), -(985,1129,o), -(968,1016,cs), -(949,884,o), -(834,785,o), -(706,786,cs), -(593,785,o), -(532,863,o), -(546,974,cs), -(564,1105,o), -(680,1204,o), -(808,1204,cs) +(926,1204,o), +(990,1129,o), +(973,1016,cs), +(954,884,o), +(839,785,o), +(711,786,cs), +(598,785,o), +(537,863,o), +(551,974,cs), +(569,1105,o), +(685,1204,o), +(813,1204,cs) ); } ); -width = 1402; +width = 1422; }, { layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; @@ -293,53 +293,53 @@ shapes = ( { closed = 1; nodes = ( -(335,1510,o), -(166,1295,o), -(166,1048,cs), -(166,783,o), -(358,582,o), -(594,582,cs), -(765,582,o), -(928,689,o), -(974,838,c), -(980,838,l), -(980,314,o), -(841,26,o), -(570,26,cs), -(375,26,o), -(253,172,o), -(238,376,c), -(192,376,l), -(207,143,o), -(349,-20,o), -(570,-20,cs), -(931,-20,o), -(1027,416,o), -(1026,818,cs), -(1027,1286,o), -(838,1510,o), -(584,1510,cs) +(317,1510,o), +(148,1295,o), +(148,1048,cs), +(148,783,o), +(340,582,o), +(576,582,cs), +(747,582,o), +(910,689,o), +(956,838,c), +(962,838,l), +(962,314,o), +(823,26,o), +(552,26,cs), +(357,26,o), +(235,172,o), +(220,376,c), +(174,376,l), +(189,143,o), +(331,-20,o), +(552,-20,cs), +(913,-20,o), +(1009,416,o), +(1008,818,cs), +(1009,1286,o), +(820,1510,o), +(566,1510,cs) ); }, { closed = 1; nodes = ( -(768,1463,o), -(908,1329,o), -(958,1068,cs), -(1001,835,o), -(823,628,o), -(596,628,cs), -(381,628,o), -(212,812,o), -(212,1048,cs), -(212,1277,o), -(369,1463,o), -(584,1464,cs) +(750,1463,o), +(890,1329,o), +(940,1068,cs), +(983,835,o), +(805,628,o), +(578,628,cs), +(363,628,o), +(194,812,o), +(194,1048,cs), +(194,1277,o), +(351,1463,o), +(566,1464,cs) ); } ); -width = 1192; +width = 1156; }, { layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; @@ -347,107 +347,159 @@ shapes = ( { closed = 1; nodes = ( -(495,1510,o), -(291,1295,o), -(248,1048,cs), -(201,783,o), -(364,582,o), -(600,582,cs), -(771,582,o), -(951,689,o), -(1024,838,c), -(1030,838,l), -(943,314,o), -(748,26,o), -(474,26,cs), -(279,26,o), -(192,172,o), -(210,376,c), -(162,376,l), -(140,143,o), -(256,-20,o), -(478,-20,cs), -(838,-20,o), -(1007,416,o), -(1070,818,cs), -(1145,1287,o), -(998,1510,o), -(744,1510,cs) +(475,1510,o), +(271,1295,o), +(228,1048,cs), +(181,783,o), +(344,582,o), +(580,582,cs), +(751,582,o), +(931,689,o), +(1004,838,c), +(1010,838,l), +(923,314,o), +(728,26,o), +(454,26,cs), +(259,26,o), +(172,172,o), +(190,376,c), +(142,376,l), +(120,143,o), +(236,-20,o), +(458,-20,cs), +(818,-20,o), +(987,416,o), +(1050,818,cs), +(1125,1287,o), +(978,1510,o), +(724,1510,cs) ); }, { closed = 1; nodes = ( -(931,1463,o), -(1039,1329,o), -(1044,1068,cs), -(1049,835,o), -(829,628,o), -(602,628,cs), -(387,628,o), -(256,812,o), -(294,1048,cs), -(331,1278,o), -(529,1463,o), -(744,1464,cs) +(911,1463,o), +(1019,1329,o), +(1024,1068,cs), +(1029,835,o), +(809,628,o), +(582,628,cs), +(367,628,o), +(236,812,o), +(274,1048,cs), +(311,1278,o), +(509,1463,o), +(724,1464,cs) ); } ); -width = 1192; +width = 1158; }, { +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(295,1514,o), +(90,1308,o), +(90,1014,cs), +(90,731,o), +(289,520,o), +(558,520,cs), +(718,520,o), +(864,595,o), +(932,710,c), +(934,710,l), +(934,377,o), +(814,136,o), +(556,136,cs), +(405,136,o), +(306,228,o), +(278,372,c), +(102,372,l), +(130,135,o), +(305,-24,o), +(564,-24,cs), +(938,-24,o), +(1106,307,o), +(1106,808,cs), +(1106,1258,o), +(918,1514,o), +(588,1514,cs) +); +}, +{ +closed = 1; +nodes = ( +(766,1354,o), +(910,1203,o), +(910,1016,cs), +(910,830,o), +(763,680,o), +(582,680,cs), +(403,680,o), +(264,826,o), +(264,1014,cs), +(264,1203,o), +(408,1354,o), +(588,1354,cs) +); +} +); +}; layerId = m007; shapes = ( { closed = 1; nodes = ( -(294,1513,o), -(99,1286,o), -(98,1012,cs), -(99,724,o), -(311,518,o), -(568,518,cs), -(721,518,o), -(852,593,o), -(934,716,c), -(946,716,l), -(945,349,o), -(803,140,o), -(574,140,cs), -(416,140,o), -(320,239,o), -(288,376,c), -(110,376,l), -(145,140,o), -(323,-20,o), -(574,-20,cs), -(908,-20,o), -(1114,276,o), -(1114,806,cs), -(1114,1353,o), -(841,1507,o), -(596,1510,cs) +(295,1514,o), +(90,1312,o), +(90,1018,cs), +(90,735,o), +(289,528,o), +(558,528,cs), +(718,528,o), +(860,595,o), +(928,710,c), +(930,710,l), +(930,377,o), +(806,136,o), +(548,136,cs), +(397,136,o), +(298,228,o), +(270,372,c), +(94,372,l), +(122,135,o), +(301,-24,o), +(560,-24,cs), +(934,-24,o), +(1106,307,o), +(1106,808,cs), +(1106,1258,o), +(918,1514,o), +(588,1514,cs) ); }, { closed = 1; nodes = ( -(783,1350,o), -(919,1190,o), -(920,1016,cs), -(919,838,o), -(774,678,o), -(590,678,cs), -(407,678,o), -(273,826,o), -(274,1012,cs), -(273,1199,o), -(413,1350,o), -(596,1350,cs) +(766,1354,o), +(910,1207,o), +(910,1020,cs), +(910,834,o), +(763,688,o), +(582,688,cs), +(403,688,o), +(264,830,o), +(264,1018,cs), +(264,1207,o), +(408,1354,o), +(588,1354,cs) ); } ); -width = 1214; +width = 1196; }, { layerId = m008; @@ -455,61 +507,70 @@ shapes = ( { closed = 1; nodes = ( -(448,1513,o), -(224,1295,o), -(178,1024,cs), -(128,730,o), -(311,518,o), -(574,518,cs), -(724,518,o), -(861,588,o), -(962,710,c), -(974,722,l), -(911,340,o), -(724,140,o), -(494,140,cs), -(335,140,o), -(262,236,o), -(256,376,c), -(84,376,l), -(81,140,o), -(241,-20,o), -(488,-20,cs), -(820,-20,o), -(1068,271,o), -(1154,794,cs), -(1248,1350,o), -(995,1507,o), -(744,1510,cs) +(436,1513,o), +(212,1295,o), +(166,1024,cs), +(116,730,o), +(299,518,o), +(562,518,cs), +(712,518,o), +(849,588,o), +(950,710,c), +(962,722,l), +(899,340,o), +(712,140,o), +(482,140,cs), +(323,140,o), +(250,236,o), +(244,376,c), +(72,376,l), +(69,140,o), +(229,-20,o), +(476,-20,cs), +(808,-20,o), +(1056,271,o), +(1142,794,cs), +(1236,1350,o), +(983,1507,o), +(732,1510,cs) ); }, { closed = 1; nodes = ( -(922,1350,o), -(1027,1199,o), -(998,1026,cs), -(969,844,o), -(791,678,o), -(602,678,cs), -(425,678,o), -(320,823,o), -(350,1000,cs), -(381,1196,o), -(553,1350,o), -(738,1350,cs) +(910,1350,o), +(1015,1199,o), +(986,1026,cs), +(957,844,o), +(779,678,o), +(590,678,cs), +(413,678,o), +(308,823,o), +(338,1000,cs), +(369,1196,o), +(541,1350,o), +(726,1350,cs) ); } ); -width = 1214; +width = 1194; }, { +background = { +shapes = ( +{ +angle = 180; +pos = (1390,1490); +ref = six; +} +); +}; guides = ( { -pos = (-84,764); +pos = (-70,764); }, { -pos = (-84,1240); +pos = (-70,1240); } ); layerId = m009; @@ -517,53 +578,53 @@ shapes = ( { closed = 1; nodes = ( -(311,1510,o), -(67,1297,o), -(68,980,cs), -(70,710,o), -(250,512,o), -(520,512,cs), -(689,512,o), -(844,593,o), -(900,730,c), -(910,730,l), -(908,483,o), -(832,323,o), -(662,322,cs), -(576,323,o), -(503,361,o), -(484,450,c), -(86,450,l), -(111,189,o), -(332,-20,o), -(662,-20,cs), -(1053,-20,o), -(1312,279,o), -(1310,768,cs), -(1309,1303,o), -(1012,1510,o), -(664,1510,cs) +(322,1514,o), +(74,1308,o), +(74,996,cs), +(74,705,o), +(294,498,o), +(598,498,cs), +(747,498,o), +(850,540,o), +(928,652,c), +(930,652,l), +(930,421,o), +(850,280,o), +(675,280,cs), +(562,280,o), +(485,340,o), +(468,434,c), +(86,434,l), +(106,209,o), +(291,-24,o), +(668,-24,cs), +(1074,-24,o), +(1316,280,o), +(1316,762,cs), +(1316,1236,o), +(1077,1514,o), +(670,1514,cs) ); }, { closed = 1; nodes = ( -(785,1204,o), -(873,1114,o), -(874,994,cs), -(876,876,o), -(785,785,o), -(668,786,cs), -(547,785,o), -(463,876,o), -(462,994,cs), -(460,1114,o), -(547,1204,o), -(668,1204,cs) +(793,1212,o), +(880,1124,o), +(880,996,cs), +(880,868,o), +(793,780,o), +(674,780,cs), +(553,780,o), +(466,868,o), +(466,996,cs), +(466,1124,o), +(553,1212,o), +(674,1212,cs) ); } ); -width = 1370; +width = 1390; }, { background = { @@ -571,59 +632,59 @@ shapes = ( { closed = 1; nodes = ( -(482,1516,o), -(212,1315,o), -(160,1004,cs), -(113,721,o), -(267,512,o), -(544,512,cs), -(709,512,o), -(869,585,o), -(948,722,c), -(960,742,l), -(916,495,o), -(802,323,o), -(626,322,cs), -(546,323,o), -(479,355,o), -(480,448,c), -(88,448,l), -(72,186,o), -(267,-20,o), -(600,-20,cs), -(983,-20,o), -(1279,268,o), -(1358,748,cs), -(1451,1297,o), -(1180,1516,o), -(824,1516,cs) +(487,1516,o), +(217,1315,o), +(165,1004,cs), +(118,721,o), +(272,512,o), +(549,512,cs), +(714,512,o), +(874,585,o), +(953,722,c), +(965,742,l), +(921,495,o), +(807,323,o), +(631,322,cs), +(551,323,o), +(484,355,o), +(485,448,c), +(93,448,l), +(77,186,o), +(272,-20,o), +(605,-20,cs), +(988,-20,o), +(1284,268,o), +(1363,748,cs), +(1456,1297,o), +(1185,1516,o), +(829,1516,cs) ); }, { closed = 1; nodes = ( -(921,1210,o), -(985,1135,o), -(968,1018,cs), -(948,884,o), -(834,785,o), -(706,786,cs), -(593,785,o), -(529,864,o), -(546,978,cs), -(564,1111,o), -(680,1210,o), -(808,1210,cs) +(926,1210,o), +(990,1135,o), +(973,1018,cs), +(953,884,o), +(839,785,o), +(711,786,cs), +(598,785,o), +(534,864,o), +(551,978,cs), +(569,1111,o), +(685,1210,o), +(813,1210,cs) ); } ); }; guides = ( { -pos = (-20,764); +pos = (-15,764); }, { -pos = (136,1240); +pos = (141,1240); } ); layerId = m010; @@ -631,53 +692,53 @@ shapes = ( { closed = 1; nodes = ( -(466,1510,o), -(196,1309,o), -(144,1000,cs), -(97,721,o), -(251,512,o), -(528,512,cs), -(693,512,o), -(853,585,o), -(932,722,c), -(944,742,l), -(900,495,o), -(786,323,o), -(610,322,cs), -(530,323,o), -(463,355,o), -(464,448,c), -(72,448,l), -(56,186,o), -(251,-20,o), -(584,-20,cs), -(967,-20,o), -(1262,268,o), -(1342,748,cs), -(1435,1292,o), -(1164,1510,o), -(808,1510,cs) +(471,1510,o), +(201,1309,o), +(149,1000,cs), +(102,721,o), +(256,512,o), +(533,512,cs), +(698,512,o), +(858,585,o), +(937,722,c), +(949,742,l), +(905,495,o), +(791,323,o), +(615,322,cs), +(535,323,o), +(468,355,o), +(469,448,c), +(77,448,l), +(61,186,o), +(256,-20,o), +(589,-20,cs), +(972,-20,o), +(1267,268,o), +(1347,748,cs), +(1440,1292,o), +(1169,1510,o), +(813,1510,cs) ); }, { closed = 1; nodes = ( -(905,1204,o), -(969,1129,o), -(952,1016,cs), -(933,884,o), -(818,785,o), -(690,786,cs), -(577,785,o), -(516,863,o), -(530,974,cs), -(548,1105,o), -(664,1204,o), -(792,1204,cs) +(910,1204,o), +(974,1129,o), +(957,1016,cs), +(938,884,o), +(823,785,o), +(695,786,cs), +(582,785,o), +(521,863,o), +(535,974,cs), +(553,1105,o), +(669,1204,o), +(797,1204,cs) ); } ); -width = 1370; +width = 1390; }, { layerId = m011; @@ -685,53 +746,53 @@ shapes = ( { closed = 1; nodes = ( -(271,1510,o), -(102,1295,o), -(102,1048,cs), -(102,783,o), -(294,582,o), -(530,582,cs), -(701,582,o), -(864,689,o), -(910,838,c), -(916,838,l), -(916,314,o), -(777,26,o), -(506,26,cs), -(311,26,o), -(189,172,o), -(174,376,c), -(128,376,l), -(143,143,o), -(285,-20,o), -(506,-20,cs), -(867,-20,o), -(963,416,o), -(962,818,cs), -(963,1286,o), -(774,1510,o), -(520,1510,cs) +(253,1510,o), +(84,1295,o), +(84,1048,cs), +(84,783,o), +(276,582,o), +(512,582,cs), +(683,582,o), +(846,689,o), +(892,838,c), +(898,838,l), +(898,314,o), +(759,26,o), +(488,26,cs), +(293,26,o), +(171,172,o), +(156,376,c), +(110,376,l), +(125,143,o), +(267,-20,o), +(488,-20,cs), +(849,-20,o), +(945,416,o), +(944,818,cs), +(945,1286,o), +(756,1510,o), +(502,1510,cs) ); }, { closed = 1; nodes = ( -(704,1463,o), -(844,1329,o), -(894,1068,cs), -(937,835,o), -(759,628,o), -(532,628,cs), -(317,628,o), -(148,812,o), -(148,1048,cs), -(148,1277,o), -(305,1463,o), -(520,1464,cs) +(686,1463,o), +(826,1329,o), +(876,1068,cs), +(919,835,o), +(741,628,o), +(514,628,cs), +(299,628,o), +(130,812,o), +(130,1048,cs), +(130,1277,o), +(287,1463,o), +(502,1464,cs) ); } ); -width = 1064; +width = 1028; }, { layerId = m012; @@ -739,55 +800,57 @@ shapes = ( { closed = 1; nodes = ( -(431,1510,o), -(227,1295,o), -(184,1048,cs), -(137,783,o), -(300,582,o), -(536,582,cs), -(707,582,o), -(887,689,o), -(960,838,c), -(966,838,l), -(879,314,o), -(684,26,o), -(410,26,cs), -(215,26,o), -(128,172,o), -(146,376,c), -(98,376,l), -(76,143,o), -(192,-20,o), -(414,-20,cs), -(774,-20,o), -(943,416,o), -(1006,818,cs), -(1081,1287,o), -(934,1510,o), -(680,1510,cs) +(411,1510,o), +(207,1295,o), +(164,1048,cs), +(117,783,o), +(280,582,o), +(516,582,cs), +(687,582,o), +(867,689,o), +(940,838,c), +(946,838,l), +(859,314,o), +(664,26,o), +(390,26,cs), +(195,26,o), +(108,172,o), +(126,376,c), +(78,376,l), +(56,143,o), +(172,-20,o), +(394,-20,cs), +(754,-20,o), +(923,416,o), +(986,818,cs), +(1061,1287,o), +(914,1510,o), +(660,1510,cs) ); }, { closed = 1; nodes = ( -(867,1463,o), -(975,1329,o), -(980,1068,cs), -(985,835,o), -(765,628,o), -(538,628,cs), -(323,628,o), -(192,812,o), -(230,1048,cs), -(267,1278,o), -(465,1463,o), -(680,1464,cs) +(847,1463,o), +(955,1329,o), +(960,1068,cs), +(965,835,o), +(745,628,o), +(518,628,cs), +(303,628,o), +(172,812,o), +(210,1048,cs), +(247,1278,o), +(445,1463,o), +(660,1464,cs) ); } ); -width = 1064; +width = 1030; } ); +metricLeft = zero; +metricRight = zero; note = "six mirrored"; tags = ( "TODO-opsz" diff --git a/src/Inter.glyphspackage/glyphs/one.glyph b/src/Inter.glyphspackage/glyphs/one.glyph index c7fd3a51a..ba98d7b8d 100644 --- a/src/Inter.glyphspackage/glyphs/one.glyph +++ b/src/Inter.glyphspackage/glyphs/one.glyph @@ -1,7 +1,7 @@ { glyphname = one; kernLeft = one; -kernRight = one; +kernRight = H; layers = ( { layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; @@ -9,28 +9,20 @@ shapes = ( { closed = 1; nodes = ( -(498,1490,l), -(126,1242,l), -(126,1058,l), -(488,1300,l), -(498,1300,l), -(498,0,l), -(678,0,l), -(678,1490,l) +(468,1490,l), +(96,1242,l), +(96,1058,l), +(458,1300,l), +(468,1300,l), +(468,0,l), +(648,0,l), +(648,1490,l) ); } ); -width = 952; +width = 828; }, { -guides = ( -{ -pos = (56,1240); -}, -{ -pos = (56,764); -} -); layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; shapes = ( { @@ -47,7 +39,7 @@ nodes = ( ); } ); -width = 1036; +width = 926; }, { layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; @@ -66,7 +58,7 @@ nodes = ( ); } ); -width = 952; +width = 858; }, { guides = ( @@ -93,7 +85,7 @@ nodes = ( ); } ); -width = 1036; +width = 926; }, { layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; @@ -112,7 +104,7 @@ nodes = ( ); } ); -width = 834; +width = 752; }, { layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; @@ -131,7 +123,7 @@ nodes = ( ); } ); -width = 834; +width = 752; }, { layerId = m007; @@ -139,18 +131,18 @@ shapes = ( { closed = 1; nodes = ( -(466,1490,l), -(94,1242,l), -(94,1058,l), -(456,1300,l), -(466,1300,l), -(466,0,l), -(646,0,l), -(646,1490,l) +(420,1490,l), +(48,1242,l), +(48,1058,l), +(410,1300,l), +(420,1300,l), +(420,0,l), +(600,0,l), +(600,1490,l) ); } ); -width = 888; +width = 748; }, { layerId = m008; @@ -169,34 +161,26 @@ nodes = ( ); } ); -width = 888; +width = 789; }, { -guides = ( -{ -pos = (-40,1240); -}, -{ -pos = (-40,764); -} -); layerId = m009; shapes = ( { closed = 1; nodes = ( -(440,1490,l), -(74,1266,l), -(74,922,l), -(400,1118,l), -(408,1118,l), -(408,0,l), -(814,0,l), -(814,1490,l) +(398,1490,l), +(32,1266,l), +(32,922,l), +(364,1125,l), +(366,1125,l), +(366,0,l), +(772,0,l), +(772,1490,l) ); } ); -width = 1004; +width = 852; }, { guides = ( @@ -223,7 +207,7 @@ nodes = ( ); } ); -width = 1004; +width = 889; }, { layerId = m011; @@ -242,7 +226,7 @@ nodes = ( ); } ); -width = 706; +width = 624; }, { layerId = m012; @@ -261,9 +245,10 @@ nodes = ( ); } ); -width = 706; +width = 624; } ); +metricRight = H; tags = ( "TODO-opsz" ); diff --git a/src/Inter.glyphspackage/glyphs/romaneight.glyph b/src/Inter.glyphspackage/glyphs/romaneight.glyph index 0dba4bd93..fc0f8a51c 100644 --- a/src/Inter.glyphspackage/glyphs/romaneight.glyph +++ b/src/Inter.glyphspackage/glyphs/romaneight.glyph @@ -141,15 +141,15 @@ pos = (1320,0); ref = I; }, { -pos = (1877,0); +pos = (1796,0); ref = I; }, { -pos = (2434,0); +pos = (2272,0); ref = I; } ); -width = 2910; +width = 2748; }, { layerId = m008; diff --git a/src/Inter.glyphspackage/glyphs/romanseven.glyph b/src/Inter.glyphspackage/glyphs/romanseven.glyph index fd45b7ec8..af3873f07 100644 --- a/src/Inter.glyphspackage/glyphs/romanseven.glyph +++ b/src/Inter.glyphspackage/glyphs/romanseven.glyph @@ -117,11 +117,11 @@ pos = (1320,0); ref = I; }, { -pos = (1877,0); +pos = (1796,0); ref = I; } ); -width = 2353; +width = 2272; }, { layerId = m008; diff --git a/src/Inter.glyphspackage/glyphs/romanthree.glyph b/src/Inter.glyphspackage/glyphs/romanthree.glyph index 9895afee8..07b6ddc9e 100644 --- a/src/Inter.glyphspackage/glyphs/romanthree.glyph +++ b/src/Inter.glyphspackage/glyphs/romanthree.glyph @@ -113,15 +113,15 @@ shapes = ( ref = I; }, { -pos = (557,0); +pos = (476,0); ref = I; }, { -pos = (1114,0); +pos = (952,0); ref = I; } ); -width = 1590; +width = 1428; }, { layerId = m008; diff --git a/src/Inter.glyphspackage/glyphs/romantwelve.glyph b/src/Inter.glyphspackage/glyphs/romantwelve.glyph index f4f34dafc..b6d359c13 100644 --- a/src/Inter.glyphspackage/glyphs/romantwelve.glyph +++ b/src/Inter.glyphspackage/glyphs/romantwelve.glyph @@ -117,11 +117,11 @@ pos = (1250,0); ref = I; }, { -pos = (1807,0); +pos = (1726,0); ref = I; } ); -width = 2283; +width = 2202; }, { layerId = m008; diff --git a/src/Inter.glyphspackage/glyphs/romantwo.glyph b/src/Inter.glyphspackage/glyphs/romantwo.glyph index 91da97e72..8271fd326 100644 --- a/src/Inter.glyphspackage/glyphs/romantwo.glyph +++ b/src/Inter.glyphspackage/glyphs/romantwo.glyph @@ -89,11 +89,11 @@ shapes = ( ref = I; }, { -pos = (557,0); +pos = (476,0); ref = I; } ); -width = 1033; +width = 952; }, { layerId = m008; diff --git a/src/Inter.glyphspackage/glyphs/seven.glyph b/src/Inter.glyphspackage/glyphs/seven.glyph index 82a72b579..4ed2b6df9 100644 --- a/src/Inter.glyphspackage/glyphs/seven.glyph +++ b/src/Inter.glyphspackage/glyphs/seven.glyph @@ -20,7 +20,7 @@ nodes = ( ); } ); -width = 1170; +width = 1152; }, { background = { @@ -56,7 +56,7 @@ nodes = ( ); } ); -width = 1250; +width = 1226; }, { layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; @@ -75,7 +75,7 @@ nodes = ( ); } ); -width = 1170; +width = 1152; }, { layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; @@ -94,7 +94,7 @@ nodes = ( ); } ); -width = 1250; +width = 1226; }, { layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; @@ -113,7 +113,7 @@ nodes = ( ); } ); -width = 1120; +width = 1110; }, { layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; @@ -132,7 +132,7 @@ nodes = ( ); } ); -width = 1120; +width = 1108; }, { layerId = m007; @@ -140,18 +140,18 @@ shapes = ( { closed = 1; nodes = ( -(358,0,l), -(1022,1320,l), -(1022,1490,l), -(66,1490,l), -(66,1330,l), -(834,1330,l), -(834,1318,l), -(168,0,l) +(324,0,l), +(988,1320,l), +(988,1490,l), +(32,1490,l), +(32,1330,l), +(800,1330,l), +(800,1318,l), +(134,0,l) ); } ); -width = 1106; +width = 1054; }, { layerId = m008; @@ -170,26 +170,9 @@ nodes = ( ); } ); -width = 1106; +width = 1078; }, { -background = { -shapes = ( -{ -closed = 1; -nodes = ( -(358,0,l), -(1022,1320,l), -(1022,1490,l), -(66,1490,l), -(66,1330,l), -(834,1330,l), -(834,1318,l), -(168,0,l) -); -} -); -}; layerId = m009; shapes = ( { @@ -199,14 +182,14 @@ nodes = ( (1154,1166,l), (1154,1490,l), (48,1490,l), -(48,1166,l), -(734,1166,l), -(734,1158,l), +(48,1152,l), +(734,1152,l), +(734,1150,l), (150,0,l) ); } ); -width = 1218; +width = 1194; }, { layerId = m010; @@ -225,7 +208,7 @@ nodes = ( ); } ); -width = 1218; +width = 1183; }, { layerId = m011; @@ -244,7 +227,7 @@ nodes = ( ); } ); -width = 992; +width = 982; }, { layerId = m012; @@ -263,9 +246,10 @@ nodes = ( ); } ); -width = 992; +width = 980; } ); +metricRight = "=|T"; tags = ( "TODO-opsz" ); diff --git a/src/Inter.glyphspackage/glyphs/six.glyph b/src/Inter.glyphspackage/glyphs/six.glyph index 320728cff..059436701 100644 --- a/src/Inter.glyphspackage/glyphs/six.glyph +++ b/src/Inter.glyphspackage/glyphs/six.glyph @@ -4,307 +4,157 @@ glyphname = six; kernLeft = six; layers = ( { -background = { -shapes = ( -{ -pos = (48,0); -ref = five; -} -); -}; -layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; shapes = ( { closed = 1; nodes = ( -(950,-24,o), -(1146,203,o), -(1146,480,cs), -(1146,768,o), -(933,975,o), -(678,974,cs), -(524,975,o), -(393,900,o), -(312,776,c), -(300,776,l), -(300,1140,o), -(441,1350,o), -(672,1350,cs), -(829,1350,o), -(924,1251,o), -(958,1118,c), -(1134,1118,l), -(1098,1348,o), -(922,1510,o), -(672,1510,cs), -(337,1510,o), -(131,1213,o), -(130,686,cs), -(131,136,o), -(404,-17,o), -(648,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(462,140,o), -(325,299,o), -(326,478,cs), -(327,655,o), -(470,815,o), -(654,814,cs), -(837,815,o), -(972,665,o), -(972,480,cs), -(972,291,o), -(831,140,o), -(648,140,cs) +(840,-20,o), +(1009,198,o), +(1008,446,cs), +(1009,710,o), +(815,911,o), +(582,910,cs), +(409,911,o), +(247,803,o), +(200,654,c), +(194,654,l), +(194,1177,o), +(333,1463,o), +(604,1464,cs), +(800,1463,o), +(922,1321,o), +(936,1118,c), +(982,1118,l), +(968,1350,o), +(826,1510,o), +(604,1510,cs), +(246,1510,o), +(148,1076,o), +(148,674,cs), +(148,207,o), +(337,-20,o), +(590,-20,cs) ); -} -); -width = 1278; -}, -{ -background = { -shapes = ( -{ -pos = (44,0); -ref = five; -} -); -}; -guides = ( -{ -orientation = center; -pos = (1496,1368); -}, -{ -angle = 90; -pos = (1640,1316); -}, -{ -angle = 90; -pos = (116,1316); }, { -pos = (316,1436); -}, -{ -angle = 90; -pos = (996,576); -} -); -layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; -shapes = ( -{ closed = 1; nodes = ( -(1073,-20,o), -(1319,191,o), -(1318,512,cs), -(1319,785,o), -(1137,983,o), -(866,984,cs), -(697,983,o), -(543,902,o), -(486,766,c), -(478,766,l), -(479,1006,o), -(554,1167,o), -(724,1166,cs), -(809,1167,o), -(884,1129,o), -(902,1044,c), -(1300,1044,l), -(1275,1299,o), -(1053,1510,o), -(724,1510,cs), -(334,1510,o), -(77,1210,o), -(76,728,cs), -(74,186,o), -(374,-20,o), -(722,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(601,285,o), -(513,375,o), -(512,498,cs), -(513,620,o), -(601,710,o), -(718,710,cs), -(839,710,o), -(927,620,o), -(926,498,cs), -(927,375,o), -(839,285,o), -(718,286,cs) +(406,26,o), +(267,163,o), +(218,424,cs), +(174,658,o), +(351,864,o), +(578,864,cs), +(794,864,o), +(962,681,o), +(962,446,cs), +(962,215,o), +(805,26,o), +(590,26,cs) ); } ); -width = 1402; +width = 1156; }, { -layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +background = { shapes = ( { closed = 1; nodes = ( -(860,-23,o), -(1085,198,o), -(1132,468,cs), -(1181,762,o), -(998,975,o), -(736,974,cs), -(585,975,o), -(448,905,o), -(346,782,c), -(334,770,l), -(399,1149,o), -(584,1350,o), -(814,1350,cs), -(973,1350,o), -(1048,1253,o), -(1054,1118,c), -(1224,1118,l), -(1228,1350,o), -(1067,1510,o), -(820,1510,cs), -(489,1510,o), -(241,1219,o), -(154,698,cs), -(61,143,o), -(314,-18,o), -(564,-20,cs) +(823,745,o), +(1007,911,o), +(1006,1118,cs), +(1007,1323,o), +(823,1489,o), +(596,1490,cs), +(370,1489,o), +(186,1323,o), +(186,1118,cs), +(186,911,o), +(370,745,o), +(596,744,cs) ); }, { closed = 1; nodes = ( -(387,140,o), -(282,294,o), -(312,466,cs), -(340,649,o), -(518,815,o), -(706,814,cs), -(884,815,o), -(989,669,o), -(960,492,cs), -(928,297,o), -(756,140,o), -(570,140,cs) -); -} +(821,3,o), +(1004,201,o), +(1004,446,cs), +(1004,689,o), +(821,887,o), +(596,888,cs), +(372,887,o), +(189,689,o), +(190,446,cs), +(189,201,o), +(372,3,o), +(596,2,cs) ); -width = 1278; -}, -{ -guides = ( -{ -pos = (320,1240); -}, -{ -pos = (-124,568); } ); -layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +}; +layerId = "9E406D40-9CB5-4845-B6DF-1B5201BAD6B0"; +name = "Dec 27 18, 12:24"; shapes = ( { -closed = 1; +closed = 0; nodes = ( -(985,-20,o), -(1255,180,o), -(1306,492,cs), -(1354,774,o), -(1200,983,o), -(922,984,cs), -(758,983,o), -(598,911,o), -(518,774,c), -(506,754,l), -(551,995,o), -(665,1167,o), -(840,1166,cs), -(920,1167,o), -(986,1134,o), -(986,1048,c), -(1378,1048,l), -(1395,1303,o), -(1199,1510,o), -(866,1510,cs), -(484,1510,o), -(188,1222,o), -(108,748,cs), -(15,198,o), -(287,-20,o), -(642,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(546,285,o), -(481,359,o), -(498,478,cs), -(519,612,o), -(633,710,o), -(760,710,cs), -(873,710,o), -(937,631,o), -(920,518,cs), -(902,384,o), -(787,285,o), -(658,286,cs) +(190,446,l), +(189,690,o), +(372,887,o), +(596,888,cs), +(820,887,o), +(1004,689,o), +(1004,446,cs), +(1004,201,o), +(822,3,o), +(608,2,cs), +(391,3,o), +(189,182,o), +(190,674,cs), +(189,1326,o), +(402,1489,o), +(628,1490,cs), +(855,1489,o), +(1007,1324,o), +(1006,1118,c) ); } ); -width = 1402; +width = 1202; }, { -layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +layerId = "0A5B7C9A-23F7-43E2-98D1-18F90204FF01"; +name = "Dec 27 18, 12:33"; shapes = ( { closed = 1; nodes = ( -(858,-20,o), -(1027,198,o), -(1026,446,cs), -(1027,710,o), -(833,911,o), -(600,910,cs), -(427,911,o), -(265,803,o), -(218,654,c), -(212,654,l), -(212,1177,o), -(351,1463,o), -(622,1464,cs), -(818,1463,o), -(940,1321,o), -(954,1118,c), -(1000,1118,l), -(986,1350,o), -(844,1510,o), -(622,1510,cs), -(264,1510,o), +(987,1349,o), +(844,1513,o), +(622,1512,cs), +(260,1513,o), (166,1076,o), (166,674,cs), -(166,207,o), -(355,-20,o), -(608,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(424,26,o), -(285,163,o), -(236,424,cs), -(192,658,o), +(166,206,o), +(354,-20,o), +(608,-20,cs), +(857,-20,o), +(1027,197,o), +(1026,446,cs), +(1027,708,o), +(836,911,o), +(596,910,cs), +(343,911,o), +(155,684,o), +(190,416,c), +(236,416,l), +(201,658,o), (369,864,o), (596,864,cs), (812,864,o), @@ -312,68 +162,87 @@ nodes = ( (980,446,cs), (980,215,o), (823,26,o), -(608,26,cs) +(608,26,cs), +(368,26,o), +(212,255,o), +(212,674,cs), +(212,1025,o), +(284,1466,o), +(622,1466,cs), +(817,1466,o), +(940,1321,o), +(954,1118,c), +(1000,1118,l) +); +}, +{ +closed = 1; +nodes = ( +(200,620,l), +(230,620,l), +(230,652,l), +(200,652,l) ); } ); -width = 1192; +width = 1202; }, { -layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +layerId = m011; shapes = ( { closed = 1; nodes = ( -(762,-20,o), -(966,198,o), -(1010,446,cs), -(1053,710,o), -(893,911,o), -(658,910,cs), -(486,911,o), -(305,803,o), -(232,654,c), -(226,654,l), -(314,1178,o), -(509,1463,o), -(782,1464,cs), -(977,1463,o), -(1065,1321,o), -(1048,1118,c), -(1094,1118,l), -(1117,1350,o), -(1001,1510,o), -(780,1510,cs), -(419,1510,o), -(250,1076,o), -(186,674,cs), -(108,207,o), -(259,-20,o), -(512,-20,cs) +(776,-20,o), +(945,198,o), +(944,446,cs), +(945,710,o), +(751,911,o), +(518,910,cs), +(345,911,o), +(183,803,o), +(136,654,c), +(130,654,l), +(130,1177,o), +(269,1463,o), +(540,1464,cs), +(736,1463,o), +(858,1321,o), +(872,1118,c), +(918,1118,l), +(904,1350,o), +(762,1510,o), +(540,1510,cs), +(182,1510,o), +(84,1076,o), +(84,674,cs), +(84,207,o), +(273,-20,o), +(526,-20,cs) ); }, { closed = 1; nodes = ( -(326,26,o), -(218,163,o), -(212,424,cs), -(209,657,o), -(428,864,o), -(654,864,cs), -(870,864,o), -(1001,681,o), -(962,446,cs), -(922,215,o), -(727,26,o), -(512,26,cs) +(342,26,o), +(203,163,o), +(154,424,cs), +(110,658,o), +(287,864,o), +(514,864,cs), +(730,864,o), +(898,681,o), +(898,446,cs), +(898,215,o), +(741,26,o), +(526,26,cs) ); } ); -width = 1192; +width = 1028; }, { -associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +associatedMasterId = m011; background = { shapes = ( { @@ -412,7 +281,7 @@ nodes = ( } ); }; -layerId = "9E406D40-9CB5-4845-B6DF-1B5201BAD6B0"; +layerId = "08DF6446-939B-40C8-8D74-85CE23B0C464"; name = "Dec 27 18, 12:24"; shapes = ( { @@ -443,8 +312,8 @@ nodes = ( width = 1202; }, { -associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; -layerId = "0A5B7C9A-23F7-43E2-98D1-18F90204FF01"; +associatedMasterId = m011; +layerId = "71F80546-750D-40FD-977B-593D0B152CA4"; name = "Dec 27 18, 12:33"; shapes = ( { @@ -503,198 +372,335 @@ nodes = ( width = 1202; }, { -background = { +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; shapes = ( { -pos = (48,0); -ref = five; -} +closed = 1; +nodes = ( +(942,-20,o), +(1138,203,o), +(1138,480,cs), +(1138,768,o), +(925,974,o), +(670,974,cs), +(516,974,o), +(385,900,o), +(304,776,c), +(292,776,l), +(292,1140,o), +(433,1350,o), +(664,1350,cs), +(821,1350,o), +(916,1251,o), +(950,1118,c), +(1126,1118,l), +(1090,1348,o), +(914,1510,o), +(664,1510,cs), +(329,1510,o), +(122,1213,o), +(122,686,cs), +(122,136,o), +(396,-20,o), +(640,-20,cs) ); -}; -layerId = m007; -shapes = ( +}, { closed = 1; nodes = ( -(918,-24,o), -(1114,203,o), -(1114,480,cs), -(1114,768,o), -(901,975,o), -(646,974,cs), -(492,975,o), -(361,900,o), -(280,776,c), -(268,776,l), -(268,1140,o), -(409,1350,o), -(640,1350,cs), -(797,1350,o), -(892,1251,o), -(926,1118,c), -(1102,1118,l), -(1066,1348,o), -(890,1510,o), -(640,1510,cs), -(305,1510,o), -(99,1213,o), -(98,686,cs), -(99,136,o), -(372,-17,o), -(616,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(430,140,o), -(293,299,o), -(294,478,cs), -(295,655,o), -(438,815,o), -(622,814,cs), -(805,815,o), -(940,665,o), -(940,480,cs), -(940,291,o), -(799,140,o), -(616,140,cs) +(454,140,o), +(318,299,o), +(318,478,cs), +(318,655,o), +(462,814,o), +(646,814,cs), +(829,814,o), +(964,665,o), +(964,480,cs), +(964,291,o), +(823,140,o), +(640,140,cs) ); } ); -width = 1214; +width = 1260; }, { -layerId = m008; +layerId = m007; shapes = ( { closed = 1; nodes = ( -(828,-23,o), -(1053,198,o), -(1100,468,cs), -(1149,762,o), -(966,975,o), -(704,974,cs), -(553,975,o), -(416,905,o), -(314,782,c), -(302,770,l), -(367,1149,o), -(552,1350,o), -(782,1350,cs), -(941,1350,o), -(1016,1253,o), -(1022,1118,c), -(1192,1118,l), -(1196,1350,o), -(1035,1510,o), -(788,1510,cs), -(457,1510,o), -(209,1219,o), -(122,698,cs), -(29,143,o), -(282,-18,o), -(532,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(355,140,o), -(250,294,o), -(280,466,cs), -(308,649,o), -(486,815,o), -(674,814,cs), -(852,815,o), -(957,669,o), -(928,492,cs), -(896,297,o), -(724,140,o), -(538,140,cs) +(901,-24,o), +(1106,182,o), +(1106,476,cs), +(1106,759,o), +(907,970,o), +(638,970,cs), +(478,970,o), +(332,895,o), +(264,780,c), +(262,780,l), +(262,1113,o), +(385,1354,o), +(643,1354,cs), +(794,1354,o), +(890,1262,o), +(918,1118,c), +(1094,1118,l), +(1066,1355,o), +(891,1514,o), +(632,1514,cs), +(258,1514,o), +(90,1183,o), +(90,682,cs), +(90,232,o), +(278,-24,o), +(608,-24,cs) +); +}, +{ +closed = 1; +nodes = ( +(430,136,o), +(286,287,o), +(286,474,cs), +(286,660,o), +(433,810,o), +(614,810,cs), +(793,810,o), +(932,664,o), +(932,476,cs), +(932,287,o), +(788,136,o), +(608,136,cs) ); } ); -width = 1214; +width = 1196; }, { background = { shapes = ( { -pos = (44,0); +pos = (58,0); ref = five; } ); }; -guides = ( +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( { -orientation = center; -pos = (-2049,1368); +closed = 1; +nodes = ( +(1087,-20,o), +(1332,191,o), +(1332,512,cs), +(1332,785,o), +(1151,984,o), +(880,984,cs), +(711,984,o), +(557,902,o), +(500,766,c), +(492,766,l), +(492,1006,o), +(568,1166,o), +(738,1166,cs), +(823,1166,o), +(898,1129,o), +(916,1044,c), +(1314,1044,l), +(1289,1299,o), +(1067,1510,o), +(738,1510,cs), +(348,1510,o), +(90,1210,o), +(90,728,cs), +(90,186,o), +(388,-20,o), +(736,-20,cs) +); }, { -angle = 90; -pos = (1544,1316); +closed = 1; +nodes = ( +(615,286,o), +(526,375,o), +(526,498,cs), +(526,620,o), +(615,710,o), +(732,710,cs), +(853,710,o), +(940,620,o), +(940,498,cs), +(940,375,o), +(853,286,o), +(732,286,cs) +); +} +); +width = 1424; }, { -angle = 90; -pos = (20,1316); +layerId = m009; +shapes = ( +{ +closed = 1; +nodes = ( +(1068,-24,o), +(1316,186,o), +(1316,498,cs), +(1316,789,o), +(1096,1000,o), +(792,1000,cs), +(643,1000,o), +(532,950,o), +(454,838,c), +(452,838,l), +(452,1069,o), +(532,1210,o), +(707,1210,cs), +(820,1210,o), +(897,1150,o), +(914,1056,c), +(1296,1056,l), +(1271,1311,o), +(1051,1514,o), +(722,1514,cs), +(316,1514,o), +(74,1210,o), +(74,728,cs), +(74,254,o), +(313,-24,o), +(720,-24,cs) +); }, { -pos = (220,1436); +closed = 1; +nodes = ( +(597,278,o), +(510,370,o), +(510,498,cs), +(510,626,o), +(597,718,o), +(716,718,cs), +(837,718,o), +(924,626,o), +(924,498,cs), +(924,370,o), +(837,278,o), +(716,278,cs) +); +} +); +width = 1390; +}, +{ +associatedMasterId = m009; +layerId = "1FC71CD3-82C3-48C2-875C-ABE048D183C9"; +name = "Jun 6, 22, 15:08"; +shapes = ( +{ +closed = 1; +nodes = ( +(1054,-24,o), +(1302,186,o), +(1302,498,cs), +(1302,789,o), +(1082,1000,o), +(778,1000,cs), +(629,1000,o), +(518,950,o), +(440,838,c), +(438,838,l), +(438,1064,o), +(527,1202,o), +(684,1202,cs), +(788,1202,o), +(865,1142,o), +(886,1044,c), +(1284,1044,l), +(1259,1299,o), +(1037,1514,o), +(708,1514,cs), +(302,1514,o), +(60,1210,o), +(60,728,cs), +(60,254,o), +(299,-24,o), +(706,-24,cs) +); }, { -angle = 90; -pos = (900,576); +closed = 1; +nodes = ( +(583,278,o), +(496,370,o), +(496,498,cs), +(496,626,o), +(583,718,o), +(702,718,cs), +(823,718,o), +(910,626,o), +(910,498,cs), +(910,370,o), +(823,278,o), +(702,278,cs) +); } ); -layerId = m009; +width = 1370; +}, +{ +associatedMasterId = m009; +layerId = "85E0F1C1-8143-495F-B065-27BFC8242DB8"; +name = "Jun 6, 22, 15:01"; shapes = ( { closed = 1; nodes = ( -(1057,-20,o), -(1303,191,o), +(1057,-24,o), +(1302,191,o), (1302,512,cs), -(1303,785,o), -(1121,983,o), +(1302,785,o), +(1121,984,o), (850,984,cs), -(681,983,o), -(527,902,o), -(470,766,c), +(681,984,o), +(522,902,o), +(465,766,c), (462,766,l), -(463,1006,o), -(538,1167,o), -(708,1166,cs), -(793,1167,o), +(462,1006,o), +(538,1170,o), +(708,1170,cs), +(793,1170,o), (868,1129,o), (886,1044,c), (1284,1044,l), (1259,1299,o), -(1037,1510,o), -(708,1510,cs), -(318,1510,o), -(61,1210,o), +(1037,1514,o), +(708,1514,cs), +(318,1514,o), +(60,1210,o), (60,728,cs), -(58,186,o), -(358,-20,o), -(706,-20,cs) +(60,186,o), +(358,-24,o), +(706,-24,cs) ); }, { closed = 1; nodes = ( -(585,285,o), -(497,375,o), +(583,286,o), +(496,376,o), (496,498,cs), -(497,620,o), -(585,710,o), +(496,620,o), +(583,710,o), (702,710,cs), -(823,710,o), -(911,620,o), +(822,710,o), +(910,621,o), (910,498,cs), -(911,375,o), -(823,285,o), +(910,376,o), +(821,286,o), (702,286,cs) ); } @@ -702,306 +708,348 @@ nodes = ( width = 1370; }, { -guides = ( -{ -pos = (288,1240); -}, +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +shapes = ( { -pos = (-156,568); -} +closed = 1; +nodes = ( +(742,-20,o), +(946,198,o), +(990,446,cs), +(1033,710,o), +(873,911,o), +(638,910,cs), +(466,911,o), +(285,803,o), +(212,654,c), +(206,654,l), +(294,1178,o), +(489,1463,o), +(762,1464,cs), +(957,1463,o), +(1045,1321,o), +(1028,1118,c), +(1074,1118,l), +(1097,1350,o), +(981,1510,o), +(760,1510,cs), +(399,1510,o), +(230,1076,o), +(166,674,cs), +(88,207,o), +(239,-20,o), +(492,-20,cs) ); -layerId = m010; -shapes = ( +}, { closed = 1; nodes = ( -(969,-20,o), -(1239,180,o), -(1290,492,cs), -(1338,774,o), -(1184,983,o), -(906,984,cs), -(742,983,o), -(582,911,o), -(502,774,c), -(490,754,l), -(535,995,o), -(649,1167,o), -(824,1166,cs), -(904,1167,o), -(970,1134,o), -(970,1048,c), -(1362,1048,l), -(1379,1303,o), -(1183,1510,o), -(850,1510,cs), -(468,1510,o), -(172,1222,o), -(92,748,cs), -(-1,198,o), -(271,-20,o), -(626,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(530,285,o), -(465,359,o), -(482,478,cs), -(503,612,o), -(617,710,o), -(744,710,cs), -(857,710,o), -(921,631,o), -(904,518,cs), -(886,384,o), -(771,285,o), -(642,286,cs) +(306,26,o), +(198,163,o), +(192,424,cs), +(189,657,o), +(408,864,o), +(634,864,cs), +(850,864,o), +(981,681,o), +(942,446,cs), +(902,215,o), +(707,26,o), +(492,26,cs) ); } ); -width = 1370; +width = 1160; }, { -layerId = m011; +layerId = m012; shapes = ( { closed = 1; nodes = ( -(794,-20,o), -(963,198,o), -(962,446,cs), -(963,710,o), -(769,911,o), -(536,910,cs), -(363,911,o), -(201,803,o), -(154,654,c), -(148,654,l), -(148,1177,o), -(287,1463,o), -(558,1464,cs), -(754,1463,o), -(876,1321,o), -(890,1118,c), -(936,1118,l), -(922,1350,o), -(780,1510,o), -(558,1510,cs), -(200,1510,o), -(102,1076,o), +(678,-20,o), +(882,198,o), +(926,446,cs), +(969,710,o), +(809,911,o), +(574,910,cs), +(402,911,o), +(221,803,o), +(148,654,c), +(142,654,l), +(230,1178,o), +(425,1463,o), +(698,1464,cs), +(893,1463,o), +(981,1321,o), +(964,1118,c), +(1010,1118,l), +(1033,1350,o), +(917,1510,o), +(696,1510,cs), +(335,1510,o), +(166,1076,o), (102,674,cs), -(102,207,o), -(291,-20,o), -(544,-20,cs) +(24,207,o), +(175,-20,o), +(428,-20,cs) ); }, { closed = 1; nodes = ( -(360,26,o), -(221,163,o), -(172,424,cs), -(128,658,o), -(305,864,o), -(532,864,cs), -(748,864,o), -(916,681,o), -(916,446,cs), -(916,215,o), -(759,26,o), -(544,26,cs) +(242,26,o), +(134,163,o), +(128,424,cs), +(125,657,o), +(344,864,o), +(570,864,cs), +(786,864,o), +(917,681,o), +(878,446,cs), +(838,215,o), +(643,26,o), +(428,26,cs) ); } ); -width = 1064; +width = 1032; }, { -associatedMasterId = m011; -background = { +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; shapes = ( { closed = 1; nodes = ( -(823,745,o), -(1007,911,o), -(1006,1118,cs), -(1007,1323,o), -(823,1489,o), -(596,1490,cs), -(370,1489,o), -(186,1323,o), -(186,1118,cs), -(186,911,o), -(370,745,o), -(596,744,cs) +(850,-23,o), +(1075,198,o), +(1122,468,cs), +(1171,762,o), +(988,975,o), +(726,974,cs), +(575,975,o), +(438,905,o), +(336,782,c), +(324,770,l), +(389,1149,o), +(574,1350,o), +(804,1350,cs), +(963,1350,o), +(1038,1253,o), +(1044,1118,c), +(1214,1118,l), +(1218,1350,o), +(1057,1510,o), +(810,1510,cs), +(479,1510,o), +(231,1219,o), +(144,698,cs), +(51,143,o), +(304,-18,o), +(554,-20,cs) ); }, { closed = 1; nodes = ( -(821,3,o), -(1004,201,o), -(1004,446,cs), -(1004,689,o), -(821,887,o), -(596,888,cs), -(372,887,o), -(189,689,o), -(190,446,cs), -(189,201,o), -(372,3,o), -(596,2,cs) +(377,140,o), +(272,294,o), +(302,466,cs), +(330,649,o), +(508,815,o), +(696,814,cs), +(874,815,o), +(979,669,o), +(950,492,cs), +(918,297,o), +(746,140,o), +(560,140,cs) ); } ); -}; -layerId = "08DF6446-939B-40C8-8D74-85CE23B0C464"; -name = "Dec 27 18, 12:24"; +width = 1260; +}, +{ +layerId = m008; shapes = ( { -closed = 0; +closed = 1; nodes = ( -(190,446,l), -(189,690,o), -(372,887,o), -(596,888,cs), -(820,887,o), -(1004,689,o), -(1004,446,cs), -(1004,201,o), -(822,3,o), -(608,2,cs), -(391,3,o), -(189,182,o), -(190,674,cs), -(189,1326,o), -(402,1489,o), -(628,1490,cs), -(855,1489,o), -(1007,1324,o), -(1006,1118,c) +(818,-23,o), +(1043,198,o), +(1090,468,cs), +(1139,762,o), +(956,975,o), +(694,974,cs), +(543,975,o), +(406,905,o), +(304,782,c), +(292,770,l), +(357,1149,o), +(542,1350,o), +(772,1350,cs), +(931,1350,o), +(1006,1253,o), +(1012,1118,c), +(1182,1118,l), +(1186,1350,o), +(1025,1510,o), +(778,1510,cs), +(447,1510,o), +(199,1219,o), +(112,698,cs), +(19,143,o), +(272,-18,o), +(522,-20,cs) +); +}, +{ +closed = 1; +nodes = ( +(345,140,o), +(240,294,o), +(270,466,cs), +(298,649,o), +(476,815,o), +(664,814,cs), +(842,815,o), +(947,669,o), +(918,492,cs), +(886,297,o), +(714,140,o), +(528,140,cs) ); } ); -width = 1202; +width = 1196; }, { -associatedMasterId = m011; -layerId = "71F80546-750D-40FD-977B-593D0B152CA4"; -name = "Dec 27 18, 12:33"; +guides = ( +{ +pos = (335,1240); +}, +{ +pos = (-109,568); +} +); +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; shapes = ( { closed = 1; nodes = ( -(987,1349,o), -(844,1513,o), -(622,1512,cs), -(260,1513,o), -(166,1076,o), -(166,674,cs), -(166,206,o), -(354,-20,o), -(608,-20,cs), -(857,-20,o), -(1027,197,o), -(1026,446,cs), -(1027,708,o), -(836,911,o), -(596,910,cs), -(343,911,o), -(155,684,o), -(190,416,c), -(236,416,l), -(201,658,o), -(369,864,o), -(596,864,cs), -(812,864,o), -(980,681,o), -(980,446,cs), -(980,215,o), -(823,26,o), -(608,26,cs), -(368,26,o), -(212,255,o), -(212,674,cs), -(212,1025,o), -(284,1466,o), -(622,1466,cs), -(817,1466,o), -(940,1321,o), -(954,1118,c), -(1000,1118,l) +(1000,-20,o), +(1270,180,o), +(1321,492,cs), +(1369,774,o), +(1215,983,o), +(937,984,cs), +(773,983,o), +(613,911,o), +(533,774,c), +(521,754,l), +(566,995,o), +(680,1167,o), +(855,1166,cs), +(935,1167,o), +(1001,1134,o), +(1001,1048,c), +(1393,1048,l), +(1410,1303,o), +(1214,1510,o), +(881,1510,cs), +(499,1510,o), +(203,1222,o), +(123,748,cs), +(30,198,o), +(302,-20,o), +(657,-20,cs) ); }, { closed = 1; nodes = ( -(200,620,l), -(230,620,l), -(230,652,l), -(200,652,l) +(561,285,o), +(496,359,o), +(513,478,cs), +(534,612,o), +(648,710,o), +(775,710,cs), +(888,710,o), +(952,631,o), +(935,518,cs), +(917,384,o), +(802,285,o), +(673,286,cs) ); } ); -width = 1202; +width = 1422; }, { -layerId = m012; +guides = ( +{ +pos = (303,1240); +}, +{ +pos = (-141,568); +} +); +layerId = m010; shapes = ( { closed = 1; nodes = ( -(698,-20,o), -(902,198,o), -(946,446,cs), -(989,710,o), -(829,911,o), -(594,910,cs), -(422,911,o), -(241,803,o), -(168,654,c), -(162,654,l), -(250,1178,o), -(445,1463,o), -(718,1464,cs), -(913,1463,o), -(1001,1321,o), -(984,1118,c), -(1030,1118,l), -(1053,1350,o), -(937,1510,o), -(716,1510,cs), -(355,1510,o), -(186,1076,o), -(122,674,cs), -(44,207,o), -(195,-20,o), -(448,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(262,26,o), -(154,163,o), -(148,424,cs), -(145,657,o), -(364,864,o), -(590,864,cs), -(806,864,o), -(937,681,o), -(898,446,cs), -(858,215,o), -(663,26,o), -(448,26,cs) +(984,-20,o), +(1254,180,o), +(1305,492,cs), +(1353,774,o), +(1199,983,o), +(921,984,cs), +(757,983,o), +(597,911,o), +(517,774,c), +(505,754,l), +(550,995,o), +(664,1167,o), +(839,1166,cs), +(919,1167,o), +(985,1134,o), +(985,1048,c), +(1377,1048,l), +(1394,1303,o), +(1198,1510,o), +(865,1510,cs), +(483,1510,o), +(187,1222,o), +(107,748,cs), +(14,198,o), +(286,-20,o), +(641,-20,cs) +); +}, +{ +closed = 1; +nodes = ( +(545,285,o), +(480,359,o), +(497,478,cs), +(518,612,o), +(632,710,o), +(759,710,cs), +(872,710,o), +(936,631,o), +(919,518,cs), +(901,384,o), +(786,285,o), +(657,286,cs) ); } ); -width = 1064; +width = 1390; } ); +metricLeft = zero; +metricRight = zero; tags = ( "TODO-opsz" ); diff --git a/src/Inter.glyphspackage/glyphs/three.glyph b/src/Inter.glyphspackage/glyphs/three.glyph index ec506406d..e072102c7 100644 --- a/src/Inter.glyphspackage/glyphs/three.glyph +++ b/src/Inter.glyphspackage/glyphs/three.glyph @@ -19,16 +19,16 @@ shapes = ( closed = 1; nodes = ( (946,-20,o), -(1161,161,o), +(1160,161,o), (1160,404,cs), -(1161,593,o), +(1160,593,o), (1049,731,o), (862,762,c), (862,774,l), (1012,820,o), -(1105,943,o), +(1106,943,o), (1106,1112,cs), -(1105,1322,o), +(1106,1322,o), (939,1510,o), (664,1510,cs), (406,1510,o), @@ -36,21 +36,21 @@ nodes = ( (184,1118,c), (358,1118,l), (364,1265,o), -(505,1353,o), +(505,1352,o), (660,1352,cs), -(825,1353,o), -(931,1253,o), +(825,1352,o), +(930,1253,o), (930,1102,cs), -(931,945,o), +(930,945,o), (808,844,o), (632,844,cs), (512,844,l), (512,684,l), (632,684,ls), (857,684,o), -(983,569,o), +(984,569,o), (984,404,cs), -(983,247,o), +(984,247,o), (846,140,o), (654,140,cs), (482,140,o), @@ -66,62 +66,51 @@ nodes = ( width = 1304; }, { -guides = ( -{ -pos = (332,1436); -}, -{ -pos = (720,1056); -}, -{ -pos = (332,624); -} -); layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; shapes = ( { closed = 1; nodes = ( (1045,-20,o), -(1302,165,o), +(1300,165,o), (1300,428,cs), -(1302,610,o), +(1300,610,o), (1180,739,o), (940,766,c), (940,776,l), (1117,796,o), -(1247,910,o), +(1246,910,o), (1246,1076,cs), -(1247,1327,o), +(1246,1327,o), (1014,1510,o), (684,1510,cs), (346,1510,o), -(106,1317,o), +(104,1317,o), (104,1044,c), (492,1044,l), -(493,1135,o), -(572,1199,o), +(492,1135,o), +(572,1198,o), (684,1198,cs), -(785,1199,o), -(857,1137,o), +(785,1198,o), +(856,1137,o), (856,1050,cs), -(857,960,o), +(856,960,o), (772,896,o), (652,896,cs), (500,896,l), (500,616,l), (652,616,ls), -(783,617,o), -(874,553,o), +(783,616,o), +(872,553,o), (872,462,cs), -(874,370,o), -(796,305,o), +(872,370,o), +(796,306,o), (684,306,cs), -(567,305,o), -(484,367,o), +(567,306,o), +(482,367,o), (482,454,c), (76,454,l), -(77,176,o), +(76,176,o), (328,-20,o), (680,-20,cs) ); @@ -543,65 +532,57 @@ nodes = ( width = 1256; }, { -background = { -shapes = ( -{ -pos = (32,0); -ref = eight; -} -); -}; layerId = m007; shapes = ( { closed = 1; nodes = ( -(914,-20,o), -(1129,161,o), -(1128,404,cs), -(1129,593,o), -(1017,731,o), -(830,762,c), -(830,774,l), -(980,820,o), -(1073,943,o), -(1074,1112,cs), -(1073,1322,o), -(907,1510,o), -(632,1510,cs), -(374,1510,o), -(160,1351,o), -(152,1118,c), -(326,1118,l), -(332,1265,o), -(473,1353,o), -(628,1352,cs), -(793,1353,o), -(899,1253,o), -(898,1102,cs), -(899,945,o), -(776,844,o), -(600,844,cs), -(480,844,l), -(480,684,l), -(600,684,ls), -(825,684,o), -(951,569,o), -(952,404,cs), -(951,247,o), -(814,140,o), -(622,140,cs), -(450,140,o), -(313,228,o), -(302,372,c), -(120,372,l), -(130,138,o), -(337,-20,o), -(626,-20,cs) +(916,-24,o), +(1136,159,o), +(1136,404,cs), +(1136,588,o), +(1012,730,o), +(822,762,c), +(822,774,l), +(988,825,o), +(1090,953,o), +(1090,1112,cs), +(1090,1339,o), +(883,1514,o), +(609,1514,cs), +(327,1514,o), +(128,1326,o), +(128,1056,c), +(302,1056,l), +(302,1244,o), +(418,1356,o), +(608,1356,cs), +(793,1356,o), +(914,1254,o), +(914,1102,cs), +(914,948,o), +(784,844,o), +(592,844,cs), +(472,844,l), +(472,684,l), +(592,684,ls), +(811,684,o), +(960,571,o), +(960,404,cs), +(960,245,o), +(820,134,o), +(616,134,cs), +(403,134,o), +(278,257,o), +(278,468,c), +(96,468,l), +(96,177,o), +(312,-24,o), +(620,-24,cs) ); } ); -width = 1240; +width = 1232; }, { associatedMasterId = m007; @@ -767,68 +748,57 @@ nodes = ( width = 1224; }, { -guides = ( -{ -pos = (236,1436); -}, -{ -pos = (624,1056); -}, -{ -pos = (236,624); -} -); layerId = m009; shapes = ( { closed = 1; nodes = ( -(1029,-20,o), -(1286,165,o), -(1284,428,cs), -(1286,610,o), -(1164,739,o), -(924,766,c), -(924,776,l), -(1101,796,o), -(1231,910,o), -(1230,1076,cs), -(1231,1327,o), -(998,1510,o), -(668,1510,cs), -(330,1510,o), -(90,1317,o), -(88,1044,c), -(476,1044,l), -(477,1135,o), -(556,1199,o), -(668,1198,cs), -(769,1199,o), -(841,1137,o), -(840,1050,cs), -(841,960,o), -(756,896,o), -(636,896,cs), -(484,896,l), -(484,616,l), -(636,616,ls), -(767,617,o), -(858,553,o), -(856,462,cs), -(858,370,o), -(780,305,o), -(668,306,cs), -(551,305,o), -(468,367,o), -(466,454,c), -(60,454,l), -(61,176,o), -(312,-20,o), -(664,-20,cs) +(1033,-24,o), +(1280,165,o), +(1280,420,cs), +(1280,598,o), +(1160,756,o), +(936,779,c), +(936,782,l), +(1105,802,o), +(1234,918,o), +(1234,1100,cs), +(1234,1343,o), +(1002,1514,o), +(672,1514,cs), +(308,1514,o), +(92,1305,o), +(92,1032,c), +(480,1032,l), +(480,1139,o), +(562,1214,o), +(672,1214,cs), +(777,1214,o), +(853,1145,o), +(853,1050,cs), +(853,953,o), +(774,896,o), +(640,896,cs), +(496,896,l), +(496,616,l), +(640,616,ls), +(779,616,o), +(868,551,o), +(868,451,cs), +(868,354,o), +(785,286,o), +(666,286,cs), +(534,286,o), +(454,371,o), +(454,512,c), +(64,512,l), +(64,234,o), +(242,-24,o), +(668,-24,cs) ); } ); -width = 1350; +width = 1344; }, { guides = ( diff --git a/src/Inter.glyphspackage/glyphs/two.glyph b/src/Inter.glyphspackage/glyphs/two.glyph index 9cc887943..37d0f3e4b 100644 --- a/src/Inter.glyphspackage/glyphs/two.glyph +++ b/src/Inter.glyphspackage/glyphs/two.glyph @@ -40,13 +40,13 @@ nodes = ( (160,1070,c), (332,1070,l), (332,1240,o), -(441,1353,o), +(441,1352,o), (614,1352,cs), -(775,1353,o), -(899,1254,o), +(775,1352,o), +(898,1254,o), (898,1096,cs), -(899,959,o), -(818,857,o), +(898,959,o), +(817,858,o), (646,670,cs), (154,130,l), (154,0,l) @@ -80,20 +80,20 @@ nodes = ( (660,322,l), (660,332,l), (800,448,ls), -(1140,731,o), +(1141,730,o), (1226,878,o), (1226,1050,cs), (1226,1328,o), (999,1510,o), (642,1510,cs), (295,1510,o), -(69,1317,o), +(70,1317,o), (70,1004,c), (454,1004,l), -(453,1129,o), -(529,1199,o), +(454,1129,o), +(529,1198,o), (642,1198,cs), -(753,1199,o), +(753,1198,o), (832,1129,o), (832,1016,cs), (832,910,o), @@ -218,19 +218,19 @@ nodes = ( (262,52,l), (702,574,ls), (930,844,o), -(1001,961,o), +(1000,961,o), (1000,1126,cs), -(1001,1347,o), +(1000,1347,o), (835,1510,o), (610,1510,cs), (378,1510,o), -(215,1333,o), +(216,1333,o), (216,1118,c), (262,1118,l), (262,1307,o), -(404,1463,o), +(404,1464,o), (610,1464,cs), -(809,1463,o), +(809,1464,o), (954,1321,o), (954,1126,cs), (954,977,o), @@ -356,13 +356,13 @@ width = 1170; anchors = ( { name = cross; -pos = (808,768); +pos = (782,768); } ); background = { shapes = ( { -pos = (12,0); +pos = (-24,0); ref = three; } ); @@ -372,36 +372,36 @@ shapes = ( { closed = 1; nodes = ( -(1062,0,l), -(1062,160,l), -(370,160,l), -(370,172,l), -(704,530,ls), -(960,804,o), -(1036,932,o), -(1036,1096,cs), -(1036,1327,o), -(849,1510,o), -(588,1510,cs), -(327,1510,o), -(128,1332,o), -(128,1070,c), -(300,1070,l), -(300,1240,o), -(409,1353,o), -(582,1352,cs), -(743,1353,o), -(867,1254,o), -(866,1096,cs), -(867,959,o), -(786,857,o), -(614,670,cs), -(122,130,l), -(122,0,l) +(1059,0,l), +(1059,160,l), +(340,160,l), +(340,162,l), +(745,528,ls), +(990,749,o), +(1066,866,o), +(1066,1048,cs), +(1066,1333,o), +(890,1514,o), +(588,1514,cs), +(294,1514,o), +(102,1312,o), +(102,1008,c), +(274,1008,l), +(274,1220,o), +(392,1354,o), +(588,1354,cs), +(787,1354,o), +(896,1242,o), +(896,1054,cs), +(896,920,o), +(831,823,o), +(626,635,cs), +(96,151,l), +(96,0,l) ); } ); -width = 1176; +width = 1162; }, { anchors = ( @@ -450,15 +450,12 @@ width = 1176; anchors = ( { name = cross; -pos = (880,818); +pos = (877,818); } ); guides = ( { -pos = (-112,2280); -}, -{ -pos = (-112,764); +pos = (-115,2280); } ); layerId = m009; @@ -466,42 +463,42 @@ shapes = ( { closed = 1; nodes = ( -(1226,0,l), -(1226,322,l), -(644,322,l), -(644,332,l), -(784,448,ls), -(1124,731,o), -(1210,878,o), -(1210,1050,cs), -(1210,1328,o), -(983,1510,o), -(626,1510,cs), -(279,1510,o), -(53,1317,o), -(54,1004,c), -(438,1004,l), -(437,1129,o), -(513,1199,o), -(626,1198,cs), -(737,1199,o), -(816,1129,o), -(816,1016,cs), -(816,910,o), -(748,841,o), -(638,750,cs), -(82,290,l), -(82,0,l) -); -} -); -width = 1292; +(1223,0,l), +(1223,322,l), +(649,322,l), +(649,332,l), +(892,520,ls), +(1126,702,o), +(1219,846,o), +(1219,1028,cs), +(1219,1311,o), +(995,1514,o), +(645,1514,cs), +(281,1514,o), +(64,1298,o), +(64,952,c), +(445,952,l), +(445,1099,o), +(523,1194,o), +(643,1194,cs), +(758,1194,o), +(833,1123,o), +(833,1012,cs), +(833,900,o), +(726,812,o), +(639,742,cs), +(79,290,l), +(79,0,l) +); +} +); +width = 1293; }, { anchors = ( { name = cross; -pos = (924,818); +pos = (928,818); } ); guides = ( @@ -517,32 +514,32 @@ shapes = ( { closed = 1; nodes = ( -(1134,0,l), -(1186,322,l), -(606,322,l), -(606,332,l), -(766,448,ls), -(1152,732,o), -(1263,879,o), -(1292,1050,cs), -(1339,1328,o), -(1140,1510,o), -(782,1510,cs), -(436,1510,o), -(179,1318,o), -(126,1004,c), -(510,1004,l), -(531,1129,o), -(620,1199,o), -(732,1198,cs), -(842,1199,o), -(911,1130,o), -(892,1016,cs), -(874,911,o), -(796,841,o), -(670,750,cs), -(38,290,l), -(-10,0,l) +(1139,0,l), +(1192,322,l), +(626,322,l), +(626,332,l), +(894,520,ls), +(1157,704,o), +(1275,846,o), +(1305,1028,cs), +(1352,1311,o), +(1161,1514,o), +(811,1514,cs), +(447,1514,o), +(194,1298,o), +(137,952,c), +(518,952,l), +(543,1099,o), +(636,1194,o), +(756,1194,cs), +(871,1194,o), +(935,1123,o), +(916,1012,cs), +(898,900,o), +(776,812,o), +(677,742,cs), +(43,290,l), +(-5,0,l) ); } ); @@ -566,19 +563,19 @@ nodes = ( (198,52,l), (638,574,ls), (866,844,o), -(937,961,o), +(936,961,o), (936,1126,cs), -(937,1347,o), +(936,1347,o), (771,1510,o), (546,1510,cs), (314,1510,o), -(151,1333,o), +(152,1333,o), (152,1118,c), (198,1118,l), (198,1307,o), -(340,1463,o), +(340,1464,o), (546,1464,cs), -(745,1463,o), +(745,1464,o), (890,1321,o), (890,1126,cs), (890,977,o), @@ -699,6 +696,59 @@ nodes = ( } ); width = 1144; +}, +{ +anchors = ( +{ +name = cross; +pos = (782,768); +} +); +associatedMasterId = m007; +background = { +shapes = ( +{ +pos = (-14,0); +ref = three; +} +); +}; +layerId = "F3D8BD0C-B0DD-44F6-98BA-FC29D6A37732"; +name = "Jun 6, 22, 16:25"; +shapes = ( +{ +closed = 1; +nodes = ( +(1036,0,l), +(1036,160,l), +(343,160,l), +(343,162,l), +(679,530,ls), +(931,807,o), +(1010,932,o), +(1010,1096,cs), +(1010,1333,o), +(815,1510,o), +(556,1510,cs), +(297,1510,o), +(102,1315,o), +(102,1056,c), +(274,1056,l), +(274,1235,o), +(385,1350,o), +(556,1350,cs), +(728,1350,o), +(840,1250,o), +(840,1096,cs), +(840,959,o), +(759,858,o), +(588,670,cs), +(96,130,l), +(96,0,l) +); +} +); +width = 1132; } ); tags = ( diff --git a/src/Inter.glyphspackage/glyphs/twostroke.glyph b/src/Inter.glyphspackage/glyphs/twostroke.glyph index 1e75c571d..5322da73e 100644 --- a/src/Inter.glyphspackage/glyphs/twostroke.glyph +++ b/src/Inter.glyphspackage/glyphs/twostroke.glyph @@ -111,11 +111,11 @@ alignment = 1; ref = two; }, { -pos = (360,-494); +pos = (334,-494); ref = crossbar; } ); -width = 1176; +width = 1162; }, { guides = ( @@ -145,11 +145,11 @@ alignment = 1; ref = two; }, { -pos = (377,290); +pos = (374,290); ref = crossbar; } ); -width = 1292; +width = 1293; }, { layerId = m010; @@ -159,7 +159,7 @@ alignment = 1; ref = two; }, { -pos = (378,12); +pos = (382,12); ref = crossbar; } ); diff --git a/src/Inter.glyphspackage/glyphs/zero.glyph b/src/Inter.glyphspackage/glyphs/zero.glyph index 2207d4d98..415e07e67 100644 --- a/src/Inter.glyphspackage/glyphs/zero.glyph +++ b/src/Inter.glyphspackage/glyphs/zero.glyph @@ -7,133 +7,283 @@ layers = ( { guides = ( { -orientation = center; -angle = 90; -pos = (824,792); +pos = (848,2044); +}, +{ +pos = (848,4); } ); -layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; shapes = ( { closed = 1; nodes = ( -(969,-20,o), -(1158,258,o), -(1158,744,cs), -(1158,1228,o), -(966,1510,o), -(640,1510,cs), -(314,1510,o), -(122,1228,o), -(122,744,cs), -(122,258,o), -(311,-20,o), -(640,-20,cs) +(889,-20,o), +(1062,271,o), +(1062,744,cs), +(1062,1219,o), +(889,1510,o), +(606,1510,cs), +(321,1510,o), +(148,1219,o), +(148,744,cs), +(148,271,o), +(321,-20,o), +(606,-20,cs) ); }, { closed = 1; nodes = ( -(423,140,o), -(297,357,o), -(296,744,cs), -(297,1132,o), -(425,1353,o), -(640,1352,cs), -(855,1353,o), -(983,1132,o), -(984,744,cs), -(983,357,o), -(857,140,o), -(640,140,cs) +(351,26,o), +(194,297,o), +(194,744,cs), +(194,1193,o), +(351,1464,o), +(606,1464,cs), +(859,1464,o), +(1016,1193,o), +(1016,744,cs), +(1016,297,o), +(859,26,o), +(606,26,cs) ); } ); -width = 1280; +width = 1210; +}, +{ +associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(858,-8,o), +(1010,264,o), +(1010,748,cs), +(1009,1225,o), +(854,1510,o), +(576,1510,cs), +(297,1510,o), +(140,1224,o), +(142,748,cs), +(143,263,o), +(293,-9,o), +(576,-8,cs) +); }, { +closed = 1; +nodes = ( +(313,51,o), +(170,314,o), +(168,748,cs), +(169,1182,o), +(315,1454,o), +(576,1454,cs), +(836,1454,o), +(982,1182,o), +(984,748,cs), +(981,314,o), +(839,51,o), +(576,52,cs) +); +} +); +}; guides = ( { -pos = (36,1240); +pos = (808,2044); }, { -pos = (36,764); +pos = (808,4); } ); -layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +layerId = "7AF2C568-77BF-4FF1-9E55-589BC7C6D392"; +name = "Dec 25 18, 17:03"; shapes = ( { closed = 1; nodes = ( -(1153,-41,o), -(1404,249,o), -(1406,742,cs), -(1406,1232,o), -(1153,1510,o), -(748,1510,cs), -(342,1510,o), -(92,1233,o), -(90,742,cs), -(89,251,o), -(342,-40,o), -(748,-40,cs) +(845,3,o), +(1009,284,o), +(1010,744,cs), +(1009,1206,o), +(845,1487,o), +(576,1486,cs), +(307,1487,o), +(143,1206,o), +(142,744,cs), +(143,284,o), +(307,3,o), +(576,2,cs) ); +} +); +width = 1152; }, { +guides = ( +{ +pos = (720,2044); +}, +{ +pos = (720,4); +} +); +layerId = m011; +shapes = ( +{ closed = 1; nodes = ( -(608,288,o), -(508,428,o), -(510,742,cs), -(511,1048,o), -(608,1184,o), -(748,1184,cs), -(887,1184,o), -(985,1048,o), -(986,742,cs), -(987,428,o), -(887,288,o), -(748,288,cs) +(825,-20,o), +(998,271,o), +(998,744,cs), +(998,1219,o), +(825,1510,o), +(542,1510,cs), +(257,1510,o), +(84,1219,o), +(84,744,cs), +(84,271,o), +(257,-20,o), +(542,-20,cs) +); +}, +{ +closed = 1; +nodes = ( +(287,26,o), +(130,297,o), +(130,744,cs), +(130,1193,o), +(287,1464,o), +(542,1464,cs), +(795,1464,o), +(952,1193,o), +(952,744,cs), +(952,297,o), +(795,26,o), +(542,26,cs) ); } ); -width = 1498; +width = 1082; }, { -layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +associatedMasterId = m011; +background = { shapes = ( { closed = 1; nodes = ( -(871,-20,o), -(1106,259,o), -(1188,744,cs), -(1269,1227,o), -(1121,1510,o), -(796,1510,cs), -(469,1510,o), -(231,1228,o), -(152,744,cs), -(73,258,o), -(213,-20,o), -(542,-20,cs) +(858,-8,o), +(1010,264,o), +(1010,748,cs), +(1009,1225,o), +(854,1510,o), +(576,1510,cs), +(297,1510,o), +(140,1224,o), +(142,748,cs), +(143,263,o), +(293,-9,o), +(576,-8,cs) ); }, { closed = 1; nodes = ( -(353,140,o), -(263,358,o), -(326,744,cs), -(391,1132,o), -(554,1353,o), -(768,1352,cs), -(984,1353,o), -(1077,1132,o), -(1014,744,cs), -(949,358,o), -(786,140,o), -(568,140,cs) +(313,51,o), +(170,314,o), +(168,748,cs), +(169,1182,o), +(315,1454,o), +(576,1454,cs), +(836,1454,o), +(982,1182,o), +(984,748,cs), +(981,314,o), +(839,51,o), +(576,52,cs) +); +} +); +}; +guides = ( +{ +pos = (808,2044); +}, +{ +pos = (808,4); +} +); +layerId = "C95386FA-5CA4-4464-B66C-6E09B1AF9D3A"; +name = "Dec 25 18, 17:03"; +shapes = ( +{ +closed = 1; +nodes = ( +(845,3,o), +(1009,284,o), +(1010,744,cs), +(1009,1206,o), +(845,1487,o), +(576,1486,cs), +(307,1487,o), +(143,1206,o), +(142,744,cs), +(143,284,o), +(307,3,o), +(576,2,cs) +); +} +); +width = 1152; +}, +{ +guides = ( +{ +orientation = center; +angle = 90; +pos = (824,792); +} +); +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( +{ +closed = 1; +nodes = ( +(969,-20,o), +(1158,258,o), +(1158,744,cs), +(1158,1228,o), +(966,1510,o), +(640,1510,cs), +(314,1510,o), +(122,1228,o), +(122,744,cs), +(122,258,o), +(311,-20,o), +(640,-20,cs) +); +}, +{ +closed = 1; +nodes = ( +(419,138,o), +(294,361,o), +(294,744,cs), +(294,1128,o), +(419,1352,o), +(640,1352,cs), +(861,1352,o), +(986,1128,o), +(986,744,cs), +(986,361,o), +(861,138,o), +(640,138,cs) ); } ); @@ -142,50 +292,93 @@ width = 1280; { guides = ( { -pos = (726,1240); +orientation = center; +angle = 90; +pos = (-5078,792); }, { -pos = (22,764); +angle = 90; +pos = (628,1552); } ); -layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +layerId = m007; shapes = ( { closed = 1; nodes = ( -(1055,-41,o), -(1355,250,o), -(1436,742,cs), -(1518,1234,o), -(1311,1510,o), -(906,1510,cs), -(502,1510,o), -(206,1233,o), -(122,742,cs), -(37,251,o), -(243,-41,o), -(650,-40,cs) +(958,-24,o), +(1166,275,o), +(1166,744,cs), +(1166,1215,o), +(958,1514,o), +(628,1514,cs), +(298,1514,o), +(90,1215,o), +(90,744,cs), +(90,275,o), +(298,-24,o), +(628,-24,cs) ); }, { closed = 1; nodes = ( -(566,288,o), -(488,428,o), -(540,742,cs), -(591,1047,o), -(715,1184,o), -(854,1184,cs), -(994,1184,o), -(1070,1047,o), -(1018,742,cs), -(963,428,o), -(846,288,o), -(706,288,cs) +(400,136,o), +(260,366,o), +(260,744,cs), +(260,1124,o), +(400,1354,o), +(628,1354,cs), +(856,1354,o), +(996,1124,o), +(996,744,cs), +(996,366,o), +(856,136,o), +(628,136,cs) ); } ); -width = 1496; +width = 1256; +}, +{ +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +closed = 1; +nodes = ( +(1163,-20,o), +(1406,263,o), +(1406,744,cs), +(1406,1225,o), +(1162,1510,o), +(748,1510,cs), +(334,1510,o), +(90,1226,o), +(90,744,cs), +(90,263,o), +(334,-20,o), +(748,-20,cs) +); +}, +{ +closed = 1; +nodes = ( +(593,308,o), +(510,461,o), +(510,744,cs), +(510,1027,o), +(595,1184,o), +(748,1184,cs), +(902,1184,o), +(986,1028,o), +(986,744,cs), +(986,461,o), +(902,308,o), +(748,308,cs) +); +} +); +width = 1498; }, { associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; @@ -238,52 +431,86 @@ nodes = ( width = 1420; }, { -guides = ( +layerId = m009; +shapes = ( { -pos = (848,2044); +closed = 1; +nodes = ( +(1145,-24,o), +(1390,267,o), +(1390,744,cs), +(1390,1222,o), +(1145,1514,o), +(732,1514,cs), +(319,1514,o), +(74,1221,o), +(74,744,cs), +(74,268,o), +(319,-24,o), +(732,-24,cs) +); }, { -pos = (848,4); +closed = 1; +nodes = ( +(567,296,o), +(466,466,o), +(466,744,cs), +(466,1023,o), +(567,1194,o), +(732,1194,cs), +(897,1194,o), +(998,1023,o), +(998,744,cs), +(998,466,o), +(897,296,o), +(732,296,cs) +); } ); -layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +width = 1464; +}, +{ +associatedMasterId = m009; +layerId = "60C30D65-A827-4491-9B22-43A063F3D711"; +name = "Jun 6, 22, 15:47"; shapes = ( { closed = 1; nodes = ( -(889,-20,o), -(1062,271,o), -(1062,744,cs), -(1062,1219,o), -(889,1510,o), -(606,1510,cs), -(321,1510,o), -(148,1219,o), -(148,744,cs), -(148,271,o), -(321,-20,o), -(606,-20,cs) +(1161,-24,o), +(1414,267,o), +(1414,744,cs), +(1414,1222,o), +(1161,1514,o), +(748,1514,cs), +(335,1514,o), +(82,1221,o), +(82,744,cs), +(82,268,o), +(335,-24,o), +(748,-24,cs) ); }, { closed = 1; nodes = ( -(351,26,o), -(195,297,o), -(194,744,cs), -(195,1193,o), -(351,1463,o), -(606,1464,cs), -(859,1463,o), -(1015,1193,o), -(1016,744,cs), -(1015,297,o), -(859,26,o), -(606,26,cs) +(572,296,o), +(482,448,o), +(482,744,cs), +(482,1042,o), +(572,1194,o), +(748,1194,cs), +(923,1194,o), +(1014,1041,o), +(1014,744,cs), +(1014,449,o), +(923,296,o), +(748,296,cs) ); } ); -width = 1210; +width = 1496; }, { layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; @@ -326,122 +553,84 @@ nodes = ( width = 1210; }, { -associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; -background = { +layerId = m012; shapes = ( { closed = 1; nodes = ( -(858,-8,o), -(1010,264,o), -(1010,748,cs), -(1009,1225,o), -(854,1510,o), -(576,1510,cs), -(297,1510,o), -(140,1224,o), -(142,748,cs), -(143,263,o), -(293,-9,o), -(576,-8,cs) -); -}, -{ -closed = 1; -nodes = ( -(313,51,o), -(170,314,o), -(168,748,cs), -(169,1182,o), -(315,1454,o), -(576,1454,cs), -(836,1454,o), -(982,1182,o), -(984,748,cs), -(981,314,o), -(839,51,o), -(576,52,cs) -); -} +(726,-20,o), +(948,271,o), +(1026,744,cs), +(1105,1219,o), +(979,1510,o), +(696,1510,cs), +(412,1510,o), +(192,1217,o), +(114,744,cs), +(35,269,o), +(159,-20,o), +(442,-20,cs) ); -}; -guides = ( -{ -pos = (808,2044); }, { -pos = (808,4); -} -); -layerId = "7AF2C568-77BF-4FF1-9E55-589BC7C6D392"; -name = "Dec 25 18, 17:03"; -shapes = ( -{ closed = 1; nodes = ( -(845,3,o), -(1009,284,o), -(1010,744,cs), -(1009,1206,o), -(845,1487,o), -(576,1486,cs), -(307,1487,o), -(143,1206,o), -(142,744,cs), -(143,284,o), -(307,3,o), -(576,2,cs) +(185,26,o), +(87,308,o), +(160,744,cs), +(236,1204,o), +(444,1463,o), +(696,1464,cs), +(953,1463,o), +(1052,1180,o), +(980,744,cs), +(904,284,o), +(694,26,o), +(446,26,cs) ); } ); -width = 1152; +width = 1082; }, { -guides = ( -{ -orientation = center; -angle = 90; -pos = (-5078,792); -} -); -layerId = m007; +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; shapes = ( { closed = 1; nodes = ( -(937,-20,o), -(1126,258,o), -(1126,744,cs), -(1126,1228,o), -(934,1510,o), -(608,1510,cs), -(282,1510,o), -(90,1228,o), -(90,744,cs), -(90,258,o), -(279,-20,o), -(608,-20,cs) +(871,-20,o), +(1106,259,o), +(1188,744,cs), +(1269,1227,o), +(1121,1510,o), +(796,1510,cs), +(469,1510,o), +(231,1228,o), +(152,744,cs), +(73,258,o), +(213,-20,o), +(542,-20,cs) ); }, { closed = 1; nodes = ( -(391,140,o), -(265,357,o), -(264,744,cs), -(265,1132,o), -(393,1353,o), -(608,1352,cs), -(823,1353,o), -(951,1132,o), -(952,744,cs), -(951,357,o), -(825,140,o), -(608,140,cs) +(353,140,o), +(263,358,o), +(326,744,cs), +(391,1132,o), +(554,1353,o), +(768,1352,cs), +(984,1353,o), +(1077,1132,o), +(1014,744,cs), +(949,358,o), +(786,140,o), +(568,140,cs) ); } ); -width = 1216; +width = 1280; }, { layerId = m008; @@ -486,100 +675,50 @@ width = 1216; { guides = ( { -pos = (-60,1240); -}, -{ -pos = (-60,764); -} -); -layerId = m009; -shapes = ( -{ -closed = 1; -nodes = ( -(1137,-41,o), -(1388,249,o), -(1390,742,cs), -(1390,1232,o), -(1137,1510,o), -(732,1510,cs), -(326,1510,o), -(76,1233,o), -(74,742,cs), -(73,251,o), -(326,-40,o), -(732,-40,cs) -); -}, -{ -closed = 1; -nodes = ( -(592,288,o), -(492,428,o), -(494,742,cs), -(495,1048,o), -(592,1184,o), -(732,1184,cs), -(871,1184,o), -(969,1048,o), -(970,742,cs), -(971,428,o), -(871,288,o), -(732,288,cs) -); -} -); -width = 1464; -}, -{ -associatedMasterId = m009; -guides = ( -{ -pos = (-16,1240); +pos = (726,1240); }, { -pos = (-16,764); +pos = (22,764); } ); -layerId = "B50C81B4-9ACE-4C5E-9033-74EE2335D59B"; -name = "Nov 23 18, 15:46"; +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; shapes = ( { closed = 1; nodes = ( -(1115,-41,o), -(1332,221,o), -(1332,738,cs), -(1332,1254,o), -(1115,1510,o), -(710,1510,cs), -(304,1510,o), -(87,1252,o), -(88,736,cs), -(86,220,o), -(304,-40,o), -(710,-40,cs) +(1055,-41,o), +(1355,250,o), +(1436,742,cs), +(1518,1234,o), +(1311,1510,o), +(906,1510,cs), +(502,1510,o), +(206,1233,o), +(122,742,cs), +(37,251,o), +(243,-41,o), +(650,-40,cs) ); }, { closed = 1; nodes = ( -(542,285,o), -(467,430,o), -(468,736,cs), -(468,1042,o), -(543,1187,o), -(710,1186,cs), -(873,1187,o), -(949,1042,o), -(952,736,cs), -(952,430,o), -(877,285,o), -(710,286,cs) +(566,288,o), +(488,428,o), +(540,742,cs), +(591,1047,o), +(715,1184,o), +(854,1184,cs), +(994,1184,o), +(1070,1047,o), +(1018,742,cs), +(963,428,o), +(846,288,o), +(706,288,cs) ); } ); -width = 1420; +width = 1496; }, { guides = ( @@ -628,165 +767,6 @@ nodes = ( } ); width = 1464; -}, -{ -guides = ( -{ -pos = (720,2044); -}, -{ -pos = (720,4); -} -); -layerId = m011; -shapes = ( -{ -closed = 1; -nodes = ( -(825,-20,o), -(998,271,o), -(998,744,cs), -(998,1219,o), -(825,1510,o), -(542,1510,cs), -(257,1510,o), -(84,1219,o), -(84,744,cs), -(84,271,o), -(257,-20,o), -(542,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(287,26,o), -(131,297,o), -(130,744,cs), -(131,1193,o), -(287,1463,o), -(542,1464,cs), -(795,1463,o), -(951,1193,o), -(952,744,cs), -(951,297,o), -(795,26,o), -(542,26,cs) -); -} -); -width = 1082; -}, -{ -associatedMasterId = m011; -background = { -shapes = ( -{ -closed = 1; -nodes = ( -(858,-8,o), -(1010,264,o), -(1010,748,cs), -(1009,1225,o), -(854,1510,o), -(576,1510,cs), -(297,1510,o), -(140,1224,o), -(142,748,cs), -(143,263,o), -(293,-9,o), -(576,-8,cs) -); -}, -{ -closed = 1; -nodes = ( -(313,51,o), -(170,314,o), -(168,748,cs), -(169,1182,o), -(315,1454,o), -(576,1454,cs), -(836,1454,o), -(982,1182,o), -(984,748,cs), -(981,314,o), -(839,51,o), -(576,52,cs) -); -} -); -}; -guides = ( -{ -pos = (808,2044); -}, -{ -pos = (808,4); -} -); -layerId = "C95386FA-5CA4-4464-B66C-6E09B1AF9D3A"; -name = "Dec 25 18, 17:03"; -shapes = ( -{ -closed = 1; -nodes = ( -(845,3,o), -(1009,284,o), -(1010,744,cs), -(1009,1206,o), -(845,1487,o), -(576,1486,cs), -(307,1487,o), -(143,1206,o), -(142,744,cs), -(143,284,o), -(307,3,o), -(576,2,cs) -); -} -); -width = 1152; -}, -{ -layerId = m012; -shapes = ( -{ -closed = 1; -nodes = ( -(726,-20,o), -(948,271,o), -(1026,744,cs), -(1105,1219,o), -(979,1510,o), -(696,1510,cs), -(412,1510,o), -(192,1217,o), -(114,744,cs), -(35,269,o), -(159,-20,o), -(442,-20,cs) -); -}, -{ -closed = 1; -nodes = ( -(185,26,o), -(87,308,o), -(160,744,cs), -(236,1204,o), -(444,1463,o), -(696,1464,cs), -(953,1463,o), -(1052,1180,o), -(980,744,cs), -(904,284,o), -(694,26,o), -(446,26,cs) -); -} -); -width = 1082; } ); metricLeft = O; |