improved /slongstroke

4 files changed, 234 insertions, 385 deletions

diff --git a/src/Inter.glyphspackage/glyphs/fdotaccent.glyph b/src/Inter.glyphspackage/glyphs/fdotaccent.glyph
index 7c7c9edc5..0027581bb 100644
--- a/src/Inter.glyphspackage/glyphs/fdotaccent.glyph
+++ b/src/Inter.glyphspackage/glyphs/fdotaccent.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = f;
 },
 {
-pos = (214,372);
+pos = (213,372);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = f;
 },
 {
-pos = (204,372);
+pos = (202,372);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/longs.glyph b/src/Inter.glyphspackage/glyphs/longs.glyph
index 473b29cef..65e351c67 100644
--- a/src/Inter.glyphspackage/glyphs/longs.glyph
+++ b/src/Inter.glyphspackage/glyphs/longs.glyph
@@ -4,6 +4,10 @@ layers = (
 {
 anchors = (
 {
+name = cross;
+pos = (317,768);
+},
+{
 name = top;
 pos = (326,1676);
 }
@@ -19,7 +23,7 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(338,0,l),
+(340,0,l),
 (340,1300,ls),
 (340,1431,o),
 (439,1510,o),
@@ -43,64 +47,54 @@ width = 678;
 {
 anchors = (
 {
+name = cross;
+pos = (353,768);
+},
+{
 name = top;
-pos = (514,1676);
+pos = (512,1676);
 }
 );
-background = {
-shapes = (
+guides = (
 {
-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)
-);
+angle = 80.6;
+pos = (437,1024);
 }
 );
-};
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(246,0,l),
-(462,1300,ls),
-(483,1431,o),
-(596,1510,o),
-(706,1510,cs),
+(248,0,l),
+(463,1300,ls),
+(485,1431,o),
+(597,1510,o),
+(708,1510,cs),
 (736,1510,o),
-(756,1504,o),
-(780,1498,c),
-(800,1542,l),
-(774,1551,o),
+(757,1505,o),
+(780,1496,c),
+(801,1540,l),
+(776,1550,o),
 (751,1556,o),
 (716,1556,cs),
-(576,1556,o),
-(442,1457,o),
-(416,1300,cs),
-(200,0,l)
+(578,1556,o),
+(443,1457,o),
+(417,1300,cs),
+(202,0,l)
 );
 }
 );
-width = 678;
+width = 679;
 },
 {
 anchors = (
 {
+name = cross;
+pos = (317,768);
+},
+{
 name = top;
 pos = (396,1676);
 }
@@ -134,39 +128,48 @@ width = 738;
 {
 anchors = (
 {
+name = cross;
+pos = (352,768);
+},
+{
 name = top;
-pos = (582,1676);
+pos = (581,1676);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 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;
+(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)
+);
+}
+);
+width = 737;
 },
 {
 anchors = (
 {
+name = cross;
+pos = (384,768);
+},
+{
 name = top;
 pos = (510,1676);
 }
@@ -202,11 +205,16 @@ width = 840;
 {
 anchors = (
 {
+name = cross;
+pos = (420,768);
+},
+{
 name = top;
 pos = (696,1676);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
@@ -214,29 +222,33 @@ nodes = (
 (492,0,l,{
 name = hr00;
 }),
-(686,1166,ls),
-(696,1219,o),
-(722,1254,o),
-(798,1254,cs),
-(827,1254,o),
+(685,1166,ls),
+(694,1219,o),
+(721,1254,o),
+(796,1254,cs),
+(826,1254,o),
 (868,1248,o),
-(896,1240,c),
-(1000,1528,l),
-(958,1539,o),
-(853,1559,o),
+(895,1240,c),
+(1001,1528,l),
+(957,1539,o),
+(853,1560,o),
 (750,1560,cs),
-(507,1559,o),
-(327,1425,o),
+(506,1560,o),
+(328,1425,o),
 (282,1150,cs),
-(90,0,l)
+(92,0,l)
 );
 }
 );
-width = 840;
+width = 841;
 },
 {
 anchors = (
 {
+name = cross;
+pos = (285,768);
+},
+{
 name = top;
 pos = (364,1676);
 }
@@ -272,35 +284,14 @@ width = 682;
 {
 anchors = (
 {
-name = top;
-pos = (554.05,1676);
-}
-);
-background = {
-shapes = (
+name = cross;
+pos = (325,768);
+},
 {
-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)
-);
+name = top;
+pos = (554,1676);
 }
 );
-};
 layerId = m008;
 metricLeft = "=_part.t_base";
 metricRight = "=_part.t_base";
@@ -309,32 +300,36 @@ 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;
+(283,0,l),
+(484.639,1218,ls),
+(499.704,1309,o),
+(539.498,1344,o),
+(629.498,1344,cs),
+(653.498,1344,o),
+(707.498,1344,o),
+(719.498,1344,c),
+(743.668,1490,l),
+(731.668,1490,o),
+(683.668,1490,o),
+(637.668,1490,cs),
+(466.668,1490,o),
+(343.941,1395,o),
+(318.943,1244,cs),
+(113,0,l)
+);
+}
+);
+width = 683;
 },
 {
 anchors = (
 {
+name = cross;
+pos = (408,768);
+},
+{
 name = top;
-pos = (654.05,1676);
+pos = (654,1676);
 }
 );
 background = {
@@ -370,32 +365,36 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(480.59,0,l,{
+(481,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;
+(659.793,1080,ls),
+(672.54,1157,o),
+(706.341,1186,o),
+(785.341,1186,cs),
+(821.341,1186,o),
+(873.341,1186,o),
+(895.341,1186,c),
+(945.668,1490,l),
+(909.668,1490,o),
+(815.668,1490,o),
+(725.668,1490,cs),
+(449.668,1490,o),
+(310.451,1386,o),
+(271.381,1150,cs),
+(81,0,l)
+);
+}
+);
+width = 829;
 },
 {
 anchors = (
 {
+name = cross;
+pos = (368,768);
+},
+{
 name = top;
 pos = (464,1676);
 }
@@ -459,6 +458,10 @@ width = 828;
 {
 anchors = (
 {
+name = cross;
+pos = (253,768);
+},
+{
 name = top;
 pos = (262,1676);
 }
@@ -474,7 +477,7 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(274,0,l),
+(276,0,l),
 (276,1300,ls),
 (276,1431,o),
 (375,1510,o),
@@ -498,8 +501,12 @@ width = 550;
 {
 anchors = (
 {
+name = cross;
+pos = (293,768);
+},
+{
 name = top;
-pos = (452.05,1676);
+pos = (452,1676);
 }
 );
 guides = (
@@ -514,27 +521,28 @@ 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)
+(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)
 );
 }
 );
 width = 550;
 }
 );
+note = "base of /f";
 unicode = 383;
 }
