improvements to /ampersand curvature

2 files changed, 1035 insertions, 521 deletions

diff --git a/src/Inter-Italic.glyphspackage/glyphs/ampersand.glyph b/src/Inter-Italic.glyphspackage/glyphs/ampersand.glyph
index 107c9be04..4feaeab16 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ampersand.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ampersand.glyph
@@ -3,133 +3,131 @@ glyphname = ampersand;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(625,-20,o),
-(793,31,o),
-(908,137,c),
-(923,151,o),
-(942,167,o),
-(957,182,c),
-(1025,243,o),
-(1164,362,o),
-(1213,658,c),
-(1040,658,l),
-(988,339,o),
-(729,137,o),
-(508,137,cs),
-(332,137,o),
-(239,260,o),
-(262,397,c),
-(267,438,o),
-(324,540,o),
-(470,637,cs),
-(803,858,ls),
-(940,949,o),
-(1032,1048,o),
-(1055,1189,c),
-(1085,1359,o),
-(969,1504,o),
-(745,1504,cs),
-(525,1504,o),
-(357,1365,o),
-(325,1162,cs),
-(297,985,o),
-(404,856,o),
-(523,678,cs),
-(977,0,l),
+(631,-20,o),
+(796,27,o),
+(912,133,c),
+(958,178,l),
+(1023,233,o),
+(1167,358,o),
+(1215,658,c),
+(1042,658,l),
+(990,345,o),
+(728,137,o),
+(487,137,cs),
+(327,137,o),
+(235,230,o),
+(258,371,cs),
+(274,469,o),
+(334,542,o),
+(473,633,cs),
+(809,854,ls),
+(938,939,o),
+(1032,1040,o),
+(1053,1171,cs),
+(1084,1354,o),
+(965,1504,o),
+(736,1504,cs),
+(520,1504,o),
+(359,1370,o),
+(328,1179,cs),
+(297,994,o),
+(401,877,o),
+(529,683,cs),
+(979,0,l),
 (1192,0,l),
-(646,832,ls),
-(566,954,o),
-(486,1057,o),
-(504,1162,cs),
-(520,1255,o),
-(614,1349,o),
-(724,1349,cs),
-(829,1349,o),
-(886,1263,o),
-(875,1188,c),
-(857,1090,o),
-(795,1035,o),
-(704,980,c),
-(456,818,l),
-(254,694,o),
-(107,581,o),
-(77,396,c),
-(37,155,o),
-(189,-20,o),
-(483,-20,c)
+(640,827,ls),
+(550,961,o),
+(487,1050,o),
+(505,1156,cs),
+(524,1269,o),
+(618,1349,o),
+(736,1349,cs),
+(839,1349,o),
+(892,1287,o),
+(877,1198,cs),
+(858,1087,o),
+(762,1024,o),
+(701,984,cs),
+(452,821,ls),
+(252,690,o),
+(109,590,o),
+(78,401,cs),
+(39,165,o),
+(194,-20,o),
+(495,-20,c)
 );
 }
 );
-width = 1319;
+width = 1412;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(606,-23,o),
-(745,6,o),
-(876,82,c),
-(919,102,o),
-(960,119,o),
-(1004,140,c),
-(1222,276,o),
-(1339,518,o),
-(1378,776,c),
-(1062,776,l),
-(1016,495,o),
-(760,291,o),
-(562,290,cs),
-(463,291,o),
-(411,340,o),
-(422,424,c),
-(434,492,o),
-(481,532,o),
-(532,564,cs),
-(878,782,ls),
-(1022,873,o),
-(1112,995,o),
-(1134,1134,c),
-(1170,1341,o),
-(1042,1513,o),
-(792,1512,cs),
-(530,1513,o),
-(326,1327,o),
-(288,1100,cs),
-(253,896,o),
-(368,735,o),
-(442,640,cs),
-(940,0,l),
-(1340,0,l),
-(750,794,l),
-(667,922,o),
-(600,1007,o),
-(610,1094,cs),
-(619,1159,o),
-(673,1196,o),
-(738,1196,cs),
-(815,1196,o),
-(841,1152,o),
-(832,1106,cs),
-(825,1071,o),
-(798,1020,o),
-(724,978,cs),
-(352,768,l),
-(181,663,o),
-(62,564,o),
-(34,396,c),
-(-2,166,o),
-(161,-23,o),
-(480,-24,c)
+(617,-24,o),
+(762,4,o),
+(894,81,c),
+(1016,132,l),
+(1230,268,o),
+(1339,510,o),
+(1381,776,c),
+(1063,776,l),
+(1019,522,o),
+(753,290,o),
+(538,290,cs),
+(461,290,o),
+(418,327,o),
+(418,392,cs),
+(418,454,o),
+(455,501,o),
+(542,556,cs),
+(889,774,ls),
+(1030,863,o),
+(1108,976,o),
+(1130,1108,cs),
+(1167,1328,o),
+(1032,1512,o),
+(771,1512,cs),
+(520,1512,o),
+(328,1340,o),
+(293,1126,cs),
+(257,909,o),
+(379,746,o),
+(452,650,cs),
+(945,0,l),
+(1338,0,l),
+(739,784,ls),
+(629,928,o),
+(593,1004,o),
+(593,1068,cs),
+(593,1153,o),
+(657,1196,o),
+(731,1196,cs),
+(796,1196,o),
+(838,1163,o),
+(838,1115,cs),
+(838,1071,o),
+(803,1033,o),
+(716,985,cs),
+(341,776,l),
+(173,671,o),
+(64,576,o),
+(38,422,cs),
+(-2,178,o),
+(171,-24,o),
+(503,-24,cs)
 );
 }
 );
