improvements to /longs, closes #390

7 files changed, 739 insertions, 629 deletions

diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.f_base.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.f_base.glyph
new file mode 100644
index 000000000..d2fbb3946
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/_part.f_base.glyph
@@ -0,0 +1,665 @@
+{
+glyphname = _part.f_base;
+kernLeft = B;
+layers = (
+{
+anchors = (
+{
+name = cross;
+pos = (353,768);
+},
+{
+name = top;
+pos = (616,1548);
+}
+);
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(248,0,l),
+(463,1300,ls),
+(485,1431,o),
+(597,1510,o),
+(708,1510,cs),
+(736,1510,o),
+(757,1505,o),
+(780,1496,c),
+(801,1540,l),
+(776,1550,o),
+(751,1556,o),
+(716,1556,cs),
+(578,1556,o),
+(443,1457,o),
+(417,1300,cs),
+(202,0,l)
+);
+}
+);
+};
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(52,-467,o),
+(187,-369,o),
+(213,-211,cs),
+(463,1300,ls),
+(485,1431,o),
+(597,1510,o),
+(707,1510,cs),
+(740,1510,o),
+(757,1507,o),
+(778,1499,c),
+(802,1540,l),
+(775,1551,o),
+(750,1556,o),
+(714,1556,cs),
+(578,1556,o),
+(443,1457,o),
+(417,1300,cs),
+(167,-211,ls),
+(145,-343,o),
+(33,-421,o),
+(-77,-421,cs),
+(-107,-421,o),
+(-128,-417,o),
+(-151,-409,c),
+(-172,-451,l),
+(-146,-462,o),
+(-120,-467,o),
+(-84,-467,cs)
+);
+}
+);
+width = 679;
+},
+{
+anchors = (
+{
+name = cross;
+pos = (357,768);
+},
+{
+name = top;
+pos = (621,1549);
+}
+);
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(309,0,l),
+(512.625,1230,ls),
+(531.001,1341,o),
+(589.768,1400,o),
+(702.768,1400,cs),
+(752.768,1400,o),
+(779.782,1388,o),
+(795.789,1382,c),
+(870.29,1530,l),
+(846.276,1542,o),
+(796.256,1560,o),
+(711.256,1560,cs),
+(552.256,1560,o),
+(381.198,1463,o),
+(349.578,1272,cs),
+(139,0,l)
+);
+}
+);
+};
+guides = (
+{
+angle = 80.6;
+pos = (109,910);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(131,-448,o),
+(264,-334,o),
+(300,-116,cs),
+(517,1198,ls),
+(539,1331,o),
+(599,1394,o),
+(706,1394,cs),
+(746,1394,o),
+(804,1391,o),
+(827,1386,c),
+(877,1540,l),
+(829,1551,o),
+(784,1560,o),
+(732,1560,cs),
+(516,1560,o),
+(375,1431,o),
+(336,1195,cs),
+(119,-117,ls),
+(100,-232,o),
+(46,-282,o),
+(-50,-282,cs),
+(-67,-282,o),
+(-126,-277,o),
+(-145,-270,c),
+(-190,-431,l),
+(-155,-443,o),
+(-116,-448,o),
+(-73,-448,cs)
+);
+}
+);
+width = 745;
+},
+{
+anchors = (
+{
+name = cross;
+pos = (420,768);
+},
+{
+name = top;
+pos = (696,1538);
+}
+);
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(492,0,l,{
+name = hr00;
+}),
+(685,1166,ls),
+(694,1219,o),
+(721,1254,o),
+(796,1254,cs),
+(826,1254,o),
+(868,1248,o),
+(895,1240,c),
+(1001,1528,l),
+(957,1539,o),
+(853,1560,o),
+(750,1560,cs),
+(506,1560,o),
+(328,1425,o),
+(282,1150,cs),
+(92,0,l)
+);
+}
+);
+};
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(259,-456,o),
+(444,-288,o),
+(495,18,cs),
+(682,1150,ls),
+(694,1222,o),
+(732,1256,o),
+(805,1256,cs),
+(857,1256,o),
+(878,1253,o),
+(910,1248,c),
+(1008,1536,l),
+(943,1553,o),
+(885,1558,o),
+(809,1558,cs),
+(510,1558,o),
+(320,1393,o),
+(270,1090,cs),
+(88,-12,ls),
+(72,-111,o),
+(24,-156,o),
+(-63,-156,cs),
+(-90,-156,o),
+(-118,-151,o),
+(-146,-146,c),
+(-225,-442,l),
+(-172,-453,o),
+(-96,-456,o),
+(-29,-456,cs)
+);
+}
+);
+width = 841;
+},
+{
+anchors = (
+{
+name = cross;
+pos = (325,768);
+},
+{
+name = top;
+pos = (546,1490);
+}
+);
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(92,-487,o),
+(221,-372,o),
+(256,-161,cs),
+(479,1186,ls),
+(502,1323,o),
+(563,1386,o),
+(671,1386,cs),
+(714,1386,o),
+(758,1386,o),
+(801,1386,c),
+(828,1546,l),
+(785,1546,o),
+(741,1546,o),
+(698,1546,cs),
+(485,1546,o),
+(348,1418,o),
+(309,1186,cs),
+(86,-161,ls),
+(67,-275,o),
+(14,-327,o),
+(-84,-327,cs),
+(-120,-327,o),
+(-156,-327,o),
+(-192,-327,c),
+(-219,-487,l),
+(-183,-487,o),
+(-147,-487,o),
+(-111,-487,cs)
+);
+}
+);
+};
+layerId = m008;
+metricRight = "=_part.t_base";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(144,-418,o),
+(230,-313,o),
+(261,-125,cs),
+(485,1218,ls),
+(500,1309,o),
+(539,1344,o),
+(629,1344,cs),
+(659,1344,o),
+(689,1344,o),
+(719,1344,c),
+(744,1490,l),
+(708,1490,o),
+(673,1490,o),
+(638,1490,cs),
+(467,1490,o),
+(344,1395,o),
+(319,1244,cs),
+(91,-125,ls),
+(75,-224,o),
+(42,-258,o),
+(-56,-258,cs),
+(-92,-258,o),
+(-80,-258,o),
+(-116,-258,c),
+(-143,-418,l),
+(-83,-418,o),
+(-95,-418,o),
+(-59,-418,cs)
+);
+}
+);
+width = 683;
+},
+{
+anchors = (
+{
+name = cross;
+pos = (408,768);
+},
+{
+name = top;
+pos = (619,1490);
+}
+);
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(482,0,l,{
+name = hr00;
+}),
+(660,1080,ls),
+(673,1157,o),
+(707,1186,o),
+(786,1186,cs),
+(822,1186,o),
+(874,1186,o),
+(896,1186,c),
+(946,1490,l),
+(910,1490,o),
+(816,1490,o),
+(726,1490,cs),
+(450,1490,o),
+(311,1386,o),
+(272,1150,cs),
+(82,0,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(99,106,l),
+(81,0,ls),
+(67,-82,o),
+(34,-114,o),
+(-37,-114,cs),
+(-62,-114,o),
+(-86,-114,o),
+(-111,-114,c),
+(-162,-418,l),
+(-111,-418,o),
+(-59,-418,o),
+(-8,-418,cs),
+(273,-418,o),
+(433,-292,o),
+(475,-38,cs),
+(499,106,l)
+);
+}
+);
+};
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(290,-418,o),
+(429,-314,o),
+(468,-78,cs),
+(660,1080,ls),
+(673,1157,o),
+(707,1186,o),
+(786,1186,cs),
+(822,1186,o),
+(874,1186,o),
+(896,1186,c),
+(946,1490,l),
+(910,1490,o),
+(816,1490,o),
+(726,1490,cs),
+(450,1490,o),
+(311,1386,o),
+(272,1150,cs),
+(80,-8,ls),
+(67,-85,o),
+(33,-114,o),
+(-46,-114,cs),
+(-82,-114,o),
+(-134,-114,o),
+(-156,-114,c),
+(-206,-418,l),
+(-170,-418,o),
+(-76,-418,o),
+(14,-418,cs)
+);
+}
+);
+width = 829;
+},
+{
+anchors = (
+{
+name = cross;
+pos = (289,745);
+},
+{
+name = top;
+pos = (522,1490);
+}
+);
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(189,0,l),
+(404.214,1300,ls),
+(425.901,1431,o),
+(537.979,1510,o),
+(648.979,1510,cs),
+(676.979,1510,o),
+(698.151,1505,o),
+(720.661,1496,c),
+(741.945,1540,l),
+(716.601,1550,o),
+(691.594,1556,o),
+(656.594,1556,cs),
+(518.594,1556,o),
+(384.205,1457,o),
+(358.214,1300,cs),
+(143,0,l)
+);
+}
+);
+};
+guides = (
+{
+angle = 260.5809;
+pos = (356,1290);
+},
+{
+angle = 260.5809;
+pos = (403,1290);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(57,-418,o),
+(130,-355,o),
+(153,-218,cs),
+(403,1290,ls),
+(421,1398,o),
+(477,1444,o),
+(590,1444,cs),
+(616,1444,o),
+(634,1444,o),
+(660,1444,c),
+(668,1490,l),
+(642,1490,o),
+(616,1490,o),
+(590,1490,cs),
+(452,1490,o),
+(379,1427,o),
+(356,1290,cs),
+(106,-218,ls),
+(88,-326,o),
+(32,-372,o),
+(-81,-372,cs),
+(-107,-372,o),
+(-125,-372,o),
+(-151,-372,c),
+(-159,-418,l),
+(-133,-418,o),
+(-107,-418,o),
+(-81,-418,cs)
+);
+}
+);
+width = 550;
+},
+{
+anchors = (
+{
+name = cross;
+pos = (293,768);
+},
+{
+name = top;
+pos = (452,1676);
+}
+);
+associatedMasterId = m012;
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(189,0,l),
+(404.214,1300,ls),
+(425.901,1431,o),
+(537.979,1510,o),
+(648.979,1510,cs),
+(676.979,1510,o),
+(698.151,1505,o),
+(720.661,1496,c),
+(741.945,1540,l),
+(716.601,1550,o),
+(691.594,1556,o),
+(656.594,1556,cs),
+(518.594,1556,o),
+(384.205,1457,o),
+(358.214,1300,cs),
+(143,0,l)
+);
+}
+);
+};
+layerId = "0069C842-4427-4523-8FF6-F7CFC9391770";
+name = "Apr 7, 23, 13:40";
+shapes = (
+{
+closed = 1;
+nodes = (
+(-7,-467,o),
+(128,-369,o),
+(154,-211,cs),
+(404,1300,ls),
+(426,1431,o),
+(538,1510,o),
+(648,1510,cs),
+(681,1510,o),
+(698,1507,o),
+(719,1499,c),
+(743,1540,l),
+(716,1551,o),
+(691,1556,o),
+(655,1556,cs),
+(519,1556,o),
+(384,1457,o),
+(358,1300,cs),
+(108,-211,ls),
+(86,-343,o),
+(-26,-421,o),
+(-136,-421,cs),
+(-166,-421,o),
+(-187,-417,o),
+(-210,-409,c),
+(-231,-451,l),
+(-205,-462,o),
+(-179,-467,o),
+(-143,-467,cs)
+);
+}
+);
+width = 550;
+},
+{
+anchors = (
+{
+name = cross;
+pos = (408,768);
+},
+{
+name = top;
+pos = (654,1676);
+}
+);
+associatedMasterId = m010;
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(482,0,l,{
+name = hr00;
+}),
+(660,1080,ls),
+(673,1157,o),
+(707,1186,o),
+(786,1186,cs),
+(822,1186,o),
+(874,1186,o),
+(896,1186,c),
+(946,1490,l),
+(910,1490,o),
+(816,1490,o),
+(726,1490,cs),
+(450,1490,o),
+(311,1386,o),
+(272,1150,cs),
+(82,0,l)
+);
+}
+);
+};
+layerId = "EFF65928-A7F7-40FD-A33A-9115CDCE16EF";
+name = "Apr 23, 23, 09:31";
+shapes = (
+{
+closed = 1;
+nodes = (
+(273,-418,o),
+(433,-292,o),
+(475,-38,cs),
+(659,1072,ls),
+(673,1154,o),
+(707,1186,o),
+(778,1186,cs),
+(803,1186,o),
+(827,1186,o),
+(852,1186,c),
+(903,1490,l),
+(852,1490,o),
+(800,1490,o),
+(749,1490,cs),
+(468,1490,o),
+(308,1364,o),
+(266,1110,cs),
+(81,0,ls),
+(67,-82,o),
+(34,-114,o),
+(-37,-114,cs),
+(-62,-114,o),
+(-86,-114,o),
+(-111,-114,c),
+(-162,-418,l),
+(-111,-418,o),
+(-59,-418,o),
+(-8,-418,cs)
+);
+}
+);
+width = 829;
+}
+);
+note = "base of /f";
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/f.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/f.1.glyph
index d92f3144c..62fc76102 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/f.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/f.1.glyph
@@ -50,7 +50,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-97,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -110,7 +110,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-74,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -172,7 +172,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-81,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -197,7 +197,7 @@ background = {
 shapes = (
 {
 pos = (-71,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -216,7 +216,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-71,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -279,7 +279,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-82,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -319,7 +319,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-95,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -346,7 +346,7 @@ name = "Apr 23, 23, 09:10";
 shapes = (
 {
 pos = (-14,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -373,7 +373,7 @@ name = "Apr 23, 23, 09:22";
 shapes = (
 {
 pos = (-58,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/f.glyph b/src/Inter-Italic.glyphspackage/glyphs/f.glyph
index e9dd3bb36..494b7b524 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/f.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/f.glyph
@@ -22,7 +22,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-66,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -55,7 +55,7 @@ shapes = (
 {
 alignment = -1;
 pos = (17,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -96,7 +96,7 @@ shapes = (
 {
 alignment = -1;
 pos = (31,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -130,7 +130,7 @@ shapes = (
 {
 alignment = -1;
 pos = (2,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -165,7 +165,7 @@ shapes = (
 {
 alignment = -1;
 pos = (31,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -199,7 +199,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-43,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -226,7 +226,7 @@ name = "Apr 23, 23, 09:10";
 shapes = (
 {
 pos = (-14,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -253,7 +253,7 @@ name = "Apr 23, 23, 09:22";
 shapes = (
 {
 pos = (-58,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
@@ -320,7 +320,7 @@ shapes = (
 {
 alignment = -1;
 pos = (55,0);
-ref = longs;
+ref = _part.f_base;
 },
 {
 closed = 1;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/florin.glyph b/src/Inter-Italic.glyphspackage/glyphs/florin.glyph
index 36ad83bb8..a1dd58d4d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/florin.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/florin.glyph
@@ -21,7 +21,7 @@ nodes = (
 },
 {
 pos = (74,0);
-ref = longs;
+ref = _part.f_base;
 }
 );
 };
@@ -185,7 +185,7 @@ nodes = (
 },
 {
 pos = (70,0);
-ref = longs;
+ref = _part.f_base;
 }
 );
 };
diff --git a/src/Inter-Italic.glyphspackage/glyphs/longs.glyph b/src/Inter-Italic.glyphspackage/glyphs/longs.glyph
index 5e1bd4368..372438e38 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/longs.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/longs.glyph
@@ -1,672 +1,116 @@
 {
 glyphname = longs;
 kernLeft = B;
+kernRight = longs;
 layers = (
 {
-anchors = (
-{
-name = cross;
-pos = (353,768);
-},
-{
-name = top;
-pos = (616,1548);
-}
-);
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(248,0,l),
-(463,1300,ls),
-(485,1431,o),
-(597,1510,o),
-(708,1510,cs),
-(736,1510,o),
-(757,1505,o),
-(780,1496,c),
-(801,1540,l),
-(776,1550,o),
-(751,1556,o),
-(716,1556,cs),
-(578,1556,o),
-(443,1457,o),
-(417,1300,cs),
-(202,0,l)
-);
+ref = l;
 }
 );
 };
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(52,-467,o),
-(187,-369,o),
-(213,-211,cs),
-(463,1300,ls),
-(485,1431,o),
-(597,1510,o),
-(707,1510,cs),
-(740,1510,o),
-(757,1507,o),
-(778,1499,c),
-(802,1540,l),
-(775,1551,o),
-(750,1556,o),
-(714,1556,cs),
-(578,1556,o),
-(443,1457,o),
-(417,1300,cs),
-(167,-211,ls),
-(145,-343,o),
-(33,-421,o),
-(-77,-421,cs),
-(-107,-421,o),
-(-128,-417,o),
-(-151,-409,c),
-(-172,-451,l),
-(-146,-462,o),
-(-120,-467,o),
-(-84,-467,cs)
-);
+alignment = -1;
+pos = (-97,0);
+ref = _part.f_base;
 }
 );
-width = 679;
+width = 543;
 },
 {
-anchors = (
-{
-name = cross;
-pos = (357,768);
-},
-{
-name = top;
-pos = (621,1549);
-}
-);
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(309,0,l),
-(512.625,1230,ls),
-(531.001,1341,o),
-(589.768,1400,o),
-(702.768,1400,cs),
-(752.768,1400,o),
-(779.782,1388,o),
-(795.789,1382,c),
-(870.29,1530,l),
-(846.276,1542,o),
-(796.256,1560,o),
-(711.256,1560,cs),
-(552.256,1560,o),
-(381.198,1463,o),
-(349.578,1272,cs),
-(139,0,l)
-);
+ref = l;
 }
 );
 };
-guides = (
-{
-angle = 80.6;
-pos = (109,910);
-}
-);
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-name = ital_gen;
+layerId = m012;
 shapes = (
 {
-closed = 1;
-nodes = (
-(131,-448,o),
-(264,-334,o),
-(300,-116,cs),
-(517,1198,ls),
-(539,1331,o),
-(599,1394,o),
-(706,1394,cs),
-(746,1394,o),
-(804,1391,o),
-(827,1386,c),
-(877,1540,l),
-(829,1551,o),
-(784,1560,o),
-(732,1560,cs),
-(516,1560,o),
-(375,1431,o),
-(336,1195,cs),
-(119,-117,ls),
-(100,-232,o),
-(46,-282,o),
-(-50,-282,cs),
-(-67,-282,o),
-(-126,-277,o),
-(-145,-270,c),
-(-190,-431,l),
-(-155,-443,o),
-(-116,-448,o),
-(-73,-448,cs)
-);
+alignment = -1;
+pos = (-96,0);
+ref = _part.f_base;
 }
 );
-width = 745;
+width = 413;
 },
 {
-anchors = (
-{
-name = cross;
-pos = (420,768);
-},
-{
-name = top;
-pos = (696,1538);
-}
-);
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(492,0,l,{
-name = hr00;
-}),
-(685,1166,ls),
-(694,1219,o),
-(721,1254,o),
-(796,1254,cs),
-(826,1254,o),
-(868,1248,o),
-(895,1240,c),
-(1001,1528,l),
-(957,1539,o),
-(853,1560,o),
-(750,1560,cs),
-(506,1560,o),
-(328,1425,o),
-(282,1150,cs),
-(92,0,l)
-);
+ref = l;
 }
 );
 };
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-name = ital_gen;
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-closed = 1;
-nodes = (
-(259,-456,o),
-(444,-288,o),
-(495,18,cs),
-(682,1150,ls),
-(694,1222,o),
-(732,1256,o),
-(805,1256,cs),
-(857,1256,o),
-(878,1253,o),
-(910,1248,c),
-(1008,1536,l),
-(943,1553,o),
-(885,1558,o),
-(809,1558,cs),
-(510,1558,o),
-(320,1393,o),
-(270,1090,cs),
-(88,-12,ls),
-(72,-111,o),
-(24,-156,o),
-(-63,-156,cs),
-(-90,-156,o),
-(-118,-151,o),
-(-146,-146,c),
-(-225,-442,l),
-(-172,-453,o),
-(-96,-456,o),
-(-29,-456,cs)
-);
+alignment = -1;
+pos = (-74,0);
+ref = _part.f_base;
 }
 );
-width = 841;
+width = 641;
 },
 {
-anchors = (
-{
-name = cross;
-pos = (325,768);
-},
-{
-name = top;
-pos = (546,1490);
-}
-);
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(92,-487,o),
-(221,-372,o),
-(256,-161,cs),
-(479,1186,ls),
-(502,1323,o),
-(563,1386,o),
-(671,1386,cs),
-(714,1386,o),
-(758,1386,o),
-(801,1386,c),
-(828,1546,l),
-(785,1546,o),
-(741,1546,o),
-(698,1546,cs),
-(485,1546,o),
-(348,1418,o),
-(309,1186,cs),
-(86,-161,ls),
-(67,-275,o),
-(14,-327,o),
-(-84,-327,cs),
-(-120,-327,o),
-(-156,-327,o),
-(-192,-327,c),
-(-219,-487,l),
-(-183,-487,o),
-(-147,-487,o),
-(-111,-487,cs)
-);
+ref = l;
 }
 );
 };
-guides = (
-{
-angle = 80.6;
-pos = (109,910);
-}
-);
 layerId = m008;
-metricRight = "=_part.t_base";
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(144,-418,o),
-(230,-313,o),
-(261,-125,cs),
-(485,1218,ls),
-(500,1309,o),
-(539,1344,o),
-(629,1344,cs),
-(659,1344,o),
-(689,1344,o),
-(719,1344,c),
-(744,1490,l),
-(708,1490,o),
-(673,1490,o),
-(638,1490,cs),
-(467,1490,o),
-(344,1395,o),
-(319,1244,cs),
-(91,-125,ls),
-(75,-224,o),
-(42,-258,o),
-(-56,-258,cs),
-(-92,-258,o),
-(-80,-258,o),
-(-116,-258,c),
-(-143,-418,l),
-(-83,-418,o),
-(-95,-418,o),
-(-59,-418,cs)
-);
-}
-);
-width = 683;
-},
-{
-anchors = (
-{
-name = cross;
-pos = (408,768);
-},
-{
-name = top;
-pos = (619,1490);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(482,0,l,{
-name = hr00;
-}),
-(660,1080,ls),
-(673,1157,o),
-(707,1186,o),
-(786,1186,cs),
-(822,1186,o),
-(874,1186,o),
-(896,1186,c),
-(946,1490,l),
-(910,1490,o),
-(816,1490,o),
-(726,1490,cs),
-(450,1490,o),
-(311,1386,o),
-(272,1150,cs),
-(82,0,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(99,106,l),
-(81,0,ls),
-(67,-82,o),
-(34,-114,o),
-(-37,-114,cs),
-(-62,-114,o),
-(-86,-114,o),
-(-111,-114,c),
-(-162,-418,l),
-(-111,-418,o),
-(-59,-418,o),
-(-8,-418,cs),
-(273,-418,o),
-(433,-292,o),
-(475,-38,cs),
-(499,106,l)
-);
-}
-);
-};
-layerId = m010;
-name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(290,-418,o),
-(429,-314,o),
-(468,-78,cs),
-(660,1080,ls),
-(673,1157,o),
-(707,1186,o),
-(786,1186,cs),
-(822,1186,o),
-(874,1186,o),
-(896,1186,c),
-(946,1490,l),
-(910,1490,o),
-(816,1490,o),
-(726,1490,cs),
-(450,1490,o),
-(311,1386,o),
-(272,1150,cs),
-(80,-8,ls),
-(67,-85,o),
-(33,-114,o),
-(-46,-114,cs),
-(-82,-114,o),
-(-134,-114,o),
-(-156,-114,c),
-(-206,-418,l),
-(-170,-418,o),
-(-76,-418,o),
-(14,-418,cs)
-);
+alignment = -1;
+pos = (-73,0);
+ref = _part.f_base;
 }
 );
-width = 829;
-},
-{
-anchors = (
-{
-name = cross;
-pos = (289,745);
+width = 512;
 },
 {
-name = top;
-pos = (522,1490);
-}
-);
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(189,0,l),
-(404.214,1300,ls),
-(425.901,1431,o),
-(537.979,1510,o),
-(648.979,1510,cs),
-(676.979,1510,o),
-(698.151,1505,o),
-(720.661,1496,c),
-(741.945,1540,l),
-(716.601,1550,o),
-(691.594,1556,o),
-(656.594,1556,cs),
-(518.594,1556,o),
-(384.205,1457,o),
-(358.214,1300,cs),
-(143,0,l)
-);
+ref = l;
 }
 );
 };
