diff options
author | Rasmus Andersson <rasmus@notion.se> | 2022-06-02 20:02:05 +0300 |
---|---|---|
committer | Rasmus Andersson <rasmus@notion.se> | 2022-06-02 20:02:05 +0300 |
commit | 6a8d7eb5d4b8124937a60dc621b3443c22dcd4de (patch) | |
tree | 007bb419ca569a56b69217edfc2731efbe33e594 | |
parent | 5814e5b3795c050f965c58bff38ac5725877b058 (diff) | |
download | inter-6a8d7eb5d4b8124937a60dc621b3443c22dcd4de.tar.xz |
more off-curve handle fixes from UPM scaling errors. #465
34 files changed, 1068 insertions, 1476 deletions
diff --git a/src/Inter.glyphspackage/fontinfo.plist b/src/Inter.glyphspackage/fontinfo.plist index ee568d1a0..6d731d67c 100644 --- a/src/Inter.glyphspackage/fontinfo.plist +++ b/src/Inter.glyphspackage/fontinfo.plist @@ -2789,7 +2789,7 @@ pos = 1490; }, { over = 16; -pos = 1118; +pos = 1056; }, { over = -16; @@ -3983,9 +3983,6 @@ name = "Cap height"; pos = (0,1490); }, { -pos = (1288,1510); -}, -{ locked = 1; name = "Top anchors"; pos = (0,1304); diff --git a/src/Inter.glyphspackage/glyphs/_part.f_base.glyph b/src/Inter.glyphspackage/glyphs/_part.f_base.glyph index 7fa9ed0e6..c34db3097 100644 --- a/src/Inter.glyphspackage/glyphs/_part.f_base.glyph +++ b/src/Inter.glyphspackage/glyphs/_part.f_base.glyph @@ -114,16 +114,16 @@ nodes = ( (402,0,l), (402,1230,ls), (402,1341,o), -(451,1399,o), +(451,1400,o), (564,1400,cs), -(614,1399,o), +(614,1400,o), (643,1388,o), (660,1382,c), (710,1530,l), (684,1542,o), -(631,1559,o), +(631,1560,o), (546,1560,cs), -(387,1559,o), +(387,1560,o), (232,1463,o), (232,1272,cs), (232,0,l) @@ -189,9 +189,9 @@ name = hr00; (782,1240,c), (840,1528,l), (794,1539,o), -(687,1559,o), +(687,1560,o), (584,1560,cs), -(340,1559,o), +(340,1560,o), (184,1425,o), (184,1150,cs), (184,0,l) diff --git a/src/Inter.glyphspackage/glyphs/a.1.glyph b/src/Inter.glyphspackage/glyphs/a.1.glyph index 6eaa2ffba..748c847a9 100644 --- a/src/Inter.glyphspackage/glyphs/a.1.glyph +++ b/src/Inter.glyphspackage/glyphs/a.1.glyph @@ -28,7 +28,7 @@ shapes = ( { closed = 1; nodes = ( -(740,-23,o), +(740,-24,o), (879,95,o), (940,280,c), (946,280,l), @@ -39,31 +39,31 @@ nodes = ( (946,832,l), (940,832,l), (881,1018,o), -(739,1135,o), +(739,1134,o), (562,1134,cs), -(300,1135,o), -(131,884,o), +(300,1134,o), +(130,884,o), (130,556,cs), -(131,225,o), -(297,-23,o), +(130,225,o), +(297,-24,o), (562,-24,cs) ); }, { closed = 1; nodes = ( -(324,23,o), -(177,253,o), -(178,556,cs), -(177,858,o), +(324,22,o), +(176,253,o), +(176,556,cs), +(176,858,o), (326,1088,o), (562,1088,cs), (797,1088,o), -(945,858,o), +(946,858,o), (946,556,cs), -(945,253,o), -(799,23,o), -(562,24,cs) +(946,253,o), +(799,22,o), +(562,22,cs) ); } ); @@ -158,7 +158,7 @@ shapes = ( { closed = 1; nodes = ( -(794,-23,o), +(794,-24,o), (867,111,o), (904,172,c), (926,172,l), @@ -172,27 +172,27 @@ nodes = ( (800,1132,o), (582,1132,cs), (300,1132,o), -(105,908,o), +(104,908,o), (104,556,cs), -(105,201,o), -(300,-23,o), +(104,201,o), +(300,-24,o), (578,-24,cs) ); }, { closed = 1; nodes = ( -(387,131,o), +(387,130,o), (276,320,o), (276,558,cs), (276,794,o), -(384,977,o), +(384,978,o), (602,978,cs), -(812,977,o), +(812,978,o), (922,809,o), (922,558,cs), (922,305,o), -(809,131,o), +(809,130,o), (602,130,cs) ); } @@ -288,7 +288,7 @@ shapes = ( { closed = 1; nodes = ( -(663,-15,o), +(663,-14,o), (771,70,o), (818,184,c), (826,184,l), @@ -302,10 +302,10 @@ nodes = ( (669,1132,o), (504,1132,cs), (282,1132,o), -(67,963,o), -(66,558,c), -(67,172,o), -(268,-15,o), +(66,963,o), +(66,558,cs), +(66,172,o), +(268,-14,o), (506,-14,cs) ); }, @@ -316,9 +316,9 @@ nodes = ( (480,393,o), (480,558,cs), (480,724,o), -(544,823,o), +(544,824,o), (654,824,cs), -(765,823,o), +(765,824,o), (832,724,o), (832,558,c), (832,396,o), @@ -678,7 +678,7 @@ shapes = ( { closed = 1; nodes = ( -(676,-23,o), +(676,-24,o), (815,95,o), (876,280,c), (882,280,l), @@ -689,31 +689,31 @@ nodes = ( (882,832,l), (876,832,l), (817,1018,o), -(675,1135,o), +(675,1134,o), (498,1134,cs), -(236,1135,o), -(67,884,o), +(236,1134,o), +(66,884,o), (66,556,cs), -(67,225,o), -(233,-23,o), +(66,225,o), +(233,-24,o), (498,-24,cs) ); }, { closed = 1; nodes = ( -(260,23,o), -(113,253,o), -(114,556,cs), -(113,858,o), +(260,22,o), +(112,253,o), +(112,556,cs), +(112,858,o), (262,1088,o), (498,1088,cs), (733,1088,o), -(881,858,o), +(882,858,o), (882,556,cs), -(881,253,o), -(735,23,o), -(498,24,cs) +(882,253,o), +(735,22,o), +(498,22,cs) ); } ); diff --git a/src/Inter.glyphspackage/glyphs/ae.glyph b/src/Inter.glyphspackage/glyphs/ae.glyph index d74d393ec..de866dd91 100644 --- a/src/Inter.glyphspackage/glyphs/ae.glyph +++ b/src/Inter.glyphspackage/glyphs/ae.glyph @@ -10,11 +10,6 @@ name = top; pos = (944,1304); } ); -guides = ( -{ -pos = (1332,888); -} -); layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; shapes = ( { @@ -343,9 +338,9 @@ nodes = ( (1068,448,cs), (1068,686,l), (1071,783,o), -(1149,849,o), +(1149,850,o), (1248,850,cs), -(1347,849,o), +(1347,850,o), (1423,783,o), (1426,686,c), (978,686,l), @@ -385,7 +380,7 @@ nodes = ( { closed = 1; nodes = ( -(629,-17,o), +(629,-18,o), (806,44,o), (876,168,c), (898,168,l), @@ -398,9 +393,9 @@ nodes = ( (94,754,c), (462,754,l), (471,823,o), -(524,855,o), +(524,856,o), (600,856,cs), -(670,855,o), +(670,856,o), (718,824,o), (718,766,cs), (718,762,ls), @@ -408,10 +403,10 @@ nodes = ( (649,678,o), (460,664,cs), (230,646,o), -(49,553,o), +(50,553,o), (50,308,cs), -(49,87,o), -(199,-17,o), +(50,87,o), +(199,-18,o), (442,-18,cs) ); } @@ -1400,9 +1395,9 @@ nodes = ( (1747,423,l), (1747,530,ls), (1747,860,o), -(1531,1081,o), +(1531,1080,o), (1210,1080,cs), -(1037,1079,o), +(1037,1080,o), (936,1017,o), (842,910,c), (842,180,l), diff --git a/src/Inter.glyphspackage/glyphs/b.glyph b/src/Inter.glyphspackage/glyphs/b.glyph index ab1be3377..898cbdbf4 100644 --- a/src/Inter.glyphspackage/glyphs/b.glyph +++ b/src/Inter.glyphspackage/glyphs/b.glyph @@ -30,41 +30,41 @@ shapes = ( { closed = 1; nodes = ( -(893,-23,o), +(893,-24,o), (1060,225,o), (1060,556,cs), (1060,884,o), -(891,1135,o), +(891,1134,o), (630,1134,cs), -(452,1135,o), -(309,1018,o), -(252,832,c), -(246,832,l), -(246,1490,l), +(452,1134,o), +(307,1018,o), +(250,832,c), +(244,832,l), +(244,1490,l), (198,1490,l), (198,0,l), -(246,0,l), -(246,280,l), -(252,280,l), -(311,94,o), -(450,-23,o), +(244,0,l), +(244,280,l), +(250,280,l), +(309,94,o), +(450,-24,o), (630,-24,cs) ); }, { closed = 1; nodes = ( -(392,21,o), -(243,253,o), +(392,22,o), +(244,253,o), (244,556,cs), -(243,858,o), +(244,858,o), (394,1088,o), (630,1088,cs), (865,1088,o), -(1013,858,o), +(1014,858,o), (1014,556,cs), -(1013,253,o), -(866,21,o), +(1014,253,o), +(866,22,o), (630,22,cs) ); } @@ -262,10 +262,10 @@ shapes = ( { closed = 1; nodes = ( -(948,-23,o), -(1143,201,o), +(948,-24,o), +(1142,201,o), (1142,556,cs), -(1143,908,o), +(1142,908,o), (948,1132,o), (666,1132,cs), (447,1132,o), @@ -279,24 +279,24 @@ nodes = ( (322,172,l), (342,172,l), (380,111,o), -(453,-23,o), +(453,-24,o), (668,-24,cs) ); }, { closed = 1; nodes = ( -(439,131,o), -(325,305,o), +(439,130,o), +(326,305,o), (326,558,cs), -(325,809,o), -(436,977,o), +(326,809,o), +(436,978,o), (646,978,cs), -(863,977,o), -(971,794,o), +(863,978,o), +(970,794,o), (970,558,cs), -(971,320,o), -(860,131,o), +(970,320,o), +(860,130,o), (646,130,cs) ); } @@ -318,51 +318,6 @@ name = top; pos = (652,1262); } ); -background = { -shapes = ( -{ -closed = 1; -nodes = ( -(324,0,l), -(324,170,l), -(335,170,l), -(415,40,o), -(541,-16,o), -(686,-16,cs), -(976,-16,o), -(1166,212,o), -(1166,556,cs), -(1166,900,o), -(976,1132,o), -(686,1132,cs), -(541,1132,o), -(410,1071,o), -(339,946,c), -(328,946,l), -(328,1490,l), -(158,1490,l), -(158,0,l) -); -}, -{ -closed = 1; -nodes = ( -(318,811,o), -(449,979,o), -(659,979,cs), -(855,979,o), -(994,832,o), -(994,556,cs), -(994,279,o), -(855,135,o), -(659,135,cs), -(449,135,o), -(318,300,o), -(318,556,cs) -); -} -); -}; guides = ( { pos = (189,168); @@ -401,8 +356,8 @@ nodes = ( (126,0,l), (292,0,l), (292,160,l), -(298,160,l), -(374,38,o), +(294,160,l), +(370,38,o), (491,-16,o), (628,-16,cs) ); @@ -602,9 +557,9 @@ shapes = ( { closed = 1; nodes = ( -(1059,-15,o), +(1059,-14,o), (1260,172,o), -(1260,558,c), +(1260,558,cs), (1260,963,o), (1045,1132,o), (824,1132,cs), @@ -619,7 +574,7 @@ nodes = ( (500,184,l), (510,184,l), (556,70,o), -(663,-15,o), +(663,-14,o), (820,-14,cs) ); }, @@ -627,15 +582,15 @@ nodes = ( closed = 1; nodes = ( (562,294,o), -(495,396,o), -(494,558,c), -(495,724,o), -(562,823,o), +(494,396,o), +(494,558,cs), +(494,724,o), +(562,824,o), (672,824,cs), -(783,823,o), -(847,724,o), +(783,824,o), +(846,724,o), (846,558,cs), -(847,393,o), +(846,393,o), (783,294,o), (672,294,cs) ); @@ -1074,21 +1029,21 @@ width = 1224; anchors = ( { name = bottom; -pos = (551,0); +pos = (599,0); }, { name = cross; -pos = (143,1280); +pos = (191,1280); }, { name = top; -pos = (551,1304); +pos = (599,1304); } ); guides = ( { angle = 90; -pos = (735,1580); +pos = (783,1580); } ); layerId = m011; @@ -1097,46 +1052,46 @@ shapes = ( { closed = 1; nodes = ( -(781,-23,o), -(948,225,o), -(948,556,cs), -(948,884,o), -(779,1135,o), -(518,1134,cs), -(340,1135,o), -(197,1018,o), -(140,832,c), -(134,832,l), +(829,-24,o), +(996,225,o), +(996,556,cs), +(996,884,o), +(827,1134,o), +(566,1134,cs), +(388,1134,o), +(243,1018,o), +(186,832,c), +(180,832,l), +(180,1490,l), (134,1490,l), -(86,1490,l), -(86,0,l), (134,0,l), -(134,280,l), -(140,280,l), -(199,94,o), -(338,-23,o), -(518,-24,cs) +(180,0,l), +(180,280,l), +(186,280,l), +(245,94,o), +(386,-24,o), +(566,-24,cs) ); }, { closed = 1; nodes = ( -(280,21,o), -(131,253,o), -(132,556,cs), -(131,858,o), -(282,1088,o), -(518,1088,cs), -(753,1088,o), -(901,858,o), -(902,556,cs), -(901,253,o), -(754,21,o), -(518,22,cs) +(328,22,o), +(180,253,o), +(180,556,cs), +(180,858,o), +(330,1088,o), +(566,1088,cs), +(801,1088,o), +(950,858,o), +(950,556,cs), +(950,253,o), +(802,22,o), +(566,22,cs) ); } ); -width = 1014; +width = 1062; }, { anchors = ( diff --git a/src/Inter.glyphspackage/glyphs/bbar.glyph b/src/Inter.glyphspackage/glyphs/bbar.glyph index 1d5a98f89..8dc51592b 100644 --- a/src/Inter.glyphspackage/glyphs/bbar.glyph +++ b/src/Inter.glyphspackage/glyphs/bbar.glyph @@ -139,11 +139,11 @@ shapes = ( ref = b; }, { -pos = (-217,558); +pos = (-169,558); ref = crossbar; } ); -width = 1014; +width = 1062; }, { layerId = m012; diff --git a/src/Inter.glyphspackage/glyphs/bdotaccent.glyph b/src/Inter.glyphspackage/glyphs/bdotaccent.glyph index 66b002b16..56accd970 100644 --- a/src/Inter.glyphspackage/glyphs/bdotaccent.glyph +++ b/src/Inter.glyphspackage/glyphs/bdotaccent.glyph @@ -140,11 +140,11 @@ shapes = ( ref = b; }, { -pos = (429,0); +pos = (477,0); ref = dotaccent; } ); -width = 1014; +width = 1062; }, { layerId = m012; diff --git a/src/Inter.glyphspackage/glyphs/bdotbelow.glyph b/src/Inter.glyphspackage/glyphs/bdotbelow.glyph index 358fece7d..a93eaaba8 100644 --- a/src/Inter.glyphspackage/glyphs/bdotbelow.glyph +++ b/src/Inter.glyphspackage/glyphs/bdotbelow.glyph @@ -140,11 +140,11 @@ shapes = ( ref = b; }, { -pos = (1173,0); +pos = (1221,0); ref = dotbelow; } ); -width = 1014; +width = 1062; }, { layerId = m012; diff --git a/src/Inter.glyphspackage/glyphs/bhook.glyph b/src/Inter.glyphspackage/glyphs/bhook.glyph index ee31356e9..cddcaf4f1 100644 --- a/src/Inter.glyphspackage/glyphs/bhook.glyph +++ b/src/Inter.glyphspackage/glyphs/bhook.glyph @@ -13,57 +13,7 @@ pos = (666,0); background = { shapes = ( { -closed = 1; -nodes = ( -(948,-23,o), -(1143,201,o), -(1144,556,cs), -(1143,908,o), -(948,1132,o), -(666,1132,cs), -(448,1132,o), -(381,998,o), -(344,940,c), -(328,940,l), -(328,1210,ls), -(329,1327,o), -(399,1361,o), -(492,1362,cs), -(512,1361,o), -(532,1359,o), -(546,1356,c), -(546,1502,l), -(521,1510,o), -(483,1510,o), -(448,1510,cs), -(285,1510,o), -(157,1402,o), -(158,1210,cs), -(158,0,l), -(322,0,l), -(322,172,l), -(344,172,l), -(381,111,o), -(454,-23,o), -(670,-24,cs) -); -}, -{ -closed = 1; -nodes = ( -(439,131,o), -(326,305,o), -(326,558,cs), -(326,809,o), -(436,977,o), -(646,978,cs), -(864,977,o), -(972,794,o), -(972,558,cs), -(972,320,o), -(861,131,o), -(646,130,cs) -); +ref = b; } ); }; @@ -72,64 +22,55 @@ shapes = ( { closed = 1; nodes = ( -(948,-23,o), -(1143,201,o), +(948,-24,o), +(1142,201,o), (1142,556,cs), -(1143,908,o), +(1142,908,o), (948,1132,o), (666,1132,cs), (447,1132,o), (380,998,o), (342,940,c), (328,940,l), -(328,1118,l), -(158,1118,l), +(328,1254,ls), +(328,1324,o), +(373,1355,o), +(486,1356,cs), +(502,1356,o), +(523,1355,o), +(542,1352,c), +(542,1496,l), +(525,1500,o), +(487,1504,o), +(442,1504,cs), +(257,1504,o), +(158,1416,o), +(158,1254,cs), (158,0,l), (322,0,l), (322,172,l), (342,172,l), (380,111,o), -(453,-23,o), +(453,-24,o), (668,-24,cs) ); }, { closed = 1; nodes = ( -(439,131,o), -(325,305,o), +(439,130,o), +(326,305,o), (326,558,cs), -(325,809,o), -(436,977,o), +(326,809,o), +(436,978,o), (646,978,cs), -(863,977,o), -(971,794,o), +(863,978,o), +(970,794,o), (970,558,cs), -(971,320,o), -(860,131,o), +(970,320,o), +(860,130,o), (646,130,cs) ); -}, -{ -closed = 1; -nodes = ( -(328,1118,l), -(328,1254,ls), -(328,1324,o), -(373,1355,o), -(486,1356,cs), -(502,1356,o), -(523,1355,o), -(542,1352,c), -(542,1496,l), -(525,1500,o), -(487,1504,o), -(442,1504,cs), -(257,1504,o), -(158,1416,o), -(158,1254,cs), -(158,1118,l) -); } ); width = 1246; @@ -153,9 +94,9 @@ shapes = ( { closed = 1; nodes = ( -(1059,-15,o), +(1059,-14,o), (1260,172,o), -(1260,558,c), +(1260,558,cs), (1260,963,o), (1045,1132,o), (824,1132,cs), @@ -163,14 +104,26 @@ nodes = ( (553,1036,o), (510,922,c), (504,922,l), -(504,1118,l), -(102,1118,l), +(504,1136,ls), +(504,1196,o), +(529,1218,o), +(607,1216,cs), +(646,1216,o), +(682,1212,o), +(722,1207,c), +(722,1480,l), +(663,1496,o), +(597,1504,o), +(524,1504,cs), +(243,1504,o), +(102,1381,o), +(102,1136,cs), (102,0,l), (500,0,l), (500,184,l), (510,184,l), (556,70,o), -(663,-15,o), +(663,-14,o), (820,-14,cs) ); }, @@ -178,39 +131,18 @@ nodes = ( closed = 1; nodes = ( (562,294,o), -(495,396,o), -(494,558,c), -(495,724,o), -(562,823,o), +(494,396,o), +(494,558,cs), +(494,724,o), +(562,824,o), (672,824,cs), -(783,823,o), -(847,724,o), +(783,824,o), +(846,724,o), (846,558,cs), -(847,393,o), +(846,393,o), (783,294,o), (672,294,cs) ); -}, -{ -closed = 1; -nodes = ( -(504,1118,l), -(504,1136,ls), -(504,1196,o), -(529,1218,o), -(607,1216,cs), -(646,1216,o), -(682,1212,o), -(722,1207,c), -(722,1480,l), -(663,1496,o), -(597,1504,o), -(524,1504,cs), -(243,1504,o), -(102,1381,o), -(102,1136,cs), -(102,1118,l) -); } ); width = 1322; @@ -227,64 +159,55 @@ shapes = ( { closed = 1; nodes = ( -(851,-23,o), -(1083,201,o), +(850,-24,o), +(1082,201,o), (1141,556,cs), -(1200,908,o), +(1199,908,o), (1042,1132,o), (760,1132,cs), (541,1132,o), (452,998,o), (404,940,c), (390,940,l), -(420,1118,l), -(250,1118,l), +(442,1254,ls), +(454,1324,o), +(504,1355,o), +(617,1356,cs), +(633,1356,o), +(654,1355,o), +(672,1352,c), +(696,1496,l), +(680,1500,o), +(642,1504,o), +(597,1504,cs), +(412,1504,o), +(299,1416,o), +(272,1254,cs), (64,0,l), (228,0,l), (257,172,l), (277,172,l), (305,111,o), -(356,-23,o), +(355,-24,o), (570,-24,cs) ); }, { closed = 1; nodes = ( -(367,131,o), -(282,305,o), +(367,130,o), +(283,305,o), (325,558,cs), -(365,809,o), -(504,977,o), +(366,809,o), +(504,978,o), (714,978,cs), -(931,977,o), -(1009,794,o), +(931,978,o), +(1008,794,o), (969,558,cs), -(930,320,o), -(788,131,o), +(929,320,o), +(788,130,o), (574,130,cs) ); -}, -{ -closed = 1; -nodes = ( -(420,1118,l), -(442,1254,ls), -(454,1324,o), -(504,1355,o), -(617,1356,cs), -(633,1356,o), -(654,1355,o), -(672,1352,c), -(696,1496,l), -(680,1500,o), -(642,1504,o), -(597,1504,cs), -(412,1504,o), -(299,1416,o), -(272,1254,cs), -(250,1118,l) -); } ); width = 1248; @@ -301,9 +224,9 @@ shapes = ( { closed = 1; nodes = ( -(963,-15,o), +(963,-14,o), (1195,172,o), -(1259,558,c), +(1259,558,cs), (1326,963,o), (1139,1132,o), (918,1132,cs), @@ -311,14 +234,26 @@ nodes = ( (631,1036,o), (569,922,c), (563,922,l), -(596,1118,l), -(194,1118,l), +(599,1136,ls), +(608,1196,o), +(637,1218,o), +(715,1216,cs), +(754,1216,o), +(789,1212,o), +(828,1207,c), +(873,1480,l), +(817,1496,o), +(752,1504,o), +(679,1504,cs), +(398,1504,o), +(237,1381,o), +(197,1136,cs), (8,0,l), (406,0,l), (437,184,l), (447,184,l), (474,70,o), -(567,-15,o), +(567,-14,o), (724,-14,cs) ); }, @@ -326,39 +261,18 @@ nodes = ( closed = 1; nodes = ( (517,294,o), -(467,396,o), -(493,558,c), -(521,724,o), -(605,823,o), +(466,396,o), +(493,558,cs), +(520,724,o), +(605,824,o), (715,824,cs), -(826,823,o), -(873,724,o), +(826,824,o), +(872,724,o), (845,558,cs), -(819,393,o), +(818,393,o), (738,294,o), (627,294,cs) ); -}, -{ -closed = 1; -nodes = ( -(596,1118,l), -(599,1136,ls), -(608,1196,o), -(637,1218,o), -(715,1216,cs), -(754,1216,o), -(789,1212,o), -(828,1207,c), -(873,1480,l), -(817,1496,o), -(752,1504,o), -(679,1504,cs), -(398,1504,o), -(237,1381,o), -(197,1136,cs), -(194,1118,l) -); } ); width = 1321; @@ -457,48 +371,16 @@ shapes = ( { closed = 1; nodes = ( -(893,-23,o), +(893,-24,o), (1060,225,o), (1060,556,cs), (1060,884,o), -(891,1135,o), +(891,1134,o), (630,1134,cs), -(452,1135,o), -(309,1018,o), -(252,832,c), -(246,832,l), -(246,1118,l), -(198,1118,l), -(198,0,l), -(246,0,l), -(246,280,l), -(252,280,l), -(311,94,o), -(450,-23,o), -(630,-24,cs) -); -}, -{ -closed = 1; -nodes = ( -(392,21,o), -(243,253,o), -(244,556,cs), -(243,858,o), -(394,1088,o), -(630,1088,cs), -(865,1088,o), -(1013,858,o), -(1014,556,cs), -(1013,253,o), -(866,21,o), -(630,22,cs) -); -}, -{ -closed = 1; -nodes = ( -(244,1118,l), +(452,1134,o), +(307,1018,o), +(250,832,c), +(244,832,l), (244,1292,ls), (244,1401,o), (286,1448,o), @@ -510,10 +392,33 @@ nodes = ( (429,1493,o), (402,1494,o), (382,1494,cs), -(259,1495,o), +(259,1494,o), (198,1428,o), (198,1292,cs), -(198,1118,l) +(198,0,l), +(244,0,l), +(244,280,l), +(250,280,l), +(309,94,o), +(450,-24,o), +(630,-24,cs) +); +}, +{ +closed = 1; +nodes = ( +(392,22,o), +(244,253,o), +(244,556,cs), +(244,858,o), +(394,1088,o), +(630,1088,cs), +(865,1088,o), +(1014,858,o), +(1014,556,cs), +(1014,253,o), +(866,22,o), +(630,22,cs) ); } ); @@ -523,7 +428,7 @@ width = 1190; anchors = ( { name = bottom; -pos = (536,0); +pos = (535,0); } ); layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; @@ -531,48 +436,16 @@ shapes = ( { closed = 1; nodes = ( -(796,-23,o), +(795,-24,o), (1004,225,o), (1059,556,cs), (1113,884,o), -(985,1135,o), +(985,1134,o), (724,1134,cs), -(546,1135,o), -(384,1018,o), -(296,832,c), -(290,832,l), -(338,1118,l), -(290,1118,l), -(104,0,l), -(152,0,l), -(199,280,l), -(205,280,l), -(233,94,o), -(353,-23,o), -(532,-24,cs) -); -}, -{ -closed = 1; -nodes = ( -(302,21,o), -(191,253,o), -(243,556,cs), -(291,858,o), -(481,1088,o), -(717,1088,cs), -(952,1088,o), -(1061,858,o), -(1013,556,cs), -(961,253,o), -(776,21,o), -(540,22,cs) -); -}, -{ -closed = 1; -nodes = ( -(336,1118,l), +(546,1134,o), +(382,1018,o), +(294,832,c), +(288,832,l), (364,1292,ls), (382,1401,o), (432,1448,o), @@ -584,10 +457,33 @@ nodes = ( (583,1493,o), (556,1494,o), (536,1494,cs), -(413,1495,o), +(413,1494,o), (341,1428,o), (318,1292,cs), -(290,1118,l) +(104,0,l), +(150,0,l), +(197,280,l), +(203,280,l), +(231,94,o), +(352,-24,o), +(532,-24,cs) +); +}, +{ +closed = 1; +nodes = ( +(302,22,o), +(192,253,o), +(243,556,cs), +(292,858,o), +(481,1088,o), +(717,1088,cs), +(952,1088,o), +(1062,858,o), +(1013,556,cs), +(962,253,o), +(776,22,o), +(540,22,cs) ); } ); @@ -597,7 +493,7 @@ width = 1188; anchors = ( { name = bottom; -pos = (656,0); +pos = (628,0); } ); background = { @@ -622,8 +518,20 @@ nodes = ( (366,1018,o), (298,900,c), (296,900,l), -(296,1056,l), -(126,1056,l), +(296,1242,ls), +(296,1313,o), +(325,1342,o), +(410,1342,cs), +(443,1342,o), +(477,1342,o), +(510,1342,c), +(510,1490,l), +(477,1490,o), +(443,1490,o), +(410,1490,cs), +(225,1490,o), +(126,1404,o), +(126,1242,cs), (126,0,l), (292,0,l), (292,160,l), @@ -649,27 +557,6 @@ nodes = ( (785,137,o), (602,137,cs) ); -}, -{ -closed = 1; -nodes = ( -(296,1056,l), -(296,1242,ls), -(296,1313,o), -(325,1341,o), -(410,1342,cs), -(430,1342,o), -(489,1342,o), -(510,1342,c), -(510,1490,l), -(482,1490,o), -(455,1490,o), -(410,1490,cs), -(225,1490,o), -(126,1404,o), -(126,1242,cs), -(126,1056,l) -); } ); width = 1150; @@ -678,7 +565,7 @@ width = 1150; anchors = ( { name = bottom; -pos = (562,0); +pos = (534,0); } ); layerId = m008; @@ -696,8 +583,20 @@ nodes = ( (440,1018,o), (353,900,c), (351,900,l), -(376,1056,l), -(206,1056,l), +(407,1242,ls), +(419,1313,o), +(453,1342,o), +(538,1342,cs), +(571,1342,o), +(605,1342,o), +(638,1342,c), +(662,1490,l), +(629,1490,o), +(595,1490,o), +(562,1490,cs), +(377,1490,o), +(264,1404,o), +(237,1242,cs), (32,0,l), (198,0,l), (224,160,l), @@ -723,27 +622,6 @@ nodes = ( (713,137,o), (530,137,cs) ); -}, -{ -closed = 1; -nodes = ( -(376,1056,l), -(407,1242,ls), -(419,1313,o), -(453,1341,o), -(538,1342,cs), -(558,1342,o), -(617,1342,o), -(638,1342,c), -(662,1490,l), -(634,1490,o), -(607,1490,o), -(562,1490,cs), -(377,1490,o), -(264,1404,o), -(237,1242,cs), -(206,1056,l) -); } ); width = 1159; @@ -767,67 +645,58 @@ shapes = ( { closed = 1; nodes = ( -(1006,-14,o), -(1196,160,o), -(1196,530,cs), -(1196,916,o), -(992,1072,o), -(784,1072,cs), -(634,1072,o), -(532,986,o), -(490,876,c), -(488,876,l), -(488,1056,l), -(86,1056,l), -(86,0,l), -(484,0,l), -(484,172,l), -(488,172,l), -(532,66,o), -(634,-14,o), -(780,-14,cs) -); -}, -{ -closed = 1; -nodes = ( -(531,290,o), -(474,376,o), -(474,530,cs), -(474,683,o), -(531,768,o), -(634,768,cs), -(735,768,o), -(792,683,o), -(792,530,cs), -(792,376,o), -(735,290,o), -(634,290,cs) -); -}, -{ -closed = 1; -nodes = ( -(488,1056,l), +(1057,-24,o), +(1236,194,o), +(1236,530,cs), +(1236,853,o), +(1049,1080,o), +(784,1080,cs), +(647,1080,o), +(555,1027,o), +(493,924,c), +(488,924,l), (488,1120,ls), (488,1162,o), (512,1186,o), (554,1186,cs), -(615,1186,o), -(682,1186,o), +(605,1186,o), +(655,1186,o), (706,1186,c), (706,1490,l), -(662,1490,o), -(491,1490,o), +(604,1490,o), +(502,1490,o), (400,1490,cs), (199,1490,o), (86,1377,o), (86,1174,cs), -(86,1056,l) +(86,0,l), +(484,0,l), +(484,156,l), +(488,156,l), +(536,40,o), +(640,-24,o), +(780,-24,cs) +); +}, +{ +closed = 1; +nodes = ( +(552,290,o), +(474,384,o), +(474,530,cs), +(474,675,o), +(552,768,o), +(661,768,cs), +(770,768,o), +(832,675,o), +(832,530,cs), +(832,384,o), +(770,290,o), +(661,290,cs) ); } ); -width = 1242; +width = 1282; }, { anchors = ( @@ -923,67 +792,58 @@ shapes = ( { closed = 1; nodes = ( -(909,-14,o), -(1128,160,o), -(1189,530,cs), -(1253,916,o), -(1075,1072,o), -(867,1072,cs), -(717,1072,o), -(601,986,o), -(541,876,c), -(539,876,l), -(568,1056,l), -(166,1056,l), -(-8,0,l), -(390,0,l), -(418,172,l), -(422,172,l), -(449,66,o), -(537,-14,o), -(683,-14,cs) -); -}, -{ -closed = 1; -nodes = ( -(485,290,o), -(442,376,o), -(467,530,cs), -(493,683,o), -(564,768,o), -(667,768,cs), -(768,768,o), -(811,683,o), -(785,530,cs), -(760,376,o), -(689,290,o), -(588,290,cs) -); -}, -{ -closed = 1; -nodes = ( -(568,1056,l), +(959,-24,o), +(1174,194,o), +(1229,530,cs), +(1283,853,o), +(1133,1080,o), +(868,1080,cs), +(731,1080,o), +(631,1027,o), +(552,924,c), +(547,924,l), (579,1120,ls), (586,1162,o), (614,1186,o), (656,1186,cs), -(717,1186,o), -(784,1186,o), +(707,1186,o), +(757,1186,o), (808,1186,c), (858,1490,l), -(814,1490,o), -(643,1490,o), +(756,1490,o), +(654,1490,o), (552,1490,cs), (351,1490,o), (220,1377,o), (186,1174,cs), -(166,1056,l) +(-8,0,l), +(390,0,l), +(415,156,l), +(419,156,l), +(448,40,o), +(542,-24,o), +(682,-24,cs) +); +}, +{ +closed = 1; +nodes = ( +(506,290,o), +(443,384,o), +(467,530,cs), +(491,675,o), +(585,768,o), +(694,768,cs), +(803,768,o), +(849,675,o), +(825,530,cs), +(801,384,o), +(724,290,o), +(615,290,cs) ); } ); -width = 1240; +width = 1280; }, { associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; @@ -1057,7 +917,7 @@ width = 1326; anchors = ( { name = bottom; -pos = (566,0); +pos = (518,0); } ); layerId = m011; @@ -1065,73 +925,64 @@ shapes = ( { closed = 1; nodes = ( -(829,-23,o), -(996,225,o), -(996,556,cs), -(996,884,o), -(827,1135,o), -(566,1134,cs), -(388,1135,o), -(245,1018,o), -(188,832,c), -(182,832,l), -(182,1118,l), -(134,1118,l), -(134,0,l), -(182,0,l), -(182,280,l), -(188,280,l), -(247,94,o), -(386,-23,o), -(566,-24,cs) -); -}, -{ -closed = 1; -nodes = ( -(328,21,o), -(179,253,o), -(180,556,cs), -(179,858,o), -(330,1088,o), -(566,1088,cs), -(801,1088,o), -(949,858,o), -(950,556,cs), -(949,253,o), -(802,21,o), -(566,22,cs) +(781,-24,o), +(948,225,o), +(948,556,cs), +(948,884,o), +(779,1134,o), +(518,1134,cs), +(340,1134,o), +(195,1018,o), +(138,832,c), +(132,832,l), +(132,1292,ls), +(132,1401,o), +(171,1444,o), +(270,1444,cs), +(289,1444,o), +(316,1444,o), +(342,1444,c), +(342,1490,l), +(317,1490,o), +(290,1490,o), +(270,1490,cs), +(145,1490,o), +(86,1427,o), +(86,1292,cs), +(86,0,l), +(132,0,l), +(132,280,l), +(138,280,l), +(197,94,o), +(338,-24,o), +(518,-24,cs) ); }, { closed = 1; nodes = ( -(180,1118,l), -(180,1292,ls), -(180,1401,o), -(222,1448,o), -(318,1448,cs), -(337,1448,o), -(364,1447,o), -(390,1444,c), -(390,1490,l), -(365,1493,o), -(338,1494,o), -(318,1494,cs), -(195,1495,o), -(134,1428,o), -(134,1292,cs), -(134,1118,l) +(280,22,o), +(132,253,o), +(132,556,cs), +(132,858,o), +(282,1088,o), +(518,1088,cs), +(753,1088,o), +(902,858,o), +(902,556,cs), +(902,253,o), +(754,22,o), +(518,22,cs) ); } ); -width = 1062; +width = 1014; }, { anchors = ( { name = bottom; -pos = (472,0); +pos = (423,0); } ); layerId = m012; @@ -1139,67 +990,58 @@ shapes = ( { closed = 1; nodes = ( -(732,-23,o), -(940,225,o), -(995,556,cs), -(1049,884,o), -(921,1135,o), -(660,1134,cs), -(482,1135,o), -(320,1018,o), -(232,832,c), -(226,832,l), -(274,1118,l), -(226,1118,l), -(40,0,l), -(88,0,l), -(135,280,l), -(141,280,l), -(169,94,o), -(289,-23,o), -(468,-24,cs) -); -}, -{ -closed = 1; -nodes = ( -(238,21,o), -(127,253,o), -(179,556,cs), -(227,858,o), -(417,1088,o), -(653,1088,cs), -(888,1088,o), -(997,858,o), -(949,556,cs), -(897,253,o), -(712,21,o), -(476,22,cs) +(682,-24,o), +(891,225,o), +(946,556,cs), +(1000,884,o), +(872,1134,o), +(611,1134,cs), +(433,1134,o), +(269,1018,o), +(181,832,c), +(175,832,l), +(251,1292,ls), +(269,1401,o), +(316,1444,o), +(415,1444,cs), +(434,1444,o), +(461,1444,o), +(487,1444,c), +(494,1490,l), +(469,1490,o), +(442,1490,o), +(422,1490,cs), +(297,1490,o), +(228,1427,o), +(205,1292,cs), +(-9,0,l), +(37,0,l), +(84,280,l), +(90,280,l), +(118,94,o), +(239,-24,o), +(419,-24,cs) ); }, { closed = 1; nodes = ( -(272,1118,l), -(300,1292,ls), -(318,1401,o), -(368,1448,o), -(464,1448,cs), -(483,1448,o), -(510,1447,o), -(536,1444,c), -(543,1490,l), -(519,1493,o), -(492,1494,o), -(472,1494,cs), -(349,1495,o), -(277,1428,o), -(254,1292,cs), -(226,1118,l) +(189,22,o), +(79,253,o), +(130,556,cs), +(179,858,o), +(368,1088,o), +(604,1088,cs), +(839,1088,o), +(949,858,o), +(900,556,cs), +(849,253,o), +(663,22,o), +(427,22,cs) ); } ); -width = 1060; +width = 1011; } ); metricLeft = b; diff --git a/src/Inter.glyphspackage/glyphs/blinebelow.glyph b/src/Inter.glyphspackage/glyphs/blinebelow.glyph index 3d9bd2cae..c6d0f5256 100644 --- a/src/Inter.glyphspackage/glyphs/blinebelow.glyph +++ b/src/Inter.glyphspackage/glyphs/blinebelow.glyph @@ -140,11 +140,11 @@ shapes = ( ref = b; }, { -pos = (1221,0); +pos = (1269,0); ref = macronsubnosp; } ); -width = 1014; +width = 1062; }, { layerId = m012; diff --git a/src/Inter.glyphspackage/glyphs/c.glyph b/src/Inter.glyphspackage/glyphs/c.glyph index a6c924cbe..643f964f7 100644 --- a/src/Inter.glyphspackage/glyphs/c.glyph +++ b/src/Inter.glyphspackage/glyphs/c.glyph @@ -26,31 +26,31 @@ shapes = ( { closed = 1; nodes = ( -(803,-23,o), +(803,-24,o), (968,115,o), (1000,326,c), (952,326,l), (924,143,o), -(777,23,o), -(600,24,cs), -(351,23,o), -(177,258,o), -(178,556,cs), -(177,861,o), +(777,22,o), +(600,22,cs), +(351,22,o), +(176,258,o), +(176,556,cs), +(176,861,o), (359,1088,o), (600,1088,cs), (775,1088,o), -(919,967,o), -(948,792,c), +(924,961,o), +(952,792,c), (998,792,l), (964,995,o), -(799,1135,o), +(799,1134,o), (600,1134,cs), -(327,1135,o), -(131,883,o), +(327,1134,o), +(130,883,o), (130,556,cs), -(131,225,o), -(328,-23,o), +(130,225,o), +(328,-24,o), (600,-24,cs) ); } @@ -133,20 +133,20 @@ shapes = ( { closed = 1; nodes = ( -(858,-23,o), +(858,-24,o), (1021,128,o), (1050,326,c), (878,326,l), (847,204,o), -(745,131,o), +(745,130,o), (610,130,cs), -(407,131,o), +(407,130,o), (276,300,o), (276,558,cs), (276,812,o), -(410,977,o), +(410,978,o), (610,978,cs), -(762,977,o), +(762,978,o), (852,884,o), (878,782,c), (1050,782,l), @@ -154,10 +154,10 @@ nodes = ( (844,1132,o), (608,1132,cs), (305,1132,o), -(105,893,o), +(104,893,o), (104,552,cs), -(105,218,o), -(297,-23,o), +(104,218,o), +(297,-24,o), (610,-24,cs) ); } @@ -349,12 +349,12 @@ nodes = ( (1178,466,c), (806,466,l), (797,348,o), -(734,279,o), +(734,280,o), (646,280,cs), -(540,279,o), -(471,375,o), +(540,280,o), +(472,375,o), (472,558,cs), -(471,742,o), +(472,742,o), (540,832,o), (646,832,cs), (735,832,o), @@ -365,9 +365,9 @@ nodes = ( (969,1132,o), (640,1132,cs), (276,1132,o), -(61,899,o), +(62,899,o), (62,556,cs), -(61,212,o), +(62,212,o), (276,-20,o), (640,-20,cs) ); @@ -797,7 +797,7 @@ shapes = ( { closed = 1; nodes = ( -(907,-25,o), +(907,-24,o), (1092,162,o), (1104,442,c), (738,442,l), @@ -815,13 +815,13 @@ nodes = ( (738,618,c), (1104,618,l), (1094,893,o), -(904,1079,o), +(904,1080,o), (594,1080,cs), -(250,1079,o), +(250,1080,o), (46,851,o), (46,528,cs), (46,203,o), -(250,-25,o), +(250,-24,o), (594,-24,cs) ); } @@ -850,31 +850,31 @@ shapes = ( { closed = 1; nodes = ( -(739,-23,o), +(739,-24,o), (904,115,o), (936,326,c), (888,326,l), (860,143,o), -(713,23,o), -(536,24,cs), -(287,23,o), -(113,258,o), -(114,556,cs), -(113,861,o), +(713,22,o), +(536,22,cs), +(287,22,o), +(112,258,o), +(112,556,cs), +(112,861,o), (295,1088,o), (536,1088,cs), (711,1088,o), -(855,967,o), -(884,792,c), +(860,961,o), +(888,792,c), (934,792,l), (900,995,o), -(735,1135,o), +(735,1134,o), (536,1134,cs), -(263,1135,o), -(67,883,o), +(263,1134,o), +(66,883,o), (66,556,cs), -(67,225,o), -(264,-23,o), +(66,225,o), +(264,-24,o), (536,-24,cs) ); } diff --git a/src/Inter.glyphspackage/glyphs/d.glyph b/src/Inter.glyphspackage/glyphs/d.glyph index e57cca62d..edea91a91 100644 --- a/src/Inter.glyphspackage/glyphs/d.glyph +++ b/src/Inter.glyphspackage/glyphs/d.glyph @@ -8,19 +8,19 @@ layers = ( anchors = ( { name = bottom; -pos = (616,0); +pos = (614,0); }, { name = cross; -pos = (930,1280); +pos = (928,1280); }, { name = raccent; -pos = (1234,1490); +pos = (1232,1490); }, { name = top; -pos = (600,1490); +pos = (598,1490); } ); layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; @@ -28,46 +28,46 @@ shapes = ( { closed = 1; nodes = ( -(794,-23,o), -(867,111,o), +(793,-24,o), +(866,111,o), (904,172,c), -(926,172,l), -(926,0,l), -(1090,0,l), -(1090,1490,l), -(920,1490,l), -(920,940,l), +(924,172,l), +(924,0,l), +(1088,0,l), +(1088,1490,l), +(918,1490,l), +(918,940,l), (904,940,l), -(867,998,o), -(800,1132,o), -(582,1132,cs), -(300,1132,o), -(105,908,o), +(866,998,o), +(799,1132,o), +(580,1132,cs), +(298,1132,o), +(104,908,o), (104,556,cs), -(105,201,o), -(300,-23,o), +(104,201,o), +(298,-24,o), (578,-24,cs) ); }, { closed = 1; nodes = ( -(387,131,o), +(386,130,o), (276,320,o), (276,558,cs), (276,794,o), -(384,977,o), -(602,978,cs), -(812,977,o), -(922,809,o), -(922,558,cs), -(922,305,o), -(809,131,o), -(602,130,cs) +(383,978,o), +(600,978,cs), +(810,978,o), +(920,809,o), +(920,558,cs), +(920,305,o), +(807,130,o), +(600,130,cs) ); } ); -width = 1248; +width = 1246; }, { anchors = ( @@ -93,41 +93,41 @@ shapes = ( { closed = 1; nodes = ( -(659,-15,o), -(767,70,o), -(814,184,c), +(659,-14,o), +(766,70,o), +(812,184,c), (822,184,l), (822,0,l), (1220,0,l), (1220,1490,l), -(820,1490,l), -(820,922,l), -(814,922,l), -(770,1036,o), -(665,1132,o), -(500,1132,cs), -(278,1132,o), -(63,963,o), -(62,558,c), -(63,172,o), -(264,-15,o), +(818,1490,l), +(818,922,l), +(812,922,l), +(769,1036,o), +(664,1132,o), +(498,1132,cs), +(277,1132,o), +(62,963,o), +(62,558,cs), +(62,172,o), +(263,-14,o), (502,-14,cs) ); }, { closed = 1; nodes = ( -(540,294,o), +(539,294,o), (476,393,o), (476,558,cs), (476,724,o), -(540,823,o), +(539,824,o), (650,824,cs), -(761,823,o), +(760,824,o), (828,724,o), -(828,558,c), +(828,558,cs), (828,396,o), -(761,294,o), +(760,294,o), (650,294,cs) ); } @@ -288,8 +288,8 @@ shapes = ( { closed = 1; nodes = ( -(740,-23,o), -(879,95,o), +(740,-24,o), +(881,94,o), (940,280,c), (946,280,l), (946,0,l), @@ -298,32 +298,32 @@ nodes = ( (946,1490,l), (946,832,l), (940,832,l), -(881,1018,o), -(739,1135,o), -(562,1134,cs), -(300,1135,o), -(131,884,o), +(883,1018,o), +(738,1134,o), +(560,1134,cs), +(299,1134,o), +(130,884,o), (130,556,cs), -(131,225,o), -(297,-23,o), -(562,-24,cs) +(130,225,o), +(297,-24,o), +(560,-24,cs) ); }, { closed = 1; nodes = ( -(324,23,o), -(177,253,o), -(178,556,cs), -(177,858,o), -(326,1088,o), -(562,1088,cs), -(797,1088,o), -(945,858,o), +(324,22,o), +(176,253,o), +(176,556,cs), +(176,858,o), +(325,1088,o), +(560,1088,cs), +(796,1088,o), +(946,858,o), (946,556,cs), -(945,253,o), -(799,23,o), -(562,24,cs) +(946,253,o), +(798,22,o), +(560,22,cs) ); } ); @@ -413,59 +413,14 @@ name = top; pos = (534,1490); } ); -background = { -shapes = ( -{ -closed = 1; -nodes = ( -(673,-16,o), -(799,40,o), -(879,170,c), -(890,170,l), -(890,0,l), -(1056,0,l), -(1056,1490,l), -(886,1490,l), -(886,946,l), -(875,946,l), -(804,1071,o), -(673,1132,o), -(528,1132,cs), -(238,1132,o), -(48,900,o), -(48,556,cs), -(48,212,o), -(238,-16,o), -(528,-16,cs) -); -}, -{ -closed = 1; -nodes = ( -(359,135,o), -(220,279,o), -(220,556,cs), -(220,832,o), -(359,979,o), -(555,979,cs), -(765,979,o), -(896,811,o), -(896,556,cs), -(896,300,o), -(765,135,o), -(555,135,cs) -); -} -); -}; layerId = m007; shapes = ( { closed = 1; nodes = ( (659,-16,o), -(776,38,o), -(852,160,c), +(780,38,o), +(856,160,c), (858,160,l), (858,0,l), (1024,0,l), @@ -653,51 +608,6 @@ name = top; pos = (518,1490); } ); -background = { -shapes = ( -{ -closed = 1; -nodes = ( -(651,-15,o), -(759,70,o), -(806,184,c), -(814,184,l), -(814,0,l), -(1212,0,l), -(1212,1490,l), -(812,1490,l), -(812,922,l), -(806,922,l), -(762,1036,o), -(657,1132,o), -(492,1132,cs), -(270,1132,o), -(55,963,o), -(54,558,c), -(55,172,o), -(256,-15,o), -(494,-14,cs) -); -}, -{ -closed = 1; -nodes = ( -(532,294,o), -(468,393,o), -(468,558,cs), -(468,724,o), -(532,823,o), -(642,824,cs), -(753,823,o), -(820,724,o), -(820,558,c), -(820,396,o), -(753,294,o), -(642,294,cs) -); -} -); -}; layerId = m009; name = "Black Display"; shapes = ( @@ -881,8 +791,8 @@ shapes = ( { closed = 1; nodes = ( -(676,-23,o), -(815,95,o), +(676,-24,o), +(817,94,o), (876,280,c), (882,280,l), (882,0,l), @@ -891,32 +801,32 @@ nodes = ( (882,1490,l), (882,832,l), (876,832,l), -(817,1018,o), -(675,1135,o), -(498,1134,cs), -(236,1135,o), -(67,884,o), +(819,1018,o), +(674,1134,o), +(496,1134,cs), +(235,1134,o), +(66,884,o), (66,556,cs), -(67,225,o), -(233,-23,o), -(498,-24,cs) +(66,225,o), +(233,-24,o), +(496,-24,cs) ); }, { closed = 1; nodes = ( -(260,23,o), -(113,253,o), -(114,556,cs), -(113,858,o), -(262,1088,o), -(498,1088,cs), -(733,1088,o), -(881,858,o), +(260,22,o), +(112,253,o), +(112,556,cs), +(112,858,o), +(261,1088,o), +(496,1088,cs), +(732,1088,o), +(882,858,o), (882,556,cs), -(881,253,o), -(735,23,o), -(498,24,cs) +(882,253,o), +(734,22,o), +(496,22,cs) ); } ); diff --git a/src/Inter.glyphspackage/glyphs/dcaron.glyph b/src/Inter.glyphspackage/glyphs/dcaron.glyph index 248bfbbd0..5acff37ad 100644 --- a/src/Inter.glyphspackage/glyphs/dcaron.glyph +++ b/src/Inter.glyphspackage/glyphs/dcaron.glyph @@ -11,7 +11,7 @@ alignment = -1; ref = d; }, { -pos = (1036,0); +pos = (1034,0); ref = commaaccentright.cn; } ); diff --git a/src/Inter.glyphspackage/glyphs/dcedilla.glyph b/src/Inter.glyphspackage/glyphs/dcedilla.glyph index fc7217135..f67f5ccc9 100644 --- a/src/Inter.glyphspackage/glyphs/dcedilla.glyph +++ b/src/Inter.glyphspackage/glyphs/dcedilla.glyph @@ -10,11 +10,11 @@ shapes = ( ref = d; }, { -pos = (336,0); +pos = (334,0); ref = commaaccent; } ); -width = 1248; +width = 1246; }, { layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; diff --git a/src/Inter.glyphspackage/glyphs/dcircumflexbelow.glyph b/src/Inter.glyphspackage/glyphs/dcircumflexbelow.glyph index 9351e3fc1..682c84b8b 100644 --- a/src/Inter.glyphspackage/glyphs/dcircumflexbelow.glyph +++ b/src/Inter.glyphspackage/glyphs/dcircumflexbelow.glyph @@ -10,11 +10,11 @@ shapes = ( ref = d; }, { -pos = (1198,0); +pos = (1196,0); ref = circumflexsubnosp; } ); -width = 1248; +width = 1246; }, { layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; diff --git a/src/Inter.glyphspackage/glyphs/dcroat.glyph b/src/Inter.glyphspackage/glyphs/dcroat.glyph index 4a8f4d784..c30500ab4 100644 --- a/src/Inter.glyphspackage/glyphs/dcroat.glyph +++ b/src/Inter.glyphspackage/glyphs/dcroat.glyph @@ -9,11 +9,11 @@ shapes = ( ref = d; }, { -pos = (470,558); +pos = (468,558); ref = crossbar; } ); -width = 1248; +width = 1246; }, { layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; diff --git a/src/Inter.glyphspackage/glyphs/ddotaccent.glyph b/src/Inter.glyphspackage/glyphs/ddotaccent.glyph index 559769d26..8ed21dad1 100644 --- a/src/Inter.glyphspackage/glyphs/ddotaccent.glyph +++ b/src/Inter.glyphspackage/glyphs/ddotaccent.glyph @@ -10,11 +10,11 @@ shapes = ( ref = d; }, { -pos = (356,186); +pos = (354,186); ref = dotaccent; } ); -width = 1248; +width = 1246; }, { layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; diff --git a/src/Inter.glyphspackage/glyphs/ddotbelow.glyph b/src/Inter.glyphspackage/glyphs/ddotbelow.glyph index 63774c1ed..b2cd9ffb4 100644 --- a/src/Inter.glyphspackage/glyphs/ddotbelow.glyph +++ b/src/Inter.glyphspackage/glyphs/ddotbelow.glyph @@ -10,11 +10,11 @@ shapes = ( ref = d; }, { -pos = (1222,0); +pos = (1220,0); ref = dotbelow; } ); -width = 1248; +width = 1246; }, { layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; diff --git a/src/Inter.glyphspackage/glyphs/dlinebelow.glyph b/src/Inter.glyphspackage/glyphs/dlinebelow.glyph index 6aed62666..c447ff9c5 100644 --- a/src/Inter.glyphspackage/glyphs/dlinebelow.glyph +++ b/src/Inter.glyphspackage/glyphs/dlinebelow.glyph @@ -10,11 +10,11 @@ shapes = ( ref = d; }, { -pos = (1222,0); +pos = (1220,0); ref = macronsubnosp; } ); -width = 1248; +width = 1246; }, { layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; diff --git a/src/Inter.glyphspackage/glyphs/dong.glyph b/src/Inter.glyphspackage/glyphs/dong.glyph index d9e1a655a..f1c73f495 100644 --- a/src/Inter.glyphspackage/glyphs/dong.glyph +++ b/src/Inter.glyphspackage/glyphs/dong.glyph @@ -9,16 +9,16 @@ shapes = ( ref = d; }, { -pos = (470,558); +pos = (468,558); ref = crossbar; }, { alignment = 1; -pos = (156,-158); +pos = (154,-158); ref = underscore; } ); -width = 1248; +width = 1246; }, { layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; diff --git a/src/Inter.glyphspackage/glyphs/ercyrillic.glyph b/src/Inter.glyphspackage/glyphs/ercyrillic.glyph index e80379d77..229fc312f 100644 --- a/src/Inter.glyphspackage/glyphs/ercyrillic.glyph +++ b/src/Inter.glyphspackage/glyphs/ercyrillic.glyph @@ -10,7 +10,7 @@ shapes = ( ref = p; } ); -width = 1248; +width = 1246; }, { layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; diff --git a/src/Inter.glyphspackage/glyphs/g.glyph b/src/Inter.glyphspackage/glyphs/g.glyph index 18de99512..40bed6d92 100644 --- a/src/Inter.glyphspackage/glyphs/g.glyph +++ b/src/Inter.glyphspackage/glyphs/g.glyph @@ -36,12 +36,12 @@ nodes = ( (946,832,l), (940,832,l), (879,1018,o), -(742,1135,o), +(742,1134,o), (562,1134,cs), -(297,1135,o), -(131,887,o), +(297,1134,o), +(130,887,o), (130,556,cs), -(131,227,o), +(130,227,o), (300,0,o), (562,0,cs), (727,0,o), @@ -64,17 +64,17 @@ nodes = ( { closed = 1; nodes = ( -(326,47,o), -(177,253,o), -(178,556,cs), -(177,858,o), +(326,46,o), +(176,253,o), +(176,556,cs), +(176,858,o), (324,1088,o), (562,1088,cs), (799,1088,o), -(945,858,o), +(946,858,o), (946,556,cs), -(945,242,o), -(794,47,o), +(946,242,o), +(794,46,o), (562,46,cs) ); } @@ -268,20 +268,20 @@ nodes = ( (800,1132,o), (582,1132,cs), (300,1132,o), -(105,908,o), +(104,908,o), (104,564,cs), -(105,215,o), -(308,17,o), +(104,215,o), +(308,18,o), (578,18,cs), -(797,17,o), +(797,18,o), (867,145,o), (904,206,c), (920,206,l), (920,-20,ls), (920,-207,o), -(788,-291,o), +(788,-290,o), (608,-290,cs), -(405,-291,o), +(405,-290,o), (334,-184,o), (288,-122,c), (152,-218,l), @@ -297,9 +297,9 @@ nodes = ( (276,335,o), (276,568,cs), (276,794,o), -(384,977,o), +(384,978,o), (602,978,cs), -(812,977,o), +(812,978,o), (922,809,o), (922,568,cs), (922,320,o), @@ -329,63 +329,6 @@ name = topr; pos = (1002,1056); } ); -background = { -shapes = ( -{ -closed = 1; -nodes = ( -(805,-442,o), -(1034,-316,o), -(1034,13,cs), -(1034,1118,l), -(867,1118,l), -(867,938,l), -(853,937,l), -(812,1007,o), -(732,1135,o), -(522,1135,cs), -(238,1134,o), -(49,898,o), -(49,564,cs), -(49,226,o), -(221,-3,o), -(518,-3,cs), -(683,-3,o), -(786,69,o), -(854,189,c), -(864,190,l), -(864,13,ls), -(864,-180,o), -(742,-290,o), -(545,-290,cs), -(401,-290,o), -(290,-230,o), -(256,-110,c), -(79,-110,l), -(108,-325,o), -(296,-442,o), -(545,-442,cs) -); -}, -{ -closed = 1; -nodes = ( -(329,152,o), -(221,317,o), -(221,562,cs), -(221,806,o), -(333,979,o), -(545,979,cs), -(744,979,o), -(863,829,o), -(863,562,cs), -(863,299,o), -(744,152,o), -(541,152,cs) -); -} -); -}; layerId = m007; shapes = ( { @@ -633,12 +576,12 @@ nodes = ( (665,1132,o), (500,1132,cs), (278,1132,o), -(63,963,o), +(62,963,o), (62,558,cs), -(63,172,o), -(264,15,o), +(62,172,o), +(264,14,o), (502,14,cs), -(653,15,o), +(653,14,o), (773,79,o), (816,192,c), (828,192,l), @@ -662,9 +605,9 @@ nodes = ( (476,393,o), (476,558,cs), (476,724,o), -(540,823,o), +(540,824,o), (650,824,cs), -(761,823,o), +(761,824,o), (828,724,o), (828,558,cs), (828,396,o), @@ -1404,12 +1347,12 @@ nodes = ( (882,832,l), (876,832,l), (815,1018,o), -(678,1135,o), +(678,1134,o), (498,1134,cs), -(233,1135,o), -(67,887,o), +(233,1134,o), +(66,887,o), (66,556,cs), -(67,227,o), +(66,227,o), (236,0,o), (498,0,cs), (663,0,o), @@ -1432,17 +1375,17 @@ nodes = ( { closed = 1; nodes = ( -(262,47,o), -(113,253,o), -(114,556,cs), -(113,858,o), +(262,46,o), +(112,253,o), +(112,556,cs), +(112,858,o), (260,1088,o), (498,1088,cs), (735,1088,o), -(881,858,o), +(882,858,o), (882,556,cs), -(881,242,o), -(730,47,o), +(882,242,o), +(730,46,o), (498,46,cs) ); } diff --git a/src/Inter.glyphspackage/glyphs/hturn.glyph b/src/Inter.glyphspackage/glyphs/hturn.glyph index ce4227a4f..76e718581 100644 --- a/src/Inter.glyphspackage/glyphs/hturn.glyph +++ b/src/Inter.glyphspackage/glyphs/hturn.glyph @@ -268,7 +268,7 @@ layerId = m011; shapes = ( { angle = 180; -pos = (1036,1118); +pos = (1036,1056); ref = h; } ); diff --git a/src/Inter.glyphspackage/glyphs/mturn.glyph b/src/Inter.glyphspackage/glyphs/mturn.glyph index 00098587c..608d5cf79 100644 --- a/src/Inter.glyphspackage/glyphs/mturn.glyph +++ b/src/Inter.glyphspackage/glyphs/mturn.glyph @@ -228,7 +228,7 @@ layerId = m011; shapes = ( { angle = 180; -pos = (1582,1118); +pos = (1582,1056); ref = m; } ); diff --git a/src/Inter.glyphspackage/glyphs/o.glyph b/src/Inter.glyphspackage/glyphs/o.glyph index 643233e9c..ffe53fffc 100644 --- a/src/Inter.glyphspackage/glyphs/o.glyph +++ b/src/Inter.glyphspackage/glyphs/o.glyph @@ -24,34 +24,34 @@ shapes = ( { closed = 1; nodes = ( -(857,-23,o), +(857,-24,o), (1056,226,o), (1056,556,cs), (1056,884,o), -(856,1135,o), +(856,1134,o), (594,1134,cs), -(330,1135,o), -(131,885,o), +(330,1134,o), +(130,885,o), (130,556,cs), -(131,226,o), -(330,-23,o), +(130,226,o), +(330,-24,o), (594,-24,cs) ); }, { closed = 1; nodes = ( -(356,21,o), -(175,252,o), +(356,22,o), +(176,252,o), (176,556,cs), -(175,857,o), +(176,857,o), (358,1088,o), (594,1088,cs), (830,1088,o), -(1009,858,o), +(1010,858,o), (1010,556,cs), -(1009,252,o), -(831,21,o), +(1010,252,o), +(831,22,o), (594,22,cs) ); } @@ -139,34 +139,34 @@ shapes = ( { closed = 1; nodes = ( -(913,-23,o), -(1117,207,o), +(913,-24,o), +(1118,207,o), (1118,552,cs), -(1117,902,o), +(1118,902,o), (913,1132,o), (610,1132,cs), (308,1132,o), -(105,902,o), +(104,902,o), (104,552,cs), -(105,207,o), -(308,-23,o), +(104,207,o), +(308,-24,o), (610,-24,cs) ); }, { closed = 1; nodes = ( -(381,131,o), +(381,130,o), (276,329,o), (276,552,cs), (276,777,o), -(381,977,o), +(381,978,o), (610,978,cs), -(841,977,o), -(945,777,o), +(841,978,o), +(946,777,o), (946,552,cs), -(945,329,o), -(841,131,o), +(946,329,o), +(841,130,o), (610,130,cs) ); } @@ -188,44 +188,6 @@ name = top; pos = (564,1262); } ); -background = { -shapes = ( -{ -closed = 1; -nodes = ( -(931,-16,o), -(1149,222,o), -(1149,556,cs), -(1149,894,o), -(930,1132,o), -(622,1132,cs), -(313,1132,o), -(96,894,o), -(96,556,cs), -(96,222,o), -(313,-16,o), -(622,-16,cs) -); -}, -{ -closed = 1; -nodes = ( -(416,138,o), -(269,312,o), -(268,556,cs), -(266,802,o), -(414,978,o), -(622,978,cs), -(828,978,o), -(977,802,o), -(977,556,cs), -(977,312,o), -(827,138,o), -(622,138,cs) -); -} -); -}; guides = ( { orientation = center; @@ -260,9 +222,9 @@ nodes = ( closed = 1; nodes = ( (372,138,o), -(235,298,o), +(234,298,o), (234,526,cs), -(233,757,o), +(234,757,o), (370,920,o), (564,920,cs), (757,920,o), @@ -546,15 +508,15 @@ shapes = ( closed = 1; nodes = ( (1004,-20,o), -(1219,212,o), +(1218,212,o), (1218,556,cs), -(1219,899,o), +(1218,899,o), (1004,1132,o), (640,1132,cs), (276,1132,o), -(61,899,o), +(62,899,o), (62,556,cs), -(61,212,o), +(62,212,o), (276,-20,o), (640,-20,cs) ); @@ -563,15 +525,15 @@ nodes = ( closed = 1; nodes = ( (535,280,o), -(471,383,o), +(472,383,o), (472,558,cs), -(471,734,o), -(535,833,o), +(472,734,o), +(535,832,o), (642,832,cs), -(745,833,o), -(809,734,o), +(745,832,o), +(808,734,o), (808,558,cs), -(809,383,o), +(808,383,o), (745,280,o), (642,280,cs) ); @@ -934,34 +896,34 @@ shapes = ( { closed = 1; nodes = ( -(793,-23,o), +(793,-24,o), (992,226,o), (992,556,cs), (992,884,o), -(792,1135,o), +(792,1134,o), (530,1134,cs), -(266,1135,o), -(67,885,o), +(266,1134,o), +(66,885,o), (66,556,cs), -(67,226,o), -(266,-23,o), +(66,226,o), +(266,-24,o), (530,-24,cs) ); }, { closed = 1; nodes = ( -(292,21,o), -(111,252,o), +(292,22,o), +(112,252,o), (112,556,cs), -(111,857,o), +(112,857,o), (294,1088,o), (530,1088,cs), (766,1088,o), -(945,858,o), +(946,858,o), (946,556,cs), -(945,252,o), -(767,21,o), +(946,252,o), +(767,22,o), (530,22,cs) ); } diff --git a/src/Inter.glyphspackage/glyphs/p.glyph b/src/Inter.glyphspackage/glyphs/p.glyph index d498d6a29..17824dcdd 100644 --- a/src/Inter.glyphspackage/glyphs/p.glyph +++ b/src/Inter.glyphspackage/glyphs/p.glyph @@ -23,13 +23,7 @@ name = topr; pos = (244,1118); } ); -guides = ( -{ -angle = 90; -pos = (864,1668); -} -); -layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +background = { shapes = ( { closed = 1; @@ -73,7 +67,58 @@ nodes = ( ); } ); -width = 1188; +}; +guides = ( +{ +angle = 90; +pos = (864,1668); +} +); +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +shapes = ( +{ +closed = 1; +nodes = ( +(244,-418,l), +(244,280,l), +(250,280,l), +(309,94,o), +(450,-24,o), +(630,-24,cs), +(893,-24,o), +(1060,225,o), +(1060,556,cs), +(1060,884,o), +(891,1134,o), +(630,1134,cs), +(452,1134,o), +(307,1018,o), +(250,832,c), +(244,832,l), +(244,1118,l), +(198,1118,l), +(198,-418,l) +); +}, +{ +closed = 1; +nodes = ( +(392,22,o), +(244,253,o), +(244,556,cs), +(244,858,o), +(394,1088,o), +(630,1088,cs), +(865,1088,o), +(1014,858,o), +(1014,556,cs), +(1014,253,o), +(866,22,o), +(630,22,cs) +); +} +); +width = 1190; }, { anchors = ( @@ -166,19 +211,19 @@ closed = 1; nodes = ( (328,-418,l), (328,172,l), -(344,172,l), -(381,111,o), -(454,-23,o), -(670,-24,cs), -(948,-23,o), -(1143,201,o), -(1144,556,cs), -(1143,908,o), +(342,172,l), +(380,111,o), +(453,-24,o), +(668,-24,cs), +(948,-24,o), +(1142,201,o), +(1142,556,cs), +(1142,908,o), (948,1132,o), (666,1132,cs), -(448,1132,o), -(381,998,o), -(344,940,c), +(447,1132,o), +(380,998,o), +(342,940,c), (322,940,l), (322,1118,l), (158,1118,l), @@ -188,22 +233,22 @@ nodes = ( { closed = 1; nodes = ( -(439,131,o), +(439,130,o), (326,305,o), (326,558,cs), (326,809,o), -(436,977,o), +(436,978,o), (646,978,cs), -(864,977,o), -(972,794,o), -(972,558,cs), -(972,320,o), -(861,131,o), +(863,978,o), +(970,794,o), +(970,558,cs), +(970,320,o), +(860,130,o), (646,130,cs) ); } ); -width = 1248; +width = 1246; }, { anchors = ( @@ -308,42 +353,42 @@ shapes = ( { closed = 1; nodes = ( -(329,-418,l), -(329,168,l), -(339,167,l), -(410,42,o), -(542,-14,o), -(687,-14,cs), -(977,-14,o), -(1167,214,o), -(1167,559,cs), -(1167,902,o), -(977,1131,o), -(687,1132,cs), -(542,1132,o), -(413,1075,o), -(334,945,c), -(324,946,l), -(324,1118,l), -(158,1118,l), -(159,-418,l) +(903,-16,o), +(1086,203,o), +(1086,528,cs), +(1086,854,o), +(903,1072,o), +(628,1072,cs), +(491,1072,o), +(364,1018,o), +(296,900,c), +(292,900,l), +(292,1056,l), +(126,1056,l), +(126,-418,l), +(296,-418,l), +(296,160,l), +(299,160,l), +(375,38,o), +(491,-16,o), +(628,-16,cs) ); }, { closed = 1; nodes = ( -(318,814,o), -(450,980,o), -(660,980,cs), -(856,980,o), -(995,835,o), -(995,559,cs), -(995,282,o), -(856,140,o), -(660,140,cs), -(450,140,o), -(318,303,o), -(318,559,cs) +(406,137,o), +(282,289,o), +(282,528,cs), +(282,767,o), +(406,920,o), +(602,920,cs), +(785,920,o), +(914,787,o), +(914,528,cs), +(914,269,o), +(785,137,o), +(602,137,cs) ); } ); @@ -354,21 +399,21 @@ shapes = ( closed = 1; nodes = ( (296,-418,l), -(296,156,l), -(298,156,l), -(366,38,o), +(296,160,l), +(298,160,l), +(374,38,o), (491,-16,o), (628,-16,cs), (903,-16,o), -(1086,202,o), +(1086,203,o), (1086,528,cs), -(1086,853,o), +(1086,854,o), (903,1072,o), (628,1072,cs), (491,1072,o), -(374,1018,o), -(298,896,c), -(292,896,l), +(362,1018,o), +(294,900,c), +(292,900,l), (292,1056,l), (126,1056,l), (126,-418,l) @@ -377,7 +422,7 @@ nodes = ( { closed = 1; nodes = ( -(406,136,o), +(406,137,o), (282,289,o), (282,528,cs), (282,767,o), @@ -387,8 +432,8 @@ nodes = ( (914,787,o), (914,528,cs), (914,269,o), -(785,136,o), -(602,136,cs) +(785,137,o), +(602,137,cs) ); } ); @@ -631,15 +676,15 @@ nodes = ( (504,184,l), (510,184,l), (556,70,o), -(663,-15,o), +(663,-14,o), (820,-14,cs), -(1059,-15,o), +(1059,-14,o), (1260,172,o), -(1260,558,c), +(1260,558,cs), (1260,963,o), -(1044,1132,o), +(1045,1132,o), (824,1132,cs), -(657,1132,o), +(658,1132,o), (553,1036,o), (510,922,c), (500,922,l), @@ -651,16 +696,16 @@ nodes = ( { closed = 1; nodes = ( -(561,294,o), -(495,396,o), -(494,558,c), -(495,724,o), -(561,823,o), +(562,294,o), +(494,396,o), +(494,558,cs), +(494,724,o), +(562,824,o), (672,824,cs), -(783,823,o), -(847,724,o), +(783,824,o), +(846,724,o), (846,558,cs), -(847,393,o), +(846,393,o), (783,294,o), (672,294,cs) ); @@ -766,16 +811,6 @@ name = topr; pos = (484,1056); } ); -guides = ( -{ -angle = 90; -pos = (561,1088); -}, -{ -angle = 90; -pos = (206,-432); -} -); layerId = m009; name = "Black Display"; shapes = ( @@ -783,21 +818,21 @@ shapes = ( closed = 1; nodes = ( (488,-418,l), -(488,132,l), -(493,132,l), -(555,29,o), -(647,-24,o), -(784,-24,cs), -(1049,-24,o), -(1236,203,o), -(1236,526,cs), -(1236,862,o), -(1057,1080,o), -(780,1080,cs), -(640,1080,o), -(536,1016,o), -(488,900,c), -(484,900,l), +(488,156,l), +(492,156,l), +(540,40,o), +(640,-24,o), +(780,-24,cs), +(1057,-24,o), +(1236,194,o), +(1236,530,cs), +(1236,853,o), +(1049,1080,o), +(784,1080,cs), +(647,1080,o), +(551,1027,o), +(489,924,c), +(484,924,l), (484,1056,l), (86,1056,l), (86,-418,l) @@ -806,18 +841,18 @@ nodes = ( { closed = 1; nodes = ( -(552,288,o), -(474,381,o), -(474,526,cs), -(474,672,o), -(552,766,o), -(661,766,cs), -(770,766,o), -(832,672,o), -(832,526,cs), -(832,381,o), -(770,288,o), -(661,288,cs) +(552,290,o), +(474,384,o), +(474,530,cs), +(474,675,o), +(552,768,o), +(661,768,cs), +(770,768,o), +(832,675,o), +(832,530,cs), +(832,384,o), +(770,290,o), +(661,290,cs) ); } ); @@ -1130,17 +1165,17 @@ nodes = ( (180,-418,l), (180,280,l), (186,280,l), -(244,93,o), -(387,-23,o), -(564,-24,cs), -(826,-23,o), -(995,227,o), -(994,556,cs), -(995,886,o), -(828,1135,o), -(564,1134,cs), -(385,1135,o), -(247,1017,o), +(245,94,o), +(386,-24,o), +(566,-24,cs), +(829,-24,o), +(996,225,o), +(996,556,cs), +(996,884,o), +(827,1134,o), +(566,1134,cs), +(388,1134,o), +(243,1018,o), (186,832,c), (180,832,l), (180,1118,l), @@ -1151,22 +1186,22 @@ nodes = ( { closed = 1; nodes = ( -(329,23,o), +(328,22,o), (180,253,o), (180,556,cs), (180,858,o), -(327,1088,o), -(564,1088,cs), +(330,1088,o), +(566,1088,cs), (801,1088,o), -(948,858,o), -(948,556,cs), -(948,253,o), -(800,23,o), -(564,24,cs) +(950,858,o), +(950,556,cs), +(950,253,o), +(802,22,o), +(566,22,cs) ); } ); -width = 1060; +width = 1062; }, { anchors = ( diff --git a/src/Inter.glyphspackage/glyphs/pacute.glyph b/src/Inter.glyphspackage/glyphs/pacute.glyph index 8c0a4ccd6..f5531f819 100644 --- a/src/Inter.glyphspackage/glyphs/pacute.glyph +++ b/src/Inter.glyphspackage/glyphs/pacute.glyph @@ -14,7 +14,7 @@ pos = (172,0); ref = acute; } ); -width = 1248; +width = 1246; }, { layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; diff --git a/src/Inter.glyphspackage/glyphs/pdotaccent.glyph b/src/Inter.glyphspackage/glyphs/pdotaccent.glyph index 41c86487a..1c38e229b 100644 --- a/src/Inter.glyphspackage/glyphs/pdotaccent.glyph +++ b/src/Inter.glyphspackage/glyphs/pdotaccent.glyph @@ -14,7 +14,7 @@ pos = (414,0); ref = dotaccent; } ); -width = 1248; +width = 1246; }, { layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; diff --git a/src/Inter.glyphspackage/glyphs/phook.glyph b/src/Inter.glyphspackage/glyphs/phook.glyph index ae5df4351..e9bcdf0d9 100644 --- a/src/Inter.glyphspackage/glyphs/phook.glyph +++ b/src/Inter.glyphspackage/glyphs/phook.glyph @@ -13,7 +13,7 @@ ref = p; ref = _part.top_r_hook; } ); -width = 1248; +width = 1246; }, { layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; @@ -22,7 +22,6 @@ shapes = ( ref = p; }, { -pos = (102,0); ref = _part.top_r_hook; } ); @@ -111,7 +110,6 @@ shapes = ( ref = p; }, { -pos = (102,0); ref = _part.top_r_hook; } ); diff --git a/src/Inter.glyphspackage/glyphs/q.glyph b/src/Inter.glyphspackage/glyphs/q.glyph index 6e601f1d4..b3c97ec19 100644 --- a/src/Inter.glyphspackage/glyphs/q.glyph +++ b/src/Inter.glyphspackage/glyphs/q.glyph @@ -8,19 +8,19 @@ layers = ( anchors = ( { name = bottom; -pos = (1006,-418); +pos = (1004,-418); }, { name = cross; -pos = (1004,-162); +pos = (1002,-162); }, { name = top; -pos = (590,1304); +pos = (588,1304); }, { name = topr; -pos = (1090,1118); +pos = (1088,1118); } ); layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; @@ -28,46 +28,46 @@ shapes = ( { closed = 1; nodes = ( -(1090,-418,l), -(1090,1118,l), -(926,1118,l), -(926,940,l), +(1088,-418,l), +(1088,1118,l), +(924,1118,l), +(924,940,l), (904,940,l), -(867,998,o), -(800,1132,o), -(582,1132,cs), -(300,1132,o), -(105,908,o), +(866,998,o), +(799,1132,o), +(580,1132,cs), +(298,1132,o), +(104,908,o), (104,556,cs), -(105,201,o), -(300,-23,o), +(104,201,o), +(298,-24,o), (578,-24,cs), -(794,-23,o), -(867,111,o), +(793,-24,o), +(866,111,o), (904,172,c), -(920,172,l), -(920,-418,l) +(918,172,l), +(918,-418,l) ); }, { closed = 1; nodes = ( -(387,131,o), +(386,130,o), (276,320,o), (276,558,cs), (276,794,o), -(384,977,o), -(602,978,cs), -(812,977,o), -(922,809,o), -(922,558,cs), -(922,305,o), -(809,131,o), -(602,130,cs) +(383,978,o), +(600,978,cs), +(810,978,o), +(920,809,o), +(920,558,cs), +(920,305,o), +(807,130,o), +(600,130,cs) ); } ); -width = 1248; +width = 1246; }, { anchors = ( @@ -97,37 +97,37 @@ nodes = ( (1220,1118,l), (822,1118,l), (822,922,l), -(814,922,l), -(770,1036,o), -(665,1132,o), -(500,1132,cs), -(278,1132,o), -(63,963,o), -(62,558,c), -(63,172,o), -(264,-15,o), +(812,922,l), +(769,1036,o), +(664,1132,o), +(498,1132,cs), +(277,1132,o), +(62,963,o), +(62,558,cs), +(62,172,o), +(263,-14,o), (502,-14,cs), -(659,-15,o), -(767,70,o), -(814,184,c), -(820,184,l), -(820,-418,l) +(659,-14,o), +(766,70,o), +(812,184,c), +(818,184,l), +(818,-418,l) ); }, { closed = 1; nodes = ( -(540,294,o), +(539,294,o), (476,393,o), (476,558,cs), (476,724,o), -(540,823,o), +(539,824,o), (650,824,cs), -(761,823,o), +(760,824,o), (828,724,o), -(828,558,c), +(828,558,cs), (828,396,o), -(761,294,o), +(760,294,o), (650,294,cs) ); } @@ -293,17 +293,17 @@ nodes = ( (946,1118,l), (946,832,l), (940,832,l), -(879,1017,o), -(741,1135,o), -(562,1134,cs), -(297,1135,o), -(131,886,o), +(883,1018,o), +(738,1134,o), +(560,1134,cs), +(299,1134,o), +(130,884,o), (130,556,cs), -(131,227,o), -(300,-23,o), -(562,-24,cs), -(739,-23,o), -(881,93,o), +(130,225,o), +(297,-24,o), +(560,-24,cs), +(740,-24,o), +(881,94,o), (940,280,c), (946,280,l), (946,-418,l) @@ -312,18 +312,18 @@ nodes = ( { closed = 1; nodes = ( -(326,23,o), -(177,253,o), -(178,556,cs), -(177,858,o), -(324,1088,o), -(562,1088,cs), -(799,1088,o), -(945,858,o), +(324,22,o), +(176,253,o), +(176,556,cs), +(176,858,o), +(325,1088,o), +(560,1088,cs), +(796,1088,o), +(946,858,o), (946,556,cs), -(945,253,o), -(797,23,o), -(562,24,cs) +(946,253,o), +(798,22,o), +(560,22,cs) ); } ); @@ -413,51 +413,6 @@ name = topr; pos = (1024,1056); } ); -background = { -shapes = ( -{ -closed = 1; -nodes = ( -(1055,-418,l), -(1056,1118,l), -(890,1118,l), -(890,946,l), -(880,945,l), -(801,1075,o), -(672,1132,o), -(527,1132,cs), -(237,1131,o), -(47,902,o), -(47,559,cs), -(47,214,o), -(237,-14,o), -(527,-14,cs), -(672,-14,o), -(804,42,o), -(875,167,c), -(885,168,l), -(885,-418,l) -); -}, -{ -closed = 1; -nodes = ( -(358,140,o), -(219,282,o), -(219,559,cs), -(219,835,o), -(358,980,o), -(554,980,cs), -(764,980,o), -(896,814,o), -(896,559,cs), -(896,303,o), -(764,140,o), -(554,140,cs) -); -} -); -}; layerId = m007; shapes = ( { @@ -466,28 +421,28 @@ nodes = ( (1024,-418,l), (1024,1056,l), (858,1056,l), -(858,896,l), -(852,896,l), -(776,1018,o), +(858,900,l), +(856,900,l), +(788,1018,o), (659,1072,o), (522,1072,cs), (247,1072,o), -(64,853,o), +(64,854,o), (64,528,cs), -(64,202,o), +(64,203,o), (247,-16,o), (522,-16,cs), (659,-16,o), -(784,38,o), -(852,156,c), -(854,156,l), +(776,38,o), +(852,160,c), +(854,160,l), (854,-418,l) ); }, { closed = 1; nodes = ( -(365,136,o), +(365,137,o), (236,269,o), (236,528,cs), (236,787,o), @@ -497,8 +452,8 @@ nodes = ( (868,767,o), (868,528,cs), (868,289,o), -(744,136,o), -(548,136,cs) +(744,137,o), +(548,137,cs) ); } ); @@ -606,39 +561,39 @@ nodes = ( (1196,-418,l), (1196,1056,l), (798,1056,l), -(798,900,l), -(794,900,l), -(746,1016,o), -(642,1080,o), -(502,1080,cs), -(225,1080,o), -(46,862,o), -(46,526,cs), -(46,203,o), -(233,-24,o), -(498,-24,cs), -(635,-24,o), -(727,29,o), -(789,132,c), -(794,132,l), +(798,924,l), +(793,924,l), +(731,1027,o), +(635,1080,o), +(498,1080,cs), +(233,1080,o), +(46,853,o), +(46,530,cs), +(46,194,o), +(225,-24,o), +(502,-24,cs), +(642,-24,o), +(742,40,o), +(790,156,c), +(794,156,l), (794,-418,l) ); }, { closed = 1; nodes = ( -(512,288,o), -(450,381,o), -(450,526,cs), -(450,672,o), -(512,766,o), -(621,766,cs), -(730,766,o), -(808,672,o), -(808,526,cs), -(808,381,o), -(730,288,o), -(621,288,cs) +(512,290,o), +(450,384,o), +(450,530,cs), +(450,675,o), +(512,768,o), +(621,768,cs), +(730,768,o), +(808,675,o), +(808,530,cs), +(808,384,o), +(730,290,o), +(621,290,cs) ); } ); @@ -815,17 +770,17 @@ nodes = ( (882,1118,l), (882,832,l), (876,832,l), -(815,1017,o), -(677,1135,o), -(498,1134,cs), -(233,1135,o), -(67,886,o), +(819,1018,o), +(674,1134,o), +(496,1134,cs), +(235,1134,o), +(66,884,o), (66,556,cs), -(67,227,o), -(236,-23,o), -(498,-24,cs), -(675,-23,o), -(817,93,o), +(66,225,o), +(233,-24,o), +(496,-24,cs), +(676,-24,o), +(817,94,o), (876,280,c), (882,280,l), (882,-418,l) @@ -834,18 +789,18 @@ nodes = ( { closed = 1; nodes = ( -(262,23,o), -(113,253,o), -(114,556,cs), -(113,858,o), -(260,1088,o), -(498,1088,cs), -(735,1088,o), -(881,858,o), +(260,22,o), +(112,253,o), +(112,556,cs), +(112,858,o), +(261,1088,o), +(496,1088,cs), +(732,1088,o), +(882,858,o), (882,556,cs), -(881,253,o), -(733,23,o), -(498,24,cs) +(882,253,o), +(734,22,o), +(496,22,cs) ); } ); diff --git a/src/Inter.glyphspackage/glyphs/qhook.glyph b/src/Inter.glyphspackage/glyphs/qhook.glyph index d415dcec3..2627fcca7 100644 --- a/src/Inter.glyphspackage/glyphs/qhook.glyph +++ b/src/Inter.glyphspackage/glyphs/qhook.glyph @@ -10,11 +10,11 @@ shapes = ( ref = q; }, { -pos = (768,0); +pos = (766,0); ref = _part.top_r_hook; } ); -width = 1248; +width = 1246; }, { layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; diff --git a/src/Inter.glyphspackage/glyphs/r.glyph b/src/Inter.glyphspackage/glyphs/r.glyph index 540b67a70..fe92f7236 100644 --- a/src/Inter.glyphspackage/glyphs/r.glyph +++ b/src/Inter.glyphspackage/glyphs/r.glyph @@ -32,17 +32,17 @@ closed = 1; nodes = ( (328,0,l), (328,706,ls), -(329,858,o), -(448,969,o), +(328,858,o), +(448,968,o), (610,968,cs), -(657,969,o), +(657,968,o), (704,960,o), (716,958,c), (716,1132,l), (696,1133,o), -(651,1135,o), +(651,1134,o), (626,1134,cs), -(492,1135,o), +(492,1134,o), (375,1059,o), (334,948,c), (322,948,l), @@ -127,7 +127,7 @@ closed = 1; nodes = ( (504,0,l), (504,582,ls), -(503,710,o), +(504,710,o), (591,794,o), (710,794,cs), (751,794,o), @@ -216,10 +216,10 @@ nodes = ( (244,0,l), (244,750,ls), (244,945,o), -(387,1085,o), +(387,1086,o), (584,1086,cs), -(596,1085,o), -(596,1085,o), +(596,1086,o), +(601,1086,o), (608,1086,c), (608,1132,l), (596,1132,o), @@ -706,10 +706,10 @@ nodes = ( (180,0,l), (180,750,ls), (180,945,o), -(323,1085,o), +(323,1086,o), (520,1086,cs), -(532,1085,o), -(532,1085,o), +(532,1086,o), +(536,1086,o), (544,1086,c), (544,1132,l), (532,1132,o), diff --git a/src/Inter.glyphspackage/glyphs/rturn.glyph b/src/Inter.glyphspackage/glyphs/rturn.glyph index a6c72933d..4e41362f7 100644 --- a/src/Inter.glyphspackage/glyphs/rturn.glyph +++ b/src/Inter.glyphspackage/glyphs/rturn.glyph @@ -227,7 +227,7 @@ layerId = m011; shapes = ( { angle = 180; -pos = (538,1118); +pos = (538,1056); ref = r; } ); diff --git a/src/Inter.glyphspackage/glyphs/tsecyrillic.glyph b/src/Inter.glyphspackage/glyphs/tsecyrillic.glyph index 33020c2ab..1fa569c51 100644 --- a/src/Inter.glyphspackage/glyphs/tsecyrillic.glyph +++ b/src/Inter.glyphspackage/glyphs/tsecyrillic.glyph @@ -171,7 +171,7 @@ layerId = m011; shapes = ( { angle = 180; -pos = (1048,1118); +pos = (1048,1056); ref = pecyrillic; }, { |