-width = 1422;
+width = 1419;
 },
 {
 associatedMasterId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -200,68 +198,67 @@ width = 1506;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(600,-20,o),
-(756,47,o),
-(877,148,cs),
-(891,161,o),
-(904,176,o),
-(917,192,cs),
-(993,285,o),
-(1070,410,o),
-(1111,536,c),
-(1065,542,l),
-(965,241,o),
-(742,33,o),
-(451,26,cs),
-(241,21,o),
-(115,180,o),
-(145,372,cs),
-(165,492,o),
-(240,578,o),
-(443,712,cs),
-(687,876,ls),
-(860,991,o),
-(935,1088,o),
-(955,1208,cs),
-(983,1382,o),
-(880,1510,o),
-(711,1510,cs),
-(539,1510,o),
-(369,1364,o),
-(341,1196,cs),
-(322,1082,o),
-(382,996,o),
-(489,824,cs),
+(656,-20,o),
+(810,76,o),
+(902,174,c),
+(918,191,l),
+(998,282,o),
+(1069,409,o),
+(1110,535,c),
+(1065,543,l),
+(964,242,o),
+(751,26,o),
+(459,26,cs),
+(250,26,o),
+(113,178,o),
+(145,369,cs),
+(165,490,o),
+(241,579,o),
+(442,713,cs),
+(687,877,ls),
+(860,993,o),
+(935,1094,o),
+(954,1213,cs),
+(983,1388,o),
+(877,1510,o),
+(706,1510,cs),
+(532,1510,o),
+(372,1381,o),
+(343,1207,cs),
+(322,1078,o),
+(383,998,o),
+(491,825,cs),
 (1005,0,l),
 (1063,0,l),
-(529,852,ls),
-(422,1025,o),
-(372,1100,o),
-(387,1196,cs),
-(410,1338,o),
-(569,1463,o),
-(713,1464,cs),
-(857,1463,o),
-(931,1356,o),
-(909,1208,cs),
-(891,1102,o),
-(824,1020,o),
-(663,914,cs),
-(419,750,ls),
-(205,607,o),
-(123,506,o),
-(99,372,cs),
-(62,155,o),
-(219,-20,o),
-(455,-20,cs)
+(530,851,ls),
+(423,1023,o),
+(370,1092,o),
+(388,1201,cs),
+(413,1351,o),
+(553,1464,o),
+(705,1464,cs),
+(846,1464,o),
+(934,1367,o),
+(909,1220,cs),
+(891,1112,o),
+(819,1020,o),
+(664,916,cs),
+(416,751,ls),
+(203,609,o),
+(121,508,o),
+(100,375,cs),
+(63,156,o),
+(220,-20,o),
+(457,-20,cs)
 );
 }
 );
-width = 1195;
+width = 1289;
 },
 {
 layerId = m008;
@@ -270,130 +267,187 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(597,-20,o),
-(766,32,o),
-(881,140,c),
-(894,154,o),
-(906,169,o),
-(920,184,c),
-(980,235,o),
-(1128,355,o),
-(1178,652,c),
-(1012,652,l),
-(959,332,o),
-(698,130,o),
-(475,130,cs),
-(297,130,o),
-(202,256,o),
-(225,396,cs),
-(232,436,o),
-(286,541,o),
-(436,640,cs),
-(770,862,ls),
-(906,952,o),
-(999,1050,o),
-(1023,1192,cs),
-(1051,1359,o),
-(938,1504,o),
-(713,1504,cs),
-(496,1504,o),
-(330,1367,o),
-(297,1166,cs),
-(268,992,o),
-(373,870,o),
-(498,680,cs),
-(950,0,l),
-(1158,0,l),
-(612,834,ls),
-(535,952,o),
-(453,1059,o),
-(470,1164,cs),
-(486,1257,o),
-(581,1356,o),
-(694,1356,cs),
-(802,1356,o),
-(860,1268,o),
-(847,1192,cs),
-(830,1091,o),
-(765,1040,o),
-(674,980,cs),
-(431,820,ls),
-(231,688,o),
-(80,582,o),
-(49,396,cs),
+(618,-20,o),
+(778,37,o),
+(884,136,c),
+(925,180,l),
+(1060,295,o),
+(1146,456,o),
+(1178,651,c),
+(1012,651,l),
+(963,382,o),
+(710,130,o),
+(471,130,cs),
+(311,130,o),
+(201,248,o),
+(223,382,cs),
+(238,474,o),
+(304,547,o),
+(439,636,cs),
+(775,858,ls),
+(924,956,o),
+(1002,1063,o),
+(1021,1180,cs),
+(1052,1370,o),
+(921,1504,o),
+(703,1504,cs),
+(491,1504,o),
+(329,1377,o),
+(296,1180,cs),
+(274,1048,o),
+(321,961,o),
+(502,685,cs),
+(952,0,l),
+(1156,0,l),
+(606,829,ls),
+(482,1015,o),
+(453,1075,o),
+(465,1153,cs),
+(485,1273,o),
+(588,1356,o),
+(700,1356,cs),
+(800,1356,o),
+(862,1286,o),
+(848,1199,cs),
+(836,1127,o),
+(781,1056,o),
+(692,998,cs),
+(426,824,ls),
+(153,646,o),
+(75,552,o),
+(51,408,cs),
 (9,154,o),
-(161,-20,o),
-(454,-20,c)
+(178,-20,o),
+(465,-20,c)
 );
 }
 );