-guides = (
-{
-angle = 260.5809;
-pos = (356,1290);
-},
-{
-angle = 260.5809;
-pos = (403,1290);
-}
-);
-layerId = m012;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(57,-418,o),
-(130,-355,o),
-(153,-218,cs),
-(403,1290,ls),
-(421,1398,o),
-(477,1444,o),
-(590,1444,cs),
-(616,1444,o),
-(634,1444,o),
-(660,1444,c),
-(668,1490,l),
-(642,1490,o),
-(616,1490,o),
-(590,1490,cs),
-(452,1490,o),
-(379,1427,o),
-(356,1290,cs),
-(106,-218,ls),
-(88,-326,o),
-(32,-372,o),
-(-81,-372,cs),
-(-107,-372,o),
-(-125,-372,o),
-(-151,-372,c),
-(-159,-418,l),
-(-133,-418,o),
-(-107,-418,o),
-(-81,-418,cs)
-);
-}
-);
-width = 550;
-},
-{
-anchors = (
-{
-name = cross;
-pos = (293,768);
-},
-{
-name = top;
-pos = (452,1676);
-}
-);
-associatedMasterId = m012;
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(189,0,l),
-(404.214,1300,ls),
-(425.901,1431,o),
-(537.979,1510,o),
-(648.979,1510,cs),
-(676.979,1510,o),
-(698.151,1505,o),
-(720.661,1496,c),
-(741.945,1540,l),
-(716.601,1550,o),
-(691.594,1556,o),
-(656.594,1556,cs),
-(518.594,1556,o),
-(384.205,1457,o),
-(358.214,1300,cs),
-(143,0,l)
-);
-}
-);
-};
-layerId = "0069C842-4427-4523-8FF6-F7CFC9391770";
-name = "Apr 7, 23, 13:40";
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-7,-467,o),
-(128,-369,o),
-(154,-211,cs),
-(404,1300,ls),
-(426,1431,o),
-(538,1510,o),
-(648,1510,cs),
-(681,1510,o),
-(698,1507,o),
-(719,1499,c),
-(743,1540,l),
-(716,1551,o),
-(691,1556,o),
-(655,1556,cs),
-(519,1556,o),
-(384,1457,o),
-(358,1300,cs),
-(108,-211,ls),
-(86,-343,o),
-(-26,-421,o),
-(-136,-421,cs),
-(-166,-421,o),
-(-187,-417,o),
-(-210,-409,c),
-(-231,-451,l),
-(-205,-462,o),
-(-179,-467,o),
-(-143,-467,cs)
-);
+alignment = -1;
+pos = (-81,0);
+ref = _part.f_base;
 }
 );
