New design of /Germandbls with old design available at /Germandbls.1 via cv14

Closes #693
This commit is contained in:
Rasmus Andersson 2024-03-26 15:38:07 -07:00
parent bfb90448ad
commit 6becdbb04f
10 changed files with 1290 additions and 475 deletions

View file

@ -3046,6 +3046,7 @@ include(features/cv10-g-spur.fea);
# Note: cv11 is single-story a, which only exists in the roman font
include(features/cv12-compact-f.fea);
include(features/cv13-compact-t.fea);
include(features/cv14-germandbls.fea);
";
tag = salt;
},
@ -3445,7 +3446,7 @@ include(features/cv06-u.fea);
tag = cv06;
},
{
code = "cvParameters { FeatUILabelNameID { name \"Alternate German double s\"; }; };
code = "cvParameters { FeatUILabelNameID { name \"Alternate sharp s\"; }; };
include(features/cv07-germandbls.fea);
";
tag = cv07;
@ -3479,6 +3480,12 @@ code = "cvParameters { FeatUILabelNameID { name \"Compact t\"; }; };
include(features/cv13-compact-t.fea);
";
tag = cv13;
},
{
code = "cvParameters { FeatUILabelNameID { name \"Alternate capital sharp S\"; }; };
include(features/cv14-germandbls.fea);
";
tag = cv14;
}
);
fontMaster = (

View file

@ -0,0 +1,323 @@
{
glyphname = Germandbls.1;
kernLeft = B;
kernRight = S;
layers = (
{
layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
shapes = (
{
closed = 1;
nodes = (
(277,0,l),
(443,989,ls),
(473,1168,o),
(557,1343,o),
(779,1343,cs),
(900,1343,o),
(971,1295,o),
(1029,1250,c),
(670,853,l),
(644,694,l),
(787,694,ls),
(851,694,o),
(1105,691,o),
(1059,421,cs),
(1030,250,o),
(907,147,o),
(720,147,cs),
(625,147,o),
(556,173,o),
(506,196,c),
(419,31,l),
(505,-4,o),
(596,-20,o),
(693,-20,cs),
(985,-20,o),
(1220,136,o),
(1267,419,cs),
(1309,672,o),
(1170,832,o),
(879,851,c),
(1280,1284,l),
(1166,1405,o),
(1019,1510,o),
(798,1510,cs),
(494,1510,o),
(309,1331,o),
(252,989,cs),
(87,0,l)
);
}
);
width = 1406;
},
{
guides = (
{
pos = (893,2092);
}
);
layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
shapes = (
{
closed = 1;
nodes = (
(409,0,l),
(571,974,ls),
(594,1117,o),
(673,1201,o),
(777,1202,cs),
(877,1201,o),
(976,1167,o),
(1033,1112,c),
(737,864,l),
(703,654,l),
(833,654,ls),
(996,655,o),
(1083,573,o),
(1059,440,cs),
(1045,343,o),
(955,285,o),
(825,286,cs),
(763,285,o),
(682,303,o),
(615,332,c),
(463,46,l),
(548,9,o),
(690,-20,o),
(813,-20,cs),
(1136,-20,o),
(1394,172,o),
(1439,440,cs),
(1473,652,o),
(1348,829,o),
(1135,872,c),
(1525,1230,l),
(1333,1393,o),
(1042,1510,o),
(827,1510,cs),
(493,1510,o),
(219,1289,o),
(167,974,cs),
(3,0,l)
);
}
);
width = 1517;
},
{
layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
shapes = (
{
closed = 1;
nodes = (
(187,0,l),
(369,1108,ls),
(406,1329,o),
(550,1463,o),
(753,1464,cs),
(867,1463,o),
(979,1416,o),
(1061,1334,c),
(605,806,l),
(597,760,l),
(619,760,ls),
(931,759,o),
(1062,645,o),
(1021,408,cs),
(984,187,o),
(815,47,o),
(587,46,cs),
(523,47,o),
(462,56,o),
(415,76,c),
(395,34,l),
(441,12,o),
(499,0,o),
(567,0,cs),
(843,0,o),
(1026,151,o),
(1069,414,cs),
(1110,662,o),
(961,801,o),
(657,802,c),
(1119,1336,l),
(1042,1444,o),
(910,1510,o),
(767,1510,cs),
(528,1510,o),
(368,1368,o),
(327,1120,cs),
(139,0,l)
);
}
);
width = 1251;
},
{
layerId = m008;
name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
(240.59,0,l),
(404.484,990,ls),
(435.11,1175,o),
(523.081,1350,o),
(750.081,1350,cs),
(872.081,1350,o),
(942.804,1300,o),
(998.52,1256,c),
(635.638,852,l),
(609.812,696,l),
(755.812,696,ls),
(815.812,696,o),
(1075.647,695,o),
(1030.452,422,cs),
(1001.481,247,o),
(875.767,140,o),
(685.767,140,cs),
(590.767,140,o),
(522.071,166,o),
(470.044,190,c),
(385.557,30,l),
(475.597,-6,o),
(566.279,-20,o),
(657.279,-20,cs),
(948.279,-20,o),
(1182.774,134,o),
(1229.79,418,cs),
(1272.336,675,o),
(1129.327,832,o),
(835.307,850,c),
(1239.486,1286,l),
(1125.683,1408,o),
(985.569,1510,o),
(768.569,1510,cs),
(465.569,1510,o),
(281.598,1335,o),
(224.484,990,cs),
(60.59,0,l)
);
}
);
width = 1327;
},
{
guides = (
{
angle = -9.4;
pos = (-88,2092);
}
);
layerId = m010;
name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
(396.59,0,l),
(555.186,958,ls),
(584.157,1133,o),
(649.587,1196,o),
(805.587,1196,cs),
(901.587,1196,o),
(987.614,1172,o),
(1020.819,1137,c),
(725.624,864,l),
(690.859,654,l),
(822.859,654,ls),
(984.859,654,o),
(1071.45,573,o),
(1049.432,440,cs),
(1033.373,343,o),
(943.937,286,o),
(813.937,286,cs),
(750.937,286,o),
(670.751,303,o),
(603.552,332,c),
(450.205,46,l),
(534.749,7,o),
(679.114,-21,o),
(801.114,-21,cs),
(1123.114,-21,o),
(1382.733,170,o),
(1427.432,440,cs),
(1462.197,650,o),
(1335.996,830,o),
(1122.949,872,c),
(1514.215,1230,l),
(1346.18,1411,o),
(1111.9,1512,o),
(856.9,1512,cs),
(461.9,1512,o),
(211.115,1320,o),
(153.835,974,cs),
(-7.41,0,l)
);
}
);
width = 1506;
},
{
layerId = m012;
name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
(129,0,l),
(312,1108,ls),
(348,1329,o),
(492,1463,o),
(693,1464,cs),
(807,1463,o),
(919,1417,o),
(1001,1334,c),
(546,806,l),
(538,760,l),
(560,760,ls),
(872,759,o),
(1002,645,o),
(964,408,cs),
(927,188,o),
(756,47,o),
(528,46,cs),
(451,47,o),
(390,57,o),
(347,76,c),
(324,32,l),
(380,12,o),
(442,0,o),
(509,0,cs),
(777,0,o),
(967,158,o),
(1009,414,cs),
(1051,665,o),
(906,801,o),
(599,802,c),
(1060,1336,l),
(983,1444,o),
(851,1510,o),
(709,1510,cs),
(479,1510,o),
(306,1358,o),
(266,1120,cs),
(81,0,l)
);
}
);
width = 1122;
}
);
metricLeft = B;
metricRight = S;
userData = {
interface.gridadjust.original = "{'width': 1819, 'leftMargin': 188, 'rightMargin': 122}";
"interface.width-adjustments" = (
-16
);
};
}