-width = 1245;
+width = 1332;
 },
 {
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(606,-24,o),
+(751,4,o),
+(883,81,c),
+(1005,132,l),
+(1219,268,o),
+(1325,505,o),
+(1368,763,c),
+(1054,789,l),
+(1008,508,o),
+(737,290,o),
+(527,290,cs),
+(441,290,o),
+(396,327,o),
+(407,398,cs),
+(421,479,o),
+(478,523,o),
+(531,556,cs),
+(878,774,ls),
+(1018,865,o),
+(1098,983,o),
+(1119,1108,c),
+(1155,1328,o),
+(1021,1512,o),
+(760,1512,cs),
+(509,1512,o),
+(317,1340,o),
+(282,1126,cs),
+(246,909,o),
+(367,745,o),
+(441,650,cs),
+(934,0,l),
+(1327,0,l),
+(728,784,l),
+(647,912,o),
+(586,994,o),
+(598,1068,cs),
+(611,1143,o),
+(673,1196,o),
+(752,1196,cs),
+(814,1196,o),
+(833,1166,o),
+(827,1132,cs),
+(819,1082,o),
+(780,1027,o),
+(705,985,cs),
+(330,776,l),
+(162,671,o),
+(53,576,o),
+(27,422,cs),
+(-13,178,o),
+(160,-24,o),
+(492,-24,cs)
+);
+}
+);
+};
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(595,-24,o),
-(733,5,o),
-(865,82,c),
-(909,102,o),
-(950,119,o),
-(995,140,c),
-(1211,276,o),
-(1327,518,o),
+(606,-24,o),
+(751,4,o),
+(883,81,c),
+(1005,132,l),
+(1219,268,o),
+(1328,510,o),
 (1370,776,c),
 (1052,776,l),
-(1006,495,o),
-(749,290,o),
-(550,290,cs),
-(453,290,o),
-(398,340,o),
-(412,424,cs),
-(423,492,o),
-(470,531,o),
-(523,564,cs),
-(867,782,ls),
-(1010,873,o),
-(1100,996,o),
-(1123,1134,c),
-(1158,1341,o),
-(1032,1512,o),
-(782,1512,cs),
-(520,1512,o),
-(315,1327,o),
-(278,1100,cs),
-(244,896,o),
-(357,735,o),
-(432,640,cs),
-(930,0,l),
-(1332,0,l),
-(741,794,l),
-(655,922,o),
-(588,1007,o),
-(603,1094,cs),
-(613,1156,o),
-(662,1196,o),
-(730,1196,cs),
-(803,1196,o),
-(830,1153,o),
-(823,1106,cs),
-(817,1069,o),
-(788,1020,o),
-(713,978,cs),
-(341,768,l),
-(170,663,o),
-(51,563,o),
-(23,396,cs),
-(-15,165,o),
-(149,-24,o),
-(470,-24,cs)
+(1008,522,o),
+(742,290,o),
+(527,290,cs),
+(450,290,o),
+(407,327,o),
+(407,392,cs),
+(407,454,o),
+(444,501,o),
+(531,556,cs),
+(878,774,ls),
+(1019,863,o),
+(1097,976,o),
+(1119,1108,cs),
+(1156,1328,o),
+(1021,1512,o),
+(760,1512,cs),
+(509,1512,o),
+(317,1340,o),
+(282,1126,cs),
+(246,909,o),
+(368,746,o),
+(441,650,cs),
+(934,0,l),
+(1327,0,l),
+(728,784,ls),
+(618,928,o),
+(582,1004,o),
+(582,1068,cs),
+(582,1153,o),
+(646,1196,o),
+(720,1196,cs),
+(785,1196,o),
+(827,1163,o),
+(827,1115,cs),
+(827,1071,o),
+(792,1033,o),
+(705,985,cs),
+(330,776,l),
+(162,671,o),
+(53,576,o),
+(27,422,cs),
+(-13,178,o),
+(160,-24,o),
+(492,-24,cs)
 );
 }
 );