-width = 550;
-},
-{
-anchors = (
-{
-name = cross;
-pos = (408,768);
+width = 765;
 },
 {
-name = top;
-pos = (654,1676);
-}
-);
-associatedMasterId = m010;
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(482,0,l,{
-name = hr00;
-}),
-(660,1080,ls),
-(673,1157,o),
-(707,1186,o),
-(786,1186,cs),
-(822,1186,o),
-(874,1186,o),
-(896,1186,c),
-(946,1490,l),
-(910,1490,o),
-(816,1490,o),
-(726,1490,cs),
-(450,1490,o),
-(311,1386,o),
-(272,1150,cs),
-(82,0,l)
-);
+ref = l;
 }
 );
 };
-layerId = "EFF65928-A7F7-40FD-A33A-9115CDCE16EF";
-name = "Apr 23, 23, 09:31";
+layerId = m010;
 shapes = (
 {
-closed = 1;
-nodes = (
-(273,-418,o),
-(433,-292,o),
-(475,-38,cs),
-(659,1072,ls),
-(673,1154,o),
-(707,1186,o),
-(778,1186,cs),
-(803,1186,o),
-(827,1186,o),
-(852,1186,c),
-(903,1490,l),
-(852,1490,o),
-(800,1490,o),
-(749,1490,cs),
-(468,1490,o),
-(308,1364,o),
-(266,1110,cs),
-(81,0,ls),
-(67,-82,o),
-(34,-114,o),
-(-37,-114,cs),
-(-62,-114,o),
-(-86,-114,o),
-(-111,-114,c),
-(-162,-418,l),
-(-111,-418,o),
-(-59,-418,o),
-(-8,-418,cs)
-);
+alignment = -1;
+pos = (-82,0);
+ref = _part.f_base;
 }
 );
