9 files changed, 458 insertions, 932 deletions
diff --git a/src/Inter.glyphspackage/glyphs/E_zhcaron.glyph b/src/Inter.glyphspackage/glyphs/E_zhcaron.glyph
index 911bb35fb..7f455661d 100644
--- a/src/Inter.glyphspackage/glyphs/E_zhcaron.glyph
+++ b/src/Inter.glyphspackage/glyphs/E_zhcaron.glyph
@@ -77,7 +77,7 @@ pos = (343,388);
 ref = caron;
 }
 );
-width = 1419;
+width = 1420;
 },
 {
 layerId = m007;
diff --git a/src/Inter.glyphspackage/glyphs/_part.f_base.glyph b/src/Inter.glyphspackage/glyphs/_part.f_base.glyph
deleted file mode 100644
index 1589b3a2c..000000000
--- a/src/Inter.glyphspackage/glyphs/_part.f_base.glyph
+++ /dev/null
@@ -1,565 +0,0 @@
-{
-color = 5;
-glyphname = _part.f_base;
-layers = (
-{
-anchors = (
-{
-name = top;
-pos = (326,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (436,1024);
-}
-);
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-closed = 1;
-nodes = (
-(338,0,l),
-(340,1300,ls),
-(340,1431,o),
-(439,1510,o),
-(550,1510,cs),
-(578,1510,o),
-(600,1505,o),
-(624,1496,c),
-(638,1540,l),
-(611,1550,o),
-(585,1556,o),
-(550,1556,cs),
-(412,1556,o),
-(294,1457,o),
-(294,1300,cs),
-(294,0,l)
-);
-}
-);
-width = 678;
-},
-{
-anchors = (
-{
-name = top;
-pos = (514,1676);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(248,0,l),
-(460,1280,ls),
-(480,1411,o),
-(593,1489,o),
-(704,1490,cs),
-(733,1489,o),
-(753,1484,o),
-(776,1478,c),
-(798,1522,l),
-(771,1530,o),
-(748,1536,o),
-(712,1536,cs),
-(573,1536,o),
-(439,1437,o),
-(414,1280,cs),
-(200,0,l)
-);
-}
-);
-};
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-closed = 1;
-nodes = (
-(246,0,l),
-(462,1300,ls),
-(483,1431,o),
-(596,1510,o),
-(706,1510,cs),
-(736,1510,o),
-(756,1504,o),
-(780,1498,c),
-(800,1542,l),
-(774,1551,o),
-(751,1556,o),
-(716,1556,cs),
-(576,1556,o),
-(442,1457,o),
-(416,1300,cs),
-(200,0,l)
-);
-}
-);
-width = 678;
-},
-{
-anchors = (
-{
-name = top;
-pos = (396,1676);
-}
-);
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-closed = 1;
-nodes = (
-(402,0,l),
-(402,1230,ls),
-(402,1341,o),
-(451,1400,o),
-(564,1400,cs),
-(614,1400,o),
-(643,1388,o),
-(660,1382,c),
-(710,1530,l),
-(684,1542,o),
-(631,1560,o),
-(546,1560,cs),
-(387,1560,o),
-(232,1463,o),
-(232,1272,cs),
-(232,0,l)
-);
-}
-);
-width = 738;
-},
-{
-anchors = (
-{
-name = top;
-pos = (582,1676);
-}
-);
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-closed = 1;
-nodes = (
-(312,0,l),
-(514,1230,l),
-(535,1341,o),
-(591,1399,o),
-(704,1400,cs),
-(753,1399,o),
-(780,1388,o),
-(798,1382,c),
-(870,1530,l),
-(847,1542,o),
-(797,1559,o),
-(712,1560,cs),
-(553,1559,o),
-(381,1463,o),
-(352,1272,c),
-(140,0,l)
-);
-}
-);
-width = 738;
-},
-{
-anchors = (
-{
-name = top;
-pos = (510,1676);
-}
-);
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-closed = 1;
-nodes = (
-(584,0,l,{
-name = hr00;
-}),
-(584,1166,ls),
-(584,1219,o),
-(605,1254,o),
-(680,1254,cs),
-(710,1254,o),
-(753,1248,o),
-(782,1240,c),
-(840,1528,l),
-(794,1539,o),
-(687,1560,o),
-(584,1560,cs),
-(340,1560,o),
-(184,1425,o),
-(184,1150,cs),
-(184,0,l)
-);
-}
-);
-width = 840;
-},
-{
-anchors = (
-{
-name = top;
-pos = (696,1676);
-}
-);
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-closed = 1;
-nodes = (
-(492,0,l,{
-name = hr00;
-}),
-(686,1166,ls),
-(696,1219,o),
-(722,1254,o),
-(798,1254,cs),
-(827,1254,o),
-(868,1248,o),
-(896,1240,c),
-(1000,1528,l),
-(958,1539,o),
-(853,1559,o),
-(750,1560,cs),
-(507,1559,o),
-(327,1425,o),
-(282,1150,cs),
-(90,0,l)
-);
-}
-);
-width = 840;
-},
-{
-anchors = (
-{
-name = top;
-pos = (364,1676);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(402,0,l),
-(402,1226,ls),
-(402,1317,o),
-(430,1344,o),
-(526,1344,cs),
-(550,1344,o),
-(604,1344,o),
-(616,1344,c),
-(616,1490,l),
-(604,1490,o),
-(556,1490,o),
-(510,1490,cs),
-(332,1490,o),
-(232,1405,o),
-(232,1252,cs),
-(232,0,l)
-);
-}
-);
-};
-layerId = m007;
-metricLeft = "=_part.t_base";
-metricRight = "=_part.t_base";
-shapes = (
-{
-closed = 1;
-nodes = (
-(370,0,l),
-(370,1218,ls),
-(370,1309,o),
-(404,1344,o),
-(494,1344,cs),
-(518,1344,o),
-(572,1344,o),
-(584,1344,c),
-(584,1490,l),
-(572,1490,o),
-(524,1490,o),
-(478,1490,cs),
-(307,1490,o),
-(200,1395,o),
-(200,1244,cs),
-(200,0,l)
-);
-}
-);
-width = 682;
-},
-{
-anchors = (
-{
-name = top;
-pos = (554.05,1676);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(402,0,l),
-(402,1226,ls),
-(402,1317,o),
-(430,1344,o),
-(526,1344,cs),
-(550,1344,o),
-(604,1344,o),
-(616,1344,c),
-(616,1490,l),
-(604,1490,o),
-(556,1490,o),
-(510,1490,cs),
-(332,1490,o),
-(232,1405,o),
-(232,1252,cs),
-(232,0,l)
-);
-}
-);
-};
-layerId = m008;
-metricLeft = "=_part.t_base";
-metricRight = "=_part.t_base";
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(282.59,0,l),
-(484.229,1218,ls),
-(499.294,1309,o),
-(539.088,1344,o),
-(629.088,1344,cs),
-(653.088,1344,o),
-(707.088,1344,o),
-(719.088,1344,c),
-(743.258,1490,l),
-(731.258,1490,o),
-(683.258,1490,o),
-(637.258,1490,cs),
-(466.258,1490,o),
-(343.531,1395,o),
-(318.533,1244,cs),
-(112.59,0,l)
-);
-}
-);
-width = 682;
-},
-{
-anchors = (
-{
-name = top;
-pos = (654.05,1676);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(584,0,l,{
-name = hr00;
-}),
-(584,1166,ls),
-(585,1219,o),
-(605,1254,o),
-(680,1254,cs),
-(710,1254,o),
-(753,1248,o),
-(782,1240,c),
-(840,1528,l),
-(794,1539,o),
-(687,1559,o),
-(584,1560,cs),
-(340,1559,o),
-(183,1425,o),
-(184,1150,cs),
-(184,0,l)
-);
-}
-);
-};
-layerId = m010;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(480.59,0,l,{
-name = hr00;
-}),
-(659.383,1080,ls),
-(672.13,1157,o),
-(705.931,1186,o),
-(784.931,1186,cs),
-(820.931,1186,o),
-(872.931,1186,o),
-(894.931,1186,c),
-(945.258,1490,l),
-(909.258,1490,o),
-(815.258,1490,o),
-(725.258,1490,cs),
-(449.258,1490,o),
-(310.041,1386,o),
-(270.971,1150,cs),
-(80.59,0,l)
-);
-}
-);
-width = 828;
-},
-{
-anchors = (
-{
-name = top;
-pos = (464,1676);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(584,0,l,{
-name = hr00;
-}),
-(584,1166,ls),
-(585,1219,o),
-(605,1254,o),
-(680,1254,cs),
-(710,1254,o),
-(753,1248,o),
-(782,1240,c),
-(840,1528,l),
-(794,1539,o),
-(687,1559,o),
-(584,1560,cs),
-(340,1559,o),
-(183,1425,o),
-(184,1150,cs),
-(184,0,l)
-);
-}
-);
-};
-layerId = m009;
-name = "Black Display";
-shapes = (
-{
-closed = 1;
-nodes = (
-(568,0,l,{
-name = hr00;
-}),
-(568,1080,ls),
-(568,1157,o),
-(597,1186,o),
-(676,1186,cs),
-(712,1186,o),
-(764,1186,o),
-(786,1186,c),
-(786,1490,l),
-(750,1490,o),
-(656,1490,o),
-(566,1490,cs),
-(290,1490,o),
-(168,1386,o),
-(168,1150,cs),
-(168,0,l)
-);
-}
-);
-width = 828;
-},
-{
-anchors = (
-{
-name = top;
-pos = (262,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (308,1024);
-}
-);
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(274,0,l),
-(276,1300,ls),
-(276,1431,o),
-(375,1510,o),
-(486,1510,cs),
-(514,1510,o),
-(536,1505,o),
-(560,1496,c),
-(574,1540,l),
-(547,1550,o),
-(521,1556,o),
-(486,1556,cs),
-(348,1556,o),
-(230,1457,o),
-(230,1300,cs),
-(230,0,l)
-);
-}
-);
-width = 550;
-},
-{
-anchors = (
-{
-name = top;
-pos = (452.05,1676);
-}
-);
-guides = (
-{
-angle = 80.6;
-pos = (308,1024);
-}
-);
-layerId = m012;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(186.59,0,l),
-(403.804,1300,ls),
-(425.491,1431,o),
-(537.569,1510,o),
-(648.569,1510,cs),
-(676.569,1510,o),
-(697.741,1505,o),
-(720.251,1496,c),
-(741.536,1540,l),
-(716.191,1550,o),
-(691.184,1556,o),
-(656.184,1556,cs),
-(518.184,1556,o),
-(383.795,1457,o),
-(357.804,1300,cs),
-(142.59,0,l)
-);
-}
-);
-width = 550;
-}
-);
-}
diff --git a/src/Inter.glyphspackage/glyphs/f.glyph b/src/Inter.glyphspackage/glyphs/f.glyph
index 5a54dcfe5..c8267fdb9 100644
--- a/src/Inter.glyphspackage/glyphs/f.glyph
+++ b/src/Inter.glyphspackage/glyphs/f.glyph
@@ -20,7 +20,7 @@ pos = (436,1024);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-ref = _part.f_base;
+ref = longs;
 },
 {
 closed = 1;
@@ -128,7 +128,7 @@ pos = (224,0);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-ref = _part.f_base;
+ref = longs;
 },
 {
 closed = 1;
@@ -152,7 +152,7 @@ pos = (320,0);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-ref = _part.f_base;
+ref = longs;
 },
 {
 closed = 1;
@@ -185,7 +185,7 @@ metricRight = "=t";
 shapes = (
 {
 pos = (-14,0);
-ref = _part.f_base;
+ref = longs;
 },
 {
 closed = 1;
@@ -209,7 +209,7 @@ pos = (226,0);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-ref = _part.f_base;
+ref = longs;
 },
 {
 closed = 1;
@@ -243,7 +243,7 @@ metricLeft = "=t";
 shapes = (
 {
 pos = (-10,0);
-ref = _part.f_base;
+ref = longs;
 },
 {
 closed = 1;
@@ -276,7 +276,7 @@ layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
 pos = (-18,0);
-ref = _part.f_base;
+ref = longs;
 },
 {
 closed = 1;
@@ -310,7 +310,7 @@ name = ital_gen;
 shapes = (
 {
 pos = (-14,0);
-ref = _part.f_base;
+ref = longs;
 },
 {
 closed = 1;
@@ -386,7 +386,7 @@ name = ital_gen;
 shapes = (
 {
 pos = (10,0);
-ref = _part.f_base;
+ref = longs;
 },
 {
 closed = 1;
@@ -460,7 +460,7 @@ name = "Black Display";
 shapes = (
 {
 pos = (10,0);
-ref = _part.f_base;
+ref = longs;
 },
 {
 closed = 1;
@@ -490,7 +490,7 @@ pos = (308,1024);
 layerId = m011;
 shapes = (
 {
-ref = _part.f_base;
+ref = longs;
 },
 {
 closed = 1;
@@ -605,7 +605,7 @@ layerId = m012;
 name = ital_gen;
 shapes = (
 {
-ref = _part.f_base;
+ref = longs;
 },
 {
 closed = 1;
diff --git a/src/Inter.glyphspackage/glyphs/florin.glyph b/src/Inter.glyphspackage/glyphs/florin.glyph
index b95692c7f..b5417cc51 100644
--- a/src/Inter.glyphspackage/glyphs/florin.glyph
+++ b/src/Inter.glyphspackage/glyphs/florin.glyph
@@ -21,7 +21,7 @@ nodes = (
 },
 {
 pos = (70,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 };
@@ -138,7 +138,7 @@ nodes = (
 },
 {
 pos = (74,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 };
@@ -349,7 +349,7 @@ nodes = (
 },
 {
 pos = (70,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 };
@@ -419,7 +419,7 @@ nodes = (
 },
 {
 pos = (70,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 };
diff --git a/src/Inter.glyphspackage/glyphs/idieresisacute.glyph b/src/Inter.glyphspackage/glyphs/idieresisacute.glyph
index 82042679c..23b753520 100644
--- a/src/Inter.glyphspackage/glyphs/idieresisacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/idieresisacute.glyph
@@ -89,7 +89,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (803,0);
+pos = (802,0);
 ref = dieresisacutecomb.lc;
 }
 );
@@ -181,7 +181,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (667,0);
+pos = (661,0);
 ref = dieresisacutecomb.lc;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/longs.glyph b/src/Inter.glyphspackage/glyphs/longs.glyph
index 6c658ea6c..473b29cef 100644
--- a/src/Inter.glyphspackage/glyphs/longs.glyph
+++ b/src/Inter.glyphspackage/glyphs/longs.glyph
@@ -2,446 +2,539 @@
 glyphname = longs;
 layers = (
 {
+anchors = (
+{
+name = top;
+pos = (326,1676);
+}
+);
+guides = (
+{
+angle = 90;
+pos = (436,1024);
+}
+);
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+closed = 1;
+nodes = (
+(338,0,l),
+(340,1300,ls),
+(340,1431,o),
+(439,1510,o),
+(550,1510,cs),
+(578,1510,o),
+(600,1505,o),
+(624,1496,c),
+(638,1540,l),
+(611,1550,o),
+(585,1556,o),
+(550,1556,cs),
+(412,1556,o),
+(294,1457,o),
+(294,1300,cs),
+(294,0,l)
+);
+}
+);
+width = 678;
+},
+{
+anchors = (
+{
+name = top;
+pos = (514,1676);
+}
+);
 background = {
 shapes = (
 {
 closed = 1;
 nodes = (
-(230,0,l),
-(230,1230,ls),
-(230,1341,o),
-(276,1399,o),
-(390,1400,cs),
-(439,1399,o),
-(468,1388,o),
-(486,1382,c),
-(536,1530,l),
-(509,1542,o),
-(457,1559,o),
-(372,1560,cs),
-(212,1559,o),
-(58,1463,o),
-(58,1272,cs),
-(58,0,l)
+(248,0,l),
+(460,1280,ls),
+(480,1411,o),
+(593,1489,o),
+(704,1490,cs),
+(733,1489,o),
+(753,1484,o),
+(776,1478,c),
+(798,1522,l),
+(771,1530,o),
+(748,1536,o),
+(712,1536,cs),
+(573,1536,o),
+(439,1437,o),
+(414,1280,cs),
+(200,0,l)
 );
 }
 );
 };
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
 closed = 1;
 nodes = (
-(230,1194,ls),
-(230,1322,o),
-(291,1398,o),
-(408,1398,cs),
-(442,1398,o),
-(471,1395,o),
-(494,1390,c),
-(518,1538,l),
-(471,1549,o),
-(422,1558,o),
-(376,1558,cs),
-(160,1558,o),
-(29,1430,o),
-(30,1194,cs),
-(30,0,l),
-(230,0,l)
+(246,0,l),
+(462,1300,ls),
+(483,1431,o),
+(596,1510,o),
+(706,1510,cs),
+(736,1510,o),
+(756,1504,o),
+(780,1498,c),
+(800,1542,l),
+(774,1551,o),
+(751,1556,o),
+(716,1556,cs),
+(576,1556,o),
+(442,1457,o),
+(416,1300,cs),
+(200,0,l)
 );
 }
 );
-width = 546;
+width = 678;
 },
 {
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+anchors = (
+{
+name = top;
+pos = (396,1676);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 closed = 1;
 nodes = (
-(370,1160,l),
-(369,1228,o),
-(415,1257,o),
-(500,1256,cs),
-(552,1257,o),
-(572,1254,o),
-(608,1248,c),
-(632,1536,l),
-(569,1548,o),
-(511,1556,o),
-(454,1556,cs),
-(159,1556,o),
-(-9,1420,o),
-(-8,1160,c),
-(-8,0,l),
-(370,0,l,{
-name = hr00;
-})
+(402,0,l),
+(402,1230,ls),
+(402,1341,o),
+(451,1400,o),
+(564,1400,cs),
+(614,1400,o),
+(643,1388,o),
+(660,1382,c),
+(710,1530,l),
+(684,1542,o),
+(631,1560,o),
+(546,1560,cs),
+(387,1560,o),
+(232,1463,o),
+(232,1272,cs),
+(232,0,l)
 );
 }
 );
-width = 622;
+width = 738;
 },
 {
+anchors = (
+{
+name = top;
+pos = (582,1676);
+}
+);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
 closed = 1;
 nodes = (
-(334,1194,ls),
-(356,1322,o),
-(431,1398,o),
-(546,1398,cs),
-(582,1398,o),
-(611,1395,o),
-(632,1390,c),
-(680,1538,l),
-(634,1549,o),
-(588,1558,o),
-(542,1558,cs),
-(326,1558,o),
-(173,1430,o),
-(134,1194,cs),
-(-64,0,l),
-(136,0,l)
-);
-}
-);
-width = 546;
+(312,0,l),
+(514,1230,l),
+(535,1341,o),
+(591,1399,o),
+(704,1400,cs),
+(753,1399,o),
+(780,1388,o),
+(798,1382,c),
+(870,1530,l),
+(847,1542,o),
+(797,1559,o),
+(712,1560,cs),
+(553,1559,o),
+(381,1463,o),
+(352,1272,c),
+(140,0,l)
+);
+}
+);
+width = 738;
+},
+{
+anchors = (
+{
+name = top;
+pos = (510,1676);
+}
+);
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+closed = 1;
+nodes = (
+(584,0,l,{
+name = hr00;
+}),
+(584,1166,ls),
+(584,1219,o),
+(605,1254,o),
+(680,1254,cs),
+(710,1254,o),
+(753,1248,o),
+(782,1240,c),
+(840,1528,l),
+(794,1539,o),
+(687,1560,o),
+(584,1560,cs),
+(340,1560,o),
+(184,1425,o),
+(184,1150,cs),
+(184,0,l)
+);
+}
+);
+width = 840;
 },
 {
+anchors = (
+{
+name = top;
+pos = (696,1676);
+}
+);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
 closed = 1;
 nodes = (
-(468,1160,l),
-(479,1228,o),
-(532,1257,o),
-(616,1256,cs),
-(668,1257,o),
-(689,1254,o),
-(722,1248,c),
-(794,1536,l),
-(732,1548,o),
-(677,1556,o),
-(620,1556,cs),
-(325,1556,o),
-(133,1420,o),
-(90,1160,c),
-(-102,0,l),
-(276,0,l,{
+(492,0,l,{
 name = hr00;
-})
+}),
+(686,1166,ls),
+(696,1219,o),
+(722,1254,o),
+(798,1254,cs),
+(827,1254,o),
+(868,1248,o),
+(896,1240,c),
+(1000,1528,l),
+(958,1539,o),
+(853,1559,o),
+(750,1560,cs),
+(507,1559,o),
+(327,1425,o),
+(282,1150,cs),
+(90,0,l)
 );
 }
 );
-width = 622;
+width = 840;
 },
 {
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+anchors = (
+{
+name = top;
+pos = (364,1676);
+}
+);
+layerId = m007;
+metricLeft = "=_part.t_base";
+metricRight = "=_part.t_base";
 shapes = (
 {
 closed = 1;
 nodes = (
-(98,1300,ls),
-(99,1433,o),
-(195,1510,o),
-(318,1510,cs),
-(337,1510,o),
-(359,1508,o),
-(388,1500,c),
-(398,1544,l),
-(372,1552,o),
-(340,1556,o),
-(312,1556,cs),
-(171,1556,o),
-(52,1457,o),
-(52,1300,cs),
-(52,0,l),
-(98,0,l)
-);
-}
-);
-width = 448;
+(370,0,l),
+(370,1218,ls),
+(370,1309,o),
+(404,1344,o),
+(494,1344,cs),
+(518,1344,o),
+(572,1344,o),
+(584,1344,c),
+(584,1490,l),
+(572,1490,o),
+(524,1490,o),
+(478,1490,cs),
+(307,1490,o),
+(200,1395,o),
+(200,1244,cs),
+(200,0,l)
+);
+}
+);
+width = 682;
 },
 {
+anchors = (
+{
+name = top;
+pos = (554.05,1676);
+}
+);
 background = {
 shapes = (
 {
 closed = 1;
 nodes = (
-(220,1280,ls),
-(240,1404,o),
-(343,1489,o),
-(472,1490,cs),
-(495,1489,o),
-(517,1487,o),
-(542,1480,c),
-(558,1524,l),
-(535,1532,o),
-(503,1536,o),
-(472,1536,cs),
-(317,1536,o),
-(199,1436,o),
-(174,1280,cs),
-(-40,0,l),
-(8,0,l)
+(402,0,l),
+(402,1226,ls),
+(402,1317,o),
+(430,1344,o),
+(526,1344,cs),
+(550,1344,o),
+(604,1344,o),
+(616,1344,c),
+(616,1490,l),
+(604,1490,o),
+(556,1490,o),
+(510,1490,cs),
+(332,1490,o),
+(232,1405,o),
+(232,1252,cs),
+(232,0,l)
 );
 }
 );
 };
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+layerId = m008;
+metricLeft = "=_part.t_base";
+metricRight = "=_part.t_base";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(222,1300,ls),
-(244,1433,o),
-(354,1510,o),
-(476,1510,cs),
-(496,1510,o),
-(517,1508,o),
-(546,1500,c),
-(562,1544,l),
-(538,1552,o),
-(507,1556,o),
-(478,1556,cs),
-(337,1556,o),
-(202,1457,o),
-(176,1300,cs),
-(-40,0,l),
-(8,0,l)
-);
-}
-);
-width = 448;
+(282.59,0,l),
+(484.229,1218,ls),
+(499.294,1309,o),
+(539.088,1344,o),
+(629.088,1344,cs),
+(653.088,1344,o),
+(707.088,1344,o),
+(719.088,1344,c),
+(743.258,1490,l),
+(731.258,1490,o),
+(683.258,1490,o),
+(637.258,1490,cs),
+(466.258,1490,o),
+(343.531,1395,o),
+(318.533,1244,cs),
+(112.59,0,l)
+);
+}
+);
+width = 682;
 },
 {
+anchors = (
+{
+name = top;
+pos = (654.05,1676);
+}
+);
 background = {
 shapes = (
 {
 closed = 1;
 nodes = (
-(230,0,l),
-(230,1230,ls),
-(230,1341,o),
-(276,1399,o),
-(390,1400,cs),
-(439,1399,o),
-(468,1388,o),
-(486,1382,c),
-(536,1530,l),
-(509,1542,o),
-(457,1559,o),
-(372,1560,cs),
-(212,1559,o),
-(58,1463,o),
-(58,1272,cs),
-(58,0,l)
+(584,0,l,{
+name = hr00;
+}),
+(584,1166,ls),
+(585,1219,o),
+(605,1254,o),
+(680,1254,cs),
+(710,1254,o),
+(753,1248,o),
+(782,1240,c),
+(840,1528,l),
+(794,1539,o),
+(687,1559,o),
+(584,1560,cs),
+(340,1559,o),
+(183,1425,o),
+(184,1150,cs),
+(184,0,l)
 );
 }
 );
 };
-layerId = m007;
+layerId = m010;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(198,1194,ls),
-(198,1322,o),
-(259,1398,o),
-(376,1398,cs),
-(410,1398,o),
-(439,1395,o),
-(462,1390,c),
-(486,1538,l),
-(439,1549,o),
-(390,1558,o),
-(344,1558,cs),
-(128,1558,o),
-(-3,1430,o),
-(-2,1194,cs),
-(-2,0,l),
-(198,0,l)
-);
-}
-);
-width = 482;
+(480.59,0,l,{
+name = hr00;
+}),
+(659.383,1080,ls),
+(672.13,1157,o),
+(705.931,1186,o),
+(784.931,1186,cs),
+(820.931,1186,o),
+(872.931,1186,o),
+(894.931,1186,c),
+(945.258,1490,l),
+(909.258,1490,o),
+(815.258,1490,o),
+(725.258,1490,cs),
+(449.258,1490,o),
+(310.041,1386,o),
+(270.971,1150,cs),
+(80.59,0,l)
+);
+}
+);
+width = 828;
 },
 {
-layerId = m008;
-shapes = (
+anchors = (
 {
-closed = 1;
-nodes = (
-(302,1194,ls),
-(324,1322,o),
-(399,1398,o),
-(514,1398,cs),
-(550,1398,o),
-(579,1395,o),
-(600,1390,c),
-(648,1538,l),
-(602,1549,o),
-(556,1558,o),
-(510,1558,cs),
-(294,1558,o),
-(141,1430,o),
-(102,1194,cs),
-(-96,0,l),
-(104,0,l)
-);
-}
-);
-width = 482;
-},
-{
-layerId = m009;
+name = top;
+pos = (464,1676);
+}
+);
+background = {
 shapes = (
 {
 closed = 1;
 nodes = (
-(354,1160,l),
-(353,1228,o),
-(399,1257,o),
-(484,1256,cs),
-(536,1257,o),
-(556,1254,o),
-(592,1248,c),
-(616,1536,l),
-(553,1548,o),
-(495,1556,o),
-(438,1556,cs),
-(143,1556,o),
-(-25,1420,o),
-(-24,1160,c),
-(-24,0,l),
-(354,0,l,{
+(584,0,l,{
 name = hr00;
-})
+}),
+(584,1166,ls),
+(585,1219,o),
+(605,1254,o),
+(680,1254,cs),
+(710,1254,o),
+(753,1248,o),
+(782,1240,c),
+(840,1528,l),
+(794,1539,o),
+(687,1559,o),
+(584,1560,cs),
+(340,1559,o),
+(183,1425,o),
+(184,1150,cs),
+(184,0,l)
 );
 }
 );
-width = 590;
-},
-{
-layerId = m010;
+};
+layerId = m009;
+name = "Black Display";
 shapes = (
 {
 closed = 1;
 nodes = (
-(452,1160,l),
-(463,1228,o),
-(516,1257,o),
-(600,1256,cs),
-(652,1257,o),
-(673,1254,o),
-(706,1248,c),
-(778,1536,l),
-(716,1548,o),
-(661,1556,o),
-(604,1556,cs),
-(309,1556,o),
-(117,1420,o),
-(74,1160,c),
-(-118,0,l),
-(260,0,l,{
+(568,0,l,{
 name = hr00;
-})
+}),
+(568,1080,ls),
+(568,1157,o),
+(597,1186,o),
+(676,1186,cs),
+(712,1186,o),
+(764,1186,o),
+(786,1186,c),
+(786,1490,l),
+(750,1490,o),
+(656,1490,o),
+(566,1490,cs),
+(290,1490,o),
+(168,1386,o),
+(168,1150,cs),
+(168,0,l)
 );
 }
 );
