1
1
mirror of https://github.com/rsms/inter.git synced 2024-08-15 13:50:55 +03:00

improved designs of /sterling and /lira, closes #574

This commit is contained in:
Rasmus Andersson 2023-05-28 11:51:46 -07:00
parent 3c8e0fc741
commit a2d84eb0ea
5 changed files with 1957 additions and 777 deletions

View File

@ -3,183 +3,210 @@ glyphname = lira;
layers = (
{
layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
(1112,166,l),
(70,166,l),
(40,0,l),
(1082,0,l)
(125,112,o),
(382,146,o),
(412,366,cs),
(505,1058,ls),
(529,1238,o),
(655,1350,o),
(833,1350,cs),
(977,1350,o),
(1057,1261,o),
(1059,1114,c),
(1227,1140,l),
(1229,1361,o),
(1071,1510,o),
(844,1510,cs),
(572,1510,o),
(370,1322,o),
(334,1054,cs),
(241,362,ls),
(221,216,o),
(151,160,o),
(44,160,c),
(37,112,l)
);
},
{
closed = 1;
nodes = (
(564,1245,o),
(716,1341,o),
(840,1342,cs),
(960,1341,o),
(1088,1280,o),
(1062,1120,c),
(1240,1120,l),
(1277,1353,o),
(1149,1510,o),
(888,1510,cs),
(631,1510,o),
(399,1347,o),
(360,1070,cs),
(270,408,ls),
(259,320,o),
(212,183,o),
(142,166,c),
(320,110,l),
(404,166,o),
(431,285,o),
(448,408,cs),
(536,1070,l)
(785,0,ls),
(960,0,o),
(1052,87,o),
(1082,262,cs),
(1090,309,l),
(930,309,l),
(920,246,ls),
(910,184,o),
(881,160,o),
(819,160,cs),
(44,160,l),
(18,0,l)
);
},
{
closed = 1;
nodes = (
(178,862,l),
(158,730,l),
(864,730,l),
(884,862,l)
(909,492,l),
(931,624,l),
(121,624,l),
(99,492,l)
);
},
{
closed = 1;
nodes = (
(134,600,l),
(114,468,l),
(820,468,l),
(840,600,l)
(959,794,l),
(981,926,l),
(171,926,l),
(149,794,l)
);
}
);
width = 1325;
width = 1243;
},
{
layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
(1232,312,l),
(106,312,l),
(54,0,l),
(1180,0,l)
(111,282,o),
(573,241,o),
(610,524,cs),
(670,988,ls),
(688,1126,o),
(744,1186,o),
(856,1186,cs),
(945,1186,o),
(983,1139,o),
(979,1032,c),
(1362,1089,l),
(1360,1354,o),
(1154,1514,o),
(879,1514,cs),
(571,1514,o),
(318,1325,o),
(284,964,cs),
(235,448,ls),
(227,368,o),
(147,328,o),
(43,328,c),
(36,282,l)
);
},
{
closed = 1;
nodes = (
(794,1164,o),
(831,1199,o),
(892,1198,cs),
(962,1199,o),
(1009,1169,o),
(992,1068,c),
(1368,1068,l),
(1410,1332,o),
(1256,1510,o),
(934,1510,cs),
(628,1510,o),
(421,1341,o),
(384,1074,cs),
(298,436,ls),
(287,367,o),
(279,326,o),
(216,312,c),
(406,194,l),
(607,265,o),
(692,326,o),
(710,466,cs),
(780,1074,l)
(819,0,ls),
(1063,0,o),
(1217,124,o),
(1256,346,cs),
(1267,409,l),
(894,409,l),
(885,358,ls),
(882,339,o),
(869,328,o),
(850,328,cs),
(42,328,l),
(-12,0,l)
);
},
{
closed = 1;
nodes = (
(210,930,l),
(182,748,l),
(988,748,l),
(1016,930,l)
(946,507,l),
(971,659,l),
(97,659,l),
(72,507,l)
);
},
{
closed = 1;
nodes = (
(164,652,l),
(134,468,l),
(940,468,l),
(970,652,l)
(992,785,l),
(1017,937,l),
(143,937,l),
(118,785,l)
);
}
);
width = 1417;
width = 1380;
},
{
layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
(987,46,l),
(79,46,l),
(71,0,l),
(979,0,l)
(203,8,o),
(309,124,o),
(331,317,cs),
(417,1057,ls),
(445,1299,o),
(627,1460,o),
(848,1460,cs),
(1058,1460,o),
(1159,1319,o),
(1126,1118,c),
(1172,1118,l),
(1209,1344,o),
(1082,1506,o),
(847,1506,cs),
(593,1506,o),
(402,1320,o),
(371,1055,cs),
(285,315,ls),
(265,142,o),
(184,46,o),
(54,46,c),
(47,8,l)
);
},
{
closed = 1;
nodes = (
(528,1314,o),
(690,1463,o),
(895,1464,cs),
(1091,1464,o),
(1210,1319,o),
(1151,1154,c),
(1193,1144,l),
(1266,1340,o),
(1128,1511,o),
(903,1510,cs),
(671,1509,o),
(485,1340,o),
(451,1096,cs),
(339,290,ls),
(319,156,o),
(261,47,o),
(155,46,c),
(163,2,l),
(293,17,o),
(362,131,o),
(385,290,cs),
(499,1096,ls)
(782,0,ls),
(919,0,o),
(998,68,o),
(1021,205,cs),
(1029,252,l),
(983,252,l),
(975,205,ls),
(956,93,o),
(902,46,o),
(790,46,cs),
(46,46,l),
(38,0,l)
);
},
{
closed = 1;
nodes = (
(213,856,l),
(205,808,l),
(833,808,l),
(841,856,l)
(917,569,l),
(925,615,l),
(140,615,l),
(132,569,l)
);
},
{
closed = 1;
nodes = (
(163,564,l),
(159,518,l),
(787,518,l),
(793,564,l)
(954,793,l),
(962,839,l),
(177,839,l),
(169,793,l)
);
}
);
width = 1293;
width = 1224;
},
{
layerId = m008;
@ -188,59 +215,67 @@ shapes = (
{
closed = 1;
nodes = (
(1084.071,166,l),
(42.071,166,l),
(14.59,0,l),
(1056.59,0,l)
(201,112,o),
(367,138,o),
(395,366,cs),
(480,1058,ls),
(502,1238,o),
(630,1350,o),
(808,1350,cs),
(970,1350,o),
(1054,1237,o),
(1024,1056,c),
(1194,1056,l),
(1238,1323,o),
(1074,1510,o),
(819,1510,cs),
(547,1510,o),
(342,1322,o),
(309,1054,cs),
(224,362,ls),
(206,216,o),
(127,160,o),
(19,160,c),
(12,112,l)
);
},
{
closed = 1;
nodes = (
(537.699,1245,o),
(687.591,1341,o),
(812.757,1342,cs),
(931.591,1341,o),
(1061.493,1280,o),
(1034.005,1120,c),
(1212.005,1120,l),
(1250.578,1353,o),
(1122.569,1510,o),
(860.569,1510,cs),
(604.569,1510,o),
(371.585,1347,o),
(333.728,1070,cs),
(244.134,408,ls),
(233.566,320,o),
(183.886,183,o),
(114.071,166,c),
(290.801,110,l),
(376.071,166,o),
(404.772,285,o),
(422.134,408,cs),
(507.728,1070,l)
(765,0,ls),
(940,0,o),
(1032,87,o),
(1062,262,cs),
(1070,309,l),
(904,309,l),
(894,246,ls),
(884,184,o),
(855,160,o),
(793,160,cs),
(19,160,l),
(-7,0,l)
);
},
{
closed = 1;
nodes = (
(151.293,862,l),
(129.441,730,l),
(835.441,730,l),
(857.293,862,l)
(836,491,l),
(859,631,l),
(97,631,l),
(74,491,l)
);
},
{
closed = 1;
nodes = (
(107.92,600,l),
(86.067,468,l),
(792.067,468,l),
(813.92,600,l)
(881,761,l),
(904,901,l),
(142,901,l),
(119,761,l)
);
}
);
width = 1261;
width = 1193;
},
{
layerId = m010;
@ -249,59 +284,67 @@ shapes = (
{
closed = 1;
nodes = (
(1222.241,312,l),
(96.241,312,l),
(44.59,0,l),
(1170.59,0,l)
(255,266,o),
(553,285,o),
(584,524,cs),
(645,988,ls),
(664,1129,o),
(736,1186,o),
(831,1186,cs),
(925,1186,o),
(973,1131,o),
(948,976,c),
(1328,976,l),
(1382,1308,o),
(1167,1514,o),
(854,1514,cs),
(546,1514,o),
(268,1325,o),
(234,964,cs),
(186,448,ls),
(179,368,o),
(123,328,o),
(18,328,c),
(8,266,l)
);
},
{
closed = 1;
nodes = (
(786.289,1164,o),
(824.083,1199,o),
(882.918,1198,cs),
(955.083,1199,o),
(1000.117,1169,o),
(983.396,1068,c),
(1359.396,1068,l),
(1402.101,1332,o),
(1248.569,1510,o),
(926.569,1510,cs),
(619.569,1510,o),
(411.591,1341,o),
(376.39,1074,cs),
(288.769,436,ls),
(279.347,367,o),
(269.559,326,o),
(206.241,312,c),
(396.707,194,l),
(600.461,265,o),
(682.559,326,o),
(701.736,466,cs),
(772.39,1074,l)
(794,0,ls),
(1038,0,o),
(1192,124,o),
(1231,346,cs),
(1242,409,l),
(869,409,l),
(860,358,ls),
(857,339,o),
(844,328,o),
(825,328,cs),
(17,328,l),
(-37,0,l)
);
},
{
closed = 1;
nodes = (
(202.551,930,l),
(172.421,748,l),
(978.421,748,l),
(1008.551,930,l)
(820,475,l),
(850,659,l),
(72,659,l),
(42,475,l)
);
},
{
closed = 1;
nodes = (
(156.528,652,l),
(126.067,468,l),
(932.067,468,l),
(962.528,652,l)
(864,745,l),
(895,929,l),
(117,929,l),
(86,745,l)
);
}
);
width = 1388;
width = 1314;
},
{
layerId = m012;
@ -310,59 +353,67 @@ shapes = (
{
closed = 1;
nodes = (
(926.205,46,l),
(18.205,46,l),
(10.59,0,l),
(918.59,0,l)
(148,8,o),
(254,124,o),
(276,317,cs),
(362,1057,ls),
(390,1299,o),
(572,1460,o),
(793,1460,cs),
(1003,1460,o),
(1104,1319,o),
(1071,1118,c),
(1117,1118,l),
(1154,1344,o),
(1027,1506,o),
(792,1506,cs),
(539,1506,o),
(347,1320,o),
(316,1055,cs),
(230,315,ls),
(210,142,o),
(129,46,o),
(-1,46,c),
(-8,8,l)
);
},
{
closed = 1;
nodes = (
(467.121,1314,o),
(630.788,1463,o),
(834.954,1464,cs),
(1030.954,1464,o),
(1150.949,1319,o),
(1089.634,1154,c),
(1133.978,1144,l),
(1205.426,1340,o),
(1067.735,1511,o),
(842.569,1510,cs),
(611.403,1509,o),
(425.426,1340,o),
(390.032,1096,cs),
(278.599,290,ls),
(259.416,156,o),
(201.371,47,o),
(94.205,46,c),
(104.921,2,l),
(232.404,17,o),
(302.277,131,o),
(324.599,290,cs),
(438.032,1096,ls)
(727,0,ls),
(864,0,o),
(943,68,o),
(966,205,cs),
(974,252,l),
(928,252,l),
(920,205,ls),
(901,93,o),
(847,46,o),
(735,46,cs),
(-9,46,l),
(-17,0,l)
);
},
{
closed = 1;
nodes = (
(152.3,856,l),
(144.354,808,l),
(774.354,808,l),
(782.3,856,l)
(734,569,l),
(742,615,l),
(85,615,l),
(77,569,l)
);
},
{
closed = 1;
nodes = (
(103.96,564,l),
(96.345,518,l),
(726.345,518,l),
(733.96,564,l)
(771,793,l),
(779,839,l),
(122,839,l),
(114,793,l)
);
}
);
width = 1164;
width = 1100;
}
);
metricLeft = sterling;