-width = 1391;
+width = 1386;
 },
 {
 associatedMasterId = m010;
@@ -469,64 +523,165 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(595,-20,o),
-(750,77,o),
-(843,175,cs),
-(848,181,o),
-(853,186,o),
-(858,192,cs),
-(938,283,o),
-(1010,410,o),
-(1051,536,c),
-(1006,542,l),
-(905,241,o),
-(694,26,o),
-(403,26,cs),
-(193,26,o),
-(54,180,o),
-(86,372,cs),
-(106,492,o),
-(182,580,o),
-(382,714,cs),
-(627,878,ls),
-(800,994,o),
-(875,1088,o),
-(895,1208,cs),
-(923,1382,o),
-(820,1510,o),
-(651,1510,cs),
-(475,1510,o),
-(312,1371,o),
-(283,1196,cs),
-(261,1068,o),
-(324,997,o),
-(431,824,cs),
-(946,0,l),
-(1005,0,l),
-(473,852,ls),
-(365,1024,o),
-(310,1086,o),
-(329,1196,cs),
-(353,1345,o),
-(493,1464,o),
-(643,1464,cs),
-(786,1464,o),
-(873,1357,o),
-(849,1209,cs),
-(831,1102,o),
-(761,1019,o),
-(606,915,cs),
-(359,750,ls),
-(145,608,o),
-(62,506,o),
-(40,372,cs),
-(4,154,o),
-(159,-20,o),
-(395,-20,cs)
+(566,-16,o),
+(724,64,o),
+(846,194,c),
+(861,210,l),
+(965,327,o),
+(1040,480,o),
+(1067,650,c),
+(1021,650,l),
+(962,300,o),
+(690,30,o),
+(401,30,cs),
+(188,30,o),
+(55,172,o),
+(86,361,cs),
+(109,504,o),
+(217,590,o),
+(395,710,cs),
+(632,870,ls),
+(722,931,o),
+(871,1026,o),
+(899,1194,cs),
+(928,1370,o),
+(814,1506,o),
+(637,1506,cs),
+(468,1506,o),
+(317,1379,o),
+(288,1208,cs),
+(263,1054,o),
+(356,954,o),
+(439,823,cs),
+(952,0,l),
+(1006,0,l),
+(477,847,ls),
+(393,983,o),
+(312,1068,o),
+(334,1200,cs),
+(358,1349,o),
+(489,1460,o),
+(637,1460,cs),
+(786,1460,o),
+(878,1350,o),
+(853,1202,cs),
+(829,1054,o),
+(696,969,o),
+(606,908,cs),
+(369,748,ls),
+(189,626,o),
+(67,531,o),
+(40,369,cs),
+(4,151,o),
+(161,-16,o),
+(401,-16,cs)
+);
+}
+);
+width = 1102;
+},
+{
+associatedMasterId = m012;
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(660,-16,o),
+(804,62,o),
+(904,190,c),
+(922,214,l),
+(1004,329,o),
+(1053,480,o),
+(1053,648,c),
+(1007,648,l),
+(1007,297,o),
+(784,30,o),
+(496,30,cs),
+(281,30,o),
+(119,176,o),
+(119,368,cs),
+(119,509,o),
+(210,591,o),
+(368,712,cs),
+(578,872,ls),
+(658,933,o),
+(794,1030,o),
+(794,1201,cs),
+(794,1374,o),
+(661,1506,o),
+(488,1506,cs),
+(315,1506,o),
+(182,1374,o),
+(182,1201,cs),
+(182,1049,o),
+(290,952,o),
+(394,820,cs),
+(1043,0,l),
+(1101,0,l),
+(430,848,ls),
+(323,983,o),
+(228,1069,o),
+(228,1201,cs),
+(228,1349,o),
+(339,1460,o),
+(488,1460,cs),
+(637,1460,o),
+(748,1349,o),
+(748,1201,cs),
+(748,1054,o),
+(630,969,o),
+(550,908,cs),
+(340,748,ls),
+(180,626,o),
+(73,530,o),
+(73,368,cs),
+(73,151,o),
+(257,-16,o),
+(496,-16,cs)
+);
+}
+);
+};
+layerId = "8130756B-6B22-4E60-8EAD-82F338338183";
+name = "Aug 31, 23, 16:15";
+shapes = (
+{
+attr = {
+lineCapEnd = "4";
+lineCapStart = 4;
+strokeWidth = 46;
+};
+closed = 0;
+nodes = (
+(1043,650,l),
+(984,291,o),
+(700,7,o),
+(400,7,cs),
+(177,7,o),
+(29,164,o),
+(62,365,cs),
+(87,517,o),
+(202,608,o),
+(381,729,cs),
+(618,889,ls),
+(708,950,o),
+(849,1040,o),
+(875,1198,cs),
+(901,1357,o),
+(796,1483,o),
+(636,1483,cs),
+(480,1483,o),
+(336,1361,o),
+(310,1204,cs),
+(286,1061,o),
+(373,968,o),
+(457,835,cs),
+(978,0,l)
 );
 }
 );
-width = 1092;
+width = 1101;
 }
 );
 metricLeft = d;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ampersand.glyph b/src/Inter-Roman.glyphspackage/glyphs/ampersand.glyph