-width = 590;
+width = 828;
 },
 {
+anchors = (
+{
+name = top;
+pos = (262,1676);
+}
+);
+guides = (
+{
+angle = 90;
+pos = (308,1024);
+}
+);
 layerId = m011;
 shapes = (
 {
 closed = 1;
 nodes = (
-(34,1300,ls),
-(35,1433,o),
-(131,1510,o),
-(254,1510,cs),
-(273,1510,o),
-(295,1508,o),
-(324,1500,c),
-(334,1544,l),
-(308,1552,o),
-(276,1556,o),
-(248,1556,cs),
-(107,1556,o),
-(-12,1457,o),
-(-12,1300,cs),
-(-12,0,l),
-(34,0,l)
-);
-}
-);
-width = 320;
+(274,0,l),
+(276,1300,ls),
+(276,1431,o),
+(375,1510,o),
+(486,1510,cs),
+(514,1510,o),
+(536,1505,o),
+(560,1496,c),
+(574,1540,l),
+(547,1550,o),
+(521,1556,o),
+(486,1556,cs),
+(348,1556,o),
+(230,1457,o),
+(230,1300,cs),
+(230,0,l)
+);
+}
+);
+width = 550;
 },
 {
-background = {
-shapes = (
+anchors = (
 {
-closed = 1;
-nodes = (
-(220,1280,ls),
-(240,1404,o),
-(343,1489,o),
-(472,1490,cs),
-(495,1489,o),
-(517,1487,o),
-(542,1480,c),
-(558,1524,l),
-(535,1532,o),
-(503,1536,o),
-(472,1536,cs),
-(317,1536,o),
-(199,1436,o),
-(174,1280,cs),
-(-40,0,l),
-(8,0,l)
+name = top;
+pos = (452.05,1676);
+}
 );
+guides = (
+{
+angle = 80.6;
+pos = (308,1024);
 }
 );
-};
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(158,1300,ls),
-(180,1433,o),
-(290,1510,o),
-(412,1510,cs),
-(432,1510,o),
-(453,1508,o),
-(482,1500,c),
-(498,1544,l),
-(474,1552,o),
-(443,1556,o),
-(414,1556,cs),
-(273,1556,o),
-(138,1457,o),
-(112,1300,cs),
-(-104,0,l),
-(-56,0,l)
+(186.59,0,l),
+(403.804,1300,ls),
+(425.491,1431,o),
+(537.569,1510,o),
+(648.569,1510,cs),
+(676.569,1510,o),
+(697.741,1505,o),
+(720.251,1496,c),
+(741.536,1540,l),
+(716.191,1550,o),
+(691.184,1556,o),
+(656.184,1556,cs),
+(518.184,1556,o),
+(383.795,1457,o),
+(357.804,1300,cs),
+(142.59,0,l)
 );
 }
 );