diff --git a/src/Inter.glyphspackage/glyphs/slongdotaccent.glyph b/src/Inter.glyphspackage/glyphs/slongdotaccent.glyph
index e52538f09..6f3800b72 100644
--- a/src/Inter.glyphspackage/glyphs/slongdotaccent.glyph
+++ b/src/Inter.glyphspackage/glyphs/slongdotaccent.glyph
@@ -40,11 +40,11 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (214,372);
+pos = (213,372);
 ref = dotaccent;
 }
 );
-width = 738;
+width = 737;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -59,7 +59,7 @@ pos = (238,372);
 ref = dotaccent;
 }
 );
-width = 840;
+width = 841;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -85,11 +85,11 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (204,372);
+pos = (202,372);
 ref = dotaccent;
 }
 );
-width = 678;
+width = 679;
 },
 {
 layerId = m007;
@@ -119,7 +119,7 @@ pos = (218,372);
 ref = dotaccent;
 }
 );
-width = 682;
+width = 683;
 },
 {
 layerId = m009;
@@ -149,7 +149,7 @@ pos = (212,372);
 ref = dotaccent;
 }
 );
-width = 828;
+width = 829;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/slongstroke.glyph b/src/Inter.glyphspackage/glyphs/slongstroke.glyph
index ca461e7c3..6e393831c 100644
--- a/src/Inter.glyphspackage/glyphs/slongstroke.glyph
+++ b/src/Inter.glyphspackage/glyphs/slongstroke.glyph
@@ -1,320 +1,161 @@
 {
 glyphname = slongstroke;
-kernLeft = f;
-kernRight = f;
 layers = (
 {
-guides = (
-{
-angle = 90;
-pos = (372,-44);
-}
-);
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(544,946,l),
-(544,1118,l),
-(52,930,l),
-(52,760,l)
-);
+ref = longs;
 },
 {
-pos = (-50,0);
-ref = longs;
+pos = (126,0);
+ref = slashshortcomb;
 }
 );
-width = 688;
+width = 678;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (520,-84);
-}
-);
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(780,814,l),
-(780,1118,l,{
-name = hr00;
-}),
-(32,878,l),
-(32,574,l)
-);
+ref = longs;
 },
 {
-pos = (-8,0);
-ref = longs;
+pos = (62,0);
+ref = slashshortcomb;
 }
 );