index bb2b76928..7d1788fe6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ampersand.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ampersand.glyph
@@ -2,82 +2,15 @@
 glyphname = ampersand;
 layers = (
 {
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-closed = 1;
-nodes = (
-(722,-20,o),
-(881,31,o),
-(979,137,c),
-(991,151,o),
-(1002,167,o),
-(1015,182,c),
-(1073,237,o),
-(1199,362,o),
-(1199,658,c),
-(1026,658,l),
-(1026,339,o),
-(799,137,o),
-(577,137,cs),
-(403,137,o),
-(289,260,o),
-(289,397,cs),
-(289,440,o),
-(328,542,o),
-(456,637,cs),
-(754,858,ls),
-(874,947,o),
-(952,1046,o),
-(952,1189,cs),
-(952,1358,o),
-(814,1504,o),
-(588,1504,cs),
-(370,1504,o),
-(225,1365,o),
-(225,1163,cs),
-(225,988,o),
-(350,864,o),
-(505,678,cs),
-(1070,0,l),
-(1287,0,l),
-(601,832,ls),
-(503,951,o),
-(406,1056,o),
-(406,1161,cs),
-(406,1252,o),
-(483,1349,o),
-(594,1349,cs),
-(700,1349,o),
-(771,1263,o),
-(771,1188,cs),
-(771,1090,o),
-(715,1039,o),
-(635,980,cs),
-(414,817,ls),
-(235,685,o),
-(104,580,o),
-(104,396,cs),
-(104,155,o),
-(285,-20,o),
-(580,-20,c)
-);
-}
-);
-width = 1319;
-},
-{
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
 (703,-24,o),
-(837,5,o),
-(956,82,c),
-(997,102,o),
-(1035,119,o),
-(1076,140,c),
+(845,9,o),
+(964,86,c),
+(1076,140,l),
 (1270,276,o),
 (1346,518,o),
 (1346,776,c),
@@ -94,7 +27,7 @@ nodes = (
 (842,782,ls),
 (970,873,o),
 (1040,996,o),
-(1040,1134,c),
+(1040,1134,cs),
 (1040,1341,o),
 (886,1512,o),
 (636,1512,cs),
@@ -106,8 +39,8 @@ nodes = (
 (430,640,cs),
 (1034,0,l),
 (1436,0,l),
-(714,794,l),
-(607,922,o),
+(714,794,ls),
+(602,917,o),
 (526,1007,o),
 (526,1094,cs),
 (526,1156,o),
@@ -119,8 +52,8 @@ nodes = (
 (744,1069,o),
 (724,1020,o),
 (656,978,cs),
-(318,768,l),
-(165,663,o),
+(318,768,ls),
+(160,670,o),
 (62,563,o),
 (62,396,cs),
 (62,165,o),
@@ -139,10 +72,8 @@ closed = 1;
 nodes = (
 (750,-20,o),
 (889,77,o),
-(965,175,cs),
-(969,181,o),
-(974,186,o),
-(978,192,cs),
+(965,175,c),
+(978,192,l),
 (1043,283,o),
 (1094,410,o),
 (1114,536,c),
@@ -158,30 +89,30 @@ nodes = (
 (415,714,cs),
 (633,878,ls),
 (787,994,o),
-(846,1088,o),
-(846,1208,cs),
-(846,1382,o),
+(846,1096,o),
+(846,1216,cs),
+(846,1390,o),
 (721,1510,o),
 (552,1510,cs),
 (376,1510,o),
-(236,1371,o),
-(236,1196,cs),
-(236,1068,o),
+(236,1379,o),
+(236,1204,cs),
+(236,1076,o),
 (310,997,o),
 (446,824,cs),
 (1097,0,l),
 (1156,0,l),
 (483,852,ls),
 (347,1024,o),
-(282,1086,o),
-(282,1196,cs),
-(282,1345,o),
+(282,1094,o),
+(282,1204,cs),
+(282,1353,o),
 (402,1464,o),
 (552,1464,cs),
 (695,1464,o),
-(800,1357,o),
-(800,1209,cs),
-(800,1102,o),
+(800,1365,o),
+(800,1217,cs),
+(800,1110,o),
 (744,1019,o),
 (606,915,cs),
 (386,750,ls),
@@ -508,59 +439,57 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(689,-20,o),
-(849,32,o),
+(704,-20,o),
+(857,41,o),
 (946,140,c),
-(957,154,o),
-(966,169,o),
-(978,184,c),
-(1030,235,o),
-(1158,355,o),
+(978,184,l),
+(1096,299,o),
+(1158,461,o),
 (1158,652,c),
 (992,652,l),
-(992,332,o),
-(765,130,o),
-(542,130,cs),
-(364,130,o),
-(248,256,o),
-(248,396,cs),
-(248,436,o),
-(285,541,o),
+(992,378,o),
+(782,130,o),
+(548,130,cs),
+(383,130,o),
+(248,254,o),
+(248,394,cs),
+(248,480,o),
+(298,550,o),
 (418,640,cs),
 (716,862,ls),
-(837,952,o),
-(914,1050,o),
+(849,961,o),
+(914,1069,o),
 (914,1192,cs),
-(914,1359,o),
-(777,1504,o),
-(552,1504,cs),
-(335,1504,o),
-(192,1367,o),
-(192,1166,cs),
-(192,992,o),
-(317,870,o),
+(914,1376,o),
+(766,1504,o),
+(553,1504,cs),
+(336,1504,o),
+(189,1371,o),
+(189,1168,cs),
+(189,1042,o),
+(246,955,o),
 (474,680,cs),
 (1038,0,l),
 (1246,0,l),
 (562,834,ls),
-(466,952,o),
-(366,1059,o),
-(366,1164,cs),
-(366,1257,o),
-(445,1356,o),
-(558,1356,cs),
-(666,1356,o),
-(738,1268,o),
-(738,1192,cs),
-(738,1091,o),
-(681,1040,o),
-(600,980,cs),
+(408,1021,o),
+(363,1081,o),
+(363,1165,cs),
+(363,1279,o),
+(447,1356,o),
+(553,1356,cs),
+(659,1356,o),
+(738,1280,o),
+(738,1187,cs),
+(738,1121,o),
+(698,1054,o),
+(619,995,cs),
 (384,820,ls),
-(206,688,o),
-(72,582,o),
+(141,639,o),
+(72,546,o),
 (72,396,cs),
-(72,154,o),
-(253,-20,o),
+(72,148,o),
+(264,-20,o),
 (546,-20,c)
 );
 }
@@ -678,11 +607,9 @@ shapes = (
 closed = 1;
 nodes = (
 (687,-24,o),
-(821,5,o),
-(940,82,c),
-(981,102,o),
-(1019,119,o),
-(1060,140,c),
+(830,11,o),
+(949,88,c),
+(1060,140,l),
 (1254,276,o),
 (1330,518,o),
 (1330,776,c),
@@ -699,7 +626,7 @@ nodes = (
 (826,782,ls),
 (954,873,o),
 (1024,996,o),
-(1024,1134,c),
+(1024,1134,cs),
 (1024,1341,o),
 (870,1512,o),
 (620,1512,cs),
@@ -711,8 +638,8 @@ nodes = (
 (414,640,cs),
 (1018,0,l),
 (1420,0,l),
-(698,794,l),
-(591,922,o),
+(698,794,ls),
+(586,917,o),
 (510,1007,o),
 (510,1094,cs),
 (510,1156,o),
@@ -724,8 +651,8 @@ nodes = (
 (728,1069,o),
 (708,1020,o),
 (640,978,cs),
-(302,768,l),
-(149,663,o),
+(302,768,ls),
+(144,670,o),
 (46,563,o),
 (46,396,cs),
 (46,165,o),
@@ -742,64 +669,62 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(686,-20,o),
-(825,77,o),
-(901,175,cs),
-(905,181,o),
-(910,186,o),
-(914,192,cs),
-(979,283,o),
-(1030,410,o),
-(1050,536,c),
-(1004,542,l),
-(953,241,o),
-(777,26,o),
-(486,26,cs),
-(276,26,o),
-(112,180,o),
-(112,372,cs),
-(112,492,o),
-(173,580,o),
-(351,714,cs),
-(569,878,ls),
-(723,994,o),
-(782,1088,o),
-(782,1208,cs),
-(782,1382,o),
-(657,1510,o),
-(488,1510,cs),
-(312,1510,o),
-(172,1371,o),
-(172,1196,cs),
-(172,1068,o),
-(246,997,o),
-(382,824,cs),
-(1033,0,l),
-(1092,0,l),
-(419,852,ls),
-(283,1024,o),
-(218,1086,o),
-(218,1196,cs),
-(218,1345,o),
-(338,1464,o),
-(488,1464,cs),
-(631,1464,o),
-(736,1357,o),
-(736,1209,cs),
-(736,1102,o),
-(680,1019,o),
-(542,915,cs),
-(322,750,ls),
-(132,608,o),
-(66,506,o),
-(66,372,cs),
-(66,154,o),
-(250,-20,o),
-(486,-20,cs)
+(653,-16,o),
+(797,62,o),
+(897,190,c),
+(915,214,l),
+(997,329,o),
+(1046,480,o),
+(1046,648,c),
+(1000,648,l),
+(1000,297.327,o),
+(777.227,30,o),
+(489,30,cs),
+(273.851,30,o),
+(112,176.217,o),
+(112,368,cs),
+(112,508.825,o),
+(203,591,o),
+(360.934,711.701,cs),
+(570.942,871.708,ls),
+(651,933,o),
+(787,1029.985,o),
+(787,1201,cs),
+(787,1374,o),
+(654,1506,o),
+(481,1506,cs),
+(308,1506,o),
+(175,1374,o),
+(175,1201,cs),
+(175,1048.839,o),
+(283,952,o),
+(386.989,819.696,cs),
+(1035.669,0,l),
+(1094.331,0,l),
+(423.011,848.304,ls),
+(316,983,o),
+(221,1069.161,o),
+(221,1201,cs),
+(221,1349.419,o),
+(332.473,1460,o),
+(481,1460,cs),
+(629.527,1460,o),
+(741,1349.419,o),
+(741,1201,cs),
+(741,1053.815,o),
+(623,969,o),
+(543.058,908.292,cs),
+(333.066,748.299,ls),
+(173,626,o),
+(66,529.975,o),
+(66,368,cs),
+(66,151,o),
+(250,-16,o),
+(489,-16,cs)
 );
 }
 );
-width = 1092;
+width = 1094;
 },
 {
 associatedMasterId = m011;
@@ -1002,6 +927,440 @@ nodes = (
 }
 );
 width = 1240;
+},
+{
+associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+layerId = "E3B9F9E7-830B-4827-9168-22E390F9FD7E";
+name = "Aug 31, 23, 15:46";
+shapes = (
+{
+closed = 1;
+nodes = (
+(737,-20,o),
+(889,40,o),
+(979,137,c),
+(967,124,o),
+(1000,164,o),
+(1015,182,c),
+(1134,295,o),
+(1199,463,o),
+(1199,658,c),
+(1026,658,l),
+(1026,381,o),
+(816,137,o),
+(577,137,cs),
+(423,137,o),
+(289,258,o),
+(289,397,cs),
+(289,479,o),
+(339,551,o),
+(456,637,cs),
+(754,858,ls),
+(887,957,o),
+(952,1065,o),
+(952,1189,cs),
+(952,1374,o),
+(802,1504,o),
+(588,1504,cs),
+(362,1504,o),
+(225,1375,o),
+(225,1163,cs),
+(225,1042,o),
+(278,950,o),
+(505,678,cs),
+(1070,0,l),
+(1287,0,l),
+(601,832,ls),
+(448,1017,o),
+(406,1089,o),
+(406,1161,cs),
+(406,1265,o),
+(491,1349,o),
+(594,1349,cs),
+(698,1349,o),
+(771,1282,o),
+(771,1188,cs),
+(771,1115,o),
+(728,1048,o),
+(635,980,cs),
+(414,817,ls),
+(174,640,o),
+(104,546,o),
+(104,396,cs),
+(104,148,o),
+(297,-20,o),
+(580,-20,c)
+);
+}
+);
+width = 1319;
+},
+{
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+name = Regular;
+shapes = (
+{
+closed = 1;
+nodes = (
+(722,-20,o),
+(881,31,o),
+(979,137,c),
+(1015,182,l),
+(1073,237,o),
+(1199,362,o),
+(1199,658,c),
+(1026,658,l),
+(1026,339,o),
+(803,137,o),
+(567,137,cs),
+(402,137,o),
+(289,236,o),
+(289,383,cs),
+(289,475,o),
+(333,546,o),
+(456,637,cs),
+(754,858,ls),
+(870,944,o),
+(952,1046,o),
+(952,1183,cs),
+(952,1360,o),
+(814,1504,o),
+(590,1504,cs),
+(369,1504,o),
+(225,1364,o),
+(225,1167,cs),
+(225,988,o),
+(344,871,o),
+(505,678,cs),
+(1070,0,l),
+(1287,0,l),
+(601,832,ls),
+(489,968,o),
+(406,1056,o),
+(406,1168,cs),
+(406,1275,o),
+(482,1349,o),
+(595,1349,cs),
+(703,1349,o),
+(771,1281,o),
+(771,1186,cs),
+(771,1081,o),
+(689,1020,o),
+(635,980,cs),
+(414,817,ls),
+(235,685,o),
+(104,584,o),
+(104,389,cs),
+(104,159,o),
+(285,-20,o),
+(580,-20,c)
+);
+}
+);
+width = 1319;
+},
+{
+associatedMasterId = m007;
+layerId = "A83F5AD0-666F-46EF-B764-74CBA341A918";
+name = "Aug 31, 23, 15:46";
+shapes = (
+{
+closed = 1;
+nodes = (
+(689,-20,o),
+(849,32,o),
+(946,140,c),
+(957,154,o),
+(966,169,o),
+(978,184,c),
+(1030,235,o),
+(1158,355,o),
+(1158,652,c),
+(992,652,l),
+(992,332,o),
+(765,130,o),
+(542,130,cs),
+(364,130,o),
+(248,282,o),
+(248,396,cs),
+(248,475,o),
+(304,555,o),
+(418,640,cs),
+(716,862,ls),
+(837,952,o),
+(914,1050,o),
+(914,1192,cs),
+(914,1359,o),
+(777,1504,o),
+(552,1504,cs),
+(335,1504,o),
+(192,1367,o),
+(192,1166,cs),
+(192,992,o),
+(317,870,o),
+(474,680,cs),
+(1038,0,l),
+(1246,0,l),
+(562,834,ls),
+(466,952,o),
+(366,1059,o),
+(366,1164,cs),
+(366,1257,o),
+(445,1356,o),
+(558,1356,cs),
+(666,1356,o),
+(738,1268,o),
+(738,1192,cs),
+(738,1091,o),
+(681,1040,o),
+(600,980,cs),
+(384,820,ls),
+(206,688,o),
+(72,582,o),
+(72,396,cs),
+(72,154,o),
+(253,-20,o),
+(546,-20,c)
+);
+}
+);
+width = 1246;
+},
+{
+associatedMasterId = m011;
+layerId = "65899377-2100-4A2C-AB8D-4C09481CCA42";
+name = "Aug 31, 23, 15:53";
+shapes = (
+{
+closed = 1;
+nodes = (
+(686,-20,o),
+(825,77,o),
+(901,175,c),
+(914,192,l),
+(979,283,o),
+(1030,410,o),
+(1050,536,c),
+(1004,542,l),
+(953,241,o),
+(777,26,o),
+(486,26,cs),
+(276,26,o),
+(112,180,o),
+(112,372,cs),
+(112,492,o),
+(173,580,o),
+(351,714,cs),
+(569,878,ls),
+(723,994,o),
+(782,1088,o),
+(782,1208,cs),
+(782,1382,o),
+(657,1510,o),
+(488,1510,cs),
+(312,1510,o),
+(172,1371,o),
+(172,1196,cs),
+(172,1068,o),
+(246,997,o),
+(382,824,cs),
+(1033,0,l),
+(1092,0,l),
+(419,852,ls),
+(283,1024,o),
+(218,1086,o),
+(218,1196,cs),
+(218,1345,o),
+(338,1464,o),
+(488,1464,cs),
+(631,1464,o),
+(736,1357,o),
+(736,1209,cs),
+(736,1102,o),
+(680,1019,o),
+(542,915,cs),
+(322,750,ls),
+(132,608,o),
+(66,506,o),
+(66,372,cs),
+(66,154,o),
+(250,-20,o),
+(486,-20,cs)
+);
+}
+);
+width = 1092;
+},
+{
+associatedMasterId = m011;
+layerId = "6C8BF687-5DE7-4BA6-B281-E1A2CA71AD2C";
+name = "Aug 31, 23, 15:53";
+shapes = (
+{
+attr = {
+lineCapEnd = "4";
+strokeWidth = 46;
+};
+closed = 0;
+nodes = (
+(1023,648,l),
+(1023,289,o),
+(788,7,o),
+(489,7,cs),
+(265,7,o),
+(89,166,o),
+(89,368,cs),
+(89,519,o),
+(188,609,o),
+(347,730,cs),
+(557,890,ls),
+(637,951,o),
+(764,1042,o),
+(764,1201,cs),
+(764,1359,o),
+(639,1483,o),
+(481,1483,cs),
+(323,1483,o),
+(198,1359,o),
+(198,1201,cs),
+(198,1059,o),
+(299,967,o),
+(405,834,cs),
+(1065,0,l)
+);
+}
+);
+width = 1094;
+},
+{
+associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+layerId = "926744F3-1F1D-4951-821F-24F78E271FC9";
+name = "Aug 31, 23, 16:07";
+shapes = (
+{
+closed = 1;
+nodes = (
+(750,-20,o),
+(889,77,o),
+(965,175,c),
+(978,192,l),
+(1043,283,o),
+(1094,410,o),
+(1114,536,c),
+(1068,542,l),
+(1017,241,o),
+(841,26,o),
+(550,26,cs),
+(340,26,o),
+(176,180,o),
+(176,372,cs),
+(176,492,o),
+(237,580,o),
+(415,714,cs),
+(633,878,ls),
+(787,994,o),
+(846,1088,o),
+(846,1208,cs),
+(846,1382,o),
+(721,1510,o),
+(552,1510,cs),
+(376,1510,o),
+(236,1371,o),
+(236,1196,cs),
+(236,1068,o),
+(310,997,o),
+(446,824,cs),
+(1097,0,l),
+(1156,0,l),
+(483,852,ls),
+(347,1024,o),
+(282,1086,o),
+(282,1196,cs),
+(282,1345,o),
+(402,1464,o),
+(552,1464,cs),
+(695,1464,o),
+(800,1357,o),
+(800,1209,cs),
+(800,1102,o),
+(744,1019,o),
+(606,915,cs),
+(386,750,ls),
+(196,608,o),
+(130,506,o),
+(130,372,cs),
+(130,154,o),
+(314,-20,o),
+(550,-20,cs)
+);
+}
+);
+width = 1196;
+},
+{
+associatedMasterId = m007;
+layerId = "9289ABDB-B721-4C1D-B110-9254610C8FD3";
+name = "Aug 31, 23, 16:08";
+shapes = (
+{
+closed = 1;
+nodes = (
+(704,-20,o),
+(857,41,o),
+(946,140,c),
+(978,184,l),
+(1096,299,o),
+(1158,461,o),
+(1158,652,c),
+(992,652,l),
+(992,378,o),
+(782,130,o),
+(548,130,cs),
+(383,130,o),
+(248,254,o),
+(248,394,cs),
+(248,480,o),
+(298,550,o),
+(418,640,cs),
+(716,862,ls),
+(849,961,o),
+(914,1069,o),
+(914,1192,cs),
+(914,1376,o),
+(766,1504,o),
+(553,1504,cs),
+(336,1504,o),
+(189,1371,o),
+(189,1168,cs),
+(189,1042,o),
+(246,955,o),
+(474,680,cs),
+(1038,0,l),
+(1246,0,l),
+(562,834,ls),
+(408,1021,o),
+(363,1081,o),
+(363,1165,cs),
+(363,1279,o),
+(447,1356,o),
+(553,1356,cs),
+(659,1356,o),
+(738,1280,o),
+(738,1190,cs),
+(738,1120,o),
+(689,1046,o),
+(600,980,cs),
+(384,820,ls),
+(141,640,o),
+(72,546,o),
+(72,396,cs),
+(72,148,o),
+(264,-20,o),
+(546,-20,c)
+);
+}
+);
+width = 1246;
 }
 );
 metricLeft = d;