-width = 320;
+width = 550;
 }
 );
-tags = (
-"TODO-opsz"
-);
 unicode = 383;
-userData = {
-interface.gridadjust.original = "{'width': 712, 'leftMargin': 219, 'rightMargin': -180}";
-"interface.width-adjustments" = (
--16
-);
-};
 }
diff --git a/src/Inter.glyphspackage/glyphs/slongdotaccent.glyph b/src/Inter.glyphspackage/glyphs/slongdotaccent.glyph
index d7be0bfd0..e52538f09 100644
--- a/src/Inter.glyphspackage/glyphs/slongdotaccent.glyph
+++ b/src/Inter.glyphspackage/glyphs/slongdotaccent.glyph
@@ -1,14 +1,12 @@
 {
 glyphname = slongdotaccent;
-kernLeft = f;
-kernRight = f;
 layers = (
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = 1;
-ref = _part.f_base;
+ref = longs;
 },
 {
 alignment = 1;
@@ -23,7 +21,7 @@ layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = 1;
-ref = _part.f_base;
+ref = longs;
 },
 {
 alignment = 1;
@@ -38,7 +36,7 @@ layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
 alignment = 1;
-ref = _part.f_base;
+ref = longs;
 },
 {
 alignment = 1;
@@ -53,7 +51,7 @@ layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
 alignment = 1;
-ref = _part.f_base;
+ref = longs;
 },
 {
 alignment = 1;
@@ -68,7 +66,7 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = 1;
-ref = _part.f_base;
+ref = longs;
 },
 {
 alignment = 1;
@@ -83,7 +81,7 @@ layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
 alignment = 1;
-ref = _part.f_base;
+ref = longs;
 },
 {
 alignment = 1;
@@ -98,7 +96,7 @@ layerId = m007;
 shapes = (
 {
 alignment = 1;
-ref = _part.f_base;
+ref = longs;
 },
 {
 alignment = 1;
@@ -113,7 +111,7 @@ layerId = m008;
 shapes = (
 {
 alignment = 1;
-ref = _part.f_base;
+ref = longs;
 },
 {
 alignment = 1;
@@ -128,7 +126,7 @@ layerId = m009;
 shapes = (
 {
 alignment = 1;
-ref = _part.f_base;
+ref = longs;
 },
 {
 alignment = 1;
@@ -143,7 +141,7 @@ layerId = m010;
 shapes = (
 {
 alignment = 1;
-ref = _part.f_base;
+ref = longs;
 },
 {
 alignment = 1;
@@ -158,7 +156,7 @@ layerId = m011;
 shapes = (
 {
 alignment = 1;
-ref = _part.f_base;
+ref = longs;
 },
 {
 alignment = 1;
@@ -173,7 +171,7 @@ layerId = m012;
 shapes = (
 {
 alignment = 1;
-ref = _part.f_base;
+ref = longs;
 },
 {
 alignment = 1;
diff --git a/src/Inter.glyphspackage/glyphs/slongstroke.glyph b/src/Inter.glyphspackage/glyphs/slongstroke.glyph
index 76d71b20f..ca461e7c3 100644
--- a/src/Inter.glyphspackage/glyphs/slongstroke.glyph
+++ b/src/Inter.glyphspackage/glyphs/slongstroke.glyph
@@ -23,7 +23,7 @@ nodes = (
 },
 {
 pos = (-50,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 width = 688;
@@ -50,7 +50,7 @@ name = hr00;
 },
 {
 pos = (-8,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 width = 834;
@@ -69,7 +69,7 @@ nodes = (
 },
 {
 pos = (-48,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 width = 690;
@@ -90,7 +90,7 @@ name = hr00;
 },
 {
 pos = (-17,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 width = 825;
@@ -117,7 +117,7 @@ name = hr00;
 },
 {
 pos = (-34,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 width = 644;
@@ -138,7 +138,7 @@ name = hr00;
 },
 {
 pos = (-34,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 width = 644;
@@ -163,7 +163,7 @@ nodes = (
 },
 {
 pos = (-38,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 width = 594;
@@ -189,7 +189,7 @@ nodes = (
 },
 {
 pos = (-38,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 width = 594;
@@ -216,7 +216,7 @@ name = hr00;
 },
 {
 pos = (-8,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 width = 810;
@@ -244,7 +244,7 @@ name = hr00;
 },
 {
 pos = (-8,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 width = 810;
@@ -271,7 +271,7 @@ name = hr00;
 },
 {
 pos = (-34,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 width = 516;
@@ -299,7 +299,7 @@ name = hr00;
 },
 {
 pos = (-34,0);
-ref = _part.f_base;
+ref = longs;
 }
 );
 width = 516;
diff --git a/src/Inter.glyphspackage/glyphs/udieresisacute.glyph b/src/Inter.glyphspackage/glyphs/udieresisacute.glyph
index fe82550ca..5407df3a5 100644
--- a/src/Inter.glyphspackage/glyphs/udieresisacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/udieresisacute.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1163,0);
+pos = (1162,0);
 ref = dieresisacutecomb.lc;
 }
 );
@@ -153,7 +153,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1029,0);
+pos = (1023,0);
 ref = dieresisacutecomb.lc;
 }
 );