From 7cb1848e711adc4b6121a88cc2d8d8708e537eda Mon Sep 17 00:00:00 2001 From: Rasmus Andersson Date: Thu, 2 Jun 2022 10:34:34 -0700 Subject: [PATCH] off curve-handle fixes from UPM scaling errors. #465 --- .../glyphs/germandbls.1.glyph | 116 +-- .../glyphs/germandbls.glyph | 645 ++++++------- src/Inter.glyphspackage/glyphs/h.glyph | 56 +- src/Inter.glyphspackage/glyphs/khook.glyph | 38 +- src/Inter.glyphspackage/glyphs/m.glyph | 101 +- src/Inter.glyphspackage/glyphs/n.glyph | 14 +- src/Inter.glyphspackage/glyphs/phook.glyph | 4 +- src/Inter.glyphspackage/glyphs/s.glyph | 167 ++-- src/Inter.glyphspackage/glyphs/sacute.glyph | 2 +- .../glyphs/sacutedotaccent.glyph | 2 +- src/Inter.glyphspackage/glyphs/scaron.glyph | 2 +- .../glyphs/scarondotaccent.glyph | 2 +- .../glyphs/scircumflex.glyph | 2 +- .../glyphs/sdotaccent.glyph | 2 +- .../glyphs/sdotbelowdotaccent.glyph | 2 +- src/Inter.glyphspackage/glyphs/tonetwo.glyph | 900 +++++++++--------- 16 files changed, 955 insertions(+), 1100 deletions(-) diff --git a/src/Inter.glyphspackage/glyphs/germandbls.1.glyph b/src/Inter.glyphspackage/glyphs/germandbls.1.glyph index ff987a97f..2ac316f62 100644 --- a/src/Inter.glyphspackage/glyphs/germandbls.1.glyph +++ b/src/Inter.glyphspackage/glyphs/germandbls.1.glyph @@ -13,9 +13,9 @@ nodes = ( (429,1350,o), (574,1350,cs), (698,1350,o), -(797,1283,o), +(798,1283,o), (798,1138,cs), -(797,967,o), +(798,967,o), (652,963,o), (652,798,cs), (652,537,o), @@ -32,9 +32,9 @@ nodes = ( (652,-20,o), (788,-20,cs), (1018,-20,o), -(1175,89,o), +(1176,89,o), (1176,290,cs), -(1175,591,o), +(1176,591,o), (826,618,o), (826,798,cs), (826,915,o), @@ -115,26 +115,26 @@ shapes = ( { closed = 1; nodes = ( -(483,1161,o), +(482,1161,o), (550,1190,o), (620,1190,cs), (701,1190,o), -(753,1146,o), +(754,1146,o), (754,1090,cs), -(753,988,o), -(663,922,o), +(754,988,o), +(664,922,o), (664,780,cs,{ name = hr01; }), -(663,529,o), +(664,529,o), (940,567,o), (940,386,cs,{ name = hr02; }), (940,311,o), -(879,285,o), +(879,286,o), (812,286,cs), -(710,285,o), +(710,286,o), (655,300,o), (616,308,c), (536,20,l), @@ -150,11 +150,11 @@ name = hr02; name = hr03; }), (1068,913,o), -(1137,970,o), +(1138,970,o), (1138,1112,cs,{ name = hr04; }), -(1137,1350,o), +(1138,1350,o), (937,1510,o), (620,1510,cs), (297,1510,o), @@ -233,23 +233,23 @@ shapes = ( { closed = 1; nodes = ( -(279,1331,o), -(388,1463,o), +(278,1331,o), +(388,1464,o), (558,1464,cs), -(711,1463,o), -(817,1344,o), +(711,1464,o), +(818,1344,o), (818,1196,cs), -(817,959,o), -(639,929,o), +(818,959,o), +(638,929,o), (638,770,cs,{ name = hr01; }), -(635,567,o), +(638,567,o), (1012,476,o), (1012,258,cs,{ name = hr02; }), -(1013,105,o), +(1012,105,o), (913,26,o), (756,26,cs), (639,26,o), @@ -260,25 +260,25 @@ name = hr02; (615,-20,o), (760,-20,cs), (888,-20,o), -(1060,43,o), +(1058,43,o), (1058,250,cs), -(1057,510,o), +(1058,510,o), (684,599,o), (684,768,cs,{ name = hr03; }), -(683,895,o), -(862,949,o), +(684,895,o), +(864,949,o), (864,1196,cs), -(865,1366,o), +(864,1366,o), (739,1510,o), (558,1510,cs), (365,1510,o), -(233,1357,o), +(232,1357,o), (232,1120,cs), (232,0,l), -(280,0,l), -(280,1108,ls) +(278,0,l), +(278,1108,ls) ); } ); @@ -351,9 +351,9 @@ nodes = ( (397,1350,o), (542,1350,cs), (666,1350,o), -(765,1283,o), +(766,1283,o), (766,1138,cs), -(765,967,o), +(766,967,o), (620,963,o), (620,798,cs), (620,537,o), @@ -370,9 +370,9 @@ nodes = ( (620,-20,o), (756,-20,cs), (986,-20,o), -(1143,89,o), +(1144,89,o), (1144,290,cs), -(1143,591,o), +(1144,591,o), (794,618,o), (794,798,cs), (794,915,o), @@ -453,26 +453,26 @@ shapes = ( { closed = 1; nodes = ( -(467,1161,o), +(466,1161,o), (534,1190,o), (604,1190,cs), (685,1190,o), -(737,1146,o), +(738,1146,o), (738,1090,cs), -(737,988,o), -(647,922,o), +(738,988,o), +(648,922,o), (648,780,cs,{ name = hr01; }), -(647,529,o), +(648,529,o), (924,567,o), (924,386,cs,{ name = hr02; }), (924,311,o), -(863,285,o), +(863,286,o), (796,286,cs), -(694,285,o), +(694,286,o), (639,300,o), (600,308,c), (520,20,l), @@ -488,11 +488,11 @@ name = hr02; name = hr03; }), (1052,913,o), -(1121,970,o), +(1122,970,o), (1122,1112,cs,{ name = hr04; }), -(1121,1350,o), +(1122,1350,o), (921,1510,o), (604,1510,cs), (281,1510,o), @@ -571,23 +571,23 @@ shapes = ( { closed = 1; nodes = ( -(215,1331,o), -(324,1463,o), +(214,1331,o), +(324,1464,o), (494,1464,cs), -(647,1463,o), -(753,1344,o), +(647,1464,o), +(754,1344,o), (754,1196,cs), -(753,959,o), -(575,929,o), +(754,959,o), +(574,929,o), (574,770,cs,{ name = hr01; }), -(571,567,o), +(574,567,o), (948,476,o), (948,258,cs,{ name = hr02; }), -(949,105,o), +(948,105,o), (849,26,o), (692,26,cs), (575,26,o), @@ -598,25 +598,25 @@ name = hr02; (551,-20,o), (696,-20,cs), (824,-20,o), -(996,43,o), +(994,43,o), (994,250,cs), -(993,510,o), +(994,510,o), (620,599,o), (620,768,cs,{ name = hr03; }), -(619,895,o), -(798,949,o), +(620,895,o), +(800,949,o), (800,1196,cs), -(801,1366,o), +(800,1366,o), (675,1510,o), (494,1510,cs), (301,1510,o), -(169,1357,o), +(168,1357,o), (168,1120,cs), (168,0,l), -(216,0,l), -(216,1108,ls) +(214,0,l), +(214,1108,ls) ); } ); diff --git a/src/Inter.glyphspackage/glyphs/germandbls.glyph b/src/Inter.glyphspackage/glyphs/germandbls.glyph index 59ac2f2bc..c973bfbd4 100644 --- a/src/Inter.glyphspackage/glyphs/germandbls.glyph +++ b/src/Inter.glyphspackage/glyphs/germandbls.glyph @@ -30,15 +30,15 @@ nodes = ( (463,1350,o), (614,1350,cs), (774,1350,o), -(873,1239,o), +(872,1239,o), (872,1100,cs), -(873,965,o), +(872,965,o), (781,838,o), (634,838,cs), (542,838,l), (542,674,l), (672,674,ls), -(849,675,o), +(849,674,o), (960,564,o), (960,410,cs), (960,264,o), @@ -77,31 +77,31 @@ closed = 1; nodes = ( (498,0,l), (498,1012,ls), -(497,1119,o), +(498,1119,o), (566,1184,o), (678,1184,cs), (785,1184,o), -(848,1124,o), +(846,1124,o), (846,1036,cs), -(845,956,o), -(793,899,o), +(846,956,o), +(793,898,o), (716,898,cs), (648,898,l), (648,606,l), (754,606,ls), -(882,605,o), -(961,552,o), +(882,606,o), +(962,552,o), (962,460,cs), -(964,369,o), +(962,369,o), (890,314,o), (776,314,cs), (642,314,l), (642,0,l), (862,0,ls), (1158,0,o), -(1368,132,o), +(1370,132,o), (1370,410,cs), -(1372,620,o), +(1370,620,o), (1255,779,o), (1058,788,c), (1058,806,l), @@ -128,48 +128,48 @@ closed = 1; nodes = ( (259,0,l), (443,1108,ls), -(466,1251,o), -(593,1350,o), +(467,1251,o), +(594,1350,o), (745,1350,cs), -(906,1350,o), -(986,1239,o), -(963,1100,cs), -(941,965,o), -(829,838,o), -(681,838,cs), -(589,838,l), -(563,674,l), -(693,674,ls), -(869,675,o), -(962,564,o), -(937,410,cs), -(914,263,o), -(794,160,o), -(635,160,cs), -(469,160,l), +(905,1350,o), +(985,1239,o), +(962,1100,cs), +(939,965,o), +(827,838,o), +(680,838,cs), +(588,838,l), +(561,674,l), +(691,674,ls), +(868,674,o), +(961,564,o), +(935,410,cs), +(911,264,o), +(793,160,o), +(636,160,cs), +(470,160,l), (443,0,l), -(607,0,ls), -(869,0,o), -(1069,170,o), -(1109,410,cs), -(1144,620,o), -(1032,755,o), -(845,774,c), -(847,788,l), -(995,837,o), -(1112,948,o), -(1139,1126,cs), -(1174,1365,o), -(1017,1510,o), -(769,1510,cs), -(517,1510,o), -(313,1359,o), +(605,0,ls), +(867,0,o), +(1068,175,o), +(1107,410,cs), +(1142,617,o), +(1030,755,o), +(844,774,c), +(846,788,l), +(994,837,o), +(1110,956,o), +(1138,1126,cs), +(1177,1364,o), +(1015,1510,o), +(767,1510,cs), +(515,1510,o), +(312,1357,o), (271,1108,cs), -(89,0,l) +(87,0,l) ); } ); -width = 1249; +width = 1247; }, { layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; @@ -178,49 +178,49 @@ shapes = ( closed = 1; nodes = ( (404,0,l), -(574,1012,ls), -(591,1119,o), -(669,1184,o), -(782,1184,cs), -(889,1184,o), -(942,1124,o), -(926,1036,cs), +(572,1012,ls), +(590,1119,o), +(668,1184,o), +(780,1184,cs), +(887,1184,o), +(939,1124,o), +(924,1036,cs), (911,956,o), -(849,899,o), -(770,898,cs), -(704,898,l), -(658,606,l), -(762,606,ls), -(890,605,o), -(961,552,o), -(946,460,cs), -(933,369,o), -(849,314,o), -(736,314,cs), -(602,314,l), -(550,0,l), +(848,898,o), +(771,898,cs), +(703,898,l), +(655,606,l), +(761,606,ls), +(889,606,o), +(960,552,o), +(945,460,cs), +(930,369,o), +(848,314,o), +(734,314,cs), +(600,314,l), +(548,0,l), (768,0,ls), -(1065,0,o), -(1297,132,o), -(1346,410,cs), -(1382,620,o), -(1292,779,o), -(1096,788,c), -(1100,806,l), +(1064,0,o), +(1298,132,o), +(1344,410,cs), +(1379,620,o), +(1290,779,o), +(1095,788,c), +(1098,806,l), (1233,836,o), (1324,951,o), -(1346,1094,cs), -(1395,1377,o), -(1139,1510,o), +(1348,1094,cs), +(1394,1377,o), +(1137,1510,o), (820,1510,cs), -(473,1510,o), -(227,1353,o), -(184,1088,cs), +(471,1510,o), +(226,1351,o), +(183,1088,cs), (2,0,l) ); } ); -width = 1418; +width = 1416; }, { associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; @@ -289,45 +289,45 @@ shapes = ( { closed = 1; nodes = ( -(280,0,l), -(280,1108,ls), -(279,1331,o), -(402,1465,o), -(602,1464,cs), -(784,1463,o), -(905,1344,o), -(904,1152,cs), -(905,940,o), -(750,791,o), -(514,792,cs), -(492,792,l), -(492,744,l), -(514,744,ls), -(796,745,o), -(975,604,o), -(974,382,cs), -(975,183,o), -(823,47,o), -(600,46,cs), +(278,0,l), +(278,1152,ls), +(278,1348,o), +(395,1464,o), +(592,1464,cs), +(789,1464,o), +(906,1348,o), +(906,1152,cs), +(906,928,o), +(758,791,o), +(514,791,cs), +(492,791,l), +(492,749,l), +(514,749,ls), +(796,749,o), +(974,606,o), +(974,386,cs), +(974,182,o), +(820,46,o), +(588,46,cs), (486,46,l), (486,0,l), (588,0,ls), -(851,0,o), -(1020,153,o), -(1020,390,cs), -(1020,589,o), -(900,719,o), -(672,770,c), -(672,776,l), -(849,829,o), -(950,969,o), +(846,0,o), +(1020,156,o), +(1020,386,cs), +(1020,590,o), +(881,737,o), +(672,771,c), +(672,775,l), +(854,823,o), +(952,960,o), (952,1152,cs), -(953,1366,o), -(812,1510,o), -(600,1510,cs), -(380,1510,o), -(233,1357,o), -(232,1120,cs), +(952,1373,o), +(814,1510,o), +(592,1510,cs), +(370,1510,o), +(232,1373,o), +(232,1152,cs), (232,0,l) ); } @@ -341,66 +341,51 @@ shapes = ( closed = 1; nodes = ( (185,0,l), -(369,1108,ls), -(406,1330,o), -(550,1465,o), -(751,1464,cs), -(935,1462,o), -(1032,1340,o), -(1001,1152,cs), -(964,929,o), -(784,791,o), -(551,792,cs), -(529,792,l), -(521,744,l), -(543,744,ls), -(832,745,o), -(980,609,o), -(941,382,cs), -(907,175,o), -(736,47,o), -(497,46,cs), -(399,46,l), -(391,0,l), -(465,0,ls), -(763,0,o), -(948,137,o), -(989,390,cs), -(1022,584,o), -(913,729,o), -(705,770,c), -(705,776,l), -(890,821,o), -(1014,953,o), -(1047,1142,cs), -(1083,1359,o), -(961,1510,o), -(751,1510,cs), -(528,1510,o), -(365,1361,o), -(325,1120,cs), +(376,1152,ls), +(409,1348,o), +(545,1464,o), +(742,1464,cs), +(939,1464,o), +(1037,1348,o), +(1004,1152,cs), +(967,928,o), +(796,791,o), +(552,791,cs), +(530,791,l), +(523,749,l), +(545,749,ls), +(827,749,o), +(982,606,o), +(945,386,cs), +(912,182,o), +(735,46,o), +(503,46,cs), +(401,46,l), +(393,0,l), +(495,0,ls), +(753,0,o), +(953,156,o), +(991,386,cs), +(1025,590,o), +(910,737,o), +(707,771,c), +(708,775,l), +(898,823,o), +(1018,960,o), +(1050,1152,cs), +(1087,1373,o), +(971,1510,o), +(749,1510,cs), +(527,1510,o), +(367,1373,o), +(330,1152,cs), (139,0,l) ); } ); -width = 1174; +width = 1177; }, { -guides = ( -{ -pos = (300,1524); -}, -{ -angle = 90; -pos = (548,1628); -}, -{ -pos = (400,1148); -}, -{ -pos = (400,932); -} -); layerId = m007; shapes = ( { @@ -412,15 +397,15 @@ nodes = ( (431,1350,o), (582,1350,cs), (742,1350,o), -(841,1239,o), +(840,1239,o), (840,1100,cs), -(841,965,o), +(840,965,o), (749,838,o), (602,838,cs), (510,838,l), (510,674,l), (640,674,ls), -(817,675,o), +(817,674,o), (928,564,o), (928,410,cs), (928,264,o), @@ -457,50 +442,50 @@ shapes = ( { closed = 1; nodes = ( -(232,0,l), +(233,0,l), (416,1108,ls), -(439,1251,o), -(566,1350,o), +(440,1251,o), +(567,1350,o), (718,1350,cs), -(879,1350,o), -(959,1239,o), -(936,1100,cs), -(914,965,o), -(802,838,o), -(654,838,cs), -(562,838,l), -(536,674,l), -(666,674,ls), -(842,675,o), -(935,564,o), -(910,410,cs), -(887,263,o), -(767,160,o), -(608,160,cs), -(442,160,l), -(416,0,l), -(580,0,ls), -(842,0,o), -(1042,170,o), -(1082,410,cs), -(1117,620,o), -(1005,755,o), -(818,774,c), -(820,788,l), -(968,837,o), -(1085,948,o), -(1112,1126,cs), -(1147,1365,o), -(990,1510,o), -(742,1510,cs), -(490,1510,o), -(286,1359,o), +(878,1350,o), +(958,1239,o), +(935,1100,cs), +(912,965,o), +(800,838,o), +(653,838,cs), +(561,838,l), +(534,674,l), +(664,674,ls), +(841,674,o), +(934,564,o), +(908,410,cs), +(884,264,o), +(766,160,o), +(609,160,cs), +(443,160,l), +(417,0,l), +(579,0,ls), +(841,0,o), +(1042,175,o), +(1080,410,cs), +(1115,617,o), +(1004,755,o), +(817,774,c), +(819,788,l), +(967,837,o), +(1083,956,o), +(1111,1126,cs), +(1150,1364,o), +(989,1510,o), +(741,1510,cs), +(489,1510,o), +(285,1357,o), (244,1108,cs), -(62,0,l) +(61,0,l) ); } ); -width = 1190; +width = 1188; }, { layerId = m009; @@ -510,31 +495,31 @@ closed = 1; nodes = ( (482,0,l), (482,1012,ls), -(481,1119,o), +(482,1119,o), (550,1184,o), (662,1184,cs), (769,1184,o), -(832,1124,o), +(830,1124,o), (830,1036,cs), -(829,956,o), -(777,899,o), +(830,956,o), +(777,898,o), (700,898,cs), (632,898,l), (632,606,l), (738,606,ls), -(866,605,o), -(945,552,o), +(866,606,o), +(946,552,o), (946,460,cs), -(948,369,o), +(946,369,o), (874,314,o), (760,314,cs), (626,314,l), (626,0,l), (846,0,ls), (1142,0,o), -(1352,132,o), +(1354,132,o), (1354,410,cs), -(1356,620,o), +(1354,620,o), (1239,779,o), (1042,788,c), (1042,806,l), @@ -621,49 +606,49 @@ shapes = ( closed = 1; nodes = ( (395,0,l), -(565,1012,ls), -(582,1119,o), -(660,1184,o), -(773,1184,cs), -(880,1184,o), -(933,1124,o), -(917,1036,cs), -(902,956,o), -(840,899,o), +(562,1012,ls), +(580,1119,o), +(659,1184,o), +(771,1184,cs), +(878,1184,o), +(929,1124,o), +(914,1036,cs), +(901,956,o), +(838,898,o), (761,898,cs), -(695,898,l), -(649,606,l), -(753,606,ls), -(881,605,o), -(952,552,o), -(937,460,cs), -(924,369,o), -(840,314,o), -(727,314,cs), -(593,314,l), -(541,0,l), +(693,898,l), +(645,606,l), +(751,606,ls), +(879,606,o), +(950,552,o), +(935,460,cs), +(920,369,o), +(839,314,o), +(725,314,cs), +(591,314,l), +(539,0,l), (759,0,ls), -(1056,0,o), +(1055,0,o), (1288,132,o), -(1337,410,cs), -(1373,620,o), -(1283,779,o), -(1087,788,c), -(1091,806,l), -(1224,836,o), -(1315,951,o), -(1337,1094,cs), -(1386,1377,o), -(1130,1510,o), +(1334,410,cs), +(1369,620,o), +(1281,779,o), +(1085,788,c), +(1088,806,l), +(1223,836,o), +(1314,951,o), +(1338,1094,cs), +(1385,1377,o), +(1128,1510,o), (811,1510,cs), -(464,1510,o), -(218,1353,o), -(175,1088,cs), +(462,1510,o), +(216,1351,o), +(173,1088,cs), (-7,0,l) ); } ); -width = 1393; +width = 1390; }, { layerId = m011; @@ -671,45 +656,45 @@ shapes = ( { closed = 1; nodes = ( -(216,0,l), -(216,1108,ls), -(215,1331,o), -(338,1465,o), -(538,1464,cs), -(720,1463,o), -(841,1344,o), -(840,1152,cs), -(841,940,o), -(686,791,o), -(450,792,cs), -(428,792,l), -(428,744,l), -(450,744,ls), -(732,745,o), -(911,604,o), -(910,382,cs), -(911,183,o), -(759,47,o), -(536,46,cs), +(214,0,l), +(214,1152,ls), +(214,1348,o), +(331,1464,o), +(528,1464,cs), +(725,1464,o), +(842,1348,o), +(842,1152,cs), +(842,928,o), +(694,791,o), +(450,791,cs), +(428,791,l), +(428,749,l), +(450,749,ls), +(732,749,o), +(910,606,o), +(910,386,cs), +(910,182,o), +(756,46,o), +(524,46,cs), (422,46,l), (422,0,l), (524,0,ls), -(787,0,o), -(956,153,o), -(956,390,cs), -(956,589,o), -(836,719,o), -(608,770,c), -(608,776,l), -(785,829,o), -(886,969,o), +(782,0,o), +(956,156,o), +(956,386,cs), +(956,590,o), +(817,737,o), +(608,771,c), +(608,775,l), +(790,823,o), +(888,960,o), (888,1152,cs), -(889,1366,o), -(748,1510,o), -(536,1510,cs), -(316,1510,o), -(169,1357,o), -(168,1120,cs), +(888,1373,o), +(750,1510,o), +(528,1510,cs), +(306,1510,o), +(168,1373,o), +(168,1152,cs), (168,0,l) ); } @@ -723,49 +708,49 @@ shapes = ( closed = 1; nodes = ( (121,0,l), -(305,1108,ls), -(342,1330,o), -(486,1465,o), -(687,1464,cs), -(871,1462,o), -(968,1340,o), -(937,1152,cs), -(900,929,o), -(720,791,o), -(487,792,cs), -(465,792,l), -(457,744,l), -(479,744,ls), -(768,745,o), -(916,609,o), -(877,382,cs), -(843,175,o), -(672,47,o), -(433,46,cs), -(335,46,l), -(327,0,l), -(401,0,ls), -(699,0,o), -(884,137,o), -(925,390,cs), -(958,584,o), -(849,729,o), -(641,770,c), -(641,776,l), -(826,821,o), -(950,953,o), -(983,1142,cs), -(1019,1359,o), -(897,1510,o), -(687,1510,cs), -(464,1510,o), -(301,1361,o), -(261,1120,cs), +(312,1152,ls), +(345,1348,o), +(481,1464,o), +(678,1464,cs), +(875,1464,o), +(973,1348,o), +(940,1152,cs), +(903,928,o), +(732,791,o), +(488,791,cs), +(466,791,l), +(459,749,l), +(481,749,ls), +(763,749,o), +(918,606,o), +(881,386,cs), +(848,182,o), +(671,46,o), +(439,46,cs), +(337,46,l), +(329,0,l), +(431,0,ls), +(689,0,o), +(889,156,o), +(927,386,cs), +(961,590,o), +(846,737,o), +(643,771,c), +(644,775,l), +(834,823,o), +(954,960,o), +(986,1152,cs), +(1023,1373,o), +(907,1510,o), +(685,1510,cs), +(463,1510,o), +(303,1373,o), +(266,1152,cs), (75,0,l) ); } ); -width = 1046; +width = 1049; } ); metricLeft = B; diff --git a/src/Inter.glyphspackage/glyphs/h.glyph b/src/Inter.glyphspackage/glyphs/h.glyph index 76c334231..5a1931f15 100644 --- a/src/Inter.glyphspackage/glyphs/h.glyph +++ b/src/Inter.glyphspackage/glyphs/h.glyph @@ -41,16 +41,16 @@ shapes = ( { closed = 1; nodes = ( -(329,867,o), -(453,977,o), +(328,867,o), +(453,978,o), (622,978,cs), -(784,977,o), -(881,876,o), +(784,978,o), +(882,876,o), (882,698,cs), (882,0,l), (1054,0,l), (1054,710,ls), -(1053,997,o), +(1054,997,o), (900,1132,o), (672,1132,cs), (496,1132,o), @@ -107,7 +107,7 @@ nodes = ( (568,806,o), (666,806,cs), (769,806,o), -(827,739,o), +(826,739,o), (826,628,cs), (826,0,l), (1228,0,l), @@ -407,10 +407,10 @@ shapes = ( closed = 1; nodes = ( (244,945,o), -(387,1085,o), +(387,1086,o), (584,1086,cs), -(783,1085,o), -(919,948,o), +(783,1086,o), +(920,948,o), (920,750,cs), (920,0,l), (966,0,l), @@ -685,36 +685,6 @@ name = top; pos = (280,1676); } ); -background = { -shapes = ( -{ -closed = 1; -nodes = ( -(504,739,o), -(568,806,o), -(666,806,cs), -(769,806,o), -(827,739,o), -(826,628,cs), -(826,0,l), -(1228,0,l), -(1228,712,ls), -(1228,957,o), -(1074,1132,o), -(838,1132,cs), -(673,1132,o), -(551,1047,o), -(500,904,c), -(488,904,l), -(488,1490,l), -(102,1490,l), -(102,0,l), -(504,0,l), -(504,628,ls) -); -} -); -}; guides = ( { pos = (-84,1240); @@ -851,10 +821,10 @@ shapes = ( closed = 1; nodes = ( (180,945,o), -(323,1085,o), +(323,1086,o), (520,1086,cs), -(719,1085,o), -(855,948,o), +(719,1086,o), +(856,948,o), (856,750,cs), (856,0,l), (902,0,l), @@ -928,7 +898,7 @@ width = 1035; } ); metricLeft = l; -metricRight = m; +metricRight = n; note = "based on \"n\" and made slightly wider, brining the top vertical stem with it out."; unicode = 104; userData = { diff --git a/src/Inter.glyphspackage/glyphs/khook.glyph b/src/Inter.glyphspackage/glyphs/khook.glyph index 10b24372a..fe57e3f4f 100644 --- a/src/Inter.glyphspackage/glyphs/khook.glyph +++ b/src/Inter.glyphspackage/glyphs/khook.glyph @@ -96,7 +96,7 @@ nodes = ( (1240,1118,l), (788,1118,l), (518,742,l), -(466,742,l), +(462,742,l), (462,264,l) ); }, @@ -330,16 +330,16 @@ nodes = ( (244,1118,l), (244,1292,ls), (244,1401,o), -(286,1448,o), -(382,1448,cs), -(401,1448,o), -(428,1447,o), +(286,1444,o), +(382,1444,cs), +(399,1444,o), +(429,1444,o), (454,1444,c), (454,1490,l), -(429,1493,o), -(402,1494,o), -(382,1494,cs), -(259,1495,o), +(431,1490,o), +(400,1490,o), +(382,1490,cs), +(259,1490,o), (198,1428,o), (198,1292,cs), (198,1118,l) @@ -464,7 +464,7 @@ nodes = ( (296,1056,l), (296,1242,ls), (296,1313,o), -(325,1341,o), +(325,1342,o), (410,1342,cs), (430,1342,o), (489,1342,o), @@ -575,7 +575,7 @@ nodes = ( (1210,1056,l), (758,1056,l), (490,712,l), -(446,712,l), +(444,712,l), (444,240,l) ); }, @@ -742,16 +742,16 @@ nodes = ( (180,1118,l), (180,1292,ls), (180,1401,o), -(222,1448,o), -(318,1448,cs), -(337,1448,o), -(364,1447,o), +(222,1444,o), +(318,1444,cs), +(335,1444,o), +(365,1444,o), (390,1444,c), (390,1490,l), -(365,1493,o), -(338,1494,o), -(318,1494,cs), -(195,1495,o), +(367,1490,o), +(336,1490,o), +(318,1490,cs), +(195,1490,o), (134,1428,o), (134,1292,cs), (134,1118,l) diff --git a/src/Inter.glyphspackage/glyphs/m.glyph b/src/Inter.glyphspackage/glyphs/m.glyph index 1340fba07..84f43eae7 100644 --- a/src/Inter.glyphspackage/glyphs/m.glyph +++ b/src/Inter.glyphspackage/glyphs/m.glyph @@ -29,25 +29,25 @@ closed = 1; nodes = ( (328,0,l), (328,698,ls), -(329,862,o), -(448,977,o), +(328,862,o), +(448,978,o), (582,978,cs), -(712,977,o), -(803,892,o), +(712,978,o), +(802,892,o), (802,766,cs), (802,0,l), (978,0,l), (978,728,ls), -(977,871,o), -(1068,977,o), +(978,871,o), +(1068,978,o), (1224,978,cs), -(1347,977,o), +(1347,978,o), (1452,913,o), (1452,748,cs), (1452,0,l), (1624,0,l), (1624,748,ls), -(1623,1010,o), +(1624,1010,o), (1482,1132,o), (1282,1132,cs), (1123,1132,o), @@ -102,19 +102,19 @@ closed = 1; nodes = ( (504,0,l), (504,652,ls), -(503,749,o), -(554,809,o), +(504,749,o), +(554,808,o), (638,808,cs), -(720,809,o), +(720,808,o), (774,749,o), (774,652,cs), (774,0,l), (1158,0,l), (1158,652,ls), (1158,749,o), -(1209,809,o), +(1209,808,o), (1292,808,cs), -(1375,809,o), +(1375,808,o), (1428,749,o), (1428,652,cs), (1428,0,l), @@ -355,24 +355,24 @@ nodes = ( (244,0,l), (244,750,ls), (244,945,o), -(352,1085,o), +(352,1086,o), (550,1086,cs), -(748,1085,o), +(748,1086,o), (832,948,o), (832,750,cs), (832,0,l), (878,0,l), (878,750,ls), -(879,945,o), -(986,1085,o), +(878,945,o), +(986,1086,o), (1184,1086,cs), -(1382,1085,o), +(1382,1086,o), (1466,948,o), (1466,750,cs), (1466,0,l), (1512,0,l), (1512,750,ls), -(1513,975,o), +(1512,975,o), (1408,1132,o), (1184,1132,cs), (1015,1132,o), @@ -785,46 +785,7 @@ pos = (944,1262); background = { shapes = ( { -closed = 1; -nodes = ( -(504,0,l), -(504,652,ls), -(503,749,o), -(554,809,o), -(638,808,cs), -(720,809,o), -(774,749,o), -(774,652,cs), -(774,0,l), -(1158,0,l), -(1158,652,ls), -(1158,749,o), -(1209,809,o), -(1292,808,cs), -(1375,809,o), -(1428,749,o), -(1428,652,cs), -(1428,0,l), -(1830,0,l), -(1830,754,ls), -(1830,983,o), -(1683,1132,o), -(1470,1132,cs), -(1303,1132,o), -(1169,1041,o), -(1132,904,c), -(1120,904,l), -(1097,1041,o), -(972,1132,o), -(814,1132,cs), -(660,1132,o), -(541,1044,o), -(494,904,c), -(482,904,l), -(482,1118,l), -(102,1118,l), -(102,0,l) -); +ref = n; } ); }; @@ -847,18 +808,18 @@ nodes = ( (486,0,l), (486,606,ls), (486,702,o), -(538,761,o), +(538,762,o), (619,762,cs), -(702,761,o), +(702,762,o), (754,702,o), (754,606,cs), (754,0,l), (1134,0,l), (1134,606,ls), (1134,702,o), -(1186,761,o), +(1186,762,o), (1266,762,cs), -(1349,761,o), +(1349,762,o), (1402,702,o), (1402,606,cs), (1402,0,l), @@ -1035,24 +996,24 @@ nodes = ( (180,0,l), (180,750,ls), (180,945,o), -(288,1085,o), +(288,1086,o), (486,1086,cs), -(684,1085,o), +(684,1086,o), (768,948,o), (768,750,cs), (768,0,l), (814,0,l), (814,750,ls), -(815,945,o), -(922,1085,o), +(814,945,o), +(922,1086,o), (1120,1086,cs), -(1318,1085,o), +(1318,1086,o), (1402,948,o), (1402,750,cs), (1402,0,l), (1448,0,l), (1448,750,ls), -(1449,975,o), +(1448,975,o), (1344,1132,o), (1120,1132,cs), (951,1132,o), @@ -1274,7 +1235,7 @@ width = 1582; } ); metricLeft = l; -metricRight = l; +metricRight = n; unicode = 109; userData = { "interface.width-adjustments" = ( diff --git a/src/Inter.glyphspackage/glyphs/n.glyph b/src/Inter.glyphspackage/glyphs/n.glyph index 8dead1448..1bd2ef65d 100644 --- a/src/Inter.glyphspackage/glyphs/n.glyph +++ b/src/Inter.glyphspackage/glyphs/n.glyph @@ -32,9 +32,9 @@ shapes = ( closed = 1; nodes = ( (328,867,o), -(450,977,o), +(450,978,o), (615,978,cs), -(774,977,o), +(774,978,o), (872,873,o), (872,698,cs), (872,0,l), @@ -281,9 +281,9 @@ shapes = ( closed = 1; nodes = ( (244,945,o), -(387,1085,o), +(387,1086,o), (584,1086,cs), -(783,1085,o), +(783,1086,o), (920,948,o), (920,750,cs), (920,0,l), @@ -694,9 +694,9 @@ shapes = ( closed = 1; nodes = ( (180,945,o), -(323,1085,o), +(323,1086,o), (520,1086,cs), -(719,1085,o), +(719,1086,o), (856,948,o), (856,750,cs), (856,0,l), @@ -853,8 +853,6 @@ nodes = ( width = 1035; } ); -metricLeft = m; -metricRight = m; unicode = 110; userData = { "interface.width-adjustments" = ( diff --git a/src/Inter.glyphspackage/glyphs/phook.glyph b/src/Inter.glyphspackage/glyphs/phook.glyph index e9bcdf0d9..dca10219a 100644 --- a/src/Inter.glyphspackage/glyphs/phook.glyph +++ b/src/Inter.glyphspackage/glyphs/phook.glyph @@ -63,7 +63,7 @@ ref = p; ref = _part.top_r_hook; } ); -width = 1188; +width = 1190; }, { layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; @@ -138,7 +138,7 @@ ref = p; ref = _part.top_r_hook; } ); -width = 1060; +width = 1062; }, { layerId = m012; diff --git a/src/Inter.glyphspackage/glyphs/s.glyph b/src/Inter.glyphspackage/glyphs/s.glyph index dd2e75b77..836c0b67f 100644 --- a/src/Inter.glyphspackage/glyphs/s.glyph +++ b/src/Inter.glyphspackage/glyphs/s.glyph @@ -34,16 +34,16 @@ nodes = ( (774,1132,o), (552,1132,cs), (317,1132,o), -(143,998,o), +(142,998,o), (142,808,cs), -(143,655,o), -(234,551,o), +(142,655,o), +(234,553,o), (440,504,cs), (626,460,ls), (738,433,o), -(791,380,o), +(792,380,o), (792,302,cs), -(791,207,o), +(792,207,o), (689,128,o), (530,128,cs), (389,128,o), @@ -51,22 +51,22 @@ nodes = ( (270,308,c), (108,268,l), (148,78,o), -(304,-23,o), +(304,-24,o), (532,-24,cs), -(792,-23,o), -(969,119,o), +(792,-24,o), +(968,119,o), (968,312,cs), -(969,467,o), -(871,565,o), +(968,467,o), +(871,566,o), (672,614,cs), (506,654,ls), -(374,687,o), +(374,686,o), (314,732,o), (314,818,cs), (314,913,o), -(416,983,o), +(416,984,o), (552,984,cs), -(703,983,o), +(703,984,o), (764,900,o), (794,824,c), (948,866,l) @@ -87,7 +87,7 @@ pos = (614,0); }, { name = top; -pos = (606,1304); +pos = (602,1304); } ); guides = ( @@ -104,16 +104,16 @@ nodes = ( (916,1132,o), (594,1132,cs), (274,1132,o), -(77,1001,o), +(78,1001,o), (78,768,cs), -(77,592,o), -(191,479,o), +(78,592,o), +(191,481,o), (418,440,cs), (616,404,ls), (704,388,o), -(743,365,o), +(744,365,o), (744,322,cs), -(743,276,o), +(744,276,o), (690,250,o), (616,250,cs), (526,250,o), @@ -124,16 +124,16 @@ nodes = ( (272,-20,o), (614,-20,cs), (923,-20,o), -(1151,130,o), +(1152,130,o), (1152,370,cs), -(1151,535,o), -(1040,631,o), +(1152,535,o), +(1040,632,o), (812,672,cs), (584,712,ls), -(500,728,o), -(476,759,o), +(500,727,o), +(478,759,o), (478,792,cs), -(476,838,o), +(478,838,o), (533,864,o), (602,864,cs), (681,864,o), @@ -317,36 +317,36 @@ shapes = ( closed = 1; nodes = ( (812,1049,o), -(696,1135,o), +(696,1134,o), (524,1134,cs), -(320,1135,o), -(177,1016,o), +(320,1134,o), +(178,1016,o), (178,840,cs), -(177,701,o), +(178,701,o), (268,601,o), (440,558,cs), (614,514,ls), (757,478,o), -(829,398,o), +(830,398,o), (830,282,cs), -(829,127,o), -(697,23,o), -(504,24,cs), -(326,23,o), -(216,109,o), -(184,268,c), +(830,127,o), +(697,22,o), +(504,22,cs), +(326,22,o), +(215,108,o), +(182,267,c), (136,256,l), (175,78,o), -(305,-23,o), +(305,-24,o), (504,-24,cs), -(722,-23,o), +(722,-24,o), (876,100,o), (876,282,cs), (876,420,o), (787,518,o), (624,559,cs), (448,603,ls), -(297,640,o), +(297,641,o), (224,724,o), (224,840,cs), (224,989,o), @@ -488,65 +488,6 @@ name = top; pos = (487,1262); } ); -background = { -shapes = ( -{ -closed = 1; -nodes = ( -(935,1002,o), -(764,1132,o), -(533,1132,cs), -(294,1132,o), -(130,1002,o), -(130,813,cs), -(130,651,o), -(236,547,o), -(443,498,cs), -(623,455,ls), -(724,431,o), -(793,390,o), -(793,303,cs), -(793,202,o), -(695,139,o), -(539,139,cs), -(382,139,o), -(289,201,o), -(275,334,c), -(104,334,l), -(120,94,o), -(306,-16,o), -(543,-16,cs), -(786,-16,o), -(967,102,o), -(967,307,cs), -(967,459,o), -(872,559,o), -(659,610,cs), -(479,653,ls), -(370,679,o), -(299,726,o), -(299,813,cs), -(299,910,o), -(393,978,o), -(533,978,cs), -(677,978,o), -(770,902,o), -(773,783,c), -(942,782,l) -); -} -); -}; -guides = ( -{ -angle = 90; -pos = (460,328); -}, -{ -angle = 90; -pos = (227,1084); -} -); layerId = m007; shapes = ( { @@ -754,7 +695,7 @@ pos = (598,0); }, { name = top; -pos = (590,1304); +pos = (572,1262); } ); guides = ( @@ -1034,36 +975,36 @@ shapes = ( closed = 1; nodes = ( (748,1049,o), -(632,1135,o), +(632,1134,o), (460,1134,cs), -(256,1135,o), -(113,1016,o), +(256,1134,o), +(114,1016,o), (114,840,cs), -(113,701,o), +(114,701,o), (204,601,o), (376,558,cs), (550,514,ls), (693,478,o), -(765,398,o), +(766,398,o), (766,282,cs), -(765,127,o), -(633,23,o), -(440,24,cs), -(262,23,o), -(152,109,o), -(120,268,c), +(766,127,o), +(633,22,o), +(440,22,cs), +(262,22,o), +(151,108,o), +(118,267,c), (72,256,l), (111,78,o), -(241,-23,o), +(241,-24,o), (440,-24,cs), -(658,-23,o), +(658,-24,o), (812,100,o), (812,282,cs), (812,420,o), (723,518,o), (560,559,cs), (384,603,ls), -(233,640,o), +(233,641,o), (160,724,o), (160,840,cs), (160,989,o), diff --git a/src/Inter.glyphspackage/glyphs/sacute.glyph b/src/Inter.glyphspackage/glyphs/sacute.glyph index b14ded949..312137543 100644 --- a/src/Inter.glyphspackage/glyphs/sacute.glyph +++ b/src/Inter.glyphspackage/glyphs/sacute.glyph @@ -23,7 +23,7 @@ shapes = ( ref = s; }, { -pos = (96,0); +pos = (92,0); ref = acute; } ); diff --git a/src/Inter.glyphspackage/glyphs/sacutedotaccent.glyph b/src/Inter.glyphspackage/glyphs/sacutedotaccent.glyph index 3fbbf1074..88f7191cf 100644 --- a/src/Inter.glyphspackage/glyphs/sacutedotaccent.glyph +++ b/src/Inter.glyphspackage/glyphs/sacutedotaccent.glyph @@ -23,7 +23,7 @@ shapes = ( ref = s; }, { -pos = (1240,12); +pos = (1236,12); ref = acutedotcomb.lc; } ); diff --git a/src/Inter.glyphspackage/glyphs/scaron.glyph b/src/Inter.glyphspackage/glyphs/scaron.glyph index aed064dbf..24aa693eb 100644 --- a/src/Inter.glyphspackage/glyphs/scaron.glyph +++ b/src/Inter.glyphspackage/glyphs/scaron.glyph @@ -23,7 +23,7 @@ shapes = ( ref = s; }, { -pos = (-40,0); +pos = (-44,0); ref = caron; } ); diff --git a/src/Inter.glyphspackage/glyphs/scarondotaccent.glyph b/src/Inter.glyphspackage/glyphs/scarondotaccent.glyph index af000d4df..13ff7a614 100644 --- a/src/Inter.glyphspackage/glyphs/scarondotaccent.glyph +++ b/src/Inter.glyphspackage/glyphs/scarondotaccent.glyph @@ -23,7 +23,7 @@ shapes = ( ref = s; }, { -pos = (1316,12); +pos = (1312,12); ref = carondotcomb.lc; } ); diff --git a/src/Inter.glyphspackage/glyphs/scircumflex.glyph b/src/Inter.glyphspackage/glyphs/scircumflex.glyph index cefd741ee..5f1fdf563 100644 --- a/src/Inter.glyphspackage/glyphs/scircumflex.glyph +++ b/src/Inter.glyphspackage/glyphs/scircumflex.glyph @@ -23,7 +23,7 @@ shapes = ( ref = s; }, { -pos = (-40,0); +pos = (-44,0); ref = circumflex; } ); diff --git a/src/Inter.glyphspackage/glyphs/sdotaccent.glyph b/src/Inter.glyphspackage/glyphs/sdotaccent.glyph index 3e437355a..650563a6a 100644 --- a/src/Inter.glyphspackage/glyphs/sdotaccent.glyph +++ b/src/Inter.glyphspackage/glyphs/sdotaccent.glyph @@ -23,7 +23,7 @@ shapes = ( ref = s; }, { -pos = (272,0); +pos = (268,0); ref = dotaccent; } ); diff --git a/src/Inter.glyphspackage/glyphs/sdotbelowdotaccent.glyph b/src/Inter.glyphspackage/glyphs/sdotbelowdotaccent.glyph index fb5baf5bb..0460f7b9c 100644 --- a/src/Inter.glyphspackage/glyphs/sdotbelowdotaccent.glyph +++ b/src/Inter.glyphspackage/glyphs/sdotbelowdotaccent.glyph @@ -31,7 +31,7 @@ pos = (1142,0); ref = dotbelow; }, { -pos = (272,0); +pos = (268,0); ref = dotaccent; } ); diff --git a/src/Inter.glyphspackage/glyphs/tonetwo.glyph b/src/Inter.glyphspackage/glyphs/tonetwo.glyph index d0d5699f4..34b72a63a 100644 --- a/src/Inter.glyphspackage/glyphs/tonetwo.glyph +++ b/src/Inter.glyphspackage/glyphs/tonetwo.glyph @@ -7,15 +7,15 @@ layers = ( anchors = ( { name = bottom; -pos = (530,0); +pos = (524,0); }, { name = cedilla; -pos = (532,0); +pos = (526,0); }, { name = top; -pos = (524,1304); +pos = (518,1304); } ); layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; @@ -23,46 +23,46 @@ shapes = ( { closed = 1; nodes = ( -(282,824,l), -(312,900,o), -(374,983,o), -(524,984,cs), -(661,983,o), -(762,913,o), -(762,818,cs), -(762,732,o), -(703,687,o), -(570,654,cs), -(404,614,ls), -(205,565,o), -(108,467,o), -(108,312,cs), -(108,119,o), -(285,-23,o), -(544,-24,cs), -(773,-23,o), -(929,78,o), -(968,268,c), -(806,308,l), -(775,188,o), -(687,128,o), -(548,128,cs), -(387,128,o), -(285,207,o), -(286,302,cs), -(285,380,o), -(338,433,o), -(452,460,cs), -(638,504,ls), -(842,551,o), -(934,655,o), -(934,808,cs), -(934,998,o), -(759,1132,o), -(524,1132,cs), -(303,1132,o), -(182,1025,o), -(128,866,c) +(276,824,l), +(306,900,o), +(367,984,o), +(518,984,cs), +(654,984,o), +(756,913,o), +(756,818,cs), +(756,732,o), +(696,686,o), +(564,654,cs), +(398,614,ls), +(199,566,o), +(102,467,o), +(102,312,cs), +(102,119,o), +(278,-24,o), +(538,-24,cs), +(766,-24,o), +(922,78,o), +(962,268,c), +(800,308,l), +(769,188,o), +(681,128,o), +(540,128,cs), +(381,128,o), +(278,207,o), +(278,302,cs), +(278,380,o), +(332,433,o), +(444,460,cs), +(630,504,ls), +(836,553,o), +(928,655,o), +(928,808,cs), +(928,998,o), +(753,1132,o), +(518,1132,cs), +(296,1132,o), +(175,1025,o), +(122,866,c) ); } ); @@ -89,44 +89,44 @@ shapes = ( closed = 1; nodes = ( (450,754,l), -(457,822,o), +(456,822,o), (523,864,o), (602,864,cs), (671,864,o), -(729,838,o), -(728,792,cs), -(729,759,o), -(705,728,o), +(726,838,o), +(726,792,cs), +(726,759,o), +(704,727,o), (620,712,cs), (392,672,ls), -(164,631,o), -(54,535,o), +(164,632,o), +(52,535,o), (52,370,cs), -(54,130,o), +(52,130,o), (281,-20,o), (590,-20,cs), (932,-20,o), (1130,132,o), (1152,360,c), (754,360,l), -(743,289,o), -(679,250,o), +(742,289,o), +(678,250,o), (588,250,cs), (514,250,o), -(461,276,o), +(460,276,o), (460,322,cs), -(461,365,o), +(460,365,o), (500,388,o), (588,404,cs), (786,440,ls), -(1013,479,o), -(1127,592,o), +(1013,481,o), +(1126,592,o), (1126,768,cs), -(1127,1001,o), +(1126,1001,o), (930,1132,o), (610,1132,cs), (288,1132,o), -(92,990,o), +(91,990,o), (82,754,c) ); } @@ -137,15 +137,15 @@ width = 1204; anchors = ( { name = bottom; -pos = (433,0); +pos = (430,0); }, { name = cedilla; -pos = (437,0); +pos = (432,0); }, { name = top; -pos = (645,1304); +pos = (640,1304); } ); layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; @@ -153,46 +153,46 @@ shapes = ( { closed = 1; nodes = ( -(323,824,l), -(366,900,o), -(442,983,o), -(591,984,cs), -(728,983,o), -(819,913,o), -(801,818,cs), -(788,732,o), -(721,687,o), -(583,654,cs), -(411,614,ls), -(203,565,o), -(90,467,o), -(65,312,cs), -(32,119,o), -(186,-23,o), -(445,-24,cs), -(674,-23,o), -(847,78,o), -(919,268,c), -(763,308,l), -(712,188,o), -(614,128,o), -(473,128,cs), -(313,128,o), -(224,207,o), -(241,302,cs), -(253,380,o), -(315,433,o), -(433,460,cs), -(625,504,ls), -(838,551,o), -(947,655,o), -(973,808,cs), -(1004,998,o), -(851,1132,o), -(615,1132,cs), -(395,1132,o), -(256,1025,o), -(177,866,c) +(320,819,l), +(363,895,o), +(442,984,o), +(598,984,cs), +(729,984,o), +(815,919,o), +(800,829,cs), +(785,738,o), +(711,687,o), +(574,655,cs), +(401,615,ls), +(194,567,o), +(87,473,o), +(62,323,cs), +(29,125,o), +(186,-24,o), +(451,-24,cs), +(674,-24,o), +(842,72,o), +(913,262,c), +(757,313,l), +(706,193,o), +(603,128,o), +(457,128,cs), +(303,128,o), +(218,201,o), +(233,291,cs), +(246,374,o), +(315,432,o), +(431,459,cs), +(625,503,ls), +(839,552,o), +(942,649,o), +(966,797,cs), +(999,992,o), +(842,1132,o), +(601,1132,cs), +(385,1132,o), +(250,1030,o), +(171,871,c) ); } ); @@ -202,15 +202,15 @@ width = 1068; anchors = ( { name = bottom; -pos = (512,0); +pos = (506,0); }, { name = cedilla; -pos = (504,0); +pos = (496,0); }, { name = top; -pos = (730,1304); +pos = (722,1304); } ); layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; @@ -218,46 +218,46 @@ shapes = ( { closed = 1; nodes = ( -(490,754,l), -(507,822,o), -(580,864,o), -(660,864,cs), -(729,864,o), -(782,838,o), -(772,792,cs), -(769,759,o), -(739,728,o), -(652,712,cs), -(418,672,ls), -(182,631,o), -(57,535,o), -(26,370,cs), -(-11,130,o), -(192,-20,o), -(500,-20,cs), -(843,-20,o), -(1066,132,o), -(1124,360,c), -(726,360,l), -(705,289,o), -(634,250,o), -(544,250,cs), -(470,250,o), -(421,276,o), -(426,322,cs), -(435,365,o), -(478,388,o), -(568,404,cs), -(772,440,ls), -(1006,479,o), -(1139,592,o), -(1168,768,cs), -(1207,1001,o), -(1031,1132,o), -(712,1132,cs), -(389,1132,o), -(169,990,o), -(120,754,c) +(481,754,l), +(499,822,o), +(572,864,o), +(651,864,cs), +(720,864,o), +(771,838,o), +(764,792,cs), +(758,759,o), +(731,727,o), +(644,712,cs), +(410,672,ls), +(175,632,o), +(47,535,o), +(20,370,cs), +(-20,130,o), +(184,-20,o), +(493,-20,cs), +(835,-20,o), +(1058,132,o), +(1118,360,c), +(720,360,l), +(696,289,o), +(626,250,o), +(536,250,cs), +(462,250,o), +(412,276,o), +(420,322,cs), +(427,365,o), +(471,388,o), +(561,404,cs), +(765,440,ls), +(999,481,o), +(1130,592,o), +(1160,768,cs), +(1198,1001,o), +(1024,1132,o), +(704,1132,cs), +(382,1132,o), +(161,990,o), +(113,754,c) ); } ); @@ -267,15 +267,15 @@ width = 1208; anchors = ( { name = bottom; -pos = (498,0); +pos = (496,0); }, { name = cedilla; -pos = (500,0); +pos = (498,0); }, { name = top; -pos = (494,1304); +pos = (492,1304); } ); layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; @@ -283,46 +283,46 @@ shapes = ( { closed = 1; nodes = ( -(192,870,l), -(238,1015,o), -(335,1088,o), -(488,1088,cs), -(667,1088,o), -(788,989,o), -(788,840,cs), -(788,724,o), -(714,640,o), -(563,603,cs), -(387,559,ls), -(224,518,o), -(137,420,o), -(136,282,cs), -(137,100,o), -(290,-23,o), -(510,-24,cs), -(708,-23,o), -(838,78,o), -(876,256,c), -(830,268,l), -(796,109,o), -(687,23,o), -(510,24,cs), -(315,23,o), -(183,127,o), -(184,282,cs), -(183,398,o), -(255,478,o), -(398,514,cs), -(574,558,ls), -(745,601,o), -(835,701,o), -(834,840,cs), -(835,1016,o), -(692,1135,o), -(488,1134,cs), -(316,1135,o), -(200,1049,o), -(146,882,c) +(190,870,l), +(235,1015,o), +(333,1088,o), +(486,1088,cs), +(665,1088,o), +(786,989,o), +(786,840,cs), +(786,724,o), +(713,641,o), +(562,603,cs), +(386,559,ls), +(223,518,o), +(134,420,o), +(134,282,cs), +(134,100,o), +(288,-24,o), +(506,-24,cs), +(705,-24,o), +(835,78,o), +(874,256,c), +(828,267,l), +(795,108,o), +(684,22,o), +(506,22,cs), +(313,22,o), +(180,127,o), +(180,282,cs), +(180,398,o), +(253,478,o), +(396,514,cs), +(570,558,ls), +(742,601,o), +(832,701,o), +(832,840,cs), +(832,1016,o), +(690,1134,o), +(486,1134,cs), +(314,1134,o), +(198,1049,o), +(144,882,c) ); } ); @@ -332,15 +332,15 @@ width = 1010; anchors = ( { name = bottom; -pos = (406,0); +pos = (402,0); }, { name = cedilla; -pos = (410,0); +pos = (404,0); }, { name = top; -pos = (618,1304); +pos = (614,1304); } ); layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; @@ -348,50 +348,50 @@ shapes = ( { closed = 1; nodes = ( -(244,870,l), -(315,1015,o), -(425,1088,o), -(578,1088,cs), -(756,1088,o), -(861,989,o), -(836,840,cs), -(817,724,o), -(729,643,o), -(570,606,cs), -(388,562,ls), -(218,521,o), -(115,420,o), -(92,282,cs), -(62,100,o), -(195,-23,o), -(414,-24,cs), -(613,-23,o), -(760,78,o), -(826,256,c), -(782,268,l), -(723,109,o), -(599,23,o), -(422,24,cs), -(227,23,o), -(113,127,o), -(138,282,cs), -(158,398,o), -(243,479,o), -(394,514,cs), -(576,558,ls), -(753,601,o), -(859,701,o), -(884,840,cs), -(912,1016,o), -(789,1135,o), -(586,1134,cs), -(413,1135,o), -(283,1049,o), -(200,882,c) +(240,870,l), +(309,1015,o), +(420,1088,o), +(573,1088,cs), +(752,1088,o), +(856,989,o), +(832,840,cs), +(812,724,o), +(726,641,o), +(568,603,cs), +(385,559,ls), +(215,518,o), +(110,420,o), +(87,282,cs), +(57,100,o), +(190,-24,o), +(408,-24,cs), +(607,-24,o), +(754,78,o), +(823,256,c), +(779,267,l), +(719,108,o), +(594,24,o), +(416,24,cs), +(223,24,o), +(107,127,o), +(133,282,cs), +(152,398,o), +(239,478,o), +(388,514,cs), +(569,558,ls), +(748,601,o), +(855,701,o), +(878,840,cs), +(907,1016,o), +(784,1134,o), +(580,1134,cs), +(408,1134,o), +(278,1049,o), +(196,882,c) ); } ); -width = 1009; +width = 1011; }, { anchors = ( @@ -413,64 +413,64 @@ shapes = ( { closed = 1; nodes = ( -(250,824,l), -(280,900,o), -(342,983,o), -(492,984,cs), -(629,983,o), -(730,913,o), -(730,818,cs), -(730,732,o), -(671,687,o), -(538,654,cs), -(372,614,ls), -(173,565,o), -(76,467,o), -(76,312,cs), -(76,119,o), -(253,-23,o), -(512,-24,cs), -(741,-23,o), -(897,78,o), -(936,268,c), -(774,308,l), -(743,188,o), -(655,128,o), -(516,128,cs), -(355,128,o), -(253,207,o), -(254,302,cs), -(253,380,o), -(306,433,o), -(420,460,cs), -(606,504,ls), -(810,551,o), -(902,655,o), -(902,808,cs), -(902,998,o), -(727,1132,o), -(492,1132,cs), -(271,1132,o), -(150,1025,o), -(96,866,c) +(264,736,l), +(266,848,o), +(352,920,o), +(488,920,cs), +(618,920,o), +(706,858,o), +(706,768,cs), +(706,688,o), +(640,644,o), +(538,620,cs), +(368,580,ls), +(166,532,o), +(76,436,o), +(76,292,cs), +(76,96,o), +(248,-16,o), +(478,-16,cs), +(704,-16,o), +(882,90,o), +(896,320,c), +(728,320,l), +(716,194,o), +(630,136,o), +(482,136,cs), +(336,136,o), +(246,194,o), +(246,288,cs), +(246,368,o), +(310,406,o), +(404,428,cs), +(574,468,ls), +(770,514,o), +(872,614,o), +(872,768,cs), +(872,948,o), +(714,1072,o), +(488,1072,cs), +(268,1072,o), +(104,946,o), +(98,736,c) ); } ); -width = 1012; +width = 972; }, { anchors = ( { name = bottom; -pos = (401,0); +pos = (409,0); }, { name = cedilla; -pos = (405,0); +pos = (411,0); }, { name = top; -pos = (613,1304); +pos = (618,1304); } ); layerId = m008; @@ -478,50 +478,50 @@ shapes = ( { closed = 1; nodes = ( -(291,824,l), -(334,900,o), -(410,983,o), -(559,984,cs), -(696,983,o), -(787,913,o), -(769,818,cs), -(756,732,o), -(689,687,o), -(551,654,cs), -(379,614,ls), -(171,565,o), -(58,467,o), -(33,312,cs), -(0,119,o), -(154,-23,o), -(413,-24,cs), -(642,-23,o), -(815,78,o), -(887,268,c), -(731,308,l), -(680,188,o), -(582,128,o), -(441,128,cs), -(281,128,o), -(192,207,o), -(209,302,cs), -(221,380,o), -(283,433,o), -(401,460,cs), -(593,504,ls), -(806,551,o), -(915,655,o), -(941,808,cs), -(972,998,o), -(819,1132,o), -(583,1132,cs), -(363,1132,o), -(224,1025,o), -(145,866,c) +(296,736,l), +(317,848,o), +(415,920,o), +(551,920,cs), +(681,920,o), +(759,858,o), +(744,768,cs), +(730,688,o), +(657,644,o), +(551,620,cs), +(375,580,ls), +(165,532,o), +(59,436,o), +(35,292,cs), +(2,96,o), +(156,-16,o), +(386,-16,cs), +(612,-16,o), +(807,90,o), +(860,320,c), +(692,320,l), +(659,194,o), +(563,136,o), +(415,136,cs), +(269,136,o), +(189,194,o), +(204,288,cs), +(218,368,o), +(288,406,o), +(385,428,cs), +(562,468,ls), +(766,514,o), +(884,614,o), +(910,768,cs), +(940,948,o), +(802,1072,o), +(576,1072,cs), +(356,1072,o), +(171,946,o), +(130,736,c) ); } ); -width = 1004; +width = 963; }, { anchors = ( @@ -592,15 +592,15 @@ width = 1144; anchors = ( { name = bottom; -pos = (496,0); +pos = (485,0); }, { name = cedilla; -pos = (488,0); +pos = (477,0); }, { name = top; -pos = (714,1304); +pos = (712,1262); } ); layerId = m010; @@ -608,64 +608,64 @@ shapes = ( { closed = 1; nodes = ( -(474,754,l), -(491,822,o), -(564,864,o), -(644,864,cs), -(713,864,o), -(766,838,o), -(756,792,cs), -(753,759,o), -(723,728,o), -(636,712,cs), -(402,672,ls), -(166,631,o), -(41,535,o), -(10,370,cs), -(-27,130,o), -(176,-20,o), -(484,-20,cs), -(827,-20,o), -(1050,132,o), -(1108,360,c), -(710,360,l), -(689,289,o), -(618,250,o), -(528,250,cs), -(454,250,o), -(405,276,o), -(410,322,cs), -(419,365,o), -(462,388,o), -(552,404,cs), -(756,440,ls), -(990,479,o), -(1123,592,o), -(1152,768,cs), -(1191,1001,o), -(1015,1132,o), -(696,1132,cs), -(373,1132,o), -(153,990,o), -(104,754,c) +(461,705,l), +(473,766,o), +(540,813,o), +(617,813,cs), +(694,813,o), +(732,784,o), +(726,745,cs), +(720,712,o), +(681,688,o), +(617,677,cs), +(384,639,ls), +(156,602,o), +(37,511,o), +(11,353,cs), +(-26,129,o), +(156,-27,o), +(472,-27,cs), +(786,-27,o), +(1024,122,o), +(1082,345,c), +(688,345,l), +(668,282,o), +(608,239,o), +(522,239,cs), +(443,239,o), +(403,266,o), +(409,307,cs), +(415,341,o), +(457,364,o), +(539,377,cs), +(742,409,ls), +(960,443,o), +(1092,552,o), +(1120,723,cs), +(1156,941,o), +(993,1077,o), +(677,1077,cs), +(358,1077,o), +(141,934,o), +(97,705,c) ); } ); -width = 1176; +width = 1148; }, { anchors = ( { name = bottom; -pos = (434,0); +pos = (432,0); }, { name = cedilla; -pos = (436,0); +pos = (434,0); }, { name = top; -pos = (430,1304); +pos = (428,1304); } ); layerId = m011; @@ -673,46 +673,46 @@ shapes = ( { closed = 1; nodes = ( -(128,870,l), -(174,1015,o), -(271,1088,o), -(424,1088,cs), -(603,1088,o), -(724,989,o), -(724,840,cs), -(724,724,o), -(650,640,o), -(499,603,cs), -(323,559,ls), -(160,518,o), -(73,420,o), -(72,282,cs), -(73,100,o), -(226,-23,o), -(446,-24,cs), -(644,-23,o), -(774,78,o), -(812,256,c), -(766,268,l), -(732,109,o), -(623,23,o), -(446,24,cs), -(251,23,o), -(119,127,o), -(120,282,cs), -(119,398,o), -(191,478,o), -(334,514,cs), -(510,558,ls), -(681,601,o), -(771,701,o), -(770,840,cs), -(771,1016,o), -(628,1135,o), -(424,1134,cs), -(252,1135,o), -(136,1049,o), -(82,882,c) +(126,870,l), +(171,1015,o), +(269,1088,o), +(422,1088,cs), +(601,1088,o), +(722,989,o), +(722,840,cs), +(722,724,o), +(649,641,o), +(498,603,cs), +(322,559,ls), +(159,518,o), +(70,420,o), +(70,282,cs), +(70,100,o), +(224,-24,o), +(442,-24,cs), +(641,-24,o), +(771,78,o), +(810,256,c), +(764,267,l), +(731,108,o), +(620,22,o), +(442,22,cs), +(249,22,o), +(116,127,o), +(116,282,cs), +(116,398,o), +(189,478,o), +(332,514,cs), +(506,558,ls), +(678,601,o), +(768,701,o), +(768,840,cs), +(768,1016,o), +(626,1134,o), +(422,1134,cs), +(250,1134,o), +(134,1049,o), +(80,882,c) ); } ); @@ -722,15 +722,15 @@ width = 882; anchors = ( { name = bottom; -pos = (342,0); +pos = (338,0); }, { name = cedilla; -pos = (346,0); +pos = (340,0); }, { name = top; -pos = (554,1304); +pos = (550,1304); } ); layerId = m012; @@ -738,54 +738,54 @@ shapes = ( { closed = 1; nodes = ( -(180,870,l), -(251,1015,o), -(361,1088,o), -(514,1088,cs), -(692,1088,o), -(797,989,o), -(772,840,cs), -(753,724,o), -(665,643,o), -(506,606,cs), -(324,562,ls), -(154,521,o), -(51,420,o), -(28,282,cs), -(-2,100,o), -(131,-23,o), -(350,-24,cs), -(549,-23,o), -(696,78,o), -(762,256,c), -(718,268,l), -(659,109,o), -(535,23,o), -(358,24,cs), -(163,23,o), -(49,127,o), -(74,282,cs), -(94,398,o), -(179,479,o), -(330,514,cs), -(512,558,ls), -(689,601,o), -(795,701,o), -(820,840,cs), -(848,1016,o), -(725,1135,o), -(522,1134,cs), -(349,1135,o), -(219,1049,o), -(136,882,c) +(176,870,l), +(245,1015,o), +(356,1088,o), +(509,1088,cs), +(688,1088,o), +(792,989,o), +(768,840,cs), +(748,724,o), +(662,641,o), +(504,603,cs), +(321,559,ls), +(151,518,o), +(46,420,o), +(23,282,cs), +(-7,100,o), +(126,-24,o), +(344,-24,cs), +(543,-24,o), +(690,78,o), +(759,256,c), +(715,267,l), +(655,108,o), +(530,22,o), +(352,22,cs), +(159,22,o), +(43,127,o), +(69,282,cs), +(88,398,o), +(175,478,o), +(324,514,cs), +(505,558,ls), +(684,601,o), +(791,701,o), +(814,840,cs), +(843,1016,o), +(720,1134,o), +(516,1134,cs), +(344,1134,o), +(214,1049,o), +(132,882,c) ); } ); -width = 881; +width = 883; } ); -metricLeft = s; -metricRight = s; +metricLeft = "=|s"; +metricRight = "=|s"; unicode = 424; userData = { interface.gridadjust.original = "{'width': 1459, 'leftMargin': 135, 'rightMargin': 129}";