From 1394fc8216969b022dbc32f44d7578f0ecfd734b Mon Sep 17 00:00:00 2001 From: Rasmus Andersson Date: Fri, 22 Mar 2024 18:01:19 -0700 Subject: improvements to /published and /registered. Closes #625 --- src/Inter-Italic.glyphspackage/fontinfo.plist | 2 +- .../glyphs/circlewhite.glyph | 306 ++++++----- .../glyphs/copyright.glyph | 323 +++++++----- .../glyphs/published.glyph | 502 ++++++------------ .../glyphs/registered.glyph | 582 +++++++++++---------- src/Inter-Roman.glyphspackage/fontinfo.plist | 2 - .../glyphs/copyright.glyph | 3 +- .../glyphs/published.glyph | 447 ++++++++-------- .../glyphs/registered.glyph | 540 +++++++++---------- .../glyphs/zedescendercyrillic.glyph | 4 +- .../glyphs/zedieresiscyrillic.glyph | 4 +- 11 files changed, 1278 insertions(+), 1437 deletions(-) diff --git a/src/Inter-Italic.glyphspackage/fontinfo.plist b/src/Inter-Italic.glyphspackage/fontinfo.plist index 62c2efd8a..509b37c8f 100644 --- a/src/Inter-Italic.glyphspackage/fontinfo.plist +++ b/src/Inter-Italic.glyphspackage/fontinfo.plist @@ -4095,7 +4095,7 @@ stemValues = ( ); userData = { GSCornerRadius = 15; -GSOffsetHorizontal = 73; +GSOffsetHorizontal = 84; GSOffsetKeepCompatible = 1; GSOffsetMakeStroke = 1; GSOffsetPosition = 1; diff --git a/src/Inter-Italic.glyphspackage/glyphs/circlewhite.glyph b/src/Inter-Italic.glyphspackage/glyphs/circlewhite.glyph index 1e53c37b4..d4796aa5a 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/circlewhite.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/circlewhite.glyph @@ -13,39 +13,39 @@ strokePos = 1; }; closed = 1; nodes = ( -(1269,-23,o), -(1664,315,o), -(1733,733,cs), -(1804,1163,o), -(1513,1513,o), -(1083,1513,cs), -(665,1513,o), -(270,1175,o), -(201,757,cs), -(130,327,o), -(421,-23,o), -(850,-23,cs) +(1315,-23,o), +(1746,404,o), +(1746,872,cs), +(1746,1236,o), +(1475,1513,o), +(1094,1513,cs), +(619,1513,o), +(188,1085,o), +(188,619,cs), +(188,255,o), +(459,-23,o), +(840,-23,cs) ); }, { closed = 1; nodes = ( -(535,151,o), -(318,411,o), -(371,733,cs), -(426,1067,o), -(742,1339,o), -(1076,1339,cs), -(1398,1339,o), -(1616,1079,o), -(1563,757,cs), -(1508,423,o), -(1191,151,o), -(858,151,cs) +(574,151,o), +(365,366,o), +(365,648,cs), +(365,1008,o), +(698,1339,o), +(1066,1339,cs), +(1360,1339,o), +(1569,1125,o), +(1569,844,cs), +(1569,481,o), +(1236,151,o), +(869,151,cs) ); } ); -width = 1872; +width = 1873; }, { layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; @@ -57,83 +57,80 @@ strokePos = "1"; }; closed = 1; nodes = ( -(1274,-23,o), -(1662,308,o), -(1730,718,cs), -(1803,1156,o), -(1507,1513,o), -(1073,1513,cs), -(659,1513,o), -(271,1182,o), -(203,772,cs), -(131,334,o), -(426,-23,o), -(861,-23,cs) +(1315,-23,o), +(1746,404,o), +(1746,872,cs), +(1746,1236,o), +(1475,1513,o), +(1094,1513,cs), +(619,1513,o), +(188,1085,o), +(188,619,cs), +(188,255,o), +(459,-23,o), +(840,-23,cs) ); }, { closed = 1; nodes = ( -(613,267,o), -(443,468,o), -(484,718,cs), -(530,996,o), -(793,1223,o), -(1067,1223,cs), -(1321,1223,o), -(1491,1022,o), -(1449,772,cs), -(1403,494,o), -(1141,267,o), -(866,267,cs) +(650,267,o), +(483,440,o), +(483,667,cs), +(483,956,o), +(749,1223,o), +(1046,1223,cs), +(1283,1223,o), +(1452,1050,o), +(1452,824,cs), +(1452,532,o), +(1183,267,o), +(888,267,cs) ); } ); -width = 1872; +width = 1873; }, { layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; name = ital_gen; shapes = ( { -attr = { -strokePos = "1"; -}; closed = 1; nodes = ( -(1265,-23,o), -(1664,319,o), -(1734,742,cs), -(1805,1167,o), -(1516,1513,o), -(1091,1513,cs), -(668,1513,o), -(269,1171,o), -(199,748,cs), -(129,323,o), -(417,-23,o), -(843,-23,cs) +(1315,-23,o), +(1746,404,o), +(1746,872,cs), +(1746,1236,o), +(1475,1513,o), +(1094,1513,cs), +(619,1513,o), +(188,1085,o), +(188,619,cs), +(188,255,o), +(459,-23,o), +(840,-23,cs) ); }, { closed = 1; nodes = ( -(447,23,o), -(178,344,o), -(244,742,cs), -(311,1142,o), -(689,1467,o), -(1089,1467,cs), -(1487,1467,o), -(1755,1146,o), -(1689,748,cs), -(1623,348,o), -(1245,23,o), -(844,23,cs) +(478,23,o), +(234,274,o), +(234,619,cs), +(234,1066,o), +(638,1467,o), +(1094,1467,cs), +(1456,1467,o), +(1700,1217,o), +(1700,872,cs), +(1700,423,o), +(1296,23,o), +(840,23,cs) ); } ); -width = 1872; +width = 1873; }, { associatedMasterId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; @@ -203,39 +200,39 @@ strokePos = "1"; }; closed = 1; nodes = ( -(1242,-23,o), -(1637,315,o), -(1706,733,cs), -(1777,1163,o), -(1486,1513,o), -(1057,1513,cs), -(638,1513,o), -(243,1175,o), -(174,757,cs), -(103,327,o), -(394,-23,o), -(823,-23,cs) +(1312,-23,o), +(1720,380,o), +(1720,872,cs), +(1720,1225,o), +(1427,1513,o), +(1068,1513,cs), +(570,1513,o), +(162,1111,o), +(162,619,cs), +(162,266,o), +(455,-23,o), +(814,-23,cs) ); }, { closed = 1; nodes = ( -(505,145,o), -(285,408,o), -(338,733,cs), -(394,1070,o), -(714,1345,o), -(1050,1345,cs), -(1376,1345,o), -(1596,1082,o), -(1542,757,cs), -(1487,420,o), -(1167,145,o), -(831,145,cs) +(562,145,o), +(333,371,o), +(333,648,cs), +(333,1031,o), +(652,1345,o), +(1041,1345,cs), +(1320,1345,o), +(1549,1120,o), +(1549,844,cs), +(1549,460,o), +(1231,145,o), +(842,145,cs) ); } ); -width = 1808; +width = 1810; }, { layerId = m010; @@ -247,39 +244,39 @@ strokePos = "1"; }; closed = 1; nodes = ( -(1264,-23,o), -(1652,308,o), -(1720,719,cs), -(1792,1156,o), -(1496,1513,o), -(1061,1513,cs), -(648,1513,o), -(260,1182,o), -(192,771,cs), -(120,334,o), -(416,-23,o), -(851,-23,cs) +(1253,-23,o), +(1655,323,o), +(1725,745,cs), +(1796,1167,o), +(1508,1513,o), +(1084,1513,cs), +(586,1513,o), +(178,1111,o), +(178,619,cs), +(178,266,o), +(471,-23,o), +(830,-23,cs) ); }, { closed = 1; nodes = ( -(602,267,o), -(432,468,o), -(474,719,cs), -(519,996,o), -(782,1223,o), -(1057,1223,cs), -(1310,1223,o), -(1480,1022,o), -(1438,771,cs), -(1392,494,o), -(1130,267,o), -(854,267,cs) +(655,267,o), +(473,447,o), +(473,667,cs), +(473,973,o), +(726,1223,o), +(1036,1223,cs), +(1299,1223,o), +(1479,1008,o), +(1435,745,cs), +(1392,482,o), +(1142,267,o), +(878,267,cs) ); } ); -width = 1840; +width = 1841; }, { associatedMasterId = m010; @@ -344,44 +341,41 @@ layerId = m012; name = ital_gen; shapes = ( { -attr = { -strokePos = "1"; -}; closed = 1; nodes = ( -(1206,-23,o), -(1605,319,o), -(1675,742,cs), -(1746,1167,o), -(1458,1513,o), -(1032,1513,cs), -(610,1513,o), -(210,1171,o), -(140,748,cs), -(70,323,o), -(358,-23,o), -(784,-23,cs) +(1257,-23,o), +(1688,404,o), +(1688,872,cs), +(1688,1236,o), +(1417,1513,o), +(1036,1513,cs), +(561,1513,o), +(130,1085,o), +(130,619,cs), +(130,255,o), +(401,-23,o), +(782,-23,cs) ); }, { closed = 1; nodes = ( -(388,23,o), -(120,344,o), -(185,742,cs), -(252,1142,o), -(630,1467,o), -(1030,1467,cs), -(1428,1467,o), -(1696,1146,o), -(1630,748,cs), -(1564,348,o), -(1186,23,o), -(785,23,cs) +(420,23,o), +(176,274,o), +(176,619,cs), +(176,1066,o), +(580,1467,o), +(1036,1467,cs), +(1398,1467,o), +(1642,1217,o), +(1642,872,cs), +(1642,423,o), +(1238,23,o), +(782,23,cs) ); } ); -width = 1744; +width = 1746; } ); metricLeft = circleblack; diff --git a/src/Inter-Italic.glyphspackage/glyphs/copyright.glyph b/src/Inter-Italic.glyphspackage/glyphs/copyright.glyph index 75947f366..04582adeb 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/copyright.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/copyright.glyph @@ -4,85 +4,128 @@ kernLeft = C; kernRight = D; layers = ( { +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(1175,313,o), +(1369,506,o), +(1368,744,cs), +(1369,983,o), +(1175,1177,o), +(936,1176,cs), +(698,1177,o), +(505,983,o), +(504,744,cs), +(505,506,o), +(698,313,o), +(936,312,cs) +); +} +); +}; layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +name = ital_gen; shapes = ( { closed = 1; nodes = ( (503,506,o), -(665,313,o), -(904,312,cs), -(1110,313,o), -(1293,458,o), -(1352,652,c), -(1176,652,l), -(1139,553,o), -(1029,481,o), -(916,482,cs), -(772,481,o), -(689,609,o), -(712,744,cs), -(736,900,o), -(890,1008,o), -(1032,1008,cs), -(1148,1008,o), -(1219,938,o), +(664,312,o), +(903,312,cs), +(1110,312,o), +(1292,458,o), +(1351,652,c), +(1175,652,l), +(1138,552,o), +(1043,482,o), +(931,482,cs), +(786,482,o), +(686,599,o), +(710,744,cs), +(734,890,o), +(873,1008,o), +(1018,1008,cs), +(1130,1008,o), +(1218,937,o), (1222,838,c), (1398,838,l), (1402,1031,o), -(1252,1177,o), +(1253,1176,o), (1046,1176,cs), -(807,1177,o), +(807,1176,o), (582,983,o), (542,744,cs) ); }, { -pos = (2,0); ref = circlewhite; } ); width = 1872; }, { +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(1154,350,o), +(1332,526,o), +(1332,744,cs), +(1333,962,o), +(1154,1140,o), +(936,1140,cs), +(718,1141,o), +(540,962,o), +(542,744,cs), +(542,526,o), +(718,348,o), +(936,350,cs) +); +} +); +}; guides = ( { -pos = (332,1240); +pos = (20,1240); }, { -pos = (18,764); +pos = (20,764); } ); layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +name = ital_gen; shapes = ( { closed = 1; nodes = ( -(540,527,o), -(688,349,o), -(906,350,cs), -(1100,349,o), -(1286,490,o), -(1336,674,c), -(1092,674,l), -(1071,618,o), -(1006,582,o), -(936,582,cs), -(839,582,o), -(793,653,o), +(539,527,o), +(688,350,o), +(907,350,cs), +(1100,350,o), +(1285,490,o), +(1335,674,c), +(1093,674,l), +(1072,620,o), +(1009,582,o), +(945,582,cs), +(855,582,o), +(794,656,o), (808,746,cs), -(825,845,o), -(905,908,o), -(1000,908,cs), -(1071,908,o), -(1113,872,o), +(823,836,o), +(909,908,o), +(999,908,cs), +(1063,908,o), +(1113,870,o), (1116,814,c), (1358,814,l), -(1370,999,o), +(1369,999,o), (1231,1140,o), (1038,1140,cs), (819,1140,o), -(612,963,o), +(611,963,o), (576,744,cs) ); }, @@ -94,34 +137,35 @@ width = 1872; }, { layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +name = ital_gen; shapes = ( { closed = 1; nodes = ( (516,506,o), -(678,313,o), -(916,312,cs), -(1088,313,o), +(686,312,o), +(925,312,cs), +(1096,312,o), (1238,413,o), -(1318,558,c), -(1266,558,l), -(1194,439,o), -(1059,359,o), -(914,360,cs), -(701,359,o), +(1317,558,c), +(1265,558,l), +(1195,439,o), +(1070,360,o), +(925,360,cs), +(712,360,o), (567,532,o), (602,744,cs), -(639,959,o), -(847,1130,o), -(1058,1130,cs), -(1204,1130,o), +(638,959,o), +(839,1130,o), +(1052,1130,cs), +(1197,1130,o), (1296,1050,o), -(1326,930,c), -(1378,930,l), +(1327,930,c), +(1379,930,l), (1348,1076,o), -(1231,1177,o), -(1058,1176,cs), -(820,1177,o), +(1223,1176,o), +(1052,1176,cs), +(813,1176,o), (595,983,o), (556,744,cs) ); @@ -160,32 +204,32 @@ shapes = ( { closed = 1; nodes = ( -(476.358,506,o), -(637.407,313,o), -(876.241,312,cs), -(1083.407,313,o), -(1265.412,458,o), -(1324.528,652,c), -(1148.528,652,l), -(1111.973,552,o), -(1016.219,481,o), -(904.385,482,cs), -(759.219,481,o), -(660.754,599,o), -(683.759,744,cs), -(708.929,890,o), -(846.463,1008,o), -(991.463,1008,cs), -(1103.463,1008,o), -(1191.71,937,o), -(1195.32,838,c), -(1371.32,838,l), -(1375.271,1031,o), -(1226.441,1177,o), -(1019.276,1176,cs), -(780.441,1177,o), -(555.325,983,o), -(515.759,744,cs) +(476,506,o), +(645,312,o), +(884,312,cs), +(1091,312,o), +(1265,458,o), +(1324,652,c), +(1148,652,l), +(1111,552,o), +(1016,482,o), +(904,482,cs), +(759,482,o), +(659,599,o), +(683,744,cs), +(707,890,o), +(846,1008,o), +(991,1008,cs), +(1103,1008,o), +(1191,937,o), +(1195,838,c), +(1371,838,l), +(1375,1031,o), +(1218,1176,o), +(1011,1176,cs), +(772,1176,o), +(555,983,o), +(515,744,cs) ); }, { @@ -218,11 +262,9 @@ nodes = ( }; guides = ( { -angle = -9.4; pos = (-76,1240); }, { -angle = -9.4; pos = (-76,764); } ); @@ -232,32 +274,32 @@ shapes = ( { closed = 1; nodes = ( -(528.834,527,o), -(677.367,349,o), -(896.532,350,cs), -(1089.367,349,o), -(1274.709,490,o), -(1324.17,674,c), -(1082.17,674,l), -(1061.231,620,o), -(998.94,582,o), -(934.94,582,cs), -(844.94,582,o), -(783.19,656,o), -(798.09,746,cs), -(812.989,836,o), -(898.909,908,o), -(988.909,908,cs), -(1052.909,908,o), -(1102.618,870,o), -(1105.347,814,c), -(1347.347,814,l), -(1358.974,999,o), -(1220.316,1140,o), -(1027.316,1140,cs), -(808.316,1140,o), -(601.014,963,o), -(565.759,744,cs) +(528,527,o), +(685,350,o), +(904,350,cs), +(1097,350,o), +(1274,490,o), +(1324,674,c), +(1082,674,l), +(1061,620,o), +(998,582,o), +(934,582,cs), +(844,582,o), +(783,656,o), +(797,746,cs), +(812,836,o), +(898,908,o), +(988,908,cs), +(1052,908,o), +(1102,870,o), +(1105,814,c), +(1347,814,l), +(1358,999,o), +(1212,1140,o), +(1019,1140,cs), +(800,1140,o), +(600,963,o), +(565,744,cs) ); }, { @@ -273,32 +315,32 @@ shapes = ( { closed = 1; nodes = ( -(457.358,506,o), -(619.407,313,o), -(858.241,312,cs), -(1029.407,313,o), -(1179.962,413,o), -(1258.966,558,c), -(1206.966,558,l), -(1136.266,439,o), -(1011.022,359,o), -(866.188,360,cs), -(653.022,359,o), -(508.662,532,o), -(543.759,744,cs), -(579.352,959,o), -(780.66,1130,o), -(993.66,1130,cs), -(1138.66,1130,o), -(1237.417,1050,o), -(1268.551,930,c), -(1320.551,930,l), -(1289.721,1076,o), -(1172.441,1177,o), -(1001.276,1176,cs), -(762.441,1177,o), -(536.325,983,o), -(497.759,744,cs) +(457,506,o), +(627,312,o), +(866,312,cs), +(1037,312,o), +(1179,413,o), +(1258,558,c), +(1206,558,l), +(1136,439,o), +(1011,360,o), +(866,360,cs), +(653,360,o), +(508,532,o), +(543,744,cs), +(579,959,o), +(780,1130,o), +(993,1130,cs), +(1138,1130,o), +(1237,1050,o), +(1268,930,c), +(1320,930,l), +(1289,1076,o), +(1164,1176,o), +(993,1176,cs), +(754,1176,o), +(536,983,o), +(497,744,cs) ); }, { @@ -308,7 +350,8 @@ ref = circlewhite; width = 1744; } ); -metricWidth = circleblack; +metricLeft = circleblack; +metricRight = circleblack; note = "Stroke R: 116\012Stroke B: 160"; unicode = 169; userData = { diff --git a/src/Inter-Italic.glyphspackage/glyphs/published.glyph b/src/Inter-Italic.glyphspackage/glyphs/published.glyph index 9086cb93e..d40fcf3fb 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/published.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/published.glyph @@ -5,416 +5,252 @@ kernRight = registered; layers = ( { layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +name = ital_gen; shapes = ( { -closed = 1; -nodes = ( -(649,666,l), -(722,1115,l), -(833,1115,ls), -(875,1115,o), -(905,1073,o), -(897,1022,cs), -(888,964,o), -(843,928,o), -(801,928,cs), -(642,928,l), -(626,835,l), -(797,835,ls), -(900,835,o), -(998,911,o), -(1017,1022,cs), -(1035,1127,o), -(966,1202,o), -(865,1202,cs), -(619,1202,l), -(529,666,l) -); -}, -{ -closed = 1; -nodes = ( -(1069,346,o), -(1330,607,o), -(1330,928,cs), -(1330,1249,o), -(1069,1510,o), -(748,1510,cs), -(426,1510,o), -(166,1249,o), -(166,928,cs), -(166,607,o), -(426,346,o), -(748,346,cs) -); +ref = circlewhite; }, { closed = 1; nodes = ( -(504,487,o), -(307,684,o), -(307,928,cs), -(307,1172,o), -(504,1369,o), -(748,1369,cs), -(991,1369,o), -(1189,1172,o), -(1189,928,cs), -(1189,685,o), -(992,487,o), -(748,487,cs) +(799,348,l), +(905,988,l), +(1042,988,ls), +(1155,988,o), +(1198,937,o), +(1185,860,cs), +(1173,783,o), +(1112,730,o), +(999,730,cs), +(808,730,l), +(786,599,l), +(1001,599,ls), +(1201,599,o), +(1329,706,o), +(1354,860,cs), +(1380,1014,o), +(1289,1123,o), +(1092,1123,cs), +(762,1123,l), +(634,348,l) ); } ); -width = 1374; +width = 1872; }, { layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +name = ital_gen; shapes = ( { -closed = 1; -nodes = ( -(650,666,l), -(720,1090,l), -(792,1090,ls), -(836,1089,o), -(870,1059,o), -(862,1008,cs), -(852,956,o), -(807,927,o), -(766,926,cs), -(622,926,l), -(604,816,l), -(772,816,ls), -(896,816,o), -(991,892,o), -(1010,1008,cs), -(1028,1124,o), -(961,1203,o), -(840,1202,cs), -(584,1202,l), -(496,666,l) -); +ref = circlewhite; }, { closed = 1; nodes = ( -(1059,346,o), -(1318,607,o), -(1318,928,cs), -(1318,1249,o), -(1057,1510,o), -(736,1510,cs), -(415,1510,o), -(154,1249,o), -(154,928,cs), -(154,607,o), -(415,346,o), -(736,346,cs) -); -}, -{ -closed = 1; -nodes = ( -(505,509,o), -(317,697,o), -(318,928,cs), -(317,1159,o), -(505,1347,o), -(736,1346,cs), -(967,1347,o), -(1155,1159,o), -(1154,928,cs), -(1155,697,o), -(969,509,o), -(736,510,cs) +(864,402,l), +(947,904,l), +(1002,904,ls), +(1074,904,o), +(1098,875,o), +(1089,820,cs), +(1079,763,o), +(1045,734,o), +(973,734,cs), +(838,734,l), +(812,577,l), +(999,577,ls), +(1163,577,o), +(1298,667,o), +(1324,820,cs), +(1349,972,o), +(1251,1073,o), +(1097,1073,cs), +(758,1073,l), +(647,402,l) ); } ); -width = 1350; +width = 1872; }, { layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +name = ital_gen; shapes = ( { -closed = 1; -nodes = ( -(596,666,l), -(678,1156,l), -(866,1156,ls), -(950,1156,o), -(976,1100,o), -(962,1028,cs), -(950,957,o), -(895,897,o), -(810,898,cs), -(614,898,l), -(606,850,l), -(810,850,ls), -(921,851,o), -(996,935,o), -(1010,1028,cs), -(1025,1123,o), -(979,1203,o), -(868,1202,cs), -(638,1202,l), -(550,666,l) -); -}, -{ -closed = 1; -nodes = ( -(1069,346,o), -(1329,607,o), -(1330,928,cs), -(1329,1249,o), -(1069,1510,o), -(748,1510,cs), -(426,1510,o), -(166,1249,o), -(166,928,cs), -(166,607,o), -(426,346,o), -(748,346,cs) -); +ref = circlewhite; }, { closed = 1; nodes = ( -(452,393,o), -(212,633,o), -(212,928,cs), -(212,1225,o), -(452,1463,o), -(748,1464,cs), -(1044,1463,o), -(1283,1225,o), -(1282,928,cs), -(1283,633,o), -(1044,393,o), -(748,392,cs) +(740,350,l), +(861,1082,l), +(1077,1082,ls), +(1208,1082,o), +(1277,1002,o), +(1259,892,cs), +(1240,782,o), +(1145,703,o), +(1014,703,cs), +(783,703,l), +(776,659,l), +(1008,659,ls), +(1166,659,o), +(1283,757,o), +(1306,892,cs), +(1328,1026,o), +(1243,1125,o), +(1085,1125,cs), +(821,1125,l), +(693,350,l) ); } ); -width = 1374; +width = 1872; }, { -background = { -shapes = ( -{ -pos = (-88,0); -ref = registered; -} -); -}; layerId = m008; name = ital_gen; shapes = ( { -closed = 1; -nodes = ( -(618,666,l), -(693,1116,l), -(805,1116,ls), -(848,1116,o), -(875,1073,o), -(867,1022,cs), -(857,967,o), -(816,928,o), -(772,928,cs), -(612,928,l), -(596,836,l), -(768,836,ls), -(870,836,o), -(968,911,o), -(985,1022,cs), -(1004,1129,o), -(934,1203,o), -(837,1202,cs), -(589,1202,l), -(500,666,l) -); +ref = circlewhite; }, { closed = 1; nodes = ( -(945,346,o), -(1248,607,o), -(1302,928,cs), -(1355,1249,o), -(1138,1510,o), -(816,1510,cs), -(495,1510,o), -(192,1249,o), -(138,928,cs), -(85,607,o), -(302,346,o), -(623,346,cs) -); -}, -{ -closed = 1; -nodes = ( -(402,486,o), -(237,684,o), -(278,928,cs), -(318,1172,o), -(549,1370,o), -(793,1370,cs), -(1038,1370,o), -(1203,1172,o), -(1162,928,cs), -(1122,684,o), -(891,486,o), -(646,486,cs) +(772,334,l), +(883,1000,l), +(1034,1000,ls), +(1127,1000,o), +(1177,952,o), +(1164,875,cs), +(1151,798,o), +(1085,750,o), +(992,750,cs), +(767,750,l), +(744,611,l), +(977,611,ls), +(1163,611,o), +(1299,713,o), +(1326,875,cs), +(1353,1037,o), +(1253,1139,o), +(1067,1139,cs), +(741,1139,l), +(607,334,l) ); } ); -width = 1310; +width = 1808; }, { -background = { -shapes = ( -{ -alignment = 1; -pos = (-88,0); -ref = registered; -} -); -}; layerId = m010; name = ital_gen; shapes = ( { -closed = 1; -nodes = ( -(638,666,l), -(708,1090,l), -(780,1090,ls), -(823,1089,o), -(856,1059,o), -(849,1008,cs), -(839,956,o), -(794,927,o), -(753,926,cs), -(609,926,l), -(591,816,l), -(759,816,ls), -(883,816,o), -(978,892,o), -(997,1008,cs), -(1016,1124,o), -(948,1203,o), -(829,1202,cs), -(573,1202,l), -(484,666,l) -); +ref = circlewhite; }, { closed = 1; nodes = ( -(951,346,o), -(1253,607,o), -(1306,928,cs), -(1360,1249,o), -(1142,1510,o), -(820,1510,cs), -(499,1510,o), -(196,1249,o), -(144,928,cs), -(89,607,o), -(306,346,o), -(627,346,cs) +(867,400,l), +(949,894,l), +(1007,894,ls), +(1056,894,o), +(1078,872,o), +(1072,831,cs), +(1065,790,o), +(1036,769,o), +(986,769,cs), +(825,769,l), +(794,577,l), +(975,577,ls), +(1157,577,o), +(1285,675,o), +(1311,831,cs), +(1336,987,o), +(1241,1085,o), +(1059,1085,cs), +(736,1085,l), +(622,400,l) ); +} +); +width = 1840; }, { +background = { +shapes = ( +{ closed = 1; nodes = ( -(424,509,o), -(267,697,o), -(306,928,cs), -(344,1159,o), -(563,1347,o), -(793,1346,cs), -(1025,1347,o), -(1182,1159,o), -(1144,928,cs), -(1105,697,o), -(888,509,o), -(654,510,cs) +(461,506,o), +(655,312,o), +(894,312,cs), +(1065,312,o), +(1199,413,o), +(1254,558,c), +(1202,558,l), +(1151,439,o), +(1039,360,o), +(894,360,cs), +(681,360,o), +(508,532,o), +(508,744,cs), +(508,959,o), +(681,1130,o), +(894,1130,cs), +(1039,1130,o), +(1151,1050,o), +(1202,930,c), +(1254,930,l), +(1199,1076,o), +(1065,1176,o), +(894,1176,cs), +(655,1176,o), +(461,983,o), +(462,744,cs) ); } ); -width = 1318; -}, -{ +}; layerId = m012; name = ital_gen; shapes = ( { -closed = 1; -nodes = ( -(532,666,l), -(613,1156,l), -(795,1156,ls), -(880,1156,o), -(913,1100,o), -(900,1028,cs), -(889,957,o), -(837,897,o), -(753,898,cs), -(549,898,l), -(541,850,l), -(747,850,ls), -(857,851,o), -(932,935,o), -(948,1028,cs), -(963,1122,o), -(915,1203,o), -(805,1202,cs), -(575,1202,l), -(486,666,l) -); -}, -{ -closed = 1; -nodes = ( -(913,346,o), -(1216,607,o), -(1270,928,cs), -(1323,1249,o), -(1106,1510,o), -(784,1510,cs), -(463,1510,o), -(160,1249,o), -(106,928,cs), -(53,607,o), -(270,346,o), -(591,346,cs) -); +ref = circlewhite; }, { closed = 1; nodes = ( -(304,393,o), -(104,633,o), -(154,928,cs), -(202,1225,o), -(481,1463,o), -(776,1464,cs), -(1073,1463,o), -(1273,1225,o), -(1224,928,cs), -(1175,633,o), -(896,393,o), -(599,392,cs) +(666,326,l), +(792,1085,l), +(1035,1085,ls), +(1162,1085,o), +(1236,1011,o), +(1217,896,cs), +(1198,781,o), +(1099,708,o), +(972,708,cs), +(707,708,l), +(700,662,l), +(964,662,ls), +(1117,662,o), +(1240,755,o), +(1263,896,cs), +(1287,1037,o), +(1195,1131,o), +(1043,1131,cs), +(753,1131,l), +(620,326,l) ); } ); -width = 1246; +width = 1744; } ); -metricWidth = registered; +metricLeft = circleblack; +metricRight = circleblack; unicode = 8471; userData = { interface.gridadjust.original = "{'width': 2199, 'leftMargin': 124, 'rightMargin': 124}"; diff --git a/src/Inter-Italic.glyphspackage/glyphs/registered.glyph b/src/Inter-Italic.glyphspackage/glyphs/registered.glyph index 45baadad0..a27556a0f 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/registered.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/registered.glyph @@ -4,148 +4,155 @@ kernLeft = registered; kernRight = registered; layers = ( { +guides = ( +{ +pos = (2802,734); +} +); layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +name = ital_gen; shapes = ( { closed = 1; nodes = ( -(623,666,l), -(697,1115,l), -(807,1115,ls), -(830,1115,o), -(880,1099,o), -(871,1033,cs), -(862,967,o), -(806,937,o), -(776,937,cs), -(616,937,l), -(600,848,l), -(797,848,ls), -(870,848,o), -(980,913,o), -(1001,1032,cs), -(1021,1145,o), -(932,1202,o), -(863,1202,cs), -(591,1202,l), -(503,666,l) +(968,346,o), +(1271,607,o), +(1325,928,cs), +(1378,1249,o), +(1161,1510,o), +(839,1510,cs), +(518,1510,o), +(214,1249,o), +(161,928,cs), +(107,607,o), +(325,346,o), +(646,346,cs) ); }, { closed = 1; nodes = ( -(743,920,l), -(830,666,l), -(962,666,l), -(871,920,l) +(427,487,o), +(261,684,o), +(302,928,cs), +(342,1172,o), +(573,1369,o), +(816,1369,cs), +(1060,1369,o), +(1224,1172,o), +(1184,928,cs), +(1143,684,o), +(914,487,o), +(670,487,cs) ); }, { closed = 1; nodes = ( -(1068,346,o), -(1330,607,o), -(1330,928,cs), -(1330,1249,o), -(1068,1510,o), -(748,1510,cs), -(425,1510,o), -(165,1249,o), -(166,928,cs), -(167,607,o), -(425,346,o), -(748,346,cs) +(954,661,l), +(863,915,l), +(733,915,l), +(822,661,l) ); }, { closed = 1; nodes = ( -(504,487,o), -(307,683,o), -(307,928,cs), -(307,1172,o), -(504,1369,o), -(748,1369,cs), -(990,1369,o), -(1188,1172,o), -(1189,928,cs), -(1190,684,o), -(990,487,o), -(748,487,cs) +(613,661,l), +(688,1110,l), +(798,1110,ls), +(827,1110,o), +(873,1091,o), +(862,1027,cs), +(851,963,o), +(799,932,o), +(766,932,cs), +(607,932,l), +(593,843,l), +(788,843,ls), +(861,843,o), +(973,908,o), +(993,1027,cs), +(1012,1142,o), +(922,1197,o), +(854,1197,cs), +(582,1197,l), +(493,661,l) ); } ); -width = 1374; +width = 1364; }, { layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +name = ital_gen; shapes = ( { closed = 1; nodes = ( -(634,666,l), -(704,1090,l), -(776,1090,ls), -(823,1089,o), -(845,1066,o), -(838,1022,cs), -(831,979,o), -(801,956,o), -(754,956,cs), -(610,956,l), -(594,846,l), -(762,846,ls), -(890,845,o), -(977,909,o), -(996,1022,cs), -(1015,1132,o), -(951,1203,o), -(824,1202,cs), -(568,1202,l), -(480,666,l) +(961,346,o), +(1263,607,o), +(1317,928,cs), +(1370,1249,o), +(1153,1510,o), +(831,1510,cs), +(510,1510,o), +(208,1249,o), +(155,928,cs), +(101,607,o), +(317,346,o), +(638,346,cs) ); }, { closed = 1; nodes = ( -(718,910,l), -(782,666,l), -(950,666,l), -(876,910,l) +(435,510,o), +(278,697,o), +(317,928,cs), +(355,1159,o), +(574,1346,o), +(804,1346,cs), +(1036,1346,o), +(1193,1159,o), +(1155,928,cs), +(1116,696,o), +(898,510,o), +(665,510,cs) ); }, { closed = 1; nodes = ( -(1059,346,o), -(1318,607,o), -(1318,928,cs), -(1318,1249,o), -(1057,1510,o), -(736,1510,cs), -(415,1510,o), -(154,1249,o), -(154,928,cs), -(154,607,o), -(415,346,o), -(736,346,cs) +(947,666,l), +(872,910,l), +(716,910,l), +(777,666,l) ); }, { closed = 1; nodes = ( -(505,509,o), -(317,697,o), -(318,928,cs), -(317,1159,o), -(505,1347,o), -(736,1346,cs), -(967,1347,o), -(1155,1159,o), -(1154,928,cs), -(1155,697,o), -(969,509,o), -(736,510,cs) +(631,666,l), +(701,1090,l), +(773,1090,ls), +(821,1090,o), +(841,1064,o), +(833,1015,cs), +(825,966,o), +(796,940,o), +(749,940,cs), +(605,940,l), +(589,846,l), +(759,846,ls), +(886,846,o), +(973,909,o), +(992,1022,cs), +(1010,1132,o), +(947.994,1202,o), +(822,1202,cs), +(566,1202,l), +(477,666,l) ); } ); @@ -153,82 +160,83 @@ width = 1350; }, { layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +name = ital_gen; shapes = ( { closed = 1; nodes = ( -(562,666,l), -(644,1156,l), -(826,1156,ls), -(910,1156,o), -(945,1114,o), -(934,1042,cs), -(923,972,o), -(872,927,o), -(788,926,cs), -(584,926,l), -(578,880,l), -(782,880,ls), -(892,880,o), -(965,950,o), -(980,1042,cs), -(996,1136,o), -(945,1203,o), -(834,1202,cs), -(606,1202,l), -(516,666,l) +(968,346,o), +(1271,607,o), +(1325,928,cs), +(1378,1249,o), +(1161,1510,o), +(839,1510,cs), +(518,1510,o), +(214,1249,o), +(161,928,cs), +(107,607,o), +(325,346,o), +(646,346,cs) ); }, { closed = 1; nodes = ( -(798,908,l), -(886,666,l), -(940,666,l), -(848,908,l) +(359,392,o), +(160,632,o), +(209,928,cs), +(258,1224,o), +(536,1464,o), +(831,1464,cs), +(1128,1464,o), +(1328,1224,o), +(1279,928,cs), +(1230,632,o), +(951,392,o), +(654,392,cs) ); }, { closed = 1; nodes = ( -(1068,346,o), -(1329,607,o), -(1330,928,cs), -(1330,1249,o), -(1068,1510,o), -(748,1510,cs), -(425,1510,o), -(165,1249,o), -(166,928,cs), -(167,607,o), -(425,346,o), -(748,346,cs) +(934,666,l), +(840,908,l), +(790,908,l), +(880,666,l) ); }, { closed = 1; nodes = ( -(451,393,o), -(212,632,o), -(212,928,cs), -(213,1224,o), -(451,1463,o), -(748,1464,cs), -(1043,1463,o), -(1282,1224,o), -(1282,928,cs), -(1284,632,o), -(1043,393,o), -(748,392,cs) +(556,666,l), +(637,1156,l), +(819,1156,ls), +(904,1156,o), +(938,1114,o), +(927,1042,cs), +(915,972,o), +(866,926,o), +(781,926,cs), +(577,926,l), +(570,880,l), +(776,880,ls), +(886,880,o), +(959,950,o), +(975,1042,cs), +(990,1136,o), +(939,1202,o), +(829,1202,cs), +(599,1202,l), +(510,666,l) ); } ); -width = 1374; +width = 1364; }, { guides = ( { -pos = (2426,734); +pos = (2506,734); } ); layerId = m008; @@ -237,73 +245,73 @@ shapes = ( { closed = 1; nodes = ( -(590,666,l), -(665,1116,l), -(777,1116,ls), -(805,1116,o), -(852,1097,o), -(841,1032,cs), -(830,967,o), -(777,935,o), -(745,936,cs), -(585,936,l), -(570,848,l), -(766,848,ls), -(837,848,o), -(950,913,o), -(971,1032,cs), -(989,1148,o), -(899,1203,o), -(833,1202,cs), -(561,1202,l), -(472,666,l) +(934,346,o), +(1240,608,o), +(1294,928,cs), +(1347,1248,o), +(1128,1510,o), +(808,1510,cs), +(488,1510,o), +(183,1248,o), +(130,928,cs), +(76,608,o), +(294,346,o), +(615,346,cs) ); }, { closed = 1; nodes = ( -(712,920,l), -(802,666,l), -(932,666,l), -(840,920,l) +(395,486,o), +(229,685,o), +(270,928,cs), +(310,1171,o), +(542,1370,o), +(785,1370,cs), +(1028,1370,o), +(1194,1171,o), +(1154,928,cs), +(1113,685,o), +(881,486,o), +(638,486,cs) ); }, { closed = 1; nodes = ( -(945,346,o), -(1248,607,o), -(1302,928,cs), -(1355,1249,o), -(1138,1510,o), -(816,1510,cs), -(495,1510,o), -(192,1249,o), -(138,928,cs), -(85,607,o), -(302,346,o), -(623,346,cs) +(917,663,l), +(828,906,l), +(685,906,l), +(771,663,l) ); }, { closed = 1; nodes = ( -(402,486,o), -(237,684,o), -(278,928,cs), -(318,1172,o), -(549,1370,o), -(793,1370,cs), -(1038,1370,o), -(1203,1172,o), -(1162,928,cs), -(1122,684,o), -(891,486,o), -(646,486,cs) +(588,663,l), +(658,1086,l), +(748,1086,ls), +(802,1086,o), +(832,1058,o), +(825,1015,cs), +(818,973,o), +(778,945,o), +(724,945,cs), +(584,945,l), +(566,836,l), +(708,836,ls), +(843,836,o), +(942,905,o), +(960,1015,cs), +(979,1128,o), +(907,1199,o), +(776,1199,cs), +(542,1199,l), +(454,663,l) ); } ); -width = 1310; +width = 1292; }, { layerId = m010; @@ -312,50 +320,16 @@ shapes = ( { closed = 1; nodes = ( -(620,666,l), -(690,1090,l), -(762,1090,ls), -(809,1089,o), -(830,1066,o), -(823,1022,cs), -(816,978,o), -(787,956,o), -(740,956,cs), -(596,956,l), -(578,846,l), -(748,846,ls), -(875,845,o), -(962,909,o), -(981,1022,cs), -(999,1132,o), -(937,1203,o), -(811,1202,cs), -(555,1202,l), -(466,666,l) -); -}, -{ -closed = 1; -nodes = ( -(705,910,l), -(766,666,l), -(936,666,l), -(861,910,l) -); -}, -{ -closed = 1; -nodes = ( (950,346,o), -(1253,607,o), +(1252,607,o), (1306,928,cs), -(1360,1249,o), +(1359,1249,o), (1142,1510,o), (820,1510,cs), (499,1510,o), -(196,1249,o), +(197,1249,o), (144,928,cs), -(89,607,o), +(90,607,o), (306,346,o), (627,346,cs) ); @@ -363,19 +337,53 @@ nodes = ( { closed = 1; nodes = ( -(424,509,o), +(424,510,o), (267,697,o), (306,928,cs), (344,1159,o), -(563,1347,o), +(563,1346,o), (793,1346,cs), -(1025,1347,o), +(1025,1346,o), (1182,1159,o), (1144,928,cs), (1105,696,o), -(887,509,o), +(887,510,o), (654,510,cs) ); +}, +{ +closed = 1; +nodes = ( +(943,662,l), +(866,906,l), +(700,906,l), +(765,662,l) +); +}, +{ +closed = 1; +nodes = ( +(625,662,l), +(690,1060,l), +(751,1060,ls), +(794,1060,o), +(819,1038,o), +(813,1005,cs), +(808,973,o), +(776,951,o), +(733,951,cs), +(607,951,l), +(586,819,l), +(716,819,ls), +(861,819,o), +(962,891,o), +(980,1005,cs), +(1000,1123,o), +(926,1198,o), +(787,1198,cs), +(542,1198,l), +(454,662,l) +); } ); width = 1318; @@ -387,73 +395,73 @@ shapes = ( { closed = 1; nodes = ( -(506,666,l), -(587,1156,l), -(769,1156,ls), -(854,1156,o), -(889,1114,o), -(877,1042,cs), -(866,972,o), -(816,927,o), -(731,926,cs), -(527,926,l), -(520,880,l), -(726,880,ls), -(836,880,o), -(908,950,o), -(925,1042,cs), -(939,1136,o), -(889,1203,o), -(779,1202,cs), -(549,1202,l), -(460,666,l) +(911,346,o), +(1216,608,o), +(1270,928,cs), +(1323,1248,o), +(1104,1510,o), +(784,1510,cs), +(464,1510,o), +(159,1248,o), +(106,928,cs), +(52,608,o), +(270,346,o), +(591,346,cs) ); }, { closed = 1; nodes = ( -(740,908,l), -(830,666,l), -(884,666,l), -(790,908,l) +(301,392,o), +(103,630,o), +(151,920,cs), +(201,1219,o), +(486,1464,o), +(784,1464,cs), +(1074,1464,o), +(1272,1226,o), +(1225,936,cs), +(1174,637,o), +(889,392,o), +(591,392,cs) ); }, { closed = 1; nodes = ( -(913,346,o), -(1216,607,o), -(1270,928,cs), -(1323,1249,o), -(1106,1510,o), -(784,1510,cs), -(463,1510,o), -(160,1249,o), -(106,928,cs), -(53,607,o), -(270,346,o), -(591,346,cs) +(876,666,l), +(782,908,l), +(732,908,l), +(823,666,l) ); }, { closed = 1; nodes = ( -(304,393,o), -(104,632,o), -(154,928,cs), -(202,1224,o), -(481,1463,o), -(776,1464,cs), -(1073,1463,o), -(1273,1224,o), -(1224,928,cs), -(1175,632,o), -(896,393,o), -(599,392,cs) +(506,666,l), +(587,1156,l), +(761,1156,ls), +(846,1156,o), +(882,1114,o), +(871,1042,cs), +(859,972,o), +(808,926,o), +(723,926,cs), +(527,926,l), +(520,880,l), +(718,880,ls), +(828,880,o), +(901,950,o), +(917,1042,cs), +(932,1136,o), +(881,1202,o), +(771,1202,cs), +(549,1202,l), +(460,666,l) ); } ); -width = 1246; +width = 1244; } ); note = "Stroke L: 32\012Stroke R: 96\012Stroke B: 112"; diff --git a/src/Inter-Roman.glyphspackage/fontinfo.plist b/src/Inter-Roman.glyphspackage/fontinfo.plist index 1678dbb24..bd12fdc6e 100644 --- a/src/Inter-Roman.glyphspackage/fontinfo.plist +++ b/src/Inter-Roman.glyphspackage/fontinfo.plist @@ -7841,7 +7841,6 @@ underscore = -93; "@MMK_R_quotedblleft" = -128; "@MMK_R_quotedblright" = -40; "@MMK_R_quoteright.ss08" = -50; -"@MMK_R_registered" = -23; "@MMK_R_v" = -40; "@MMK_R_w" = -37; "@MMK_R_x" = -46; @@ -11495,7 +11494,6 @@ underscore = -93; "@MMK_R_quotedblleft" = -128; "@MMK_R_quotedblright" = -40; "@MMK_R_quoteright.ss08" = -70; -"@MMK_R_registered" = -23; "@MMK_R_v" = -40; "@MMK_R_w" = -37; "@MMK_R_x" = -46; diff --git a/src/Inter-Roman.glyphspackage/glyphs/copyright.glyph b/src/Inter-Roman.glyphspackage/glyphs/copyright.glyph index d28ae2e77..89490f672 100644 --- a/src/Inter-Roman.glyphspackage/glyphs/copyright.glyph +++ b/src/Inter-Roman.glyphspackage/glyphs/copyright.glyph @@ -344,7 +344,8 @@ ref = circlewhite; width = 1744; } ); -metricWidth = circleblack; +metricLeft = circleblack; +metricRight = circleblack; note = "Stroke R: 116\012Stroke B: 160"; unicode = 169; userData = { diff --git a/src/Inter-Roman.glyphspackage/glyphs/published.glyph b/src/Inter-Roman.glyphspackage/glyphs/published.glyph index 499a0e385..d1f691551 100644 --- a/src/Inter-Roman.glyphspackage/glyphs/published.glyph +++ b/src/Inter-Roman.glyphspackage/glyphs/published.glyph @@ -4,152 +4,248 @@ kernLeft = registered; kernRight = registered; layers = ( { -background = { -shapes = ( -{ -ref = registered; -} -); -}; layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; shapes = ( { +ref = circlewhite; +}, +{ closed = 1; nodes = ( -(629,666,l), -(629,1115,l), -(739,1115,ls), -(782,1115,o), -(817,1072,o), -(817,1021,cs), -(817,967,o), -(781,928,o), -(737,928,cs), -(578,928,l), -(578,835,l), -(749,835,ls), -(852,835,o), -(936,910,o), -(936,1021,cs), -(936,1128,o), -(855,1202,o), -(757,1202,cs), -(509,1202,l), -(509,666,l) +(834,348,l), +(834,988,l), +(971,988,ls), +(1084,988,o), +(1136,937,o), +(1136,860,cs), +(1136,783,o), +(1084,730,o), +(971,730,cs), +(780,730,l), +(780,599,l), +(995,599,ls), +(1195,599,o), +(1305,706,o), +(1305,860,cs), +(1305,1014,o), +(1196,1123,o), +(999,1123,cs), +(669,1123,l), +(669,348,l) +); +} ); +width = 1872; +}, +{ +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +ref = circlewhite; }, { closed = 1; nodes = ( -(1008,346,o), -(1268,607,o), -(1268,928,cs), -(1268,1249,o), -(1008,1510,o), -(686,1510,cs), -(365,1510,o), -(104,1249,o), -(104,928,cs), -(104,607,o), -(365,346,o), -(686,346,cs) +(890,402,l), +(890,904,l), +(945,904,ls), +(1017,904,o), +(1046,875,o), +(1046,820,cs), +(1046,763,o), +(1016,734,o), +(944,734,cs), +(809,734,l), +(809,577,l), +(996,577,ls), +(1160,577,o), +(1281,667,o), +(1281,820,cs), +(1281,972,o), +(1166,1073,o), +(1012,1073,cs), +(673,1073,l), +(673,402,l) ); +} +); +width = 1872; +}, +{ +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +shapes = ( +{ +ref = circlewhite; }, { closed = 1; nodes = ( -(443,487,o), -(245,684,o), -(245,928,cs), -(245,1172,o), -(443,1369,o), -(686,1369,cs), -(930,1369,o), -(1127,1172,o), -(1127,928,cs), -(1127,685,o), -(931,487,o), -(686,487,cs) +(775,350,l), +(775,1082,l), +(991,1082,ls), +(1122,1082,o), +(1204,1002,o), +(1204,892,cs), +(1204,782,o), +(1122,703,o), +(991,703,cs), +(760,703,l), +(760,659,l), +(992,659,ls), +(1150,659,o), +(1251,757,o), +(1251,892,cs), +(1251,1026,o), +(1150,1125,o), +(992,1125,cs), +(728,1125,l), +(728,350,l) ); } ); -width = 1374; +width = 1872; }, { -background = { +layerId = m007; shapes = ( { -alignment = 1; -ref = registered; +ref = circlewhite; +}, +{ +closed = 1; +nodes = ( +(805,334,l), +(805,1000,l), +(956,1000,ls), +(1049,1000,o), +(1107,952,o), +(1107,875,cs), +(1107,798,o), +(1049,750,o), +(956,750,cs), +(731,750,l), +(731,611,l), +(964,611,ls), +(1150,611,o), +(1269,713,o), +(1269,875,cs), +(1269,1037,o), +(1152,1139,o), +(966,1139,cs), +(640,1139,l), +(640,334,l) +); } ); -}; -layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +width = 1808; +}, +{ +layerId = m009; shapes = ( { +ref = circlewhite; +}, +{ closed = 1; nodes = ( -(632,666,l), -(632,1090,l), -(704,1090,ls), -(747,1090,o), -(786,1059,o), -(786,1008,cs), -(786,956,o), -(745,927,o), -(704,926,cs), -(560,926,l), -(560,816,l), -(728,816,ls), -(852,816,o), -(934,892,o), -(934,1008,cs), -(934,1124,o), -(853,1203,o), -(734,1202,cs), -(478,1202,l), -(478,666,l) +(889,400,l), +(889,894,l), +(947,894,ls), +(996,894,o), +(1022,872,o), +(1022,831,cs), +(1022,790,o), +(996,769,o), +(947,769,cs), +(786,769,l), +(786,577,l), +(967,577,ls), +(1149,577,o), +(1261,675,o), +(1261,831,cs), +(1261,987,o), +(1149,1085,o), +(967,1085,cs), +(644,1085,l), +(644,400,l) ); +} +); +width = 1840; }, { +background = { +shapes = ( +{ closed = 1; nodes = ( -(998,346,o), -(1256,607,o), -(1256,928,cs), -(1256,1249,o), -(996,1510,o), -(674,1510,cs), -(353,1510,o), -(94,1249,o), -(94,928,cs), -(94,607,o), -(353,346,o), -(674,346,cs) +(461,506,o), +(655,312,o), +(894,312,cs), +(1065,312,o), +(1199,413,o), +(1254,558,c), +(1202,558,l), +(1151,439,o), +(1039,360,o), +(894,360,cs), +(681,360,o), +(508,532,o), +(508,744,cs), +(508,959,o), +(681,1130,o), +(894,1130,cs), +(1039,1130,o), +(1151,1050,o), +(1202,930,c), +(1254,930,l), +(1199,1076,o), +(1065,1176,o), +(894,1176,cs), +(655,1176,o), +(461,983,o), +(462,744,cs) +); +} ); +}; +layerId = m011; +shapes = ( +{ +ref = circlewhite; }, { closed = 1; nodes = ( -(444,509,o), -(256,697,o), -(256,928,cs), -(256,1159,o), -(444,1346,o), -(674,1346,cs), -(906,1346,o), -(1094,1159,o), -(1094,928,cs), -(1094,697,o), -(908,509,o), -(674,510,cs) +(700,326,l), +(700,1085,l), +(943,1085,ls), +(1070,1085,o), +(1157,1011,o), +(1157,896,cs), +(1157,781,o), +(1070,708,o), +(943,708,cs), +(678,708,l), +(678,662,l), +(942,662,ls), +(1095,662,o), +(1203,755,o), +(1203,896,cs), +(1203,1037,o), +(1096,1131,o), +(944,1131,cs), +(654,1131,l), +(654,326,l) ); } ); -width = 1350; +width = 1744; }, { -layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +layerId = "8C1010B4-77A2-484D-9131-C541CED75214"; +name = "Mar 22, 24, 13:10"; shapes = ( { closed = 1; @@ -214,6 +310,7 @@ nodes = ( width = 1374; }, { +associatedMasterId = m007; background = { shapes = ( { @@ -221,7 +318,8 @@ ref = registered; } ); }; -layerId = m007; +layerId = "A25BBBF4-45C9-46C7-A1FB-AB6BA98F1AE7"; +name = "Mar 22, 24, 13:10"; shapes = ( { closed = 1; @@ -284,147 +382,10 @@ nodes = ( } ); width = 1310; -}, -{ -background = { -shapes = ( -{ -alignment = 1; -ref = registered; -} -); -}; -layerId = m009; -shapes = ( -{ -closed = 1; -nodes = ( -(616,666,l), -(616,1090,l), -(688,1090,ls), -(731,1090,o), -(770,1059,o), -(770,1008,cs), -(770,956,o), -(729,927,o), -(688,926,cs), -(544,926,l), -(544,816,l), -(712,816,ls), -(836,816,o), -(918,892,o), -(918,1008,cs), -(918,1124,o), -(837,1203,o), -(718,1202,cs), -(462,1202,l), -(462,666,l) -); -}, -{ -closed = 1; -nodes = ( -(982,346,o), -(1240,607,o), -(1240,928,cs), -(1240,1249,o), -(980,1510,o), -(658,1510,cs), -(337,1510,o), -(78,1249,o), -(78,928,cs), -(78,607,o), -(337,346,o), -(658,346,cs) -); -}, -{ -closed = 1; -nodes = ( -(428,509,o), -(240,697,o), -(240,928,cs), -(240,1159,o), -(428,1346,o), -(658,1346,cs), -(890,1346,o), -(1078,1159,o), -(1078,928,cs), -(1078,697,o), -(892,509,o), -(658,510,cs) -); -} -); -width = 1318; -}, -{ -layerId = m011; -shapes = ( -{ -closed = 1; -nodes = ( -(510,666,l), -(510,1156,l), -(692,1156,ls), -(777,1156,o), -(818,1100,o), -(818,1028,cs), -(818,957,o), -(777,897,o), -(692,898,cs), -(488,898,l), -(488,850,l), -(694,850,ls), -(804,850,o), -(866,935,o), -(866,1028,cs), -(866,1122,o), -(804,1203,o), -(694,1202,cs), -(464,1202,l), -(464,666,l) -); -}, -{ -closed = 1; -nodes = ( -(944,346,o), -(1204,607,o), -(1204,928,cs), -(1204,1249,o), -(944,1510,o), -(622,1510,cs), -(301,1510,o), -(40,1249,o), -(40,928,cs), -(40,607,o), -(301,346,o), -(622,346,cs) -); -}, -{ -closed = 1; -nodes = ( -(327,393,o), -(88,633,o), -(88,928,cs), -(88,1225,o), -(327,1464,o), -(622,1464,cs), -(919,1464,o), -(1158,1225,o), -(1158,928,cs), -(1158,633,o), -(919,393,o), -(622,392,cs) -); -} -); -width = 1246; } ); -metricWidth = registered; +metricLeft = circleblack; +metricRight = circleblack; unicode = 8471; userData = { interface.gridadjust.original = "{'width': 2199, 'leftMargin': 124, 'rightMargin': 124}"; diff --git a/src/Inter-Roman.glyphspackage/glyphs/registered.glyph b/src/Inter-Roman.glyphspackage/glyphs/registered.glyph index 5d96a3d74..520bfd5bb 100644 --- a/src/Inter-Roman.glyphspackage/glyphs/registered.glyph +++ b/src/Inter-Roman.glyphspackage/glyphs/registered.glyph @@ -6,7 +6,7 @@ layers = ( { guides = ( { -pos = (2806,734); +pos = (2802,734); } ); layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; @@ -14,73 +14,73 @@ shapes = ( { closed = 1; nodes = ( -(601,666,l), -(601,1115,l), -(711,1115,ls), -(740,1115,o), -(789,1096,o), -(789,1032,cs), -(789,968,o), -(742,937,o), -(709,937,cs), -(550,937,l), -(550,848,l), -(745,848,ls), -(818,848,o), -(920,913,o), -(920,1032,cs), -(920,1147,o), -(821,1202,o), -(753,1202,cs), -(481,1202,l), -(481,666,l) +(1004,346,o), +(1264,607,o), +(1264,928,cs), +(1264,1249,o), +(1004,1510,o), +(682,1510,cs), +(361,1510,o), +(100,1249,o), +(100,928,cs), +(100,607,o), +(361,346,o), +(682,346,cs) ); }, { closed = 1; nodes = ( -(679,920,l), -(810,666,l), -(942,666,l), -(809,920,l) +(439,487,o), +(241,684,o), +(241,928,cs), +(241,1172,o), +(439,1369,o), +(682,1369,cs), +(926,1369,o), +(1123,1172,o), +(1123,928,cs), +(1123,684,o), +(926,487,o), +(682,487,cs) ); }, { closed = 1; nodes = ( -(1008,346,o), -(1268,607,o), -(1268,928,cs), -(1268,1249,o), -(1008,1510,o), -(686,1510,cs), -(365,1510,o), -(104,1249,o), -(104,928,cs), -(104,607,o), -(365,346,o), -(686,346,cs) +(938,661,l), +(805,915,l), +(675,915,l), +(806,661,l) ); }, { closed = 1; nodes = ( -(443,487,o), -(245,684,o), -(245,928,cs), -(245,1172,o), -(443,1369,o), -(686,1369,cs), -(930,1369,o), -(1127,1172,o), -(1127,928,cs), -(1127,684,o), -(930,487,o), -(686,487,cs) +(597,661,l), +(597,1110,l), +(707,1110,ls), +(736,1110,o), +(785,1091,o), +(785,1027,cs), +(785,963,o), +(738,932,o), +(705,932,cs), +(546,932,l), +(546,843,l), +(741,843,ls), +(814,843,o), +(916,908,o), +(916,1027,cs), +(916,1142,o), +(817,1197,o), +(749,1197,cs), +(477,1197,l), +(477,661,l) ); } ); -width = 1374; +width = 1364; }, { layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; @@ -88,40 +88,6 @@ shapes = ( { closed = 1; nodes = ( -(614,666,l), -(614,1090,l), -(686,1090,ls), -(733,1090,o), -(758,1066,o), -(758,1022,cs), -(758,978,o), -(733,956,o), -(686,956,cs), -(542,956,l), -(542,846,l), -(712,846,ls), -(839,846,o), -(916,909,o), -(916,1022,cs), -(916,1132,o), -(842,1203,o), -(716,1202,cs), -(460,1202,l), -(460,666,l) -); -}, -{ -closed = 1; -nodes = ( -(658,910,l), -(760,666,l), -(930,666,l), -(814,910,l) -); -}, -{ -closed = 1; -nodes = ( (997,346,o), (1256,607,o), (1256,928,cs), @@ -139,7 +105,7 @@ nodes = ( { closed = 1; nodes = ( -(444,509,o), +(444,510,o), (256,697,o), (256,928,cs), (256,1159,o), @@ -149,9 +115,43 @@ nodes = ( (1094,1159,o), (1094,928,cs), (1094,696,o), -(907,509,o), +(907,510,o), (674,510,cs) ); +}, +{ +closed = 1; +nodes = ( +(930,666,l), +(814,910,l), +(658,910,l), +(760,666,l) +); +}, +{ +closed = 1; +nodes = ( +(614,666,l), +(614,1090,l), +(686,1090,ls), +(733,1090,o), +(758,1064,o), +(758,1015,cs), +(758,966,o), +(733,940,o), +(686,940,cs), +(542,940,l), +(542,846,l), +(712,846,ls), +(839,846,o), +(916,909,o), +(916,1022,cs), +(916,1132,o), +(842,1202,o), +(716,1202,cs), +(460,1202,l), +(460,666,l) +); } ); width = 1350; @@ -162,73 +162,73 @@ shapes = ( { closed = 1; nodes = ( -(548,666,l), -(548,1156,l), -(730,1156,ls), -(815,1156,o), -(856,1114,o), -(856,1042,cs), -(856,972,o), -(815,927,o), -(730,926,cs), -(526,926,l), -(526,880,l), -(732,880,ls), -(842,880,o), -(904,950,o), -(904,1042,cs), -(904,1136,o), -(842,1203,o), -(732,1202,cs), -(502,1202,l), -(502,666,l) +(1004,346,o), +(1264,607,o), +(1264,928,cs), +(1264,1249,o), +(1004,1510,o), +(682,1510,cs), +(361,1510,o), +(100,1249,o), +(100,928,cs), +(100,607,o), +(361,346,o), +(682,346,cs) ); }, { closed = 1; nodes = ( -(742,908,l), -(872,666,l), -(926,666,l), -(792,908,l) +(387,392,o), +(148,632,o), +(148,928,cs), +(148,1224,o), +(387,1464,o), +(682,1464,cs), +(979,1464,o), +(1218,1224,o), +(1218,928,cs), +(1218,632,o), +(979,392,o), +(682,392,cs) ); }, { closed = 1; nodes = ( -(1008,346,o), -(1268,607,o), -(1268,928,cs), -(1268,1249,o), -(1008,1510,o), -(686,1510,cs), -(365,1510,o), -(104,1249,o), -(104,928,cs), -(104,607,o), -(365,346,o), -(686,346,cs) +(917,666,l), +(783,908,l), +(733,908,l), +(863,666,l) ); }, { closed = 1; nodes = ( -(391,393,o), -(152,632,o), -(152,928,cs), -(152,1224,o), -(391,1464,o), -(686,1464,cs), -(983,1464,o), -(1222,1224,o), -(1222,928,cs), -(1222,632,o), -(983,393,o), -(686,392,cs) +(539,666,l), +(539,1156,l), +(721,1156,ls), +(806,1156,o), +(847,1114,o), +(847,1042,cs), +(847,972,o), +(806,926,o), +(721,926,cs), +(517,926,l), +(517,880,l), +(723,880,ls), +(833,880,o), +(895,950,o), +(895,1042,cs), +(895,1136,o), +(833,1202,o), +(723,1202,cs), +(493,1202,l), +(493,666,l) ); } ); -width = 1374; +width = 1364; }, { associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; @@ -329,7 +329,7 @@ width = 1664; { guides = ( { -pos = (2514,734); +pos = (2506,734); } ); layerId = m007; @@ -337,73 +337,73 @@ shapes = ( { closed = 1; nodes = ( -(568,666,l), -(568,1116,l), -(680,1116,ls), -(708,1116,o), -(758,1097,o), -(758,1032,cs), -(758,967,o), -(710,935,o), -(678,936,cs), -(518,936,l), -(518,848,l), -(714,848,ls), -(785,848,o), -(888,913,o), -(888,1032,cs), -(888,1148,o), -(788,1203,o), -(722,1202,cs), -(450,1202,l), -(450,666,l) +(968,346,o), +(1228,607,o), +(1228,928,cs), +(1228,1249,o), +(968,1510,o), +(646,1510,cs), +(325,1510,o), +(64,1249,o), +(64,928,cs), +(64,607,o), +(325,346,o), +(646,346,cs) ); }, { closed = 1; nodes = ( -(648,920,l), -(780,666,l), -(910,666,l), -(776,920,l) +(402,486,o), +(204,684,o), +(204,928,cs), +(204,1172,o), +(402,1370,o), +(646,1370,cs), +(891,1370,o), +(1088,1172,o), +(1088,928,cs), +(1088,684,o), +(891,486,o), +(646,486,cs) ); }, { closed = 1; nodes = ( -(976,346,o), -(1236,607,o), -(1236,928,cs), -(1236,1249,o), -(976,1510,o), -(654,1510,cs), -(333,1510,o), -(72,1249,o), -(72,928,cs), -(72,607,o), -(333,346,o), -(654,346,cs) +(895,663,l), +(766,906,l), +(623,906,l), +(749,663,l) ); }, { closed = 1; nodes = ( -(410,486,o), -(212,684,o), -(212,928,cs), -(212,1172,o), -(410,1370,o), -(654,1370,cs), -(899,1370,o), -(1096,1172,o), -(1096,928,cs), -(1096,684,o), -(899,486,o), -(654,486,cs) +(566,663,l), +(566,1086,l), +(656,1086,ls), +(710,1086,o), +(745,1058,o), +(745,1015,cs), +(745,973,o), +(710,945,o), +(656,945,cs), +(516,945,l), +(516,836,l), +(658,836,ls), +(793,836,o), +(880,905,o), +(880,1015,cs), +(880,1128,o), +(797,1199,o), +(666,1199,cs), +(432,1199,l), +(432,663,l) ); } ); -width = 1310; +width = 1292; }, { associatedMasterId = m007; @@ -507,40 +507,6 @@ shapes = ( { closed = 1; nodes = ( -(598,666,l), -(598,1090,l), -(670,1090,ls), -(717,1090,o), -(742,1066,o), -(742,1022,cs), -(742,978,o), -(717,956,o), -(670,956,cs), -(526,956,l), -(526,846,l), -(696,846,ls), -(823,846,o), -(900,909,o), -(900,1022,cs), -(900,1132,o), -(826,1203,o), -(700,1202,cs), -(444,1202,l), -(444,666,l) -); -}, -{ -closed = 1; -nodes = ( -(642,910,l), -(744,666,l), -(914,666,l), -(798,910,l) -); -}, -{ -closed = 1; -nodes = ( (981,346,o), (1240,607,o), (1240,928,cs), @@ -558,7 +524,7 @@ nodes = ( { closed = 1; nodes = ( -(428,509,o), +(428,510,o), (240,697,o), (240,928,cs), (240,1159,o), @@ -568,9 +534,43 @@ nodes = ( (1078,1159,o), (1078,928,cs), (1078,696,o), -(891,509,o), +(891,510,o), (658,510,cs) ); +}, +{ +closed = 1; +nodes = ( +(921,662,l), +(804,906,l), +(638,906,l), +(743,662,l) +); +}, +{ +closed = 1; +nodes = ( +(603,662,l), +(603,1060,l), +(664,1060,ls), +(707,1060,o), +(735,1038,o), +(735,1005,cs), +(735,973,o), +(707,951,o), +(664,951,cs), +(538,951,l), +(538,819,l), +(668,819,ls), +(813,819,o), +(902,891,o), +(902,1005,cs), +(902,1123,o), +(816,1198,o), +(677,1198,cs), +(432,1198,l), +(432,662,l) +); } ); width = 1318; @@ -581,73 +581,73 @@ shapes = ( { closed = 1; nodes = ( -(484,666,l), -(484,1156,l), -(666,1156,ls), -(751,1156,o), -(792,1114,o), -(792,1042,cs), -(792,972,o), -(751,927,o), -(666,926,cs), -(462,926,l), -(462,880,l), -(668,880,ls), -(778,880,o), -(840,950,o), -(840,1042,cs), -(840,1136,o), -(778,1203,o), -(668,1202,cs), -(438,1202,l), -(438,666,l) +(968,346,o), +(1228,607,o), +(1228,928,cs), +(1228,1249,o), +(968,1510,o), +(646,1510,cs), +(325,1510,o), +(64,1249,o), +(64,928,cs), +(64,607,o), +(325,346,o), +(646,346,cs) ); }, { closed = 1; nodes = ( -(678,908,l), -(808,666,l), -(862,666,l), -(728,908,l) +(351,392,o), +(112,632,o), +(112,928,cs), +(112,1224,o), +(351,1464,o), +(646,1464,cs), +(943,1464,o), +(1182,1224,o), +(1182,928,cs), +(1182,632,o), +(943,392,o), +(646,392,cs) ); }, { closed = 1; nodes = ( -(944,346,o), -(1204,607,o), -(1204,928,cs), -(1204,1249,o), -(944,1510,o), -(622,1510,cs), -(301,1510,o), -(40,1249,o), -(40,928,cs), -(40,607,o), -(301,346,o), -(622,346,cs) +(878,666,l), +(744,908,l), +(694,908,l), +(825,666,l) ); }, { closed = 1; nodes = ( -(327,393,o), -(88,632,o), -(88,928,cs), -(88,1224,o), -(327,1464,o), -(622,1464,cs), -(919,1464,o), -(1158,1224,o), -(1158,928,cs), -(1158,632,o), -(919,393,o), -(622,392,cs) +(508,666,l), +(508,1156,l), +(682,1156,ls), +(767,1156,o), +(810,1114,o), +(810,1042,cs), +(810,972,o), +(767,926,o), +(682,926,cs), +(486,926,l), +(486,880,l), +(684,880,ls), +(794,880,o), +(856,950,o), +(856,1042,cs), +(856,1136,o), +(794,1202,o), +(684,1202,cs), +(462,1202,l), +(462,666,l) ); } ); -width = 1246; +width = 1292; } ); note = "Stroke L: 32\012Stroke R: 96\012Stroke B: 112"; diff --git a/src/Inter-Roman.glyphspackage/glyphs/zedescendercyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/zedescendercyrillic.glyph index d52c21f20..85be4cece 100644 --- a/src/Inter-Roman.glyphspackage/glyphs/zedescendercyrillic.glyph +++ b/src/Inter-Roman.glyphspackage/glyphs/zedescendercyrillic.glyph @@ -60,11 +60,11 @@ shapes = ( ref = zecyrillic; }, { -pos = (108,0); +pos = (98,0); ref = cedillacomb; } ); -width = 1073; +width = 1063; }, { layerId = m011; diff --git a/src/Inter-Roman.glyphspackage/glyphs/zedieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/zedieresiscyrillic.glyph index 34df38dd1..a0f09c712 100644 --- a/src/Inter-Roman.glyphspackage/glyphs/zedieresiscyrillic.glyph +++ b/src/Inter-Roman.glyphspackage/glyphs/zedieresiscyrillic.glyph @@ -60,11 +60,11 @@ shapes = ( ref = zecyrillic; }, { -pos = (-85,0); +pos = (-95,0); ref = dieresiscomb; } ); -width = 1073; +width = 1063; }, { layerId = m011; -- cgit v1.2.3