View file

@ -5,155 +5,143 @@ kernRight = S;
layers = (
{
layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
(277,0,l),
(443,989,ls),
(473,1168,o),
(557,1343,o),
(779,1343,cs),
(900,1343,o),
(971,1295,o),
(1029,1250,c),
(670,853,l),
(644,694,l),
(787,694,ls),
(851,694,o),
(1105,691,o),
(1059,421,cs),
(1030,250,o),
(907,147,o),
(720,147,cs),
(625,147,o),
(556,173,o),
(506,196,c),
(419,31,l),
(505,-4,o),
(596,-20,o),
(693,-20,cs),
(985,-20,o),
(1220,136,o),
(1267,419,cs),
(1309,672,o),
(1170,832,o),
(879,851,c),
(1280,1284,l),
(1166,1405,o),
(1019,1510,o),
(798,1510,cs),
(494,1510,o),
(309,1331,o),
(252,989,cs),
(87,0,l)
(278,0,l),
(462,1110,ls),
(485,1253,o),
(574,1322,o),
(717,1322,cs),
(1211,1322,l),
(1207,1405,l),
(709,859,l),
(685,713,l),
(869,713,ls),
(1060,713,o),
(1160,609,o),
(1131,437,cs),
(1103,264,o),
(969,166,o),
(778,166,cs),
(541,166,l),
(514,0,l),
(751,0,ls),
(1037,0,o),
(1274,181,o),
(1316,437,cs),
(1359,697,o),
(1178,851,o),
(892,851,c),
(889,836,l),
(1331,1330,l),
(1358,1490,l),
(745,1490,ls),
(485,1490,o),
(311,1350,o),
(268,1090,cs),
(88,0,l)
);
}
);
width = 1406;
width = 1452;
},
{
guides = (
{
pos = (893,2092);
pos = (25,2092);
}
);
layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
(409,0,l),
(571,974,ls),
(594,1117,o),
(673,1201,o),
(777,1202,cs),
(877,1201,o),
(976,1167,o),
(1033,1112,c),
(737,864,l),
(703,654,l),
(833,654,ls),
(996,655,o),
(1083,573,o),
(1059,440,cs),
(1045,343,o),
(955,285,o),
(825,286,cs),
(763,285,o),
(682,303,o),
(615,332,c),
(463,46,l),
(548,9,o),
(690,-20,o),
(813,-20,cs),
(1136,-20,o),
(1394,172,o),
(1439,440,cs),
(1473,652,o),
(1348,829,o),
(1135,872,c),
(1525,1230,l),
(1333,1393,o),
(1042,1510,o),
(827,1510,cs),
(493,1510,o),
(219,1289,o),
(167,974,cs),
(3,0,l)
(420,0,l),
(596,1066,ls),
(607,1128,o),
(651,1166,o),
(713,1166,cs),
(1154,1166,l),
(1125,1243,l),
(705,826,l),
(671,622,l),
(841,622,ls),
(987,622,o),
(1043,573,o),
(1025,464,cs),
(1007,357,o),
(935,310,o),
(789,310,cs),
(619,310,l),
(568,0,l),
(738,0,ls),
(1152,0,o),
(1393,154,o),
(1445,464,cs),
(1499,792,o),
(1271,884,o),
(906,778,c),
(929,749,l),
(1426,1184,l),
(1477,1490,l),
(767,1490,ls),
(428,1490,o),
(225,1334,o),
(175,1034,cs),
(4,0,l)
);
}
);
width = 1517;
width = 1519;
},
{
layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
(187,0,l),
(369,1108,ls),
(406,1329,o),
(550,1463,o),
(753,1464,cs),
(867,1463,o),
(979,1416,o),
(1061,1334,c),
(605,806,l),
(597,760,l),
(619,760,ls),
(931,759,o),
(1062,645,o),
(1021,408,cs),
(984,187,o),
(815,47,o),
(587,46,cs),
(523,47,o),
(462,56,o),
(415,76,c),
(395,34,l),
(441,12,o),
(499,0,o),
(567,0,cs),
(843,0,o),
(1026,151,o),
(1069,414,cs),
(1110,662,o),
(961,801,o),
(657,802,c),
(1119,1336,l),
(1042,1444,o),
(910,1510,o),
(767,1510,cs),
(528,1510,o),
(368,1368,o),
(327,1120,cs),
(139,0,l)
(186,0,l),
(362,1064,ls),
(404,1315,o),
(555,1444,o),
(805,1444,cs),
(1208,1444,l),
(1208,1467,l),
(664,841,l),
(657,796,l),
(712,796,ls),
(1021,796,o),
(1171,657,o),
(1132,421,cs),
(1093,185,o),
(871,46,o),
(562,46,cs),
(453,46,l),
(445,0,l),
(568,0,ls),
(904,0,o),
(1134,159,o),
(1178,421,cs),
(1221,683,o),
(1043,840,o),
(707,840,c),
(702,819,l),
(1252,1452,l),
(1259,1490,l),
(813,1490,ls),
(537,1490,o),
(362,1341,o),
(316,1064,cs),
(140,0,l)
);
}
);
width = 1251;
width = 1359;
},
{
layerId = m008;
@ -162,54 +150,48 @@ shapes = (
{
closed = 1;
nodes = (
(240.59,0,l),
(404.484,990,ls),
(435.11,1175,o),
(523.081,1350,o),
(750.081,1350,cs),
(872.081,1350,o),
(942.804,1300,o),
(998.52,1256,c),
(635.638,852,l),
(609.812,696,l),
(755.812,696,ls),
(815.812,696,o),
(1075.647,695,o),
(1030.452,422,cs),
(1001.481,247,o),
(875.767,140,o),
(685.767,140,cs),
(590.767,140,o),
(522.071,166,o),
(470.044,190,c),
(385.557,30,l),
(475.597,-6,o),
(566.279,-20,o),
(657.279,-20,cs),
(948.279,-20,o),
(1182.774,134,o),
(1229.79,418,cs),
(1272.336,675,o),
(1129.327,832,o),
(835.307,850,c),
(1239.486,1286,l),
(1125.683,1408,o),
(985.569,1510,o),
(768.569,1510,cs),
(465.569,1510,o),
(281.598,1335,o),
(224.484,990,cs),
(60.59,0,l)
(241,0,l),
(425,1110,ls),
(449,1253,o),
(538,1330,o),
(681,1330,cs),
(1119,1330,l),
(1105,1405,l),
(616,859,l),
(592,713,l),
(784,713,ls),
(975,713,o),
(1067,609,o),
(1038,437,cs),
(1010,264,o),
(867,160,o),
(676,160,cs),
(447,160,l),
(421,0,l),
(674,0,ls),
(959,0,o),
(1176,181,o),
(1218,436,cs),
(1260,689,o),
(1081,867,o),
(794,867,c),
(798,844,l),
(1238,1330,l),
(1265,1490,l),
(708,1490,ls),
(448,1490,o),
(287,1366,o),
(241,1090,cs),
(61,0,l)
);
}
);
width = 1327;
width = 1312;
},
{
guides = (
{
angle = -9.4;
pos = (-88,2092);
pos = (-475,2092);
}
);
layerId = m010;
@ -218,48 +200,43 @@ shapes = (
{
closed = 1;
nodes = (
(396.59,0,l),
(555.186,958,ls),
(584.157,1133,o),
(649.587,1196,o),
(805.587,1196,cs),
(901.587,1196,o),
(987.614,1172,o),
(1020.819,1137,c),
(725.624,864,l),
(690.859,654,l),
(822.859,654,ls),
(984.859,654,o),
(1071.45,573,o),
(1049.432,440,cs),
(1033.373,343,o),
(943.937,286,o),
(813.937,286,cs),
(750.937,286,o),
(670.751,303,o),
(603.552,332,c),
(450.205,46,l),
(534.749,7,o),
(679.114,-21,o),
(801.114,-21,cs),
(1123.114,-21,o),
(1382.733,170,o),
(1427.432,440,cs),
(1462.197,650,o),
(1335.996,830,o),
(1122.949,872,c),
(1514.215,1230,l),
(1346.18,1411,o),
(1111.9,1512,o),
(856.9,1512,cs),
(461.9,1512,o),
(211.115,1320,o),
(153.835,974,cs),
(-7.41,0,l)
(409,0,l),
(585,1066,ls),
(595,1128,o),
(640,1166,o),
(702,1166,cs),
(1031,1166,l),
(1026,1219,l),
(643,858,l),
(607,638,l),
(841,638,ls),
(979,638,o),
(1033,581,o),
(1015,472,cs),
(998,366,o),
(908,310,o),
(770,310,cs),
(552,310,l),
(501,0,l),
(751,0,ls),
(1165,0,o),
(1384,162,o),
(1435,472,cs),
(1481,752,o),
(1266,898,o),
(852,898,c),
(957,741,l),
(1415,1184,l),
(1466,1490,l),
(756,1490,ls),
(401,1490,o),
(216,1350,o),
(164,1034,cs),
(-7,0,l)
);
}
);
width = 1506;
width = 1508;
},
{
layerId = m012;
@ -268,48 +245,43 @@ shapes = (
{
closed = 1;
nodes = (
(129,0,l),
(312,1108,ls),
(348,1329,o),
(492,1463,o),
(693,1464,cs),
(807,1463,o),
(919,1417,o),
(1001,1334,c),
(546,806,l),
(538,760,l),
(560,760,ls),
(872,759,o),
(1002,645,o),
(964,408,cs),
(927,188,o),
(756,47,o),
(528,46,cs),
(451,47,o),
(390,57,o),
(347,76,c),
(324,32,l),
(380,12,o),
(442,0,o),
(509,0,cs),
(777,0,o),
(967,158,o),
(1009,414,cs),
(1051,665,o),
(906,801,o),
(599,802,c),
(1060,1336,l),
(983,1444,o),
(851,1510,o),
(709,1510,cs),
(479,1510,o),
(306,1358,o),
(266,1120,cs),
(127,0,l),
(303,1064,ls),
(345,1315,o),
(496,1444,o),
(746,1444,cs),
(1149,1444,l),
(1149,1467,l),
(605,841,l),
(598,796,l),
(652,796,ls),
(961,796,o),
(1112,657,o),
(1073,421,cs),
(1034,185,o),
(812,46,o),
(503,46,cs),
(370,46,l),
(362,0,l),
(509,0,ls),
(845,0,o),
(1075,159,o),
(1119,421,cs),
(1162,683,o),
(984,840,o),
(648,840,c),
(643,819,l),
(1193,1452,l),
(1200,1490,l),
(754,1490,ls),
(469,1490,o),
(304,1346,o),
(257,1064,cs),
(81,0,l)
);
}
);
width = 1122;
width = 1231;
}
);
metricLeft = B;

