From 259090593232df4848744259130750a5bd28b6c8 Mon Sep 17 00:00:00 2001 From: Rasmus Andersson Date: Sun, 23 Apr 2023 17:39:37 -0700 Subject: [PATCH] ligatures (really, substitutions) fi ffi tt ff rf rt etc --- .../glyphs/f.1.glyph | 396 ++++++++ .../glyphs/f.i.1.glyph | 414 +++++++++ .../glyphs/f.i.glyph | 313 ++++++- src/Inter-Italic.glyphspackage/order.plist | 2 + src/Inter-Roman.glyphspackage/fontinfo.plist | 12 +- .../glyphs/f.1.glyph | 430 +++++++++ .../glyphs/f.i.1.glyph | 873 ++++++++++++++++++ .../glyphs/f.i.glyph | 355 ++++++- .../glyphs/tbar.glyph | 2 +- src/Inter-Roman.glyphspackage/order.plist | 2 + src/features/liga.fea | 45 +- 11 files changed, 2733 insertions(+), 111 deletions(-) create mode 100644 src/Inter-Italic.glyphspackage/glyphs/f.1.glyph create mode 100644 src/Inter-Italic.glyphspackage/glyphs/f.i.1.glyph create mode 100644 src/Inter-Roman.glyphspackage/glyphs/f.1.glyph create mode 100644 src/Inter-Roman.glyphspackage/glyphs/f.i.1.glyph diff --git a/src/Inter-Italic.glyphspackage/glyphs/f.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/f.1.glyph new file mode 100644 index 000000000..99e4e3a4c --- /dev/null +++ b/src/Inter-Italic.glyphspackage/glyphs/f.1.glyph @@ -0,0 +1,396 @@ +{ +glyphname = f.1; +kernLeft = B; +kernRight = f; +layers = ( +{ +anchors = ( +{ +name = bottom; +pos = (127,0); +} +); +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(151,0,l), +(366,1300,ls), +(388,1431,o), +(500,1510,o), +(611,1510,cs), +(639,1510,o), +(660,1505,o), +(682,1496,c), +(704,1540,l), +(678,1550,o), +(653,1556,o), +(618,1556,cs), +(480,1556,o), +(346,1457,o), +(320,1300,cs), +(105,0,l) +); +}, +{ +closed = 1; +nodes = ( +(72,1118,l), +(64,1072,l), +(602,1072,l), +(610,1118,l) +); +} +); +}; +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +shapes = ( +{ +alignment = -1; +pos = (-97,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(306,1118,l), +(298,1072,l), +(602,1072,l), +(610,1118,l) +); +} +); +width = 543; +}, +{ +anchors = ( +{ +name = bottom; +pos = (152,0); +} +); +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(236,0,l), +(439,1230,ls), +(458,1341,o), +(516,1400,o), +(629,1400,cs), +(679,1400,o), +(706,1388,o), +(722,1382,c), +(797,1530,l), +(773,1542,o), +(723,1560,o), +(638,1560,cs), +(479,1560,o), +(308,1463,o), +(276,1272,cs), +(66,0,l) +); +}, +{ +closed = 1; +nodes = ( +(31,1118,l), +(7,972,l), +(665,972,l), +(689,1118,l) +); +} +); +}; +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +shapes = ( +{ +alignment = -1; +pos = (-74,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(333,1118,l), +(309,972,l), +(665,972,l), +(689,1118,l) +); +} +); +width = 633; +}, +{ +anchors = ( +{ +name = bottom; +pos = (209,0); +} +); +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(410,0,l,{ +name = hr00; +}), +(603,1166,ls), +(611,1219,o), +(638,1254,o), +(713,1254,cs), +(743,1254,o), +(785,1248,o), +(813,1240,c), +(919,1528,l), +(874,1539,o), +(771,1560,o), +(668,1560,cs), +(424,1560,o), +(246,1425,o), +(200,1150,cs), +(10,0,l) +); +}, +{ +closed = 1; +nodes = ( +(17,1118,l), +(-32,826,l), +(759,826,l), +(808,1118,l) +); +} +); +}; +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +shapes = ( +{ +alignment = -1; +pos = (-81,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(387,1118,l), +(338,826,l), +(775,826,l), +(824,1118,l) +); +} +); +width = 765; +}, +{ +anchors = ( +{ +name = bottom; +pos = (130,0); +} +); +background = { +shapes = ( +{ +pos = (-71,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(62,1056,l), +(38,910,l), +(576,910,l), +(600,1056,l) +); +} +); +}; +layerId = m008; +name = ital_gen; +shapes = ( +{ +alignment = -1; +pos = (-71,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(300,1056,l), +(276,910,l), +(577,910,l), +(601,1056,l) +); +} +); +width = 534; +}, +{ +anchors = ( +{ +name = bottom; +pos = (197,0); +} +); +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(400,0,l,{ +name = hr00; +}), +(578,1080,ls), +(591,1157,o), +(625,1186,o), +(704,1186,cs), +(740,1186,o), +(792,1186,o), +(814,1186,c), +(864,1490,l), +(828,1490,o), +(734,1490,o), +(644,1490,cs), +(368,1490,o), +(229,1386,o), +(190,1150,cs), +(0,0,l) +); +}, +{ +closed = 1; +nodes = ( +(-20,1056,l), +(-70,752,l), +(742,752,l), +(792,1056,l) +); +} +); +}; +layerId = m010; +name = ital_gen; +shapes = ( +{ +alignment = -1; +pos = (-82,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(375,1056,l), +(325,752,l), +(742,752,l), +(792,1056,l) +); +} +); +width = 735; +}, +{ +anchors = ( +{ +name = bottom; +pos = (72,0); +} +); +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(59,1056,l), +(51,1010,l), +(493,1010,l), +(501,1056,l) +); +} +); +}; +layerId = m012; +name = ital_gen; +shapes = ( +{ +alignment = -1; +pos = (-95,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(242,1056,l), +(235,1010,l), +(494,1010,l), +(501,1056,l) +); +} +); +width = 374; +}, +{ +anchors = ( +{ +name = bottom; +pos = (187,0); +} +); +associatedMasterId = m008; +layerId = "3E978263-4E9B-47F4-9CCE-730344640B0A"; +name = "Apr 23, 23, 09:10"; +shapes = ( +{ +pos = (-14,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(119,1056,l), +(95,910,l), +(633,910,l), +(657,1056,l) +); +} +); +width = 611; +}, +{ +anchors = ( +{ +name = bottom; +pos = (109,0); +} +); +associatedMasterId = m012; +layerId = "414AE0C3-C502-4EE9-A2CD-D8C962B817F7"; +name = "Apr 23, 23, 09:22"; +shapes = ( +{ +pos = (-58,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(96,1056,l), +(88,1010,l), +(530,1010,l), +(538,1056,l) +); +} +); +width = 431; +} +); +metricRight = f; +userData = { +"interface.width-adjustments" = ( +-16 +); +}; +} diff --git a/src/Inter-Italic.glyphspackage/glyphs/f.i.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/f.i.1.glyph new file mode 100644 index 000000000..9f9d19741 --- /dev/null +++ b/src/Inter-Italic.glyphspackage/glyphs/f.i.1.glyph @@ -0,0 +1,414 @@ +{ +glyphname = f.i.1; +kernLeft = B; +layers = ( +{ +anchors = ( +{ +name = bottom; +pos = (127,0); +}, +{ +name = top; +pos = (519,1548); +} +); +background = { +shapes = ( +{ +ref = l; +} +); +}; +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +shapes = ( +{ +closed = 1; +nodes = ( +(-45,-467,o), +(90,-369,o), +(116,-211,cs), +(366,1300,ls), +(388,1431,o), +(500,1510,o), +(610,1510,cs), +(643,1510,o), +(660,1507,o), +(681,1499,c), +(705,1540,l), +(678,1551,o), +(653,1556,o), +(617,1556,cs), +(481,1556,o), +(346,1457,o), +(320,1300,cs), +(70,-211,ls), +(48,-343,o), +(-64,-421,o), +(-174,-421,cs), +(-204,-421,o), +(-225,-417,o), +(-248,-409,c), +(-269,-451,l), +(-243,-462,o), +(-217,-467,o), +(-181,-467,cs) +); +}, +{ +closed = 1; +nodes = ( +(569,1070,l), +(577,1118,l), +(314,1118,l), +(306,1070,l) +); +} +); +width = 493; +}, +{ +anchors = ( +{ +name = bottom; +pos = (152,0); +}, +{ +name = top; +pos = (542,1549); +} +); +background = { +shapes = ( +{ +ref = l; +} +); +}; +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +shapes = ( +{ +closed = 1; +nodes = ( +(52,-448,o), +(180,-333,o), +(215,-122,cs), +(434,1200,ls), +(457,1337,o), +(518,1400,o), +(626,1400,cs), +(642,1400,o), +(663,1399,o), +(683,1398,c), +(701,1557,l), +(686,1559,o), +(670,1560,o), +(653,1560,cs), +(440,1560,o), +(302,1432,o), +(264,1200,cs), +(45,-122,ls), +(26,-236,o), +(-27,-288,o), +(-125,-288,cs), +(-142,-288,o), +(-202,-283,o), +(-221,-276,c), +(-264,-430,l), +(-229,-443,o), +(-191,-448,o), +(-151,-448,cs) +); +}, +{ +closed = 1; +nodes = ( +(874,972,l), +(898,1118,l), +(331,1118,l), +(307,972,l) +); +} +); +width = 591; +}, +{ +anchors = ( +{ +name = bottom; +pos = (209,0); +}, +{ +name = top; +pos = (615,1538); +} +); +background = { +shapes = ( +{ +ref = l; +} +); +}; +guides = ( +{ +pos = (426,1228); +}, +{ +pos = (-536,256); +} +); +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +shapes = ( +{ +closed = 1; +nodes = ( +(178,-456,o), +(363,-288,o), +(414,18,cs), +(601,1150,ls), +(613,1222,o), +(651,1256,o), +(724,1256,cs), +(745,1256,o), +(767,1256,o), +(788,1256,c), +(837,1553,l), +(802,1557,o), +(769,1558,o), +(728,1558,cs), +(429,1558,o), +(239,1393,o), +(189,1090,cs), +(7,-12,ls), +(-9,-111,o), +(-57,-156,o), +(-144,-156,cs), +(-171,-156,o), +(-199,-151,o), +(-227,-146,c), +(-306,-442,l), +(-253,-453,o), +(-177,-456,o), +(-110,-456,cs) +); +}, +{ +closed = 1; +nodes = ( +(1126,826,l), +(1174,1118,l), +(370,1118,l), +(320,826,l) +); +} +); +width = 682; +}, +{ +anchors = ( +{ +name = bottom; +pos = (130,0); +}, +{ +name = top; +pos = (475,1490); +} +); +background = { +shapes = ( +{ +ref = l; +} +); +}; +layerId = m008; +name = ital_gen; +shapes = ( +{ +closed = 1; +nodes = ( +(73,-418,o), +(159,-313,o), +(190,-125,cs), +(414,1218,ls), +(429,1309,o), +(468,1344,o), +(558,1344,cs), +(575,1344,o), +(591,1344,o), +(608,1344,c), +(633,1490,l), +(611,1490,o), +(589,1490,o), +(567,1490,cs), +(396,1490,o), +(273,1395,o), +(248,1244,cs), +(20,-125,ls), +(4,-224,o), +(-29,-258,o), +(-127,-258,cs), +(-163,-258,o), +(-151,-258,o), +(-187,-258,c), +(-214,-418,l), +(-154,-418,o), +(-166,-418,o), +(-130,-418,cs) +); +}, +{ +closed = 1; +nodes = ( +(759,910,l), +(783,1056,l), +(296,1056,l), +(272,910,l) +); +} +); +width = 520; +}, +{ +anchors = ( +{ +name = bottom; +pos = (197,0); +}, +{ +name = top; +pos = (537,1490); +} +); +background = { +shapes = ( +{ +ref = l; +} +); +}; +layerId = m010; +name = ital_gen; +shapes = ( +{ +closed = 1; +nodes = ( +(208,-418,o), +(347,-314,o), +(386,-78,cs), +(582,1107,ls), +(592,1166,o), +(619,1186,o), +(688,1186,cs), +(709,1186,o), +(729,1186,o), +(750,1186,c), +(800,1490,l), +(748,1490,o), +(696,1490,o), +(644,1490,cs), +(368,1490,o), +(229,1386,o), +(190,1150,cs), +(-2,-8,ls), +(-15,-85,o), +(-49,-114,o), +(-128,-114,cs), +(-164,-114,o), +(-216,-114,o), +(-238,-114,c), +(-288,-418,l), +(-252,-418,o), +(-158,-418,o), +(-68,-418,cs) +); +}, +{ +closed = 1; +nodes = ( +(989,752,l), +(1039,1056,l), +(386,1056,l), +(336,752,l) +); +} +); +width = 692; +}, +{ +anchors = ( +{ +name = bottom; +pos = (72,0); +}, +{ +name = top; +pos = (427,1490); +} +); +background = { +shapes = ( +{ +ref = l; +} +); +}; +layerId = m012; +name = ital_gen; +shapes = ( +{ +closed = 1; +nodes = ( +(-38,-418,o), +(35,-355,o), +(58,-218,cs), +(308,1290,ls), +(326,1398,o), +(382,1444,o), +(495,1444,cs), +(521,1444,o), +(539,1444,o), +(565,1444,c), +(573,1490,l), +(547,1490,o), +(521,1490,o), +(495,1490,cs), +(357,1490,o), +(284,1427,o), +(261,1290,cs), +(11,-218,ls), +(-7,-326,o), +(-63,-372,o), +(-176,-372,cs), +(-202,-372,o), +(-220,-372,o), +(-246,-372,c), +(-254,-418,l), +(-228,-418,o), +(-202,-418,o), +(-176,-418,cs) +); +}, +{ +closed = 1; +nodes = ( +(493,1010,l), +(501,1056,l), +(245,1056,l), +(237,1010,l) +); +} +); +width = 394; +} +); +metricLeft = f.1; +metricRight = f.i; +userData = { +"interface.width-adjustments" = ( +-16 +); +}; +} diff --git a/src/Inter-Italic.glyphspackage/glyphs/f.i.glyph b/src/Inter-Italic.glyphspackage/glyphs/f.i.glyph index dd68fd5aa..65e8e66ec 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/f.i.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/f.i.glyph @@ -8,6 +8,14 @@ anchors = ( { name = bottom; pos = (129,0); +}, +{ +name = cross; +pos = (258,768); +}, +{ +name = top; +pos = (521,1548); } ); background = { @@ -21,16 +29,45 @@ ref = t; layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; shapes = ( { -pos = (-95,0); -ref = longs; +closed = 1; +nodes = ( +(-43,-467,o), +(92,-369,o), +(118,-211,cs), +(368,1300,ls), +(390,1431,o), +(502,1510,o), +(612,1510,cs), +(645,1510,o), +(662,1507,o), +(683,1499,c), +(707,1540,l), +(680,1551,o), +(655,1556,o), +(619,1556,cs), +(483,1556,o), +(348,1457,o), +(322,1300,cs), +(72,-211,ls), +(50,-343,o), +(-62,-421,o), +(-172,-421,cs), +(-202,-421,o), +(-223,-417,o), +(-246,-409,c), +(-267,-451,l), +(-241,-462,o), +(-215,-467,o), +(-179,-467,cs) +); }, { closed = 1; nodes = ( -(137,1118,l), -(129,1070,l), (571,1070,l), -(579,1118,l) +(579,1118,l), +(137,1118,l), +(129,1070,l) ); } ); @@ -41,6 +78,14 @@ anchors = ( { name = bottom; pos = (202,0); +}, +{ +name = cross; +pos = (328,768); +}, +{ +name = top; +pos = (592,1549); } ); background = { @@ -54,26 +99,63 @@ ref = t; layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; shapes = ( { -pos = (-24,0); -ref = longs; +closed = 1; +nodes = ( +(102,-448,o), +(230,-333,o), +(265,-122,cs), +(484,1200,ls), +(507,1337,o), +(568,1400,o), +(676,1400,cs), +(692,1400,o), +(713,1399,o), +(733,1398,c), +(751,1557,l), +(736,1559,o), +(720,1560,o), +(703,1560,cs), +(490,1560,o), +(352,1432,o), +(314,1200,cs), +(95,-122,ls), +(76,-236,o), +(23,-288,o), +(-75,-288,cs), +(-92,-288,o), +(-152,-283,o), +(-171,-276,c), +(-214,-430,l), +(-179,-443,o), +(-141,-448,o), +(-101,-448,cs) +); }, { closed = 1; nodes = ( +(924,972,l), +(948,1118,l), (122,1118,l), -(98,972,l), -(681,972,l), -(705,1118,l) +(98,972,l) ); } ); -width = 673; +width = 641; }, { anchors = ( { name = bottom; pos = (272,0); +}, +{ +name = cross; +pos = (402,768); +}, +{ +name = top; +pos = (678,1538); } ); background = { @@ -94,59 +176,152 @@ pos = (-536,256); layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; shapes = ( { -pos = (-18,0); -ref = longs; +closed = 1; +nodes = ( +(241,-456,o), +(426,-288,o), +(477,18,cs), +(664,1150,ls), +(676,1222,o), +(714,1256,o), +(787,1256,cs), +(808,1256,o), +(830,1256,o), +(851,1256,c), +(900,1553,l), +(865,1557,o), +(832,1558,o), +(791,1558,cs), +(492,1558,o), +(302,1393,o), +(252,1090,cs), +(70,-12,ls), +(54,-111,o), +(6,-156,o), +(-81,-156,cs), +(-108,-156,o), +(-136,-151,o), +(-164,-146,c), +(-243,-442,l), +(-190,-453,o), +(-114,-456,o), +(-47,-456,cs) +); }, { closed = 1; nodes = ( +(1189,826,l), +(1237,1118,l), (118,1118,l), -(68,826,l), -(816,826,l), -(866,1118,l) +(68,826,l) ); } ); -width = 838; +width = 745; }, { anchors = ( { name = bottom; pos = (187,0); +}, +{ +name = cross; +pos = (311,768); +}, +{ +name = top; +pos = (532,1490); } ); layerId = m008; name = ital_gen; shapes = ( { -pos = (-14,0); -ref = longs; +closed = 1; +nodes = ( +(130,-418,o), +(216,-313,o), +(247,-125,cs), +(471,1218,ls), +(486,1309,o), +(525,1344,o), +(615,1344,cs), +(632,1344,o), +(648,1344,o), +(665,1344,c), +(690,1490,l), +(668,1490,o), +(646,1490,o), +(624,1490,cs), +(453,1490,o), +(330,1395,o), +(305,1244,cs), +(77,-125,ls), +(61,-224,o), +(28,-258,o), +(-70,-258,cs), +(-106,-258,o), +(-94,-258,o), +(-130,-258,c), +(-157,-418,l), +(-97,-418,o), +(-109,-418,o), +(-73,-418,cs) +); }, { closed = 1; nodes = ( +(816,910,l), +(840,1056,l), (119,1056,l), -(95,910,l), -(633,910,l), -(657,1056,l) +(95,910,l) ); } ); -width = 611; +width = 577; }, { anchors = ( { name = bottom; pos = (304,0); +}, +{ +name = cross; +pos = (433,768); +}, +{ +name = top; +pos = (644,1490); } ); background = { shapes = ( { -pos = (20,0); -ref = t; +closed = 1; +nodes = ( +(507,0,l,{ +name = hr00; +}), +(685,1080,ls), +(698,1157,o), +(732,1186,o), +(811,1186,cs), +(826,1186,o), +(842,1186,o), +(857,1186,c), +(907,1490,l), +(855,1490,o), +(803,1490,o), +(751,1490,cs), +(475,1490,o), +(336,1386,o), +(297,1150,cs), +(107,0,l) +); } ); }; @@ -154,42 +329,108 @@ layerId = m010; name = ital_gen; shapes = ( { -pos = (25,0); -ref = longs; +closed = 1; +nodes = ( +(315,-418,o), +(454,-314,o), +(493,-78,cs), +(689,1107,ls), +(699,1166,o), +(726,1186,o), +(795,1186,cs), +(816,1186,o), +(836,1186,o), +(857,1186,c), +(907,1490,l), +(855,1490,o), +(803,1490,o), +(751,1490,cs), +(475,1490,o), +(336,1386,o), +(297,1150,cs), +(105,-8,ls), +(92,-85,o), +(58,-114,o), +(-21,-114,cs), +(-57,-114,o), +(-109,-114,o), +(-131,-114,c), +(-181,-418,l), +(-145,-418,o), +(-51,-418,o), +(39,-418,cs) +); }, { closed = 1; nodes = ( +(1096,752,l), +(1146,1056,l), (118,1056,l), -(68,752,l), -(848,752,l), -(898,1056,l) +(68,752,l) ); } ); -width = 851; +width = 799; }, { anchors = ( { name = bottom; pos = (109,0); +}, +{ +name = cross; +pos = (231,745); +}, +{ +name = top; +pos = (464,1490); } ); layerId = m012; name = ital_gen; shapes = ( { -pos = (-58,0); -ref = longs; +closed = 1; +nodes = ( +(-1,-418,o), +(72,-355,o), +(95,-218,cs), +(345,1290,ls), +(363,1398,o), +(419,1444,o), +(532,1444,cs), +(558,1444,o), +(576,1444,o), +(602,1444,c), +(610,1490,l), +(584,1490,o), +(558,1490,o), +(532,1490,cs), +(394,1490,o), +(321,1427,o), +(298,1290,cs), +(48,-218,ls), +(30,-326,o), +(-26,-372,o), +(-139,-372,cs), +(-165,-372,o), +(-183,-372,o), +(-209,-372,c), +(-217,-418,l), +(-191,-418,o), +(-165,-418,o), +(-139,-418,cs) +); }, { closed = 1; nodes = ( -(96,1056,l), -(88,1010,l), (530,1010,l), -(538,1056,l) +(538,1056,l), +(96,1056,l), +(88,1010,l) ); } ); diff --git a/src/Inter-Italic.glyphspackage/order.plist b/src/Inter-Italic.glyphspackage/order.plist index c880757fb..dab3c03c9 100644 --- a/src/Inter-Italic.glyphspackage/order.plist +++ b/src/Inter-Italic.glyphspackage/order.plist @@ -2031,8 +2031,10 @@ uni2184, upsilonlatin, vscript, wynn, +f.1, h.sc, f.i, +f.i.1, m.sc, t.sc, uni2094, diff --git a/src/Inter-Roman.glyphspackage/fontinfo.plist b/src/Inter-Roman.glyphspackage/fontinfo.plist index f8d237e43..9fc5199c1 100644 --- a/src/Inter-Roman.glyphspackage/fontinfo.plist +++ b/src/Inter-Roman.glyphspackage/fontinfo.plist @@ -3005,6 +3005,7 @@ GSCornerRadius = 140; GSOffsetHorizontal = 23; GSOffsetKeepCompatible = 1; GSOffsetMakeStroke = 1; +GSOffsetPosition = 1; GSOffsetProportional = 1; GSOffsetVertical = 64; }; @@ -5152,7 +5153,6 @@ zeta = -128; }; "@MMK_L_r" = { "@MMK_R_A" = -81; -"@MMK_R_B" = 32; "@MMK_R_J" = -116; "@MMK_R_T" = -116; "@MMK_R_Z" = -69; @@ -6861,7 +6861,6 @@ zeta = -128; }; "@MMK_L_r" = { "@MMK_R_A" = -81; -"@MMK_R_B" = 69; "@MMK_R_J" = -116; "@MMK_R_T" = -116; "@MMK_R_Z" = -69; @@ -9967,7 +9966,7 @@ Psi = -93; "@MMK_R_guillemetleft" = -81; "@MMK_R_hyphen" = -58; "@MMK_R_idblgrave" = 93; -"@MMK_R_idieresis" = 209; +"@MMK_R_idieresis" = 200; "@MMK_R_o" = -10; "@MMK_R_quotedblbase" = -186; "@MMK_R_s" = -46; @@ -12798,7 +12797,7 @@ m009 = { "@MMK_R_bullet" = -69; "@MMK_R_dagger" = -151; "@MMK_R_eight.sups" = -186; -"@MMK_R_f" = -34; +"@MMK_R_f" = -80; "@MMK_R_gammagreek" = -104; "@MMK_R_guillemetleft" = -69; "@MMK_R_guillemetright" = -69; @@ -12811,7 +12810,7 @@ m009 = { "@MMK_R_quotedblright" = -209; "@MMK_R_registered" = -145; "@MMK_R_s" = -43; -"@MMK_R_t" = -69; +"@MMK_R_t" = -90; "@MMK_R_v" = -139; "@MMK_R_w" = -139; Psi = -81; @@ -13207,6 +13206,7 @@ less = -128; "@MMK_R_V" = -104; "@MMK_R_W" = -104; "@MMK_R_Y" = -238; +"@MMK_R_f" = -20; "@MMK_R_idblgrave" = 93; "@MMK_R_one" = -81; "@MMK_R_quotedbl" = -60; @@ -13727,7 +13727,7 @@ zeta = -128; }; "@MMK_L_r" = { "@MMK_R_A" = -81; -"@MMK_R_B" = 40; +"@MMK_R_B" = 20; "@MMK_R_J" = -116; "@MMK_R_T" = -116; "@MMK_R_Z" = -69; diff --git a/src/Inter-Roman.glyphspackage/glyphs/f.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/f.1.glyph new file mode 100644 index 000000000..505415b4b --- /dev/null +++ b/src/Inter-Roman.glyphspackage/glyphs/f.1.glyph @@ -0,0 +1,430 @@ +{ +glyphname = f.1; +kernLeft = B; +kernRight = f; +layers = ( +{ +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +shapes = ( +{ +pos = (-96,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(220,1118,l), +(220,1072,l), +(518,1072,l), +(518,1118,l) +); +} +); +width = 542; +}, +{ +anchors = ( +{ +name = bottom; +pos = (286,0); +}, +{ +name = top; +pos = (328,1678); +} +); +associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(296,0,l,{ +name = hr00; +}), +(296,1268,ls), +(296,1415,o), +(359,1487,o), +(494,1486,cs), +(556,1487,o), +(577,1471,o), +(588,1470,c), +(632,1534,l), +(617,1543,o), +(598,1559,o), +(524,1560,cs), +(415,1559,o), +(263,1486,o), +(262,1344,cs), +(262,0,l) +); +}, +{ +closed = 1; +nodes = ( +(679,1047,o), +(783,1151,o), +(782,1280,cs), +(783,1409,o), +(679,1513,o), +(550,1512,cs), +(421,1513,o), +(317,1409,o), +(318,1280,cs), +(317,1151,o), +(421,1047,o), +(550,1048,cs) +); +} +); +}; +layerId = "EEC3B7B5-366D-4A2B-B0D1-EFDAE34EDF22"; +name = "Nov 26 18, 09:09"; +shapes = ( +{ +closed = 1; +nodes = ( +(62,1118,l), +(62,1070,l), +(574,1070,l), +(574,1118,l) +); +}, +{ +closed = 0; +nodes = ( +(632,1498,l), +(605,1507,o), +(579,1513,o), +(550,1512,cs), +(421,1513,o), +(317,1409,o), +(318,1280,cs), +(318,0,l) +); +} +); +width = 678; +}, +{ +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( +{ +pos = (-74,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(238,1118,l), +(238,972,l), +(596,972,l), +(596,1118,l) +); +} +); +width = 646; +}, +{ +layerId = m007; +shapes = ( +{ +pos = (-72,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(196,1056,l), +(196,910,l), +(512,910,l), +(512,1056,l) +); +} +); +width = 532; +}, +{ +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +pos = (-82,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(300,1118,l), +(300,826,l), +(715,826,l), +(715,1118,l) +); +} +); +width = 768; +}, +{ +layerId = m009; +name = "Black Display"; +shapes = ( +{ +pos = (-82,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(286,1056,l), +(286,752,l), +(704,752,l), +(704,1056,l) +); +} +); +width = 734; +}, +{ +layerId = m011; +shapes = ( +{ +pos = (-96,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(158,1056,l), +(158,1010,l), +(412,1010,l), +(412,1056,l) +); +} +); +width = 372; +}, +{ +anchors = ( +{ +name = bottom; +pos = (286,0); +}, +{ +name = top; +pos = (328,1678); +} +); +associatedMasterId = m011; +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(296,0,l,{ +name = hr00; +}), +(296,1268,ls), +(296,1415,o), +(359,1487,o), +(494,1486,cs), +(556,1487,o), +(577,1471,o), +(588,1470,c), +(632,1534,l), +(617,1543,o), +(598,1559,o), +(524,1560,cs), +(415,1559,o), +(263,1486,o), +(262,1344,cs), +(262,0,l) +); +}, +{ +closed = 1; +nodes = ( +(679,1047,o), +(783,1151,o), +(782,1280,cs), +(783,1409,o), +(679,1513,o), +(550,1512,cs), +(421,1513,o), +(317,1409,o), +(318,1280,cs), +(317,1151,o), +(421,1047,o), +(550,1048,cs) +); +} +); +}; +layerId = "B40C3ECE-E849-485F-9ED5-057BFD17AE8D"; +name = "Nov 26 18, 09:09"; +shapes = ( +{ +closed = 1; +nodes = ( +(62,1118,l), +(62,1070,l), +(574,1070,l), +(574,1118,l) +); +}, +{ +closed = 0; +nodes = ( +(632,1498,l), +(605,1507,o), +(579,1513,o), +(550,1512,cs), +(421,1513,o), +(317,1409,o), +(318,1280,cs), +(318,0,l) +); +} +); +width = 678; +}, +{ +associatedMasterId = m009; +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(804,761,l), +(804,1069,l), +(53,1069,l), +(53,761,l) +); +}, +{ +closed = 1; +nodes = ( +(604,0,l), +(604,1075,ls), +(604,1153,o), +(633,1182,o), +(713,1182,cs), +(749,1182,o), +(782,1182,o), +(804,1182,c), +(804,1490,l), +(768,1490,o), +(693,1490,o), +(602,1490,cs), +(322,1490,o), +(199,1385,o), +(199,1146,cs), +(199,0,l) +); +} +); +}; +layerId = "61A7873A-9068-4AF9-B17E-616060BB3004"; +name = "Apr 22, 23, 12:37"; +shapes = ( +{ +pos = (14,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(20,1056,l), +(20,752,l), +(800,752,l), +(800,1056,l) +); +} +); +width = 840; +}, +{ +associatedMasterId = m007; +guides = ( +{ +angle = 90; +pos = (298,1317); +} +); +layerId = "E57C9381-4B1B-4ED3-8FD6-96CFFB3DFE05"; +name = "Apr 23, 23, 08:56"; +shapes = ( +{ +pos = (-26,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(10,1056,l), +(10,910,l), +(558,910,l), +(558,1056,l) +); +} +); +width = 568; +}, +{ +associatedMasterId = m011; +layerId = "94567BF6-7623-41FC-B7BD-ABE8B828E00C"; +name = "Apr 23, 23, 09:12"; +shapes = ( +{ +pos = (-66,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(0,1056,l), +(0,1010,l), +(442,1010,l), +(442,1056,l) +); +} +); +width = 392; +}, +{ +associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +guides = ( +{ +pos = (-36,1228); +}, +{ +pos = (-36,256); +} +); +layerId = "CE29235F-285C-491C-BF99-41C92D4B646A"; +name = "Apr 23, 23, 09:14"; +shapes = ( +{ +pos = (-22,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(20,1118,l), +(20,826,l), +(766,826,l), +(766,1118,l) +); +} +); +width = 828; +} +); +metricLeft = l; +metricRight = f; +note = "!flatten"; +userData = { +"interface.width-adjustments" = ( +-16 +); +}; +} diff --git a/src/Inter-Roman.glyphspackage/glyphs/f.i.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/f.i.1.glyph new file mode 100644 index 000000000..203bb49f9 --- /dev/null +++ b/src/Inter-Roman.glyphspackage/glyphs/f.i.1.glyph @@ -0,0 +1,873 @@ +{ +glyphname = f.i.1; +kernLeft = B; +layers = ( +{ +anchors = ( +{ +name = bottom; +pos = (221,0); +}, +{ +name = cross; +pos = (221,768); +}, +{ +name = top; +pos = (318,1552); +} +); +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +shapes = ( +{ +closed = 1; +nodes = ( +(244,0,l), +(244,1300,ls), +(244,1431,o), +(343,1510,o), +(454,1510,cs), +(482,1510,o), +(504,1505,o), +(528,1496,c), +(542,1540,l), +(515,1550,o), +(489,1556,o), +(454,1556,cs), +(316,1556,o), +(198,1457,o), +(198,1300,cs), +(198,0,l) +); +}, +{ +closed = 1; +nodes = ( +(518,1072,l), +(518,1118,l), +(222,1118,l), +(222,1072,l) +); +} +); +width = 542; +}, +{ +anchors = ( +{ +name = bottom; +pos = (286,0); +}, +{ +name = top; +pos = (328,1678); +} +); +associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(296,0,l,{ +name = hr00; +}), +(296,1268,ls), +(296,1415,o), +(359,1487,o), +(494,1486,cs), +(556,1487,o), +(577,1471,o), +(588,1470,c), +(632,1534,l), +(617,1543,o), +(598,1559,o), +(524,1560,cs), +(415,1559,o), +(263,1486,o), +(262,1344,cs), +(262,0,l) +); +}, +{ +closed = 1; +nodes = ( +(679,1047,o), +(783,1151,o), +(782,1280,cs), +(783,1409,o), +(679,1513,o), +(550,1512,cs), +(421,1513,o), +(317,1409,o), +(318,1280,cs), +(317,1151,o), +(421,1047,o), +(550,1048,cs) +); +} +); +}; +layerId = "EEC3B7B5-366D-4A2B-B0D1-EFDAE34EDF22"; +name = "Nov 26 18, 09:09"; +shapes = ( +{ +closed = 1; +nodes = ( +(62,1118,l), +(62,1070,l), +(574,1070,l), +(574,1118,l) +); +}, +{ +closed = 0; +nodes = ( +(632,1498,l), +(605,1507,o), +(579,1513,o), +(550,1512,cs), +(421,1513,o), +(317,1409,o), +(318,1280,cs), +(318,0,l) +); +} +); +width = 678; +}, +{ +anchors = ( +{ +name = bottom; +pos = (243,0); +}, +{ +name = cross; +pos = (243,768); +}, +{ +name = top; +pos = (322,1552); +} +); +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( +{ +closed = 1; +nodes = ( +(328,0,l), +(328,1230,ls), +(328,1341,o), +(377,1400,o), +(490,1400,cs), +(507,1400,o), +(522,1399,o), +(534,1396,c), +(563,1552,l), +(538,1557,o), +(508,1560,o), +(472,1560,cs), +(313,1560,o), +(158,1463,o), +(158,1272,cs), +(158,0,l) +); +}, +{ +closed = 1; +nodes = ( +(813,972,l), +(813,1118,l), +(240,1118,l), +(240,972,l) +); +} +); +width = 595; +}, +{ +anchors = ( +{ +name = bottom; +pos = (213,0); +}, +{ +name = cross; +pos = (213,768); +}, +{ +name = top; +pos = (292,1490); +} +); +layerId = m007; +shapes = ( +{ +closed = 1; +nodes = ( +(298,0,l), +(298,1218,ls), +(298,1309,o), +(332,1344,o), +(422,1344,cs), +(437,1344,o), +(453,1344,o), +(468,1344,c), +(468,1490,l), +(447,1490,o), +(427,1490,o), +(406,1490,cs), +(235,1490,o), +(128,1395,o), +(128,1244,cs), +(128,0,l) +); +}, +{ +closed = 1; +nodes = ( +(706,910,l), +(706,1056,l), +(203,1056,l), +(203,910,l) +); +} +); +width = 532; +}, +{ +anchors = ( +{ +name = bottom; +pos = (302,0); +}, +{ +name = cross; +pos = (302,768); +}, +{ +name = top; +pos = (359,1552); +} +); +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(502,0,l,{ +name = hr00; +}), +(502,1080,ls), +(502,1157,o), +(531,1186,o), +(610,1186,cs), +(625,1186,o), +(641,1186,o), +(656,1186,c), +(656,1490,l), +(604,1490,o), +(552,1490,o), +(500,1490,cs), +(224,1490,o), +(102,1386,o), +(102,1150,cs), +(102,0,l) +); +}, +{ +closed = 1; +nodes = ( +(1028,752,l), +(1028,1056,l), +(-92,1056,l), +(-92,752,l) +); +} +); +}; +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +closed = 1; +nodes = ( +(502,0,l,{ +name = hr00; +}), +(502,1166,ls), +(502,1219,o), +(523,1254,o), +(598,1254,cs), +(619,1254,o), +(645,1251,o), +(669,1247,c), +(669,1545,l), +(620,1553,o), +(561,1560,o), +(502,1560,cs), +(258,1560,o), +(102,1425,o), +(102,1150,cs), +(102,0,l) +); +}, +{ +closed = 1; +nodes = ( +(1047,826,l), +(1047,1118,l), +(310,1118,l), +(310,826,l) +); +} +); +width = 709; +}, +{ +anchors = ( +{ +name = bottom; +pos = (286,0); +}, +{ +name = cross; +pos = (286,768); +}, +{ +name = top; +pos = (342,1490); +} +); +layerId = m009; +name = "Black Display"; +shapes = ( +{ +closed = 1; +nodes = ( +(486,0,l,{ +name = hr00; +}), +(486,1080,ls), +(486,1157,o), +(515,1186,o), +(594,1186,cs), +(609,1186,o), +(625,1186,o), +(640,1186,c), +(640,1490,l), +(588,1490,o), +(536,1490,o), +(484,1490,cs), +(208,1490,o), +(86,1386,o), +(86,1150,cs), +(86,0,l) +); +}, +{ +closed = 1; +nodes = ( +(1012,752,l), +(1012,1056,l), +(282,1056,l), +(282,752,l) +); +} +); +width = 670; +}, +{ +anchors = ( +{ +name = bottom; +pos = (157,0); +}, +{ +name = cross; +pos = (157,745); +}, +{ +name = top; +pos = (236,1490); +} +); +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(180,0,l), +(180,1290,ls), +(180,1395,o), +(229,1444,o), +(334,1444,cs), +(376,1444,o), +(398,1432,o), +(416,1420,c), +(437,1460,l), +(413,1474,o), +(384,1490,o), +(334,1490,cs), +(204,1490,o), +(134,1420,o), +(134,1290,cs), +(134,0,l) +); +} +); +}; +layerId = m011; +shapes = ( +{ +closed = 1; +nodes = ( +(180,0,l), +(180,1290,ls), +(180,1391,o), +(221,1444,o), +(289,1444,cs), +(309,1444,o), +(326,1440,o), +(350,1430,c), +(367,1473,l), +(340,1484,o), +(314,1490,o), +(289,1490,cs), +(198,1490,o), +(134,1407,o), +(134,1290,cs), +(134,0,l) +); +}, +{ +closed = 1; +nodes = ( +(412,1010,l), +(412,1056,l), +(159,1056,l), +(159,1010,l) +); +} +); +width = 372; +}, +{ +anchors = ( +{ +name = bottom; +pos = (286,0); +}, +{ +name = top; +pos = (328,1678); +} +); +associatedMasterId = m011; +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(296,0,l,{ +name = hr00; +}), +(296,1268,ls), +(296,1415,o), +(359,1487,o), +(494,1486,cs), +(556,1487,o), +(577,1471,o), +(588,1470,c), +(632,1534,l), +(617,1543,o), +(598,1559,o), +(524,1560,cs), +(415,1559,o), +(263,1486,o), +(262,1344,cs), +(262,0,l) +); +}, +{ +closed = 1; +nodes = ( +(679,1047,o), +(783,1151,o), +(782,1280,cs), +(783,1409,o), +(679,1513,o), +(550,1512,cs), +(421,1513,o), +(317,1409,o), +(318,1280,cs), +(317,1151,o), +(421,1047,o), +(550,1048,cs) +); +} +); +}; +layerId = "B40C3ECE-E849-485F-9ED5-057BFD17AE8D"; +name = "Nov 26 18, 09:09"; +shapes = ( +{ +closed = 1; +nodes = ( +(62,1118,l), +(62,1070,l), +(574,1070,l), +(574,1118,l) +); +}, +{ +closed = 0; +nodes = ( +(632,1498,l), +(605,1507,o), +(579,1513,o), +(550,1512,cs), +(421,1513,o), +(317,1409,o), +(318,1280,cs), +(318,0,l) +); +} +); +width = 678; +}, +{ +associatedMasterId = m009; +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(804,761,l), +(804,1069,l), +(53,1069,l), +(53,761,l) +); +}, +{ +closed = 1; +nodes = ( +(604,0,l), +(604,1075,ls), +(604,1153,o), +(633,1182,o), +(713,1182,cs), +(749,1182,o), +(782,1182,o), +(804,1182,c), +(804,1490,l), +(768,1490,o), +(693,1490,o), +(602,1490,cs), +(322,1490,o), +(199,1385,o), +(199,1146,cs), +(199,0,l) +); +} +); +}; +layerId = "61A7873A-9068-4AF9-B17E-616060BB3004"; +name = "Apr 22, 23, 12:37"; +shapes = ( +{ +pos = (14,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(20,1056,l), +(20,752,l), +(800,752,l), +(800,1056,l) +); +} +); +width = 840; +}, +{ +associatedMasterId = m007; +guides = ( +{ +angle = 90; +pos = (298,1317); +} +); +layerId = "E57C9381-4B1B-4ED3-8FD6-96CFFB3DFE05"; +name = "Apr 23, 23, 08:56"; +shapes = ( +{ +pos = (-26,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(10,1056,l), +(10,910,l), +(558,910,l), +(558,1056,l) +); +} +); +width = 568; +}, +{ +associatedMasterId = m011; +layerId = "94567BF6-7623-41FC-B7BD-ABE8B828E00C"; +name = "Apr 23, 23, 09:12"; +shapes = ( +{ +pos = (-66,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(0,1056,l), +(0,1010,l), +(442,1010,l), +(442,1056,l) +); +} +); +width = 392; +}, +{ +associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +guides = ( +{ +pos = (-36,1228); +}, +{ +pos = (-36,256); +} +); +layerId = "CE29235F-285C-491C-BF99-41C92D4B646A"; +name = "Apr 23, 23, 09:14"; +shapes = ( +{ +pos = (-22,0); +ref = longs; +}, +{ +closed = 1; +nodes = ( +(20,1118,l), +(20,826,l), +(766,826,l), +(766,1118,l) +); +} +); +width = 828; +}, +{ +anchors = ( +{ +name = bottom; +pos = (201,0); +}, +{ +name = cross; +pos = (201,745); +}, +{ +name = top; +pos = (280,1490); +} +); +associatedMasterId = m011; +layerId = "A1DC3EA2-DA4F-4B1C-9826-2F059F013E7F"; +name = "Apr 23, 23, 15:52"; +shapes = ( +{ +closed = 1; +nodes = ( +(224,0,l), +(224,1290,ls), +(224,1395,o), +(273,1444,o), +(378,1444,cs), +(404,1444,o), +(430,1444,o), +(456,1444,c), +(456,1490,l), +(430,1490,o), +(404,1490,o), +(378,1490,cs), +(248,1490,o), +(178,1420,o), +(178,1290,cs), +(178,0,l) +); +}, +{ +closed = 1; +nodes = ( +(-10,1056,l), +(-10,1010,l), +(456,1010,l), +(456,1056,l) +); +} +); +width = 416; +}, +{ +anchors = ( +{ +name = bottom; +pos = (404,0); +}, +{ +name = cross; +pos = (404,768); +}, +{ +name = top; +pos = (461,1552); +} +); +associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(604,0,l,{ +name = hr00; +}), +(604,1080,ls), +(604,1157,o), +(633,1186,o), +(712,1186,cs), +(727,1186,o), +(743,1186,o), +(758,1186,c), +(758,1490,l), +(706,1490,o), +(654,1490,o), +(602,1490,cs), +(326,1490,o), +(204,1386,o), +(204,1150,cs), +(204,0,l) +); +}, +{ +closed = 1; +nodes = ( +(1130,752,l), +(1130,1056,l), +(10,1056,l), +(10,752,l) +); +} +); +}; +layerId = "3F7C99FC-9ED9-428D-AAEC-69E09EB189CF"; +name = "Apr 23, 23, 16:16"; +shapes = ( +{ +closed = 1; +nodes = ( +(604,0,l,{ +name = hr00; +}), +(604,1166,ls), +(604,1219,o), +(625,1254,o), +(700,1254,cs), +(730,1254,o), +(773,1248,o), +(802,1240,c), +(860,1528,l), +(814,1539,o), +(707,1560,o), +(604,1560,cs), +(360,1560,o), +(204,1425,o), +(204,1150,cs), +(204,0,l) +); +}, +{ +closed = 1; +nodes = ( +(817,826,l), +(817,1118,l), +(26,1118,l), +(26,826,l) +); +} +); +width = 870; +}, +{ +anchors = ( +{ +name = bottom; +pos = (345,0); +}, +{ +name = cross; +pos = (345,768); +}, +{ +name = top; +pos = (424,1552); +} +); +associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +layerId = "25F4AD27-557B-46C8-9D24-CB4DBA145DF4"; +name = "Apr 23, 23, 16:18"; +shapes = ( +{ +closed = 1; +nodes = ( +(430,0,l), +(430,1230,ls), +(430,1341,o), +(479,1400,o), +(592,1400,cs), +(642,1400,o), +(671,1388,o), +(688,1382,c), +(738,1530,l), +(712,1542,o), +(659,1560,o), +(574,1560,cs), +(415,1560,o), +(260,1463,o), +(260,1272,cs), +(260,0,l) +); +}, +{ +closed = 1; +nodes = ( +(698,972,l), +(698,1118,l), +(40,1118,l), +(40,972,l) +); +} +); +width = 748; +} +); +metricLeft = l; +note = "!flatten"; +userData = { +"interface.width-adjustments" = ( +-16 +); +}; +} diff --git a/src/Inter-Roman.glyphspackage/glyphs/f.i.glyph b/src/Inter-Roman.glyphspackage/glyphs/f.i.glyph index f449957c7..8a63b8c8f 100644 --- a/src/Inter-Roman.glyphspackage/glyphs/f.i.glyph +++ b/src/Inter-Roman.glyphspackage/glyphs/f.i.glyph @@ -44,10 +44,10 @@ nodes = ( { closed = 1; nodes = ( -(20,1118,l), -(20,1072,l), (558,1072,l), -(558,1118,l) +(558,1118,l), +(20,1118,l), +(20,1072,l) ); } ); @@ -162,12 +162,12 @@ nodes = ( (430,1341,o), (479,1400,o), (592,1400,cs), -(642,1400,o), -(671,1388,o), -(688,1382,c), -(738,1530,l), -(712,1542,o), -(659,1560,o), +(609,1400,o), +(624,1399,o), +(636,1396,c), +(665,1552,l), +(640,1557,o), +(610,1560,o), (574,1560,cs), (415,1560,o), (260,1463,o), @@ -178,14 +178,14 @@ nodes = ( { closed = 1; nodes = ( +(915,972,l), +(915,1118,l), (40,1118,l), -(40,972,l), -(698,972,l), -(698,1118,l) +(40,972,l) ); } ); -width = 748; +width = 697; }, { anchors = ( @@ -202,6 +202,13 @@ name = top; pos = (362,1490); } ); +background = { +shapes = ( +{ +ref = f; +} +); +}; layerId = m007; shapes = ( { @@ -228,10 +235,10 @@ nodes = ( { closed = 1; nodes = ( +(776,910,l), +(776,1056,l), (10,1056,l), -(10,910,l), -(755,910,l), -(755,1056,l) +(10,910,l) ); } ); @@ -252,6 +259,42 @@ name = top; pos = (461,1552); } ); +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(604,0,l,{ +name = hr00; +}), +(604,1080,ls), +(604,1157,o), +(633,1186,o), +(712,1186,cs), +(727,1186,o), +(743,1186,o), +(758,1186,c), +(758,1490,l), +(706,1490,o), +(654,1490,o), +(602,1490,cs), +(326,1490,o), +(204,1386,o), +(204,1150,cs), +(204,0,l) +); +}, +{ +closed = 1; +nodes = ( +(1130,752,l), +(1130,1056,l), +(10,1056,l), +(10,752,l) +); +} +); +}; layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; shapes = ( { @@ -264,12 +307,12 @@ name = hr00; (604,1219,o), (625,1254,o), (700,1254,cs), -(730,1254,o), -(773,1248,o), -(802,1240,c), -(860,1528,l), -(814,1539,o), -(707,1560,o), +(721,1254,o), +(747,1251,o), +(771,1247,c), +(771,1545,l), +(722,1553,o), +(663,1560,o), (604,1560,cs), (360,1560,o), (204,1425,o), @@ -280,14 +323,14 @@ name = hr00; { closed = 1; nodes = ( +(1149,826,l), +(1149,1118,l), (26,1118,l), -(26,826,l), -(817,826,l), -(817,1118,l) +(26,826,l) ); } ); -width = 870; +width = 811; }, { anchors = ( @@ -317,12 +360,12 @@ name = hr00; (624,1157,o), (653,1186,o), (732,1186,cs), -(768,1186,o), -(820,1186,o), -(842,1186,c), -(842,1490,l), -(806,1490,o), -(712,1490,o), +(747,1186,o), +(763,1186,o), +(778,1186,c), +(778,1490,l), +(726,1490,o), +(674,1490,o), (622,1490,cs), (346,1490,o), (224,1386,o), @@ -333,14 +376,14 @@ name = hr00; { closed = 1; nodes = ( +(1067,752,l), +(1067,1056,l), (30,1056,l), -(30,752,l), -(842,752,l), -(842,1056,l) +(30,752,l) ); } ); -width = 872; +width = 800; }, { anchors = ( @@ -357,7 +400,7 @@ name = top; pos = (280,1490); } ); -layerId = m011; +background = { shapes = ( { closed = 1; @@ -367,26 +410,51 @@ nodes = ( (224,1395,o), (273,1444,o), (378,1444,cs), -(404,1444,o), -(430,1444,o), -(456,1444,c), -(456,1490,l), -(430,1490,o), -(404,1490,o), +(420,1444,o), +(442,1432,o), +(460,1420,c), +(481,1460,l), +(457,1474,o), +(428,1490,o), (378,1490,cs), (248,1490,o), (178,1420,o), (178,1290,cs), (178,0,l) ); +} +); +}; +layerId = m011; +shapes = ( +{ +closed = 1; +nodes = ( +(224,0,l), +(224,1290,ls), +(224,1391,o), +(265,1444,o), +(333,1444,cs), +(353,1444,o), +(370,1440,o), +(394,1430,c), +(411,1473,l), +(384,1484,o), +(358,1490,o), +(333,1490,cs), +(242,1490,o), +(178,1407,o), +(178,1290,cs), +(178,0,l) +); }, { closed = 1; nodes = ( -(-10,1056,l), -(-10,1010,l), (456,1010,l), -(456,1056,l) +(456,1056,l), +(-10,1056,l), +(-10,1010,l) ); } ); @@ -607,8 +675,203 @@ nodes = ( } ); width = 828; +}, +{ +anchors = ( +{ +name = bottom; +pos = (201,0); +}, +{ +name = cross; +pos = (201,745); +}, +{ +name = top; +pos = (280,1490); } ); +associatedMasterId = m011; +layerId = "A1DC3EA2-DA4F-4B1C-9826-2F059F013E7F"; +name = "Apr 23, 23, 15:52"; +shapes = ( +{ +closed = 1; +nodes = ( +(224,0,l), +(224,1290,ls), +(224,1395,o), +(273,1444,o), +(378,1444,cs), +(404,1444,o), +(430,1444,o), +(456,1444,c), +(456,1490,l), +(430,1490,o), +(404,1490,o), +(378,1490,cs), +(248,1490,o), +(178,1420,o), +(178,1290,cs), +(178,0,l) +); +}, +{ +closed = 1; +nodes = ( +(-10,1056,l), +(-10,1010,l), +(456,1010,l), +(456,1056,l) +); +} +); +width = 416; +}, +{ +anchors = ( +{ +name = bottom; +pos = (404,0); +}, +{ +name = cross; +pos = (404,768); +}, +{ +name = top; +pos = (461,1552); +} +); +associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(604,0,l,{ +name = hr00; +}), +(604,1080,ls), +(604,1157,o), +(633,1186,o), +(712,1186,cs), +(727,1186,o), +(743,1186,o), +(758,1186,c), +(758,1490,l), +(706,1490,o), +(654,1490,o), +(602,1490,cs), +(326,1490,o), +(204,1386,o), +(204,1150,cs), +(204,0,l) +); +}, +{ +closed = 1; +nodes = ( +(1130,752,l), +(1130,1056,l), +(10,1056,l), +(10,752,l) +); +} +); +}; +layerId = "3F7C99FC-9ED9-428D-AAEC-69E09EB189CF"; +name = "Apr 23, 23, 16:16"; +shapes = ( +{ +closed = 1; +nodes = ( +(604,0,l,{ +name = hr00; +}), +(604,1166,ls), +(604,1219,o), +(625,1254,o), +(700,1254,cs), +(730,1254,o), +(773,1248,o), +(802,1240,c), +(860,1528,l), +(814,1539,o), +(707,1560,o), +(604,1560,cs), +(360,1560,o), +(204,1425,o), +(204,1150,cs), +(204,0,l) +); +}, +{ +closed = 1; +nodes = ( +(817,826,l), +(817,1118,l), +(26,1118,l), +(26,826,l) +); +} +); +width = 870; +}, +{ +anchors = ( +{ +name = bottom; +pos = (345,0); +}, +{ +name = cross; +pos = (345,768); +}, +{ +name = top; +pos = (424,1552); +} +); +associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +layerId = "25F4AD27-557B-46C8-9D24-CB4DBA145DF4"; +name = "Apr 23, 23, 16:18"; +shapes = ( +{ +closed = 1; +nodes = ( +(430,0,l), +(430,1230,ls), +(430,1341,o), +(479,1400,o), +(592,1400,cs), +(642,1400,o), +(671,1388,o), +(688,1382,c), +(738,1530,l), +(712,1542,o), +(659,1560,o), +(574,1560,cs), +(415,1560,o), +(260,1463,o), +(260,1272,cs), +(260,0,l) +); +}, +{ +closed = 1; +nodes = ( +(698,972,l), +(698,1118,l), +(40,1118,l), +(40,972,l) +); +} +); +width = 748; +} +); +metricLeft = f; note = "!flatten"; userData = { "interface.width-adjustments" = ( diff --git a/src/Inter-Roman.glyphspackage/glyphs/tbar.glyph b/src/Inter-Roman.glyphspackage/glyphs/tbar.glyph index 3d7c0e40d..798a8a46a 100644 --- a/src/Inter-Roman.glyphspackage/glyphs/tbar.glyph +++ b/src/Inter-Roman.glyphspackage/glyphs/tbar.glyph @@ -73,7 +73,7 @@ nodes = ( ); } ); -width = 620; +width = 637; }, { layerId = m009; diff --git a/src/Inter-Roman.glyphspackage/order.plist b/src/Inter-Roman.glyphspackage/order.plist index 7a04e743f..d7245318c 100644 --- a/src/Inter-Roman.glyphspackage/order.plist +++ b/src/Inter-Roman.glyphspackage/order.plist @@ -2031,8 +2031,10 @@ uni2184, upsilonlatin, vscript, wynn, +f.1, h.sc, f.i, +f.i.1, m.sc, t.sc, uni2094, diff --git a/src/features/liga.fea b/src/features/liga.fea index 28a3b91e9..8fa85f646 100644 --- a/src/features/liga.fea +++ b/src/features/liga.fea @@ -6,26 +6,27 @@ # https://learn.microsoft.com/en-us/typography/opentype/spec/chapter2#lookup-table lookupflag IgnoreMarks; -# /r/t -> /r/t.1 -sub [ - r - rrthook - uni024D - rturn - rturnrthook - rfishhookrev - rfishhook - rdescend - racute - rcommaaccent - rcaron - rdblgrave - rinvertedbreve - rdotaccent - rdotbelow - rdotbelowmacron - rlinebelow -] t' by t.1; +# ffi +sub f f' i by f.i.1; -# /f/i -> /f.i/i -sub f' [f i] by f.i; +# fi +sub f' [ + i idotless idotless.double itildebelow ibar igrave iacute iogonek + ihookabove idotbelow icyrillic ij i.sc + + j jdotless jdotlessbar uni0249 uni0249.ccmp jcrosstail yotgreek jecyrillic +] by f.i; + +# tt, ft, rt, tf, ff, ft, etc. +# left side "trigger" glyph for t.1 and f.1 sub +@LIGA_L_t = [ + f f.1 fdotaccent feng + + r rrthook uni024D rfishhook rdescend racute rcommaaccent rcaron + rdblgrave rinvertedbreve rdotaccent rdotbelow rdotbelowmacron rlinebelow + + t t.1 tpalatalhook trthook tcurl tbar tcedilla tcaron tcommaaccent tdotaccent + tdotbelow tlinebelow tcircumflexbelow tdieresis +]; +sub @LIGA_L_t t' by t.1; +sub @LIGA_L_t f' by f.1;