-width = 834;
+width = 550;
 },
 {
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(608,946,l),
-(638,1118,l),
-(114,930,l),
-(86,760,l)
-);
+ref = longs;
 },
 {
-pos = (-48,0);
-ref = longs;
+pos = (61,0);
+ref = slashshortcomb;
 }
 );
-width = 690;
+width = 738;
 },
 {
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(815,814,l),
-(865,1118,l,{
-name = hr00;
-}),
-(77,878,l),
-(27,574,l)
-);
+ref = longs;
 },
 {
-pos = (-17,0);
-ref = longs;
+pos = (29,0);
+ref = slashshortcomb;
 }
 );
-width = 825;
+width = 682;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (400,-48);
-}
-);
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(484,1068,l),
-(484,1118,l,{
-name = hr00;
-}),
-(140,962,l),
-(140,914,l)
-);
+ref = longs;
 },
 {
-pos = (-34,0);
-ref = longs;
+pos = (58,0);
+ref = slashshortcomb;
 }
 );
-width = 644;
+width = 840;
 },
 {
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(568,1068,l),
-(578,1118,l,{
-name = hr00;
-}),
-(208,962,l),
-(198,914,l)
-);
+ref = longs;
 },
 {
-pos = (-34,0);
-ref = longs;
+pos = (42,0);
+ref = slashshortcomb;
 }
 );
-width = 644;
+width = 828;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (92,-44);
-}
-);
-layerId = m007;
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-closed = 1;
-nodes = (
-(524,946,l),
-(524,1118,l),
-(32,930,l),
-(32,760,l)
-);
+ref = longs;
 },
 {
-pos = (-38,0);
-ref = longs;
+pos = (128,0);
+ref = slashshortcomb;
 }
 );
-width = 594;
+width = 679;
 },
 {
-guides = (
-{
-angle = 80.6;
-pos = (92,-44);
-}
-);
-layerId = m008;
-name = ital_gen;
+layerId = m012;
 shapes = (
 {
-closed = 1;
-nodes = (
-(593.199,946,l),
-(621.674,1118,l),
-(98.551,930,l),
-(70.407,760,l)
-);
+ref = longs;
 },
 {
-pos = (-38,0);
-ref = longs;
+pos = (62,0);
+ref = slashshortcomb;
 }
 );
-width = 594;
+width = 550;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (424,-84);
-}
-);
-layerId = m009;
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-closed = 1;
-nodes = (
-(764,814,l),
-(764,1118,l,{
-name = hr00;
-}),
-(16,878,l),
-(16,574,l)
-);
+ref = longs;
 },
 {
-pos = (-8,0);
-ref = longs;
+pos = (61,0);
+ref = slashshortcomb;
 }
 );
-width = 810;
+width = 737;
 },
 {
-guides = (
-{
-angle = 80.6;
-pos = (424,-84);
-}
-);
-layerId = m010;
-name = ital_gen;
+layerId = m008;
 shapes = (
 {
-closed = 1;
-nodes = (
-(811.347,814,l),
-(861.674,1118,l,{
-name = hr00;
-}),
-(73.942,878,l),
-(23.615,574,l)
-);
+ref = longs;
 },
 {
-pos = (-8,0);
-ref = longs;
+pos = (29,0);
+ref = slashshortcomb;
 }
 );
-width = 810;
+width = 683;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (272,-48);
-}
-);
-layerId = m011;
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-closed = 1;
-nodes = (
-(420,1068,l),
-(420,1118,l,{
-name = hr00;
-}),
-(76,962,l),
-(76,914,l)
-);
+ref = longs;
 },
 {
-pos = (-34,0);
-ref = longs;
+pos = (59,0);
+ref = slashshortcomb;
 }
 );
-width = 516;
+width = 841;
 },
 {
-guides = (
-{
-angle = 80.6;
-pos = (272,-48);
-}
-);
-layerId = m012;
-name = ital_gen;
+layerId = m010;
 shapes = (
 {
-closed = 1;
-nodes = (
-(509.396,1068,l),
-(517.674,1118,l,{
-name = hr00;
-}),
-(147.848,962,l),
-(139.902,914,l)
-);
+ref = longs;
 },
 {
-pos = (-34,0);
-ref = longs;
+pos = (42,0);
+ref = slashshortcomb;
 }
 );
-width = 516;
+width = 829;
 }
 );
-metricLeft = f;
-metricRight = f;
-tags = (
-"TODO-opsz"
-);
-unicode = 7836;
-userData = {
-interface.gridadjust.original = "{'width': 1031, 'leftMargin': 125, 'rightMargin': 41}";
-"interface.width-adjustments" = (
--16
-);
-};
 }