-width = 829;
+width = 705;
 }
 );
-note = "base of /f";
 unicode = 383;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/slongdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/slongdotaccent.glyph
index d0468e628..ee64018c6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/slongdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/slongdotaccent.glyph
@@ -1,6 +1,7 @@
 {
 glyphname = slongdotaccent;
 kernLeft = B;
+kernRight = longs;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -12,11 +13,11 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (281,431);
+pos = (207,431);
 ref = dotaccentcomb;
 }
 );
-width = 745;
+width = 673;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -28,11 +29,11 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (269,420);
+pos = (188,420);
 ref = dotaccentcomb;
 }
 );
-width = 841;
+width = 790;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -44,11 +45,11 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (337,430);
+pos = (240,430);
 ref = dotaccentcomb;
 }
 );
-width = 679;
+width = 543;
 },
 {
 layerId = m008;
@@ -60,11 +61,11 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (246,434);
+pos = (173,434);
 ref = dotaccentcomb;
 }
 );
-width = 683;
+width = 512;
 },
 {
 layerId = m010;
@@ -76,11 +77,11 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (212,434);
+pos = (130,434);
 ref = dotaccentcomb;
 }
 );
-width = 829;
+width = 705;
 },
 {
 layerId = m012;
@@ -92,11 +93,11 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (312,434);
+pos = (216,434);
 ref = dotaccentcomb;
 }
 );
