diff options
author | Rasmus Andersson <rasmus@notion.se> | 2023-05-26 01:26:31 +0300 |
---|---|---|
committer | Rasmus Andersson <rasmus@notion.se> | 2023-05-26 01:26:31 +0300 |
commit | 3b07eda8fdc49f0266fbd2c89ee67602d5faa32d (patch) | |
tree | 78ca58d4f7d5d14dafc4fb1c89facd4d95a67277 | |
parent | af769e739538559b917816613431e801263565dd (diff) | |
download | inter-3b07eda8fdc49f0266fbd2c89ee67602d5faa32d.tar.xz |
extends t.1 and f.1 to cover all t and f derivatives, plus adds cv11 and cv12 for explicit access
62 files changed, 2416 insertions, 177 deletions
diff --git a/src/Inter-Italic.glyphspackage/fontinfo.plist b/src/Inter-Italic.glyphspackage/fontinfo.plist index 9a313e8b3..6699a710d 100644 --- a/src/Inter-Italic.glyphspackage/fontinfo.plist +++ b/src/Inter-Italic.glyphspackage/fontinfo.plist @@ -740,6 +740,11 @@ iebrevecyrillic, eturn, _part.f_base, f, +f.1, +f.i, +f.i.1, +fdotaccent.1, +feng.1, longs, slongstroke, slongdotaccent, @@ -978,7 +983,6 @@ germandbls, germandbls.1, _part.t_base, t, -t.1, tpalatalhook, trthook, _part.tcurl_base, @@ -994,6 +998,16 @@ tdotbelow, tlinebelow, tcircumflexbelow, tdieresis, +t.1, +tpalatalhook.1, +tcedilla.1, +tcaron.1, +tcommaaccent.1, +tdotaccent.1, +tdotbelow.1, +tlinebelow.1, +tcircumflexbelow.1, +tdieresis.1, u, udieresis, utilde, @@ -2685,6 +2699,18 @@ code = "include(features/cv10-g-spur.fea);"; tag = cv10; }, { +code = "cvParameters { FeatUILabelNameID { name \"Compact f\"; }; }; +include(features/cv12-compact-f.fea); +"; +tag = cv12; +}, +{ +code = "cvParameters { FeatUILabelNameID { name \"Compact t\"; }; }; +include(features/cv13-compact-t.fea); +"; +tag = cv13; +}, +{ automatic = 1; code = "sub G by g.sc; sub Ghook by ghook.sc; diff --git a/src/Inter-Italic.glyphspackage/glyphs/C_cedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/C_cedilla.glyph index b43451f02..1173c0d85 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/C_cedilla.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/C_cedilla.glyph @@ -10,7 +10,7 @@ shapes = ( ref = C; }, { -pos = (499,-12); +pos = (497,-12); ref = cedillacomb; } ); diff --git a/src/Inter-Italic.glyphspackage/glyphs/C_cedillaacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/C_cedillaacute.glyph index a686b1aa2..90ac2fd32 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/C_cedillaacute.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/C_cedillaacute.glyph @@ -11,7 +11,7 @@ shapes = ( ref = C; }, { -pos = (499,-12); +pos = (497,-12); ref = cedillacomb; }, { diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_cedillabreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_cedillabreve.glyph index fa4fb684d..1546e2754 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/E_cedillabreve.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/E_cedillabreve.glyph @@ -10,7 +10,7 @@ shapes = ( ref = E; }, { -pos = (356,0); +pos = (354,0); ref = cedillacomb; }, { diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_sdescendercyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_sdescendercyrillic.glyph index 617f96f3c..86f24226d 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/E_sdescendercyrillic.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/E_sdescendercyrillic.glyph @@ -10,7 +10,7 @@ shapes = ( ref = C; }, { -pos = (499,-12); +pos = (497,-12); ref = cedillacomb; } ); diff --git a/src/Inter-Italic.glyphspackage/glyphs/H_cedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/H_cedilla.glyph index 9cf75efc4..189575a20 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/H_cedilla.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/H_cedilla.glyph @@ -11,7 +11,7 @@ ref = H; }, { anchor = cedilla; -pos = (15,-2); +pos = (13,-2); ref = cedillacomb; } ); diff --git a/src/Inter-Italic.glyphspackage/glyphs/S_cedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/S_cedilla.glyph index b1e3e2309..94311331a 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/S_cedilla.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/S_cedilla.glyph @@ -11,7 +11,7 @@ ref = S; }, { anchor = cedilla; -pos = (375,0); +pos = (373,0); ref = cedillacomb; } ); diff --git a/src/Inter-Italic.glyphspackage/glyphs/T_commaaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/T_commaaccent.glyph index fc1925e60..a96aa5871 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/T_commaaccent.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/T_commaaccent.glyph @@ -11,7 +11,7 @@ ref = T; }, { anchor = cedilla; -pos = (402,0); +pos = (400,0); ref = cedillacomb; } ); diff --git a/src/Inter-Italic.glyphspackage/glyphs/Z_edescendercyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/Z_edescendercyrillic.glyph index c8cfe54d4..1b4e2c46a 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/Z_edescendercyrillic.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/Z_edescendercyrillic.glyph @@ -9,7 +9,7 @@ shapes = ( ref = afii10025; }, { -pos = (398,0); +pos = (396,0); ref = cedillacomb; } ); @@ -48,7 +48,7 @@ shapes = ( ref = afii10025; }, { -pos = (430,0); +pos = (423,0); ref = cedillacomb; } ); @@ -61,7 +61,7 @@ shapes = ( ref = afii10025; }, { -pos = (272,0); +pos = (267,0); ref = cedillacomb; } ); @@ -74,7 +74,7 @@ shapes = ( ref = afii10025; }, { -pos = (506,0); +pos = (501,0); ref = cedillacomb; } ); diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.t_base.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.t_base.glyph index 4931dfa15..da8e96ff8 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/_part.t_base.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/_part.t_base.glyph @@ -9,7 +9,7 @@ pos = (312,0); }, { name = cedilla; -pos = (336,0); +pos = (312,0); }, { name = lfthook; @@ -37,8 +37,8 @@ nodes = ( (440,46,o), (427,43,o), (416,40,cs), -(296,10,o), -(235,80,o), +(295,9,o), +(234,76,o), (257,213,cs), (451,1384,l), (405,1384,l) @@ -55,7 +55,7 @@ pos = (324,0); }, { name = cedilla; -pos = (408,0); +pos = (379,0); }, { name = lfthook; @@ -101,7 +101,7 @@ pos = (372,0); }, { name = cedilla; -pos = (478,0); +pos = (415,0); }, { name = lfthook; @@ -130,7 +130,7 @@ nodes = ( (632,289,o), (608,289,cs), (555,289,o), -(535,312,o), +(536,312,o), (543,359,cs), (713,1384,l), (311,1384,l) @@ -147,7 +147,7 @@ pos = (297,0); }, { name = cedilla; -pos = (399,0); +pos = (311,0); }, { name = lfthook; @@ -193,7 +193,7 @@ pos = (361,0); }, { name = cedilla; -pos = (467,0); +pos = (413,0); }, { name = lfthook; @@ -239,7 +239,7 @@ pos = (261,0); }, { name = cedilla; -pos = (284,0); +pos = (254,0); }, { name = lfthook; @@ -292,8 +292,8 @@ nodes = ( (377,46,o), (351,46,o), (325,46,cs), -(220,46,o), -(179,95,o), +(214,46,o), +(178,89,o), (196,200,cs), (385,1344,l), (339,1344,l) diff --git a/src/Inter-Italic.glyphspackage/glyphs/ccedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/ccedilla.glyph index 690ba4d1a..1b24cf987 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/ccedilla.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/ccedilla.glyph @@ -10,7 +10,7 @@ shapes = ( ref = c; }, { -pos = (331,0); +pos = (329,0); ref = cedillacomb; } ); diff --git a/src/Inter-Italic.glyphspackage/glyphs/ccedillaacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/ccedillaacute.glyph index 3737432f3..630cfae5c 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/ccedillaacute.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/ccedillaacute.glyph @@ -11,7 +11,7 @@ shapes = ( ref = c; }, { -pos = (331,0); +pos = (329,0); ref = cedillacomb; }, { diff --git a/src/Inter-Italic.glyphspackage/glyphs/cedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/cedilla.glyph index 3c44b3ac4..9202bf6d3 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/cedilla.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/cedilla.glyph @@ -10,7 +10,7 @@ alignment = 1; ref = cedillacomb; } ); -width = 546; +width = 547; }, { layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; diff --git a/src/Inter-Italic.glyphspackage/glyphs/cedillacomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/cedillacomb.glyph index c4b3da926..8e3e08279 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/cedillacomb.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/cedillacomb.glyph @@ -5,34 +5,35 @@ layers = ( anchors = ( { name = _cedilla; -pos = (186,0); +pos = (188,0); } ); layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +name = ital_gen; shapes = ( { closed = 1; nodes = ( -(58,-136,l), +(59,-136,l), (169,-145,o), -(212,-163,o), -(200,-230,cs), -(189,-297,o), -(119,-323,o), -(30,-322,c), -(14,-436,l), -(215,-436,o), -(335,-349,o), -(354,-224,cs), -(375,-111,o), -(308,-64,o), -(232,-52,c), -(256,6,l), -(114,6,l) -); -} -); -width = 546; +(213,-163,o), +(202,-230,cs), +(191,-297,o), +(120,-323,o), +(29,-322,c), +(16,-436,l), +(217,-436,o), +(336,-349,o), +(357,-224,cs), +(376,-111,o), +(307,-64,o), +(233,-52,c), +(255,6,l), +(122,30,l) +); +} +); +width = 547; }, { anchors = ( @@ -41,31 +42,39 @@ name = _cedilla; pos = (364,0); } ); +guides = ( +{ +orientation = center; +angle = 80.6; +pos = (164,132); +} +); layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +name = ital_gen; shapes = ( { closed = 1; nodes = ( (236,-146,l), -(326,-160,o), -(367,-195,o), -(354,-250,cs), -(340,-308,o), -(259,-340,o), +(328,-160,o), +(368,-196,o), +(355,-250,cs), +(342,-309,o), +(260,-340,o), (116,-340,c), (90,-494,l), -(364,-495,o), +(363,-494,o), (544,-399,o), -(568,-242,cs), -(585,-148,o), -(527,-79,o), +(570,-242,cs), +(584,-147,o), +(528,-79,o), (416,-62,c), -(440,6,l), -(296,6,l) +(439,6,l), +(310,44,l) ); } ); -width = 914; +width = 915; }, { anchors = ( @@ -75,26 +84,27 @@ pos = (122,0); } ); layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +name = ital_gen; shapes = ( { closed = 1; nodes = ( (62,-96,l), -(170,-95,o), -(216,-138,o), -(204,-222,cs), -(193,-292,o), -(144,-326,o), +(168,-94,o), +(217,-137,o), +(203,-222,cs), +(192,-292,o), +(143,-325,o), (34,-328,c), -(30,-376,l), +(28,-376,l), (157,-371,o), -(233,-323,o), -(250,-222,cs), -(265,-131,o), -(224,-68,o), -(126,-52,c), -(146,6,l), -(100,6,l) +(232,-324,o), +(249,-222,cs), +(264,-131,o), +(223,-68,o), +(125,-52,c), +(147,6,l), +(107,28,l) ); } ); @@ -104,30 +114,31 @@ width = 418; anchors = ( { name = _cedilla; -pos = (154,0); +pos = (161,0); } ); layerId = m008; +name = ital_gen; shapes = ( { closed = 1; nodes = ( -(26,-136,l), -(137,-145,o), -(180,-163,o), -(168,-230,cs), -(157,-297,o), -(87,-323,o), -(-2,-322,c), -(-18,-436,l), -(183,-436,o), -(303,-349,o), -(322,-224,cs), -(343,-111,o), -(276,-64,o), -(200,-52,c), -(224,6,l), -(82,6,l) +(32,-136,l), +(142,-145,o), +(186,-163,o), +(175,-230,cs), +(164,-297,o), +(93,-323,o), +(2,-322,c), +(-11,-436,l), +(190,-436,o), +(309,-349,o), +(330,-224,cs), +(349,-111,o), +(280,-64,o), +(206,-52,c), +(228,6,l), +(95,31,l) ); } ); @@ -137,30 +148,38 @@ width = 482; anchors = ( { name = _cedilla; -pos = (348,0); +pos = (353,0); +} +); +guides = ( +{ +orientation = center; +angle = 80.6; +pos = (-2145,132); } ); layerId = m010; +name = ital_gen; shapes = ( { closed = 1; nodes = ( -(220,-146,l), -(310,-160,o), -(351,-195,o), -(338,-250,cs), -(324,-308,o), -(243,-340,o), -(100,-340,c), -(74,-494,l), -(348,-495,o), -(528,-399,o), -(552,-242,cs), -(569,-148,o), -(511,-79,o), -(400,-62,c), -(424,6,l), -(280,6,l) +(225,-146,l), +(317,-160,o), +(357,-196,o), +(344,-250,cs), +(331,-309,o), +(249,-340,o), +(105,-340,c), +(79,-494,l), +(352,-494,o), +(533,-399,o), +(559,-242,cs), +(573,-147,o), +(517,-79,o), +(405,-62,c), +(428,6,l), +(296,36,l) ); } ); @@ -170,30 +189,31 @@ width = 882; anchors = ( { name = _cedilla; -pos = (58,0); +pos = (63,0); } ); layerId = m012; +name = ital_gen; shapes = ( { closed = 1; nodes = ( -(-2,-96,l), -(106,-95,o), -(152,-138,o), -(140,-222,cs), -(129,-292,o), -(80,-326,o), -(-30,-328,c), -(-34,-376,l), -(93,-371,o), -(169,-323,o), -(186,-222,cs), -(201,-131,o), -(160,-68,o), -(62,-52,c), -(82,6,l), -(36,6,l) +(3,-96,l), +(109,-94,o), +(158,-137,o), +(144,-222,cs), +(133,-292,o), +(84,-325,o), +(-25,-328,c), +(-31,-376,l), +(98,-371,o), +(173,-324,o), +(190,-222,cs), +(205,-131,o), +(162,-68,o), +(64,-52,c), +(86,6,l), +(43,15,l) ); } ); diff --git a/src/Inter-Italic.glyphspackage/glyphs/chedescenderabkhasiancyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/chedescenderabkhasiancyrillic.glyph index 5a7c8e555..11b5ebb8a 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/chedescenderabkhasiancyrillic.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/chedescenderabkhasiancyrillic.glyph @@ -9,7 +9,7 @@ shapes = ( ref = cheabkhasiancyrillic; }, { -pos = (566,0); +pos = (564,0); ref = cedillacomb; } ); diff --git a/src/Inter-Italic.glyphspackage/glyphs/ecedillabreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/ecedillabreve.glyph index 09e145420..b560f1dce 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/ecedillabreve.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/ecedillabreve.glyph @@ -10,7 +10,7 @@ shapes = ( ref = e; }, { -pos = (326,0); +pos = (324,0); ref = cedillacomb; }, { diff --git a/src/Inter-Italic.glyphspackage/glyphs/esdescendercyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/esdescendercyrillic.glyph index eae415baa..2f38711e4 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/esdescendercyrillic.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/esdescendercyrillic.glyph @@ -10,7 +10,7 @@ shapes = ( ref = c; }, { -pos = (331,0); +pos = (329,0); ref = cedillacomb; } ); diff --git a/src/Inter-Italic.glyphspackage/glyphs/f.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/f.1.glyph index 32c3eb609..d92f3144c 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/f.1.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/f.1.glyph @@ -1,4 +1,5 @@ { +color = 9; glyphname = f.1; kernLeft = B; kernRight = f; diff --git a/src/Inter-Italic.glyphspackage/glyphs/f.i.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/f.i.1.glyph index 9f9d19741..543a7cb21 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/f.i.1.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/f.i.1.glyph @@ -1,4 +1,5 @@ { +color = 9; glyphname = f.i.1; kernLeft = B; layers = ( diff --git a/src/Inter-Italic.glyphspackage/glyphs/f.i.glyph b/src/Inter-Italic.glyphspackage/glyphs/f.i.glyph index 65e8e66ec..c5c834be9 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/f.i.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/f.i.glyph @@ -1,4 +1,5 @@ { +color = 9; glyphname = f.i; kernLeft = f; kernRight = f; diff --git a/src/Inter-Italic.glyphspackage/glyphs/fdotaccent.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/fdotaccent.1.glyph new file mode 100644 index 000000000..be0b0434b --- /dev/null +++ b/src/Inter-Italic.glyphspackage/glyphs/fdotaccent.1.glyph @@ -0,0 +1,92 @@ +{ +color = 9; +glyphname = fdotaccent.1; +kernLeft = B; +kernRight = f; +layers = ( +{ +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +name = ital_gen; +shapes = ( +{ +ref = f.1; +}, +{ +pos = (205,431); +ref = dotaccentcomb; +} +); +width = 673; +}, +{ +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +name = ital_gen; +shapes = ( +{ +ref = f.1; +}, +{ +pos = (188,420); +ref = dotaccentcomb; +} +); +width = 790; +}, +{ +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +name = ital_gen; +shapes = ( +{ +ref = f.1; +}, +{ +pos = (240,430); +ref = dotaccentcomb; +} +); +width = 563; +}, +{ +layerId = m008; +name = ital_gen; +shapes = ( +{ +ref = f.1; +}, +{ +pos = (175,434); +ref = dotaccentcomb; +} +); +width = 554; +}, +{ +layerId = m010; +name = ital_gen; +shapes = ( +{ +ref = f.1; +}, +{ +pos = (130,434); +ref = dotaccentcomb; +} +); +width = 745; +}, +{ +layerId = m012; +name = ital_gen; +shapes = ( +{ +ref = f.1; +}, +{ +pos = (217,434); +ref = dotaccentcomb; +} +); +width = 434; +} +); +} diff --git a/src/Inter-Italic.glyphspackage/glyphs/feng.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/feng.1.glyph new file mode 100644 index 000000000..d23523d12 --- /dev/null +++ b/src/Inter-Italic.glyphspackage/glyphs/feng.1.glyph @@ -0,0 +1,112 @@ +{ +color = 9; +glyphname = feng.1; +kernLeft = B; +kernRight = a; +layers = ( +{ +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +name = ital_gen; +shapes = ( +{ +alignment = -1; +ref = f.1; +}, +{ +alignment = -1; +pos = (430,0); +ref = eng; +} +); +width = 1630; +}, +{ +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +name = ital_gen; +shapes = ( +{ +alignment = -1; +ref = f.1; +}, +{ +alignment = -1; +pos = (621,0); +ref = eng; +} +); +width = 1951; +}, +{ +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +name = ital_gen; +shapes = ( +{ +alignment = -1; +ref = f.1; +}, +{ +alignment = -1; +pos = (315,0); +ref = eng; +} +); +width = 1512; +}, +{ +layerId = m008; +name = ital_gen; +shapes = ( +{ +alignment = -1; +ref = f.1; +}, +{ +alignment = -1; +pos = (381,0); +ref = eng; +} +); +width = 1502; +}, +{ +layerId = m010; +name = ital_gen; +shapes = ( +{ +alignment = -1; +ref = f.1; +}, +{ +alignment = -1; +pos = (614,0); +ref = eng; +} +); +width = 1881; +}, +{ +layerId = m012; +name = ital_gen; +shapes = ( +{ +alignment = -1; +ref = f.1; +}, +{ +alignment = -1; +pos = (275,0); +ref = eng; +} +); +width = 1344; +} +); +metricLeft = f.1; +metricRight = n; +userData = { +interface.gridadjust.original = "{'width': 2354.0, 'leftMargin': 83, 'rightMargin': 187.0}"; +"interface.width-adjustments" = ( +-16 +); +}; +} diff --git a/src/Inter-Italic.glyphspackage/glyphs/hcedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/hcedilla.glyph index b4523a8f7..7c71ddf74 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/hcedilla.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/hcedilla.glyph @@ -11,7 +11,7 @@ ref = h; }, { anchor = cedilla; -pos = (-17,0); +pos = (-19,0); ref = cedillacomb; } ); diff --git a/src/Inter-Italic.glyphspackage/glyphs/longs.glyph b/src/Inter-Italic.glyphspackage/glyphs/longs.glyph index 9261d41b7..0b1f9d246 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/longs.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/longs.glyph @@ -1,5 +1,6 @@ { glyphname = longs; +kernLeft = B; layers = ( { anchors = ( diff --git a/src/Inter-Italic.glyphspackage/glyphs/scedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/scedilla.glyph index 811da3cc0..ca7e49b07 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/scedilla.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/scedilla.glyph @@ -10,7 +10,7 @@ shapes = ( ref = s; }, { -pos = (266,0); +pos = (264,0); ref = cedillacomb; } ); @@ -49,7 +49,7 @@ shapes = ( ref = s; }, { -pos = (253,0); +pos = (246,0); ref = cedillacomb; } ); @@ -62,7 +62,7 @@ shapes = ( ref = s; }, { -pos = (138,0); +pos = (133,0); ref = cedillacomb; } ); @@ -75,7 +75,7 @@ shapes = ( ref = s; }, { -pos = (316,0); +pos = (311,0); ref = cedillacomb; } ); diff --git a/src/Inter-Italic.glyphspackage/glyphs/slongdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/slongdotaccent.glyph index 17c8d57aa..1ea153e5e 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/slongdotaccent.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/slongdotaccent.glyph @@ -1,5 +1,6 @@ { glyphname = slongdotaccent; +kernLeft = B; layers = ( { layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; diff --git a/src/Inter-Italic.glyphspackage/glyphs/tcaron.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/tcaron.1.glyph new file mode 100644 index 000000000..8623d2a15 --- /dev/null +++ b/src/Inter-Italic.glyphspackage/glyphs/tcaron.1.glyph @@ -0,0 +1,93 @@ +{ +color = 9; +glyphname = tcaron.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (266,72); +ref = commaaccentright.cn; +} +); +width = 641; +}, +{ +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (520,72); +ref = commaaccentright.cn; +} +); +width = 759; +}, +{ +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (136,72); +ref = commaaccentright.cn; +} +); +width = 517; +}, +{ +layerId = m008; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (261,0); +ref = commaaccentright.cn; +} +); +width = 560; +}, +{ +layerId = m010; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (525,72); +ref = commaaccentright.cn; +} +); +width = 744; +}, +{ +layerId = m012; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (141,72); +ref = commaaccentright.cn; +} +); +width = 443; +} +); +metricLeft = t; +} diff --git a/src/Inter-Italic.glyphspackage/glyphs/tcedilla.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/tcedilla.1.glyph new file mode 100644 index 000000000..8f0af9dfe --- /dev/null +++ b/src/Inter-Italic.glyphspackage/glyphs/tcedilla.1.glyph @@ -0,0 +1,98 @@ +{ +color = 9; +glyphname = tcedilla.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +anchor = cedilla; +pos = (117,0); +ref = cedillacomb; +} +); +width = 641; +}, +{ +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +anchor = cedilla; +pos = (-21,0); +ref = cedillacomb; +} +); +width = 759; +}, +{ +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +anchor = cedilla; +pos = (120,0); +ref = cedillacomb; +} +); +width = 517; +}, +{ +layerId = m008; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +anchor = cedilla; +pos = (76,0); +ref = cedillacomb; +} +); +width = 560; +}, +{ +layerId = m010; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +anchor = cedilla; +pos = (-12,0); +ref = cedillacomb; +} +); +width = 744; +}, +{ +layerId = m012; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +anchor = cedilla; +pos = (121,0); +ref = cedillacomb; +} +); +width = 443; +} +); +} diff --git a/src/Inter-Italic.glyphspackage/glyphs/tcedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/tcedilla.glyph index e62049e4d..8d0e8ae62 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/tcedilla.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/tcedilla.glyph @@ -11,7 +11,7 @@ ref = t; }, { anchor = cedilla; -pos = (179,0); +pos = (148,0); ref = cedillacomb; } ); @@ -25,7 +25,7 @@ ref = t; }, { anchor = cedilla; -pos = (103,0); +pos = (40,0); ref = cedillacomb; } ); @@ -39,7 +39,7 @@ ref = t; }, { anchor = cedilla; -pos = (121,0); +pos = (97,0); ref = cedillacomb; } ); @@ -53,7 +53,7 @@ ref = t; }, { anchor = cedilla; -pos = (248,0); +pos = (153,0); ref = cedillacomb; } ); @@ -67,7 +67,7 @@ ref = t; }, { anchor = cedilla; -pos = (160,0); +pos = (101,0); ref = cedillacomb; } ); @@ -81,7 +81,7 @@ ref = t; }, { anchor = cedilla; -pos = (187,0); +pos = (152,0); ref = cedillacomb; } ); diff --git a/src/Inter-Italic.glyphspackage/glyphs/tcircumflexbelow.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/tcircumflexbelow.1.glyph new file mode 100644 index 000000000..92b4b5bca --- /dev/null +++ b/src/Inter-Italic.glyphspackage/glyphs/tcircumflexbelow.1.glyph @@ -0,0 +1,92 @@ +{ +color = 9; +glyphname = tcircumflexbelow.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (924,0); +ref = circumflexsubcomb; +} +); +width = 641; +}, +{ +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (1066,0); +ref = circumflexsubcomb; +} +); +width = 759; +}, +{ +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (846,0); +ref = circumflexsubcomb; +} +); +width = 517; +}, +{ +layerId = m008; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (924,0); +ref = circumflexsubcomb; +} +); +width = 560; +}, +{ +layerId = m010; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (1067,0); +ref = circumflexsubcomb; +} +); +width = 744; +}, +{ +layerId = m012; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (852,0); +ref = circumflexsubcomb; +} +); +width = 443; +} +); +} diff --git a/src/Inter-Italic.glyphspackage/glyphs/tcommaaccent.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/tcommaaccent.1.glyph new file mode 100644 index 000000000..08ae4c134 --- /dev/null +++ b/src/Inter-Italic.glyphspackage/glyphs/tcommaaccent.1.glyph @@ -0,0 +1,98 @@ +{ +color = 9; +glyphname = tcommaaccent.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +alignment = 1; +pos = (64,0); +ref = commaaccent; +} +); +width = 641; +}, +{ +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +alignment = 1; +pos = (114,0); +ref = commaaccent; +} +); +width = 759; +}, +{ +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +alignment = 1; +pos = (56,0); +ref = commaaccent; +} +); +width = 517; +}, +{ +layerId = m008; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +alignment = 1; +pos = (69,0); +ref = commaaccent; +} +); +width = 560; +}, +{ +layerId = m010; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +alignment = 1; +pos = (119,0); +ref = commaaccent; +} +); +width = 744; +}, +{ +layerId = m012; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +alignment = 1; +pos = (69,0); +ref = commaaccent; +} +); +width = 443; +} +); +} diff --git a/src/Inter-Italic.glyphspackage/glyphs/tdieresis.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/tdieresis.1.glyph new file mode 100644 index 000000000..d97b859fe --- /dev/null +++ b/src/Inter-Italic.glyphspackage/glyphs/tdieresis.1.glyph @@ -0,0 +1,92 @@ +{ +color = 9; +glyphname = tdieresis.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-314,266); +ref = dieresiscomb; +} +); +width = 641; +}, +{ +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-318,266); +ref = dieresiscomb; +} +); +width = 759; +}, +{ +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-317,266); +ref = dieresiscomb; +} +); +width = 517; +}, +{ +layerId = m008; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-310,288); +ref = dieresiscomb; +} +); +width = 560; +}, +{ +layerId = m010; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-315,288); +ref = dieresiscomb; +} +); +width = 744; +}, +{ +layerId = m012; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-329,288); +ref = dieresiscomb; +} +); +width = 443; +} +); +} diff --git a/src/Inter-Italic.glyphspackage/glyphs/tdotaccent.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/tdotaccent.1.glyph new file mode 100644 index 000000000..dcc092c9a --- /dev/null +++ b/src/Inter-Italic.glyphspackage/glyphs/tdotaccent.1.glyph @@ -0,0 +1,98 @@ +{ +color = 9; +glyphname = tdotaccent.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +name = ital_gen; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (43,266); +ref = dotaccentcomb; +} +); +width = 641; +}, +{ +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +name = ital_gen; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (13,266); +ref = dotaccentcomb; +} +); +width = 759; +}, +{ +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +name = ital_gen; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (79,266); +ref = dotaccentcomb; +} +); +width = 517; +}, +{ +layerId = m008; +name = ital_gen; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (47,288); +ref = dotaccentcomb; +} +); +width = 560; +}, +{ +layerId = m010; +name = ital_gen; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (15,288); +ref = dotaccentcomb; +} +); +width = 744; +}, +{ +layerId = m012; +name = ital_gen; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (83,288); +ref = dotaccentcomb; +} +); +width = 443; +} +); +} diff --git a/src/Inter-Italic.glyphspackage/glyphs/tdotbelow.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/tdotbelow.1.glyph new file mode 100644 index 000000000..23b0f4956 --- /dev/null +++ b/src/Inter-Italic.glyphspackage/glyphs/tdotbelow.1.glyph @@ -0,0 +1,92 @@ +{ +color = 9; +glyphname = tdotbelow.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (946,0); +ref = dotbelow; +} +); +width = 641; +}, +{ +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (930,0); +ref = dotbelow; +} +); +width = 759; +}, +{ +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (894,0); +ref = dotbelow; +} +); +width = 517; +}, +{ +layerId = m008; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (951,0); +ref = dotbelow; +} +); +width = 560; +}, +{ +layerId = m010; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (935,0); +ref = dotbelow; +} +); +width = 744; +}, +{ +layerId = m012; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (907,0); +ref = dotbelow; +} +); +width = 443; +} +); +} diff --git a/src/Inter-Italic.glyphspackage/glyphs/tlinebelow.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/tlinebelow.1.glyph new file mode 100644 index 000000000..9566186bb --- /dev/null +++ b/src/Inter-Italic.glyphspackage/glyphs/tlinebelow.1.glyph @@ -0,0 +1,92 @@ +{ +color = 9; +glyphname = tlinebelow.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-146,0); +ref = macronsub; +} +); +width = 641; +}, +{ +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-24,0); +ref = macronsub; +} +); +width = 759; +}, +{ +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-66,0); +ref = macronsub; +} +); +width = 517; +}, +{ +layerId = m008; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-105,0); +ref = macronsub; +} +); +width = 560; +}, +{ +layerId = m010; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-8,0); +ref = macronsub; +} +); +width = 744; +}, +{ +layerId = m012; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-105,0); +ref = macronsub; +} +); +width = 443; +} +); +} diff --git a/src/Inter-Italic.glyphspackage/glyphs/tpalatalhook.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/tpalatalhook.1.glyph new file mode 100644 index 000000000..de402316b --- /dev/null +++ b/src/Inter-Italic.glyphspackage/glyphs/tpalatalhook.1.glyph @@ -0,0 +1,106 @@ +{ +color = 9; +glyphname = tpalatalhook.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +name = ital_gen; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (79,0); +ref = _part.bottom_lfthook_t; +} +); +width = 641; +}, +{ +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +name = ital_gen; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-23,-3); +ref = _part.bottom_lfthook_t; +} +); +width = 759; +}, +{ +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +name = ital_gen; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (157,6); +ref = _part.bottom_lfthook_t; +} +); +width = 517; +}, +{ +layerId = m008; +name = ital_gen; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-2,0); +ref = _part.bottom_lfthook_t; +} +); +width = 560; +}, +{ +layerId = m010; +name = ital_gen; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-43,0); +ref = _part.bottom_lfthook_t; +} +); +width = 744; +}, +{ +layerId = m012; +name = ital_gen; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (97,2); +ref = _part.bottom_lfthook_t; +} +); +width = 443; +} +); +metricLeft = t; +metricRight = t; +userData = { +interface.gridadjust.original = "{'width': 924.0, 'leftMargin': 0, 'rightMargin': 96.0}"; +"interface.width-adjustments" = ( +-16 +); +}; +} diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0228.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0228.glyph index 759209b1b..b7dbdac49 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/uni0228.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/uni0228.glyph @@ -10,7 +10,7 @@ shapes = ( ref = E; }, { -pos = (356,0); +pos = (354,0); ref = cedillacomb; } ); diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0229.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0229.glyph index 2f9b99530..4e25afb7b 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/uni0229.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/uni0229.glyph @@ -10,7 +10,7 @@ shapes = ( ref = e; }, { -pos = (326,0); +pos = (324,0); ref = cedillacomb; } ); diff --git a/src/Inter-Italic.glyphspackage/glyphs/zedescendercyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/zedescendercyrillic.glyph index 99996c062..7db403d7e 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/zedescendercyrillic.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/zedescendercyrillic.glyph @@ -8,7 +8,7 @@ shapes = ( ref = zecyrillic; }, { -pos = (242,0); +pos = (240,0); ref = cedillacomb; } ); diff --git a/src/Inter-Italic.glyphspackage/order.plist b/src/Inter-Italic.glyphspackage/order.plist index aaf370171..8e8131004 100644 --- a/src/Inter-Italic.glyphspackage/order.plist +++ b/src/Inter-Italic.glyphspackage/order.plist @@ -616,6 +616,11 @@ iocyrillic, iebrevecyrillic, eturn, f, +f.1, +f.i, +f.i.1, +fdotaccent.1, +feng.1, longs, slongstroke, slongdotaccent, @@ -854,7 +859,6 @@ germandbls, germandbls.1, _part.t_base, t, -t.1, tpalatalhook, trthook, _part.tcurl_base, @@ -870,6 +874,16 @@ tdotbelow, tlinebelow, tcircumflexbelow, tdieresis, +t.1, +tpalatalhook.1, +tcedilla.1, +tcaron.1, +tcommaaccent.1, +tdotaccent.1, +tdotbelow.1, +tlinebelow.1, +tcircumflexbelow.1, +tdieresis.1, u, udieresis, utilde, @@ -1999,10 +2013,7 @@ uni2184, upsilonlatin, vscript, wynn, -f.1, h.sc, -f.i, -f.i.1, m.sc, t.sc, uni2094, @@ -2471,7 +2482,6 @@ uni1FDF.tonos, uni1FEF.tonos, uni1FFD.tonos, dieresisacutecomb.lc, -carondot.lc, caronsubcomb, ascript_uni02DE, dotmacron.lc, @@ -2485,14 +2495,10 @@ ringacute.uc, dieresiscaroncomb.uc, dieresismacroncomb.uc, carondot.uc, -brevegravecomb.cn, -brevetildecomb.cn, dieresisacutecomb.uc, dotmacroncomb.uc, macrondieresiscomb.cn, dieresisgravecomb.uc, -circumflextildecomb.cn, -tonostop, tildeacutecomb.uc, ringcomb.uc, pecyrillicturn, @@ -2540,6 +2546,7 @@ tackupsubcomb, tildemidcomb, tildesubcomb, tildevertsupcomb, +tonostop, underscorecomb, underscoredblcomb, xsupcomb, @@ -2556,9 +2563,13 @@ _tildecross.cn, acutedotcomb.cn, acutedotcomb.lc, breveacutecomb.cn, +brevegravecomb.cn, +brevetildecomb.cn, +carondot.lc, circumflexacutecomb.cn, circumflexgravecomb.cn, circumflexhookcomb.cn, +circumflextildecomb.cn, commaaccentright.cn, commaaccentrotate.cn, crossbar.uc, diff --git a/src/Inter-Roman.glyphspackage/fontinfo.plist b/src/Inter-Roman.glyphspackage/fontinfo.plist index 702a7d25c..e5f90494c 100644 --- a/src/Inter-Roman.glyphspackage/fontinfo.plist +++ b/src/Inter-Roman.glyphspackage/fontinfo.plist @@ -741,6 +741,10 @@ eturn, _part.f_base, f, f.1, +f.i, +f.i.1, +fdotaccent.1, +feng.1, longs, slongstroke, slongdotaccent, @@ -979,7 +983,6 @@ germandbls, germandbls.1, _part.t_base, t, -t.1, tpalatalhook, trthook, _part.tcurl_base, @@ -995,6 +998,16 @@ tdotbelow, tlinebelow, tcircumflexbelow, tdieresis, +t.1, +tpalatalhook.1, +tcedilla.1, +tcaron.1, +tcommaaccent.1, +tdotaccent.1, +tdotbelow.1, +tlinebelow.1, +tcircumflexbelow.1, +tdieresis.1, u, udieresis, utilde, @@ -2694,6 +2707,17 @@ include(features/cv11-single-storey-a.fea); tag = cv11; }, { +code = "cvParameters { FeatUILabelNameID { name \"Compact f\"; }; }; +include(features/cv12-compact-f.fea);"; +tag = cv12; +}, +{ +code = "cvParameters { FeatUILabelNameID { name \"Compact t\"; }; }; +include(features/cv13-compact-t.fea); +"; +tag = cv13; +}, +{ automatic = 1; code = "sub G by g.sc; sub Ghook by ghook.sc; diff --git a/src/Inter-Roman.glyphspackage/glyphs/_part.t_base.glyph b/src/Inter-Roman.glyphspackage/glyphs/_part.t_base.glyph index ccb0d9f10..96ffdf08f 100644 --- a/src/Inter-Roman.glyphspackage/glyphs/_part.t_base.glyph +++ b/src/Inter-Roman.glyphspackage/glyphs/_part.t_base.glyph @@ -9,7 +9,7 @@ pos = (404,0); }, { name = cedilla; -pos = (428,0); +pos = (404,0); }, { name = lfthook; @@ -54,7 +54,7 @@ pos = (416,0); }, { name = cedilla; -pos = (500,0); +pos = (471,0); }, { name = lfthook; @@ -99,7 +99,7 @@ pos = (384,0); }, { name = cedilla; -pos = (486,0); +pos = (398,0); }, { name = lfthook; @@ -230,7 +230,7 @@ pos = (348,0); }, { name = cedilla; -pos = (371,0); +pos = (341,0); }, { name = lfthook; @@ -594,7 +594,7 @@ pos = (448,0); }, { name = cedilla; -pos = (554,0); +pos = (500,0); }, { name = lfthook; @@ -743,7 +743,7 @@ pos = (464,0); }, { name = cedilla; -pos = (570,0); +pos = (507,0); }, { name = lfthook; diff --git a/src/Inter-Roman.glyphspackage/glyphs/cedillacomb.glyph b/src/Inter-Roman.glyphspackage/glyphs/cedillacomb.glyph index dfb88954b..80eefa713 100644 --- a/src/Inter-Roman.glyphspackage/glyphs/cedillacomb.glyph +++ b/src/Inter-Roman.glyphspackage/glyphs/cedillacomb.glyph @@ -28,7 +28,7 @@ nodes = ( (410,-64,o), (334,-52,c), (346,6,l), -(204,6,l) +(209,30,l) ); } ); @@ -68,7 +68,7 @@ nodes = ( (633,-79,o), (518,-62,c), (530,6,l), -(386,6,l) +(395,44,l) ); } ); @@ -101,7 +101,7 @@ nodes = ( (326,-68,o), (226,-52,c), (238,6,l), -(190,6,l) +(194,28,l) ); } ); @@ -161,7 +161,7 @@ nodes = ( (378,-64,o), (302,-52,c), (314,6,l), -(172,6,l) +(177,31,l) ); } ); @@ -201,7 +201,7 @@ nodes = ( (617,-79,o), (502,-62,c), (514,6,l), -(370,6,l) +(377,36,l) ); } ); @@ -234,7 +234,7 @@ nodes = ( (260,-68,o), (160,-52,c), (172,6,l), -(126,6,l) +(128,15,l) ); } ); diff --git a/src/Inter-Roman.glyphspackage/glyphs/f.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/f.1.glyph index 6aa7dad8e..2debcb0eb 100644 --- a/src/Inter-Roman.glyphspackage/glyphs/f.1.glyph +++ b/src/Inter-Roman.glyphspackage/glyphs/f.1.glyph @@ -420,7 +420,7 @@ nodes = ( width = 828; } ); -metricLeft = l; +metricLeft = n; metricRight = f; note = "!flatten"; userData = { diff --git a/src/Inter-Roman.glyphspackage/glyphs/f.i.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/f.i.1.glyph index 795e1ac56..d63272fb4 100644 --- a/src/Inter-Roman.glyphspackage/glyphs/f.i.1.glyph +++ b/src/Inter-Roman.glyphspackage/glyphs/f.i.1.glyph @@ -1,4 +1,5 @@ { +color = 9; glyphname = f.i.1; kernLeft = B; layers = ( diff --git a/src/Inter-Roman.glyphspackage/glyphs/f.i.glyph b/src/Inter-Roman.glyphspackage/glyphs/f.i.glyph index daef7a6f5..965bf8f09 100644 --- a/src/Inter-Roman.glyphspackage/glyphs/f.i.glyph +++ b/src/Inter-Roman.glyphspackage/glyphs/f.i.glyph @@ -1,4 +1,5 @@ { +color = 9; glyphname = f.i; kernLeft = f; kernRight = f; diff --git a/src/Inter-Roman.glyphspackage/glyphs/fdotaccent.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/fdotaccent.1.glyph new file mode 100644 index 000000000..e001596cb --- /dev/null +++ b/src/Inter-Roman.glyphspackage/glyphs/fdotaccent.1.glyph @@ -0,0 +1,86 @@ +{ +color = 9; +glyphname = fdotaccent.1; +kernLeft = B; +kernRight = f; +layers = ( +{ +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( +{ +ref = f.1; +}, +{ +pos = (78,434); +ref = dotaccentcomb; +} +); +width = 676; +}, +{ +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +ref = f.1; +}, +{ +pos = (25,434); +ref = dotaccentcomb; +} +); +width = 768; +}, +{ +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +shapes = ( +{ +ref = f.1; +}, +{ +pos = (132,434); +ref = dotaccentcomb; +} +); +width = 572; +}, +{ +layerId = m007; +shapes = ( +{ +ref = f.1; +}, +{ +pos = (78,434); +ref = dotaccentcomb; +} +); +width = 550; +}, +{ +layerId = m009; +shapes = ( +{ +ref = f.1; +}, +{ +pos = (22,434); +ref = dotaccentcomb; +} +); +width = 744; +}, +{ +layerId = m011; +shapes = ( +{ +ref = f.1; +}, +{ +pos = (114,434); +ref = dotaccentcomb; +} +); +width = 432; +} +); +} diff --git a/src/Inter-Roman.glyphspackage/glyphs/feng.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/feng.1.glyph new file mode 100644 index 000000000..e3aee53fd --- /dev/null +++ b/src/Inter-Roman.glyphspackage/glyphs/feng.1.glyph @@ -0,0 +1,106 @@ +{ +color = 9; +glyphname = feng.1; +kernLeft = B; +kernRight = a; +layers = ( +{ +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( +{ +alignment = -1; +ref = f.1; +}, +{ +alignment = -1; +pos = (433,0); +ref = eng; +} +); +width = 1633; +}, +{ +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +alignment = -1; +ref = f.1; +}, +{ +alignment = -1; +pos = (605,0); +ref = eng; +} +); +width = 1935; +}, +{ +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +shapes = ( +{ +alignment = -1; +ref = f.1; +}, +{ +alignment = -1; +pos = (316,0); +ref = eng; +} +); +width = 1512; +}, +{ +layerId = m007; +shapes = ( +{ +alignment = -1; +ref = f.1; +}, +{ +alignment = -1; +pos = (375,0); +ref = eng; +} +); +width = 1495; +}, +{ +layerId = m009; +shapes = ( +{ +alignment = -1; +ref = f.1; +}, +{ +alignment = -1; +pos = (609,0); +ref = eng; +} +); +width = 1875; +}, +{ +layerId = m011; +shapes = ( +{ +alignment = -1; +ref = f.1; +}, +{ +alignment = -1; +pos = (277,0); +ref = eng; +} +); +width = 1345; +} +); +metricLeft = n; +metricRight = n; +userData = { +interface.gridadjust.original = "{'width': 2354.0, 'leftMargin': 83, 'rightMargin': 187.0}"; +"interface.width-adjustments" = ( +-16 +); +}; +} diff --git a/src/Inter-Roman.glyphspackage/glyphs/tcaron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/tcaron.1.glyph new file mode 100644 index 000000000..edbb155fc --- /dev/null +++ b/src/Inter-Roman.glyphspackage/glyphs/tcaron.1.glyph @@ -0,0 +1,93 @@ +{ +color = 9; +glyphname = tcaron.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (256,72); +ref = commaaccentright.cn; +} +); +width = 640; +}, +{ +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (508,72); +ref = commaaccentright.cn; +} +); +width = 758; +}, +{ +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (126,72); +ref = commaaccentright.cn; +} +); +width = 516; +}, +{ +layerId = m007; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (256,0); +ref = commaaccentright.cn; +} +); +width = 560; +}, +{ +layerId = m009; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (508,0); +ref = commaaccentright.cn; +} +); +width = 744; +}, +{ +layerId = m011; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (126,0); +ref = commaaccentright.cn; +} +); +width = 442; +} +); +metricLeft = t; +} diff --git a/src/Inter-Roman.glyphspackage/glyphs/tcedilla.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/tcedilla.1.glyph new file mode 100644 index 000000000..7bdeb20bf --- /dev/null +++ b/src/Inter-Roman.glyphspackage/glyphs/tcedilla.1.glyph @@ -0,0 +1,98 @@ +{ +color = 9; +glyphname = tcedilla.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +anchor = cedilla; +pos = (117,0); +ref = cedillacomb; +} +); +width = 640; +}, +{ +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +anchor = cedilla; +pos = (-21,0); +ref = cedillacomb; +} +); +width = 758; +}, +{ +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +anchor = cedilla; +pos = (120,0); +ref = cedillacomb; +} +); +width = 516; +}, +{ +layerId = m007; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +anchor = cedilla; +pos = (76,0); +ref = cedillacomb; +} +); +width = 560; +}, +{ +layerId = m009; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +anchor = cedilla; +pos = (-12,0); +ref = cedillacomb; +} +); +width = 744; +}, +{ +layerId = m011; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +anchor = cedilla; +pos = (121,0); +ref = cedillacomb; +} +); +width = 442; +} +); +} diff --git a/src/Inter-Roman.glyphspackage/glyphs/tcedilla.glyph b/src/Inter-Roman.glyphspackage/glyphs/tcedilla.glyph index c2115c6af..3c9bf19d6 100644 --- a/src/Inter-Roman.glyphspackage/glyphs/tcedilla.glyph +++ b/src/Inter-Roman.glyphspackage/glyphs/tcedilla.glyph @@ -11,7 +11,7 @@ ref = t; }, { anchor = cedilla; -pos = (176,0); +pos = (147,0); ref = cedillacomb; } ); @@ -25,7 +25,7 @@ ref = t; }, { anchor = cedilla; -pos = (102,0); +pos = (39,0); ref = cedillacomb; } ); @@ -39,7 +39,7 @@ ref = t; }, { anchor = cedilla; -pos = (120,0); +pos = (96,0); ref = cedillacomb; } ); @@ -53,7 +53,7 @@ ref = t; }, { anchor = cedilla; -pos = (241,0); +pos = (153,0); ref = cedillacomb; } ); @@ -67,7 +67,7 @@ ref = t; }, { anchor = cedilla; -pos = (154,0); +pos = (100,0); ref = cedillacomb; } ); @@ -81,7 +81,7 @@ ref = t; }, { anchor = cedilla; -pos = (181,0); +pos = (151,0); ref = cedillacomb; } ); diff --git a/src/Inter-Roman.glyphspackage/glyphs/tcircumflexbelow.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/tcircumflexbelow.1.glyph new file mode 100644 index 000000000..90b257ca8 --- /dev/null +++ b/src/Inter-Roman.glyphspackage/glyphs/tcircumflexbelow.1.glyph @@ -0,0 +1,92 @@ +{ +color = 9; +glyphname = tcircumflexbelow.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (938,0); +ref = circumflexsubcomb; +} +); +width = 640; +}, +{ +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (1057,0); +ref = circumflexsubcomb; +} +); +width = 758; +}, +{ +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (911,0); +ref = circumflexsubcomb; +} +); +width = 516; +}, +{ +layerId = m007; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (876,0); +ref = circumflexsubcomb; +} +); +width = 560; +}, +{ +layerId = m009; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (1026,0); +ref = circumflexsubcomb; +} +); +width = 744; +}, +{ +layerId = m011; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (802,0); +ref = circumflexsubcomb; +} +); +width = 442; +} +); +} diff --git a/src/Inter-Roman.glyphspackage/glyphs/tcommaaccent.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/tcommaaccent.1.glyph new file mode 100644 index 000000000..a60c5babb --- /dev/null +++ b/src/Inter-Roman.glyphspackage/glyphs/tcommaaccent.1.glyph @@ -0,0 +1,98 @@ +{ +color = 9; +glyphname = tcommaaccent.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +alignment = 1; +pos = (62,0); +ref = commaaccent; +} +); +width = 640; +}, +{ +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +alignment = 1; +pos = (112,0); +ref = commaaccent; +} +); +width = 758; +}, +{ +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +alignment = 1; +pos = (54,0); +ref = commaaccent; +} +); +width = 516; +}, +{ +layerId = m007; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +alignment = 1; +pos = (62,0); +ref = commaaccent; +} +); +width = 560; +}, +{ +layerId = m009; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +alignment = 1; +pos = (112,0); +ref = commaaccent; +} +); +width = 744; +}, +{ +layerId = m011; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +alignment = 1; +pos = (62,0); +ref = commaaccent; +} +); +width = 442; +} +); +} diff --git a/src/Inter-Roman.glyphspackage/glyphs/tdieresis.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/tdieresis.1.glyph new file mode 100644 index 000000000..c08c29a7c --- /dev/null +++ b/src/Inter-Roman.glyphspackage/glyphs/tdieresis.1.glyph @@ -0,0 +1,92 @@ +{ +color = 9; +glyphname = tdieresis.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-358,266); +ref = dieresiscomb; +} +); +width = 640; +}, +{ +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-362,266); +ref = dieresiscomb; +} +); +width = 758; +}, +{ +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-361,266); +ref = dieresiscomb; +} +); +width = 516; +}, +{ +layerId = m007; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-358,288); +ref = dieresiscomb; +} +); +width = 560; +}, +{ +layerId = m009; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-363,288); +ref = dieresiscomb; +} +); +width = 744; +}, +{ +layerId = m011; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-377,288); +ref = dieresiscomb; +} +); +width = 442; +} +); +} diff --git a/src/Inter-Roman.glyphspackage/glyphs/tdotaccent.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/tdotaccent.1.glyph new file mode 100644 index 000000000..061ce30b6 --- /dev/null +++ b/src/Inter-Roman.glyphspackage/glyphs/tdotaccent.1.glyph @@ -0,0 +1,92 @@ +{ +color = 9; +glyphname = tdotaccent.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-1,266); +ref = dotaccentcomb; +} +); +width = 640; +}, +{ +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-31,266); +ref = dotaccentcomb; +} +); +width = 758; +}, +{ +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (35,266); +ref = dotaccentcomb; +} +); +width = 516; +}, +{ +layerId = m007; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-1,288); +ref = dotaccentcomb; +} +); +width = 560; +}, +{ +layerId = m009; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-34,288); +ref = dotaccentcomb; +} +); +width = 744; +}, +{ +layerId = m011; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (35,288); +ref = dotaccentcomb; +} +); +width = 442; +} +); +} diff --git a/src/Inter-Roman.glyphspackage/glyphs/tdotbelow.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/tdotbelow.1.glyph new file mode 100644 index 000000000..78732406a --- /dev/null +++ b/src/Inter-Roman.glyphspackage/glyphs/tdotbelow.1.glyph @@ -0,0 +1,92 @@ +{ +color = 9; +glyphname = tdotbelow.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (98,0); +ref = dotbelow; +} +); +width = 640; +}, +{ +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (58,0); +ref = dotbelow; +} +); +width = 758; +}, +{ +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (148,0); +ref = dotbelow; +} +); +width = 516; +}, +{ +layerId = m007; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (98,0); +ref = dotbelow; +} +); +width = 560; +}, +{ +layerId = m009; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (56,0); +ref = dotbelow; +} +); +width = 744; +}, +{ +layerId = m011; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (156,0); +ref = dotbelow; +} +); +width = 442; +} +); +} diff --git a/src/Inter-Roman.glyphspackage/glyphs/tlinebelow.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/tlinebelow.1.glyph new file mode 100644 index 000000000..d067af5f9 --- /dev/null +++ b/src/Inter-Roman.glyphspackage/glyphs/tlinebelow.1.glyph @@ -0,0 +1,92 @@ +{ +color = 9; +glyphname = tlinebelow.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-146,0); +ref = macronsub; +} +); +width = 640; +}, +{ +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-24,0); +ref = macronsub; +} +); +width = 758; +}, +{ +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-66,0); +ref = macronsub; +} +); +width = 516; +}, +{ +layerId = m007; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-106,0); +ref = macronsub; +} +); +width = 560; +}, +{ +layerId = m009; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-8,0); +ref = macronsub; +} +); +width = 744; +}, +{ +layerId = m011; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-106,0); +ref = macronsub; +} +); +width = 442; +} +); +} diff --git a/src/Inter-Roman.glyphspackage/glyphs/tpalatalhook.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/tpalatalhook.1.glyph new file mode 100644 index 000000000..93e9bf6dc --- /dev/null +++ b/src/Inter-Roman.glyphspackage/glyphs/tpalatalhook.1.glyph @@ -0,0 +1,100 @@ +{ +color = 9; +glyphname = tpalatalhook.1; +kernLeft = B; +kernRight = t; +layers = ( +{ +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (78,0); +ref = _part.bottom_lfthook_t; +} +); +width = 640; +}, +{ +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-22,-3); +ref = _part.bottom_lfthook_t; +} +); +width = 758; +}, +{ +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (156,6); +ref = _part.bottom_lfthook_t; +} +); +width = 516; +}, +{ +layerId = m007; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-2,0); +ref = _part.bottom_lfthook_t; +} +); +width = 560; +}, +{ +layerId = m009; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (-44,0); +ref = _part.bottom_lfthook_t; +} +); +width = 744; +}, +{ +layerId = m011; +shapes = ( +{ +alignment = 1; +ref = t.1; +}, +{ +pos = (92,2); +ref = _part.bottom_lfthook_t; +} +); +width = 442; +} +); +metricLeft = t; +metricRight = t; +userData = { +interface.gridadjust.original = "{'width': 924.0, 'leftMargin': 0, 'rightMargin': 96.0}"; +"interface.width-adjustments" = ( +-16 +); +}; +} diff --git a/src/Inter-Roman.glyphspackage/order.plist b/src/Inter-Roman.glyphspackage/order.plist index 7cd395bd8..f42e802df 100644 --- a/src/Inter-Roman.glyphspackage/order.plist +++ b/src/Inter-Roman.glyphspackage/order.plist @@ -648,6 +648,10 @@ iebrevecyrillic, eturn, f, f.1, +f.i, +f.i.1, +fdotaccent.1, +feng.1, longs, slongstroke, slongdotaccent, @@ -886,7 +890,6 @@ germandbls, germandbls.1, _part.t_base, t, -t.1, tpalatalhook, trthook, _part.tcurl_base, @@ -902,6 +905,16 @@ tdotbelow, tlinebelow, tcircumflexbelow, tdieresis, +t.1, +tpalatalhook.1, +tcedilla.1, +tcaron.1, +tcommaaccent.1, +tdotaccent.1, +tdotbelow.1, +tlinebelow.1, +tcircumflexbelow.1, +tdieresis.1, u, udieresis, utilde, @@ -2032,8 +2045,6 @@ upsilonlatin, vscript, wynn, h.sc, -f.i, -f.i.1, m.sc, t.sc, uni2094, diff --git a/src/features/cv12-compact-f.fea b/src/features/cv12-compact-f.fea new file mode 100644 index 000000000..cc0d10073 --- /dev/null +++ b/src/features/cv12-compact-f.fea @@ -0,0 +1,6 @@ +# Note: don't use cvParameters here since this file is +# included for both salt and cvXX + +sub f by f.1; +sub fdotaccent by fdotaccent.1; +sub feng by feng.1; diff --git a/src/features/cv13-compact-t.fea b/src/features/cv13-compact-t.fea new file mode 100644 index 000000000..3a8bd12cf --- /dev/null +++ b/src/features/cv13-compact-t.fea @@ -0,0 +1,13 @@ +# Note: don't use cvParameters here since this file is +# included for both salt and cvXX + +sub t by t.1; +sub tpalatalhook by tpalatalhook.1; +sub tcedilla by tcedilla.1; +sub tcaron by tcaron.1; +sub tcommaaccent by tcommaaccent.1; +sub tdotaccent by tdotaccent.1; +sub tdotbelow by tdotbelow.1; +sub tlinebelow by tlinebelow.1; +sub tcircumflexbelow by tcircumflexbelow.1; +sub tdieresis by tdieresis.1; diff --git a/src/features/dlig.fea b/src/features/dlig.fea index 2182a2bd4..4d7f3ae97 100644 --- a/src/features/dlig.fea +++ b/src/features/dlig.fea @@ -6,17 +6,31 @@ # https://learn.microsoft.com/en-us/typography/opentype/spec/chapter2#lookup-table lookupflag IgnoreMarks; +# ff -> ff' +@DLIG_f_L = [ f fdotaccent feng ]; +@DLIG_f_R = [ f.1 fdotaccent.1 feng.1 ]; + +# tt -> tt' +@DLIG_t_L = [ + t tpalatalhook tcedilla tcaron tcommaaccent tdotaccent tdotbelow + tlinebelow tcircumflexbelow tdieresis +]; + +@DLIG_t_R = [ + t.1 tpalatalhook.1 tcedilla.1 tcaron.1 tcommaaccent.1 tdotaccent.1 tdotbelow.1 + tlinebelow.1 tcircumflexbelow.1 tdieresis.1 +]; + # left side "trigger" glyph for t.1 and f.1 sub -@DLIG_L_t = [ - f f.1 fdotaccent feng +@DLIG_t1_L = [ + @DLIG_f_L @DLIG_f_R k khook kcommaaccent kcaron kacute kdotbelow klinebelow k.base 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 + @DLIG_t_L @DLIG_t_R v vtilde vdotbelow @@ -29,12 +43,13 @@ lookupflag IgnoreMarks; uhungarumlautcyrillic yogonek y.sc ]; + # ffi (note. f.i is sub'd by liga) sub f [ f f.i ]' i by f.i.1; # tt, ft, rt, tf, ff, ft ... -sub @DLIG_L_t t' by t.1; -sub @DLIG_L_t f' by f.1; +sub @DLIG_t1_L @DLIG_t_L' by @DLIG_t_R; +sub @DLIG_t1_L @DLIG_f_L' by @DLIG_f_R; # interrobang sub exclam question by interrobang; |