View file

@ -2322,6 +2322,7 @@ uni0245,
uni1EFA,
uni1EFC,
uni1EFE,
Germandbls.1,
ascript,
ascriptturn,
babygamma,

View file

@ -3047,6 +3047,7 @@ include(features/cv10-g-spur.fea);
include(features/cv11-single-storey-a.fea);
include(features/cv12-compact-f.fea);
include(features/cv13-compact-t.fea);
include(features/cv14-germandbls.fea);
";
tag = salt;
},
@ -3455,7 +3456,7 @@ include(features/cv06-u.fea);
tag = cv06;
},
{
code = "cvParameters { FeatUILabelNameID { name \"Alternate German double s\"; }; };
code = "cvParameters { FeatUILabelNameID { name \"Alternate sharp s\"; }; };
include(features/cv07-germandbls.fea);
";
tag = cv07;
@ -3494,6 +3495,12 @@ code = "cvParameters { FeatUILabelNameID { name \"Compact t\"; }; };
include(features/cv13-compact-t.fea);
";
tag = cv13;
},
{
code = "cvParameters { FeatUILabelNameID { name \"Alternate capital sharp S\"; }; };
include(features/cv14-germandbls.fea);
";
tag = cv14;
}
);
fontMaster = (
@ -3786,7 +3793,7 @@ stemValues = (
46
);
userData = {
GSCornerRadius = 142;
GSCornerRadius = 426;
GSOffsetCapStyle = 4;
GSOffsetHorizontal = 23;
GSOffsetKeepCompatible = 1;
@ -4068,7 +4075,7 @@ stemValues = (
180
);
userData = {
GSCornerRadius = 110;
GSCornerRadius = 220;
GSOffsetCapStyle = 3;
GSOffsetHorizontal = 87;
GSOffsetKeepCompatible = 1;
@ -4076,6 +4083,7 @@ GSOffsetMakeStroke = 1;
GSOffsetPosition = 1;
GSOffsetVertical = 85;
};
visible = 1;
},
{
axesValues = (
@ -4367,7 +4375,7 @@ stemValues = (
400
);
userData = {
GSCornerRadius = 30;
GSCornerRadius = 500;
GSExtrudeAngle = 30;
GSExtrudeOffset = 15;
GSOffsetHorizontal = 180;

View file

@ -0,0 +1,319 @@
{
glyphname = Germandbls.1;
kernLeft = B;
kernRight = S;
layers = (
{
layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
shapes = (
{
closed = 1;
nodes = (
(370,0,l),
(370,989,ls),
(370,1172,o),
(429,1343,o),
(651,1343,cs),
(772,1343,o),
(852,1294,o),
(915,1250,c),
(621,853,l),
(621,694,l),
(766,694,ls),
(832,694,o),
(1084,689,o),
(1084,423,cs),
(1084,252,o),
(977,147,o),
(790,147,cs),
(697,147,o),
(623,172,o),
(566,196,c),
(506,31,l),
(601,-5,o),
(696,-20,o),
(789,-20,cs),
(1082,-20,o),
(1292,136,o),
(1292,419,cs),
(1292,675,o),
(1122,832,o),
(830,851,c),
(1162,1284,l),
(1020,1411,o),
(857,1510,o),
(643,1510,cs),
(339,1510,o),
(180,1333,o),
(180,989,cs),
(180,0,l)
);
}
);
width = 1408;
},
{
guides = (
{
pos = (8,2092);
}
);
layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
shapes = (
{
closed = 1;
nodes = (
(500,0,l),
(500,974,ls),
(500,1116,o),
(564,1202,o),
(670,1202,cs),
(770,1202,o),
(873,1167,o),
(942,1112,c),
(686,864,l),
(686,654,l),
(818,654,ls),
(980,654,o),
(1080,573,o),
(1080,440,cs),
(1080,343,o),
(1000,286,o),
(870,286,cs),
(807,286,o),
(724,303,o),
(652,332,c),
(546,46,l),
(637,7,o),
(786,-20,o),
(908,-20,cs),
(1230,-20,o),
(1458,170,o),
(1458,440,cs),
(1458,650,o),
(1302,830,o),
(1082,872,c),
(1414,1230,l),
(1193,1394,o),
(884,1510,o),
(670,1510,cs),
(333,1510,o),
(96,1288,o),
(96,974,cs),
(96,0,l)
);
}
);
width = 1516;
},
{
layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
shapes = (
{
closed = 1;
nodes = (
(280,0,l),
(280,1108,ls),
(280,1329,o),
(401,1464,o),
(602,1464,cs),
(716,1464,o),
(836,1417,o),
(932,1334,c),
(564,806,l),
(564,760,l),
(586,760,ls),
(898,760,o),
(1048,645,o),
(1048,408,cs),
(1048,188,o),
(900,46,o),
(672,46,cs),
(595,46,o),
(532,57,o),
(486,76,c),
(470,32,l),
(529,12,o),
(593,0,o),
(660,0,cs),
(928,0,o),
(1092,158,o),
(1092,414,cs),
(1092,665,o),
(925,801,o),
(618,802,c),
(990,1336,l),
(895,1444,o),
(752,1510,o),
(610,1510,cs),
(380,1510,o),
(232,1358,o),
(232,1120,cs),
(232,0,l)
);
}
);
width = 1250;
},
{
layerId = m007;
shapes = (
{
closed = 1;
nodes = (
(328,0,l),
(328,990,ls),
(328,1175,o),
(387,1350,o),
(614,1350,cs),
(736,1350,o),
(815,1300,o),
(878,1256,c),
(582,852,l),
(582,696,l),
(728,696,ls),
(788,696,o),
(1048,695,o),
(1048,422,cs),
(1048,247,o),
(940,140,o),
(750,140,cs),
(655,140,o),
(582,166,o),
(526,190,c),
(468,30,l),
(564,-6,o),
(657,-20,o),
(748,-20,cs),
(1039,-20,o),
(1248,134,o),
(1248,418,cs),
(1248,675,o),
(1079,832,o),
(782,850,c),
(1114,1286,l),
(980,1408,o),
(823,1510,o),
(606,1510,cs),
(303,1510,o),
(148,1335,o),
(148,990,cs),
(148,0,l)
);
}
);
width = 1326;
},
{
guides = (
{
pos = (-88,2092);
}
);
layerId = m009;
shapes = (
{
closed = 1;
nodes = (
(484,0,l),
(484,958,ls),
(484,1133,o),
(539,1196,o),
(695,1196,cs),
(791,1196,o),
(881,1172,o),
(920,1137,c),
(670,864,l),
(670,654,l),
(802,654,ls),
(964,654,o),
(1064,573,o),
(1064,440,cs),
(1064,343,o),
(984,286,o),
(854,286,cs),
(791,286,o),
(708,303,o),
(636,332,c),
(530,46,l),
(621,7,o),
(770,-21,o),
(892,-21,cs),
(1214,-21,o),
(1442,170,o),
(1442,440,cs),
(1442,650,o),
(1286,830,o),
(1066,872,c),
(1398,1230,l),
(1200,1411,o),
(949,1512,o),
(694,1512,cs),
(299,1512,o),
(80,1320,o),
(80,974,cs),
(80,0,l)
);
}
);
width = 1506;
},
{
layerId = m011;
shapes = (
{
closed = 1;
nodes = (
(216,0,l),
(216,1108,ls),
(216,1329,o),
(337,1464,o),
(538,1464,cs),
(652,1464,o),
(772,1417,o),
(868,1334,c),
(500,806,l),
(500,760,l),
(522,760,ls),
(834,760,o),
(984,645,o),
(984,408,cs),
(984,188,o),
(836,46,o),
(608,46,cs),
(531,46,o),
(468,57,o),
(422,76,c),
(406,32,l),
(465,12,o),
(529,0,o),
(596,0,cs),
(864,0,o),
(1028,158,o),
(1028,414,cs),
(1028,665,o),
(861,801,o),
(554,802,c),
(926,1336,l),
(831,1444,o),
(688,1510,o),
(546,1510,cs),
(316,1510,o),
(169,1358,o),
(168,1120,cs),
(168,0,l)
);
}
);
width = 1122;
}
);
metricLeft = B;
metricRight = S;
userData = {
interface.gridadjust.original = "{'width': 1819, 'leftMargin': 188, 'rightMargin': 122}";
"interface.width-adjustments" = (
-16
);
};
}

View file

@ -10,52 +10,47 @@ shapes = (
closed = 1;
nodes = (
(370,0,l),
(370,989,ls),
(370,1172,o),
(429,1343,o),
(651,1343,cs),
(772,1343,o),
(852,1294,o),
(915,1250,c),
(621,853,l),
(621,694,l),
(766,694,ls),
(832,694,o),
(1084,689,o),
(1084,423,cs),
(1084,252,o),
(977,147,o),
(790,147,cs),
(697,147,o),
(623,172,o),
(566,196,c),
(506,31,l),
(601,-5,o),
(696,-20,o),
(789,-20,cs),
(1082,-20,o),
(1292,136,o),
(1292,419,cs),
(1292,675,o),
(1122,832,o),
(830,851,c),
(1162,1284,l),
(1020,1411,o),
(857,1510,o),
(643,1510,cs),
(339,1510,o),
(180,1333,o),
(180,989,cs),
(370,1110,ls),
(370,1253,o),
(447,1322,o),
(590,1322,cs),
(1084,1322,l),
(1066,1405,l),
(659,859,l),
(659,713,l),
(843,713,ls),
(1034,713,o),
(1151,609,o),
(1151,437,cs),
(1151,264,o),
(1034,166,o),
(843,166,cs),
(606,166,l),
(606,0,l),
(843,0,ls),
(1129,0,o),
(1336,181,o),
(1336,437,cs),
(1336,697,o),
(1129,851,o),
(843,851,c),
(843,836,l),
(1203,1330,l),
(1203,1490,l),
(590,1490,ls),
(330,1490,o),
(180,1350,o),
(180,1090,cs),
(180,0,l)
);
}
);
width = 1408;
width = 1452;
},
{
guides = (
{
pos = (8,2092);
pos = (24,2092);
}
);
layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@ -63,48 +58,43 @@ shapes = (
{
closed = 1;
nodes = (
(500,0,l),
(500,974,ls),
(500,1116,o),
(564,1202,o),
(670,1202,cs),
(770,1202,o),
(873,1167,o),
(942,1112,c),
(686,864,l),
(686,654,l),
(818,654,ls),
(980,654,o),
(1080,573,o),
(1080,440,cs),
(1080,343,o),
(1000,286,o),
(870,286,cs),
(807,286,o),
(724,303,o),
(652,332,c),
(546,46,l),
(637,7,o),
(786,-20,o),
(908,-20,cs),
(1230,-20,o),
(1458,170,o),
(1458,440,cs),
(1458,650,o),
(1302,830,o),
(1082,872,c),
(1414,1230,l),
(1193,1394,o),
(884,1510,o),
(670,1510,cs),
(333,1510,o),
(96,1288,o),
(96,974,cs),
(512,0,l),
(512,1066,ls),
(512,1128,o),
(550,1166,o),
(612,1166,cs),
(1053,1166,l),
(1011,1243,l),
(660,826,l),
(660,622,l),
(830,622,ls),
(976,622,o),
(1040,573,o),
(1040,464,cs),
(1040,357,o),
(976,310,o),
(830,310,cs),
(660,310,l),
(660,0,l),
(830,0,ls),
(1244,0,o),
(1460,154,o),
(1460,464,cs),
(1460,792,o),
(1217,884,o),
(869,778,c),
(897,749,l),
(1322,1184,l),
(1322,1490,l),
(612,1490,ls),
(273,1490,o),
(96,1334,o),
(96,1034,cs),
(96,0,l)
);
}
);
width = 1516;
width = 1518;
},
{
layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@ -112,48 +102,43 @@ shapes = (
{
closed = 1;
nodes = (
(280,0,l),
(280,1108,ls),
(280,1329,o),
(401,1464,o),
(602,1464,cs),
(716,1464,o),
(836,1417,o),
(932,1334,c),
(564,806,l),
(564,760,l),
(586,760,ls),
(898,760,o),
(1048,645,o),
(1048,408,cs),
(1048,188,o),
(900,46,o),
(672,46,cs),
(595,46,o),
(532,57,o),
(486,76,c),
(470,32,l),
(529,12,o),
(593,0,o),
(660,0,cs),
(928,0,o),
(1092,158,o),
(1092,414,cs),
(1092,665,o),
(925,801,o),
(618,802,c),
(990,1336,l),
(895,1444,o),
(752,1510,o),
(610,1510,cs),
(380,1510,o),
(232,1358,o),
(232,1120,cs),
(278,0,l),
(278,1064,ls),
(278,1315,o),
(408,1444,o),
(658,1444,cs),
(1061,1444,l),
(1057,1467,l),
(617,841,l),
(617,796,l),
(660,796,ls),
(969,796,o),
(1154,657,o),
(1154,421,cs),
(1154,185,o),
(969,46,o),
(660,46,cs),
(537,46,l),
(537,0,l),
(660,0,ls),
(996,0,o),
(1200,159,o),
(1200,421,cs),
(1200,683,o),
(996,840,o),
(660,840,c),
(658,819,l),
(1104,1452,l),
(1104,1490,l),
(658,1490,ls),
(382,1490,o),
(232,1341,o),
(232,1064,cs),
(232,0,l)
);
}
);
width = 1250;
width = 1358;
},
{
layerId = m007;
@ -162,52 +147,47 @@ shapes = (
closed = 1;
nodes = (
(328,0,l),
(328,990,ls),
(328,1175,o),
(387,1350,o),
(614,1350,cs),
(736,1350,o),
(815,1300,o),
(878,1256,c),
(582,852,l),
(582,696,l),
(728,696,ls),
(788,696,o),
(1048,695,o),
(1048,422,cs),
(1048,247,o),
(940,140,o),
(750,140,cs),
(655,140,o),
(582,166,o),
(526,190,c),
(468,30,l),
(564,-6,o),
(657,-20,o),
(748,-20,cs),
(1039,-20,o),
(1248,134,o),
(1248,418,cs),
(1248,675,o),
(1079,832,o),
(782,850,c),
(1114,1286,l),
(980,1408,o),
(823,1510,o),
(606,1510,cs),
(303,1510,o),
(148,1335,o),
(148,990,cs),
(328,1110,ls),
(328,1253,o),
(405,1330,o),
(548,1330,cs),
(986,1330,l),
(959,1405,l),
(561,859,l),
(561,713,l),
(745,713,ls),
(936,713,o),
(1053,609,o),
(1053,437,cs),
(1053,264,o),
(936,160,o),
(745,160,cs),
(508,160,l),
(508,0,l),
(745,0,ls),
(1030,0,o),
(1233,181,o),
(1233,436,cs),
(1233,689,o),
(1032,867,o),
(745,867,c),
(745,844,l),
(1105,1330,l),
(1105,1490,l),
(548,1490,ls),
(288,1490,o),
(148,1350,o),
(148,1090,cs),
(148,0,l)
);
}
);
width = 1326;
width = 1311;
},
{
guides = (
{
pos = (-88,2092);
pos = (-476,2092);
}
);
layerId = m009;
@ -215,48 +195,43 @@ shapes = (
{
closed = 1;
nodes = (
(484,0,l),
(484,958,ls),
(484,1133,o),
(539,1196,o),
(695,1196,cs),
(791,1196,o),
(881,1172,o),
(920,1137,c),
(670,864,l),
(670,654,l),
(802,654,ls),
(964,654,o),
(1064,573,o),
(1064,440,cs),
(1064,343,o),
(984,286,o),
(854,286,cs),
(791,286,o),
(708,303,o),
(636,332,c),
(530,46,l),
(621,7,o),
(770,-21,o),
(892,-21,cs),
(1214,-21,o),
(1442,170,o),
(1442,440,cs),
(1442,650,o),
(1286,830,o),
(1066,872,c),
(1398,1230,l),
(1200,1411,o),
(949,1512,o),
(694,1512,cs),
(299,1512,o),
(80,1320,o),
(80,974,cs),
(496,0,l),
(496,1066,ls),
(496,1128,o),
(534,1166,o),
(596,1166,cs),
(925,1166,l),
(925,1246,l),
(588,858,l),
(588,638,l),
(814,638,ls),
(952,638,o),
(1024,581,o),
(1024,472,cs),
(1024,366,o),
(952,310,o),
(814,310,cs),
(588,310,l),
(588,0,l),
(814,0,ls),
(1228,0,o),
(1444,162,o),
(1444,472,cs),
(1444,752,o),
(1228,898,o),
(814,898,c),
(913,741,l),
(1306,1184,l),
(1306,1490,l),
(596,1490,ls),
(257,1490,o),
(80,1334,o),
(80,1034,cs),
(80,0,l)
);
}
);
width = 1506;
width = 1508;
},
{
layerId = m011;
@ -264,48 +239,254 @@ shapes = (
{
closed = 1;
nodes = (
(216,0,l),
(216,1108,ls),
(216,1329,o),
(337,1464,o),
(538,1464,cs),
(652,1464,o),
(772,1417,o),
(868,1334,c),
(500,806,l),
(500,760,l),
(522,760,ls),
(834,760,o),
(984,645,o),
(984,408,cs),
(984,188,o),
(836,46,o),
(608,46,cs),
(531,46,o),
(468,57,o),
(422,76,c),
(406,32,l),
(465,12,o),
(529,0,o),
(596,0,cs),
(864,0,o),
(1028,158,o),
(1028,414,cs),
(1028,665,o),
(861,801,o),
(554,802,c),
(926,1336,l),
(831,1444,o),
(688,1510,o),
(546,1510,cs),
(316,1510,o),
(169,1358,o),
(168,1120,cs),
(214,0,l),
(214,1064,ls),
(214,1315,o),
(344,1444,o),
(594,1444,cs),
(997,1444,l),
(993,1467,l),
(553,841,l),
(553,796,l),
(596,796,ls),
(905,796,o),
(1090,657,o),
(1090,421,cs),
(1090,185,o),
(905,46,o),
(596,46,cs),
(449,46,l),
(449,0,l),
(596,0,ls),
(932,0,o),
(1136,159,o),
(1136,421,cs),
(1136,683,o),
(932,840,o),
(596,840,c),
(594,819,l),
(1040,1452,l),
(1040,1490,l),
(594,1490,ls),
(318,1490,o),
(168,1341,o),
(168,1064,cs),
(168,0,l)
);
}
);
width = 1122;
width = 1230;
},
{
associatedMasterId = m007;
layerId = "0AF19716-623F-47A7-AFD8-6C51437F4B27";
name = "Mar 26, 24, 14:05";
shapes = (
{
closed = 1;
nodes = (
(148,0,l),
(328,0,l),
(328,1330,l),
(1028,1330,l),
(1028,1328,l),
(593,907,l),
(593,761,l),
(779,761,ls),
(1016,761,o),
(1162,660,o),
(1162,464,cs),
(1162,275,o),
(1028,158,o),
(830,158,c),
(593,158,l),
(593,0,l),
(830,0,l),
(1126,0,o),
(1338,184,o),
(1338,464,cs),
(1338,737,o),
(1141,912,o),
(770,888,c),
(770,851,l),
(1262,1330,l),
(1262,1490,l),
(148,1490,l)
);
}
);
width = 1326;
},
{
associatedMasterId = m007;
layerId = "6D3D46C7-763E-4376-B0D5-C8DA4E8D0615";
name = "Mar 26, 24, 14:09";
shapes = (
{
closed = 1;
nodes = (
(148,0,l),
(328,0,l),
(328,1330,l),
(940,1330,l),
(940,1328,l),
(550,907,l),
(550,761,l),
(734,761,ls),
(940,761,o),
(1066,647,o),
(1066,461,cs),
(1066,273,o),
(940,158,o),
(734,158,cs),
(497,158,l),
(497,0,l),
(734,0,ls),
(1034,0,o),
(1246,191,o),
(1246,461,cs),
(1246,727,o),
(1034,915,o),
(734,915,c),
(734,867,l),
(1166,1330,l),
(1166,1490,l),
(148,1490,l)
);
}
);
width = 1324;
},
{
associatedMasterId = m007;
layerId = "5A3F2C3B-2BBC-49F9-867B-AAA06C361582";
name = "Mar 26, 24, 14:17";
shapes = (
{
closed = 1;
nodes = (
(148,0,l),
(328,0,l),
(328,1110,ls),
(328,1253,o),
(405,1330,o),
(548,1330,cs),
(951,1330,l),
(951,1328,l),
(561,907,l),
(561,761,l),
(745,761,ls),
(951,761,o),
(1077,647,o),
(1077,461,cs),
(1077,273,o),
(951,158,o),
(745,158,cs),
(508,158,l),
(508,0,l),
(745,0,ls),
(1045,0,o),
(1257,191,o),
(1257,461,cs),
(1257,727,o),
(1045,915,o),
(745,915,c),
(745,867,l),
(1177,1330,l),
(1177,1490,l),
(548,1490,ls),
(288,1490,o),
(148,1350,o),
(148,1090,cs)
);
}
);
width = 1335;
},
{
associatedMasterId = m009;
guides = (
{
pos = (-476,2092);
}
);
layerId = "033EB3EB-C53B-4ECF-8D62-090238C972D3";
name = "Mar 26, 24, 14:29";
shapes = (
{
closed = 1;
nodes = (
(496,0,l),
(496,1166,l),
(925,1166,l),
(907,1243,l),
(588,858,l),
(588,638,l),
(814,638,ls),
(952,638,o),
(1024,581,o),
(1024,472,cs),
(1024,366,o),
(952,310,o),
(814,310,cs),
(588,310,l),
(588,0,l),
(814,0,ls),
(1228,0,o),
(1444,162,o),
(1444,472,cs),
(1444,752,o),
(1228,898,o),
(814,898,c),
(937,741,l),
(1306,1184,l),
(1306,1490,l),
(80,1490,l),
(80,0,l)
);
}
);
width = 1508;
},
{
associatedMasterId = m011;
layerId = "73BD0924-07B0-47B6-8463-B86ABE17F536";
name = "Mar 26, 24, 14:40";
shapes = (
{
closed = 1;
nodes = (
(214,0,l),
(214,1444,l),
(997,1444,l),
(993,1467,l),
(553,841,l),
(553,796,l),
(596,796,ls),
(905,796,o),
(1090,657,o),
(1090,421,cs),
(1090,185,o),
(905,46,o),
(596,46,cs),
(449,46,l),
(449,0,l),
(596,0,ls),
(932,0,o),
(1136,159,o),
(1136,421,cs),
(1136,683,o),
(932,840,o),
(596,840,c),
(594,819,l),
(1040,1452,l),
(1040,1490,l),
(168,1490,l),
(168,0,l)
);
}
);
width = 1230;
}
);
metricLeft = B;

View file

@ -293,8 +293,8 @@ nodes = (
(915,677,o),
(658,756,cs),
(488,808,ls),
(275,873,o),
(174,977,o),
(277,873,o),
(174,979,o),
(174,1128,cs),
(174,1324,o),
(343,1466,o),
@ -310,10 +310,10 @@ nodes = (
(128,1348,o),
(128,1128,cs),
(128,956,o),
(243,836,o),
(478,763,cs),
(646,711,ls),
(887,636,o),
(243,837,o),
(478,764,cs),
(646,712,ls),
(887,637,o),
(986,538,o),
(986,378,cs),
(986,167,o),

View file

@ -2359,6 +2359,7 @@ uni0245,
uni1EFA,
uni1EFC,
uni1EFE,
Germandbls.1,
ascript,
ascriptturn,
babygamma,

View file

@ -0,0 +1,3 @@
# Note: don't use cvParameters here since this file is included in salt
sub Germandbls by Germandbls.1;