-width = 550;
+width = 433;
 }
 );
 metricLeft = i;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/slongstroke.glyph b/src/Inter-Italic.glyphspackage/glyphs/slongstroke.glyph
index 90fd95728..f4d912fde 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/slongstroke.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/slongstroke.glyph
@@ -5,7 +5,7 @@ layers = (
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-ref = longs;
+ref = _part.f_base;
 },
 {
 pos = (128,0);
@@ -18,7 +18,7 @@ width = 679;
 layerId = m012;
 shapes = (
 {
-ref = longs;
+ref = _part.f_base;
 },
 {
 pos = (58,-23);
@@ -31,7 +31,7 @@ width = 550;
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-ref = longs;
+ref = _part.f_base;
 },
 {
 pos = (61,0);
@@ -44,7 +44,7 @@ width = 745;
 layerId = m008;
 shapes = (
 {
-ref = longs;
+ref = _part.f_base;
 },
 {
 pos = (29,0);
@@ -57,7 +57,7 @@ width = 683;
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-ref = longs;
+ref = _part.f_base;
 },
 {
 pos = (59,0);
@@ -70,7 +70,7 @@ width = 841;
 layerId = m010;
 shapes = (
 {
-ref = longs;
+ref = _part.f_base;
 },
 {
 pos = (42,0);