View File

@ -3,156 +3,183 @@ glyphname = sterling;
layers = (
{
layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
(1054,160,l),
(66,160,l),
(40,0,l),
(1026,0,l)
(125,112,o),
(382,146,o),
(412,366,cs),
(505,1058,ls),
(529,1238,o),
(655,1350,o),
(833,1350,cs),
(977,1350,o),
(1057,1261,o),
(1059,1114,c),
(1227,1140,l),
(1229,1361,o),
(1071,1510,o),
(844,1510,cs),
(572,1510,o),
(370,1322,o),
(334,1054,cs),
(241,362,ls),
(221,216,o),
(151,160,o),
(44,160,c),
(37,112,l)
);
},
{
closed = 1;
nodes = (
(838,744,l),
(160,744,l),
(130,578,l),
(808,578,l)
(785,0,ls),
(960,0,o),
(1052,87,o),
(1082,262,cs),
(1090,309,l),
(930,309,l),
(920,246,ls),
(910,184,o),
(881,160,o),
(819,160,cs),
(44,160,l),
(18,0,l)
);
},
{
closed = 1;
nodes = (
(561,1254,o),
(719,1350,o),
(858,1350,cs),
(989,1350,o),
(1103,1265,o),
(1058,1114,c),
(1218,1068,l),
(1312,1289,o),
(1152,1510,o),
(876,1510,cs),
(649,1510,o),
(396,1356,o),
(354,1038,cs),
(270,408,ls),
(259,320,o),
(212,160,o),
(126,160,c),
(300,120,l),
(387,175,o),
(428,285,o),
(442,408,cs),
(524,1038,l)
(939,672,l),
(963,818,l),
(153,818,l),
(129,672,l)
);
}
);
width = 1292;
width = 1243;
},
{
layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
(1260,326,l),
(114,326,l),
(58,0,l),
(1204,0,l)
(111,282,o),
(573,241,o),
(610,524,cs),
(670,988,ls),
(688,1126,o),
(744,1186,o),
(856,1186,cs),
(945,1186,o),
(983,1139,o),
(979,1032,c),
(1362,1089,l),
(1360,1354,o),
(1163,1514,o),
(887,1514,cs),
(579,1514,o),
(318,1325,o),
(284,964,cs),
(235,448,ls),
(227,368,o),
(147,328,o),
(43,328,c),
(36,282,l)
);
},
{
closed = 1;
nodes = (
(1086,904,l),
(206,904,l),
(154,602,l),
(1032,602,l)
(819,0,ls),
(1063,0,o),
(1217,124,o),
(1256,346,cs),
(1267,409,l),
(894,409,l),
(885,358,ls),
(882,339,o),
(869,328,o),
(850,328,cs),
(42,328,l),
(-12,0,l)
);
},
{
closed = 1;
nodes = (
(804,1158,o),
(833,1196,o),
(894,1196,cs),
(961,1196,o),
(1008,1175,o),
(998,1070,c),
(1378,1088,l),
(1407,1359,o),
(1264,1510,o),
(942,1510,cs),
(641,1510,o),
(423,1350,o),
(390,1088,cs),
(308,448,ls),
(298,378,o),
(284,349,o),
(232,326,c),
(422,204,l),
(615,271,o),
(697,337,o),
(716,478,cs),
(794,1088,l)
(930,630,l),
(968,860,l),
(130,860,l),
(92,630,l)
);
}
);
width = 1432;
width = 1380;
},
{
layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
(986,46,l),
(78,46,l),
(70,0,l),
(978,0,l)
(203,8,o),
(309,124,o),
(331,317,cs),
(417,1057,ls),
(445,1299,o),
(627,1460,o),
(848,1460,cs),
(1058,1460,o),
(1159,1319,o),
(1126,1118,c),
(1172,1118,l),
(1209,1344,o),
(1082,1506,o),
(847,1506,cs),
(592,1506,o),
(402,1320,o),
(371,1055,cs),
(285,315,ls),
(265,142,o),
(184,46,o),
(54,46,c),
(47,8,l)
);
},
{
closed = 1;
nodes = (
(808,666,l),
(180,666,l),
(172,620,l),
(800,620,l)
(782,0,ls),
(919,0,o),
(998,68,o),
(1021,205,cs),
(1029,252,l),
(983,252,l),
(975,205,ls),
(956,93,o),
(902,46,o),
(790,46,cs),
(46,46,l),
(38,0,l)
);
},
{
closed = 1;
nodes = (
(527,1315,o),
(689,1463,o),
(894,1464,cs),
(1091,1463,o),
(1210,1321,o),
(1150,1154,c),
(1192,1144,l),
(1265,1341,o),
(1126,1510,o),
(902,1510,cs),
(669,1510,o),
(483,1341,o),
(450,1096,cs),
(338,290,ls),
(317,157,o),
(259,47,o),
(154,46,c),
(162,2,l),
(291,17,o),
(361,131,o),
(384,290,cs),
(498,1096,ls)
(943,722,l),
(950,768,l),
(165,768,l),
(158,722,l)
);
}
);
width = 1292;
width = 1224;
},
{
layerId = m008;
@ -161,50 +188,58 @@ shapes = (
{
closed = 1;
nodes = (
(1027.078,160,l),
(41.078,160,l),
(14.59,0,l),
(1000.59,0,l)
(201,112,o),
(367,138,o),
(395,366,cs),
(480,1058,ls),
(502,1238,o),
(630,1350,o),
(808,1350,cs),
(970,1350,o),
(1054,1237,o),
(1024,1056,c),
(1194,1056,l),
(1238,1323,o),
(1074,1510,o),
(819,1510,cs),
(547,1510,o),
(342,1322,o),
(309,1054,cs),
(224,362,ls),
(206,216,o),
(127,160,o),
(19,160,c),
(12,112,l)
);
},
{
closed = 1;
nodes = (
(809.759,744,l),
(131.759,744,l),
(104.277,578,l),
(782.277,578,l)
(765,0,ls),
(940,0,o),
(1032,87,o),
(1062,262,cs),
(1070,309,l),
(904,309,l),
(894,246,ls),
(884,184,o),
(855,160,o),
(793,160,cs),
(19,160,l),
(-7,0,l)
);
},
{
closed = 1;
nodes = (
(533.189,1254,o),
(692.081,1350,o),
(832.081,1350,cs),
(962.081,1350,o),
(1076.01,1265,o),
(1031.012,1114,c),
(1191.396,1068,l),
(1283.983,1289,o),
(1125.569,1510,o),
(848.569,1510,cs),
(622.569,1510,o),
(370.075,1356,o),
(328.43,1038,cs),
(244.134,408,ls),
(233.566,320,o),
(186.078,160,o),
(99.078,160,c),
(272.456,120,l),
(360.561,175,o),
(401.772,285,o),
(416.134,408,cs),
(498.43,1038,l)
(866,672,l),
(890,818,l),
(128,818,l),
(104,672,l)
);
}
);
width = 1228;
width = 1193;
},
{
layerId = m010;
@ -213,50 +248,58 @@ shapes = (
{
closed = 1;
nodes = (
(1248.559,326,l),
(102.559,326,l),
(48.59,0,l),
(1194.59,0,l)
(255,266,o),
(554,285,o),
(585,524,cs),
(645,988,ls),
(663,1129,o),
(736,1186,o),
(831,1186,cs),
(925,1186,o),
(973,1131,o),
(948,976,c),
(1328,976,l),
(1383,1308,o),
(1175,1514,o),
(862,1514,cs),
(554,1514,o),
(269,1325,o),
(235,964,cs),
(186,448,ls),
(178,368,o),
(122,328,o),
(18,328,c),
(8,266,l)
);
},
{
closed = 1;
nodes = (
(1072.246,904,l),
(194.246,904,l),
(144.251,602,l),
(1022.251,602,l)
(794,0,ls),
(1038,0,o),
(1192,124,o),
(1231,346,cs),
(1242,409,l),
(869,409,l),
(860,358,ls),
(857,339,o),
(844,328,o),
(825,328,cs),
(17,328,l),
(-37,0,l)
);
},
{
closed = 1;
nodes = (
(793.296,1158,o),
(823.587,1196,o),
(882.587,1196,cs),
(951.587,1196,o),
(997.11,1175,o),
(987.728,1070,c),
(1368.707,1088,l),
(1394.571,1359,o),
(1253.569,1510,o),
(932.569,1510,cs),
(630.569,1510,o),
(412.081,1350,o),
(378.707,1088,cs),
(296.756,448,ls),
(286.168,378,o),
(273.367,349,o),
(220.559,326,c),
(410.362,204,l),
(603.454,271,o),
(687.38,337,o),
(705.723,478,cs),
(782.707,1088,l)
(835,568,l),
(885,872,l),
(107,872,l),
(57,568,l)
);
}
);
width = 1400;
width = 1314;
},
{
layerId = m012;
@ -265,52 +308,61 @@ shapes = (
{
closed = 1;
nodes = (
(926.205,46,l),
(18.205,46,l),
(10.59,0,l),
(918.59,0,l)
(148,8,o),
(254,124,o),
(276,317,cs),
(362,1057,ls),
(390,1299,o),
(572,1460,o),
(793,1460,cs),
(1003,1460,o),
(1104,1319,o),
(1071,1118,c),
(1117,1118,l),
(1154,1344,o),
(1027,1506,o),
(792,1506,cs),
(539,1506,o),
(347,1320,o),
(316,1055,cs),
(230,315,ls),
(210,142,o),
(129,46,o),
(-1,46,c),
(-8,8,l)
);
},
{
closed = 1;
nodes = (
(750.846,666,l),
(120.846,666,l),
(113.231,620,l),
(743.231,620,l)
(727,0,ls),
(864,0,o),
(943,68,o),
(966,205,cs),
(974,252,l),
(928,252,l),
(920,205,ls),
(901,93,o),
(847,46,o),
(735,46,cs),
(-9,46,l),
(-17,0,l)
);
},
{
closed = 1;
nodes = (
(467.121,1314,o),
(630.788,1463,o),
(834.954,1464,cs),
(1030.954,1464,o),
(1150.949,1319,o),
(1089.634,1154,c),
(1133.978,1144,l),
(1205.426,1340,o),
(1067.735,1511,o),
(842.569,1510,cs),
(611.403,1509,o),
(425.426,1340,o),
(390.032,1096,cs),
(278.599,290,ls),
(259.416,156,o),
(201.371,47,o),
(94.205,46,c),
(104.921,2,l),
(232.404,17,o),
(302.277,131,o),
(324.599,290,cs),
(438.032,1096,ls)
(756,699,l),
(763,745,l),
(106,745,l),
(99,699,l)
);
}
);
width = 1164;
width = 1100;
}
);
metricRight = C;
unicode = 163;
userData = {
"interface.width-adjustments" = (

View File

@ -3393,7 +3393,7 @@ stemValues = (
180
);
userData = {
GSCornerRadius = 180;
GSCornerRadius = 110;
GSOffsetCapStyle = 3;
GSOffsetHorizontal = 87;
GSOffsetKeepCompatible = 1;
@ -3676,7 +3676,7 @@ stemValues = (
404
);
userData = {
GSCornerRadius = 160;
GSCornerRadius = 30;
GSExtrudeAngle = 30;
GSExtrudeOffset = 15;
GSOffsetHorizontal = 180;

File diff suppressed because it is too large Load Diff

View File

@ -7,50 +7,58 @@ shapes = (
{
closed = 1;
nodes = (
(1120,160,l),
(134,160,l),
(134,0,l),
(1120,0,l)
(198,112,o),
(450,146,o),
(443,366,cs),
(422,1058,ls),
(417,1238,o),
(524,1350,o),
(702,1350,cs),
(846,1350,o),
(940,1261,o),
(967,1114,c),
(1130,1140,l),
(1096,1361,o),
(929,1510,o),
(702,1510,cs),
(430,1510,o),
(244,1322,o),
(252,1054,cs),
(273,362,ls),
(277,216,o),
(217,160,o),
(110,160,c),
(110,112,l)
);
},
{
closed = 1;
nodes = (
(806,744,l),
(128,744,l),
(128,578,l),
(806,578,l)
(877,0,ls),
(1052,0,o),
(1131,87,o),
(1131,262,cs),
(1131,309,l),
(971,309,l),
(971,246,ls),
(971,184,o),
(947,160,o),
(885,160,cs),
(110,160,l),
(110,0,l)
);
},
{
closed = 1;
nodes = (
(445,1254,o),
(588,1350,o),
(728,1350,cs),
(858,1350,o),
(986,1265,o),
(966,1114,c),
(1134,1068,l),
(1190,1289,o),
(995,1510,o),
(718,1510,cs),
(492,1510,o),
(265,1356,o),
(276,1038,cs),
(296,408,ls),
(300,320,o),
(279,160,o),
(192,160,c),
(372,120,l),
(451,175,o),
(474,285,o),
(468,408,cs),
(446,1038,l)
(920,672,l),
(920,818,l),
(110,818,l),
(110,672,l)
);
}
);
width = 1292;
width = 1243;
},
{
layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@ -58,50 +66,58 @@ shapes = (
{
closed = 1;
nodes = (
(1298,326,l),
(152,326,l),
(152,0,l),
(1298,0,l)
(156,282,o),
(625,241,o),
(615,524,cs),
(598,988,ls),
(593,1126,o),
(640,1186,o),
(752,1186,cs),
(841,1186,o),
(886,1139,o),
(900,1032,c),
(1274,1089,l),
(1228,1354,o),
(1020,1514,o),
(744,1514,cs),
(436,1514,o),
(190,1325,o),
(216,964,cs),
(253,448,ls),
(259,368,o),
(185,328,o),
(81,328,c),
(81,282,l)
);
},
{
closed = 1;
nodes = (
(1026,904,l),
(148,904,l),
(148,602,l),
(1026,602,l)
(911,0,ls),
(1155,0,o),
(1291,124,o),
(1291,346,cs),
(1291,409,l),
(918,409,l),
(918,358,ls),
(918,339,o),
(907,328,o),
(888,328,cs),
(80,328,l),
(80,0,l)
);
},
{
closed = 1;
nodes = (
(705,1158,o),
(729,1196,o),
(788,1196,cs),
(857,1196,o),
(906,1175,o),
(914,1070,c),
(1292,1088,l),
(1273,1359,o),
(1107,1510,o),
(786,1510,cs),
(484,1510,o),
(292,1350,o),
(302,1088,cs),
(326,448,ls),
(326,378,o),
(319,349,o),
(270,326,c),
(480,204,l),
(662,271,o),
(735,337,o),
(730,478,cs),
(706,1088,l)
(918,630,l),
(918,860,l),
(80,860,l),
(80,630,l)
);
}
);
width = 1432;
width = 1379;
},
{
layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@ -109,50 +125,58 @@ shapes = (
{
closed = 1;
nodes = (
(1070,46,l),
(162,46,l),
(162,0,l),
(1070,0,l)
(294,8,o),
(381,124,o),
(371,317,cs),
(334,1057,ls),
(322,1299,o),
(469,1460,o),
(690,1460,cs),
(882,1460,o),
(1010,1342,o),
(1030,1168,c),
(1076,1173,l),
(1053,1370,o),
(905,1506,o),
(690,1506,cs),
(440,1506,o),
(275,1320,o),
(288,1055,cs),
(325,315,ls),
(334,142,o),
(268,46,o),
(138,46,c),
(138,8,l)
);
},
{
closed = 1;
nodes = (
(792,666,l),
(162,666,l),
(162,620,l),
(792,620,l)
(874,0,ls),
(1011,0,o),
(1079,68,o),
(1079,205,cs),
(1079,252,l),
(1033,252,l),
(1033,205,ls),
(1033,93,o),
(986,46,o),
(874,46,cs),
(130,46,l),
(130,0,l)
);
},
{
closed = 1;
nodes = (
(401,1314,o),
(540,1464,o),
(744,1464,cs),
(940,1464,o),
(1084,1319,o),
(1050,1154,c),
(1096,1144,l),
(1135,1340,o),
(969,1510,o),
(744,1510,cs),
(513,1510,o),
(355,1340,o),
(360,1096,cs),
(382,290,ls),
(385,156,o),
(345,47,o),
(238,46,c),
(256,2,l),
(381,17,o),
(432,131,o),
(428,290,cs),
(408,1096,ls)
(915,722,l),
(915,768,l),
(130,768,l),
(130,722,l)
);
}
);
width = 1292;
width = 1223;
},
{
associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@ -251,50 +275,58 @@ shapes = (
{
closed = 1;
nodes = (
(1088,160,l),
(102,160,l),
(102,0,l),
(1088,0,l)
(269,112,o),
(431,138,o),
(421,366,cs),
(392,1058,ls),
(384,1238,o),
(494,1350,o),
(672,1350,cs),
(834,1350,o),
(936,1237,o),
(936,1056,c),
(1106,1056,l),
(1106,1323,o),
(927,1510,o),
(672,1510,cs),
(400,1510,o),
(211,1322,o),
(222,1054,cs),
(251,362,ls),
(257,216,o),
(187,160,o),
(80,160,c),
(80,112,l)
);
},
{
closed = 1;
nodes = (
(774,744,l),
(96,744,l),
(96,578,l),
(774,578,l)
(852,0,ls),
(1027,0,o),
(1106,87,o),
(1106,262,cs),
(1106,309,l),
(940,309,l),
(940,246,ls),
(940,184,o),
(916,160,o),
(854,160,cs),
(80,160,l),
(80,0,l)
);
},
{
closed = 1;
nodes = (
(413,1254,o),
(556,1350,o),
(696,1350,cs),
(826,1350,o),
(954,1265,o),
(934,1114,c),
(1102,1068,l),
(1158,1289,o),
(963,1510,o),
(686,1510,cs),
(460,1510,o),
(233,1356,o),
(244,1038,cs),
(264,408,ls),
(268,320,o),
(247,160,o),
(160,160,c),
(340,120,l),
(419,175,o),
(442,285,o),
(436,408,cs),
(414,1038,l)
(842,672,l),
(842,818,l),
(80,818,l),
(80,672,l)
);
}
);
width = 1228;
width = 1192;
},
{
layerId = m009;
@ -302,50 +334,58 @@ shapes = (
{
closed = 1;
nodes = (
(1282,326,l),
(136,326,l),
(136,0,l),
(1282,0,l)
(298,266,o),
(594,285,o),
(585,524,cs),
(568,988,ls),
(563,1129,o),
(627,1186,o),
(722,1186,cs),
(816,1186,o),
(873,1131,o),
(873,976,c),
(1253,976,l),
(1253,1308,o),
(1027,1514,o),
(714,1514,cs),
(406,1514,o),
(136,1325,o),
(162,964,cs),
(199,448,ls),
(205,368,o),
(155,328,o),
(51,328,c),
(51,266,l)
);
},
{
closed = 1;
nodes = (
(1010,904,l),
(132,904,l),
(132,602,l),
(1010,602,l)
(881,0,ls),
(1125,0,o),
(1261,124,o),
(1261,346,cs),
(1261,409,l),
(888,409,l),
(888,358,ls),
(888,339,o),
(877,328,o),
(858,328,cs),
(50,328,l),
(50,0,l)
);
},
{
closed = 1;
nodes = (
(689,1158,o),
(713,1196,o),
(772,1196,cs),
(841,1196,o),
(890,1175,o),
(898,1070,c),
(1276,1088,l),
(1257,1359,o),
(1091,1510,o),
(770,1510,cs),
(468,1510,o),
(276,1350,o),
(286,1088,cs),
(310,448,ls),
(310,378,o),
(303,349,o),
(254,326,c),
(464,204,l),
(646,271,o),
(719,337,o),
(714,478,cs),
(690,1088,l)
(828,568,l),
(828,872,l),
(50,872,l),
(50,568,l)
);
}
);
width = 1400;
width = 1313;
},
{
layerId = m011;
@ -353,50 +393,58 @@ shapes = (
{
closed = 1;
nodes = (
(1006,46,l),
(98,46,l),
(98,0,l),
(1006,0,l)
(234,8,o),
(321,124,o),
(311,317,cs),
(274,1057,ls),
(262,1299,o),
(409,1460,o),
(630,1460,cs),
(840,1460,o),
(973,1319,o),
(973,1118,c),
(1019,1118,l),
(1019,1344,o),
(865,1506,o),
(630,1506,cs),
(380,1506,o),
(215,1320,o),
(228,1055,cs),
(265,315,ls),
(274,142,o),
(208,46,o),
(78,46,c),
(78,8,l)
);
},
{
closed = 1;
nodes = (
(728,666,l),
(98,666,l),
(98,620,l),
(728,620,l)
(814,0,ls),
(951,0,o),
(1019,68,o),
(1019,205,cs),
(1019,252,l),
(973,252,l),
(973,205,ls),
(973,93,o),
(926,46,o),
(814,46,cs),
(70,46,l),
(70,0,l)
);
},
{
closed = 1;
nodes = (
(337,1314,o),
(476,1464,o),
(680,1464,cs),
(876,1464,o),
(1020,1319,o),
(986,1154,c),
(1032,1144,l),
(1071,1340,o),
(905,1510,o),
(680,1510,cs),
(449,1510,o),
(291,1340,o),
(296,1096,cs),
(318,290,ls),
(321,156,o),
(281,47,o),
(174,46,c),
(192,2,l),
(317,17,o),
(368,131,o),
(364,290,cs),
(344,1096,ls)
(727,699,l),
(727,745,l),
(70,745,l),
(70,699,l)
);
}
);
width = 1164;
width = 1099;
},
{
associatedMasterId = m011;
@ -488,8 +536,168 @@ nodes = (
}
);
width = 1208;
},
{
associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
layerId = "9E0371F6-281D-469F-A84B-1B7C1C6C6073";
name = "May 28, 23, 11:37";
shapes = (
{
closed = 1;
nodes = (
(1298,326,l),
(152,326,l),
(152,0,l),
(1298,0,l)
);
},
{
closed = 1;
nodes = (
(1026,904,l),
(148,904,l),
(148,602,l),
(1026,602,l)
);
},
{
closed = 1;
nodes = (
(705,1158,o),
(729,1196,o),
(788,1196,cs),
(857,1196,o),
(906,1175,o),
(914,1070,c),
(1292,1088,l),
(1273,1359,o),
(1107,1510,o),
(786,1510,cs),
(484,1510,o),
(292,1350,o),
(302,1088,cs),
(326,448,ls),
(326,378,o),
(319,349,o),
(270,326,c),
(480,204,l),
(662,271,o),
(735,337,o),
(730,478,cs),
(706,1088,l)
);
}
);
width = 1432;
},
{
associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
layerId = "ACB7AE0C-6369-44D8-9FE6-9393104B7089";
name = "May 28, 23, 11:42";
shapes = (
{
closed = 1;
nodes = (
(1120,160,l),
(134,160,l),
(134,0,l),
(1120,0,l)
);
},
{
closed = 1;
nodes = (
(806,744,l),
(128,744,l),
(128,578,l),
(806,578,l)
);
},
{
closed = 1;
nodes = (
(445,1254,o),
(588,1350,o),
(728,1350,cs),
(858,1350,o),
(986,1265,o),
(966,1114,c),
(1134,1068,l),
(1190,1289,o),
(995,1510,o),
(718,1510,cs),
(492,1510,o),
(265,1356,o),
(276,1038,cs),
(296,408,ls),
(300,320,o),
(279,160,o),
(192,160,c),
(372,120,l),
(451,175,o),
(474,285,o),
(468,408,cs),
(446,1038,l)
);
}
);
width = 1292;
},
{
associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
layerId = "5C5B5AE4-3C64-4C5A-8343-1BCAF611F7ED";
name = "May 28, 23, 11:43";
shapes = (
{
closed = 1;
nodes = (
(1070,46,l),
(162,46,l),
(162,0,l),
(1070,0,l)
);
},
{
closed = 1;
nodes = (
(792,666,l),
(162,666,l),
(162,620,l),
(792,620,l)
);
},
{
closed = 1;
nodes = (
(401,1314,o),
(540,1464,o),
(744,1464,cs),
(940,1464,o),
(1084,1319,o),
(1050,1154,c),
(1096,1144,l),
(1135,1340,o),
(969,1510,o),
(744,1510,cs),
(513,1510,o),
(355,1340,o),
(360,1096,cs),
(382,290,ls),
(385,156,o),
(345,47,o),
(238,46,c),
(256,2,l),
(381,17,o),
(432,131,o),
(428,290,cs),
(408,1096,ls)
);
}
);
width = 1292;
}
);
metricRight = C;
unicode = 163;
userData = {
"interface.width-adjustments" = (