improved /integral /esh and /jhookdblbar

3 files changed, 242 insertions, 654 deletions

diff --git a/src/Inter-Roman.glyphspackage/glyphs/esh.glyph b/src/Inter-Roman.glyphspackage/glyphs/esh.glyph
index 620c68e19..84c526c8b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/esh.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/esh.glyph
@@ -2,111 +2,16 @@
 glyphname = esh;
 layers = (
 {
-anchors = (
-{
-name = cross;
-pos = (460,90);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(550,1082,l),
-(550,1192,ls),
-(550,1321,o),
-(611,1385,o),
-(728,1384,cs),
-(762,1385,o),
-(788,1379,o),
-(808,1374,c),
-(852,1530,l),
-(815,1545,o),
-(736,1556,o),
-(680,1556,cs),
-(500,1556,o),
-(369,1428,o),
-(370,1192,cs),
-(370,1082,l),
-(190,1082,l),
-(190,934,l),
-(370,934,l),
-(370,-90,ls),
-(369,-207,o),
-(311,-276,o),
-(232,-276,cs),
-(215,-276,o),
-(154,-273,o),
-(134,-264,c),
-(120,-422,l),
-(157,-433,o),
-(192,-436,o),
-(232,-436,cs),
-(436,-436,o),
-(550,-314,o),
-(550,-90,cs),
-(550,934,l),
-(754,934,l),
-(754,1082,l)
-);
-}
-);
-};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(558,-6,l),
-(558,1192,ls),
-(559,1321,o),
-(628,1391,o),
-(742,1390,cs),
-(777,1391,o),
-(815,1388,o),
-(840,1382,c),
-(852,1542,l),
-(809,1551,o),
-(765,1556,o),
-(724,1556,cs),
-(497,1556,o),
-(361,1428,o),
-(360,1192,cs),
-(360,-6,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(422,-442,o),
-(559,-314,o),
-(558,-78,cs),
-(558,1120,l),
-(360,1120,l),
-(360,-78,ls),
-(361,-207,o),
-(294,-276,o),
-(178,-276,cs),
-(143,-276,o),
-(105,-273,o),
-(78,-268,c),
-(70,-428,l),
-(111,-436,o),
-(154,-442,o),
-(194,-442,cs)
-);
+alignment = 1;
+ref = integral;
 }
 );
-width = 920;
+width = 736;
 },
 {
-anchors = (
-{
-name = cross;
-pos = (514,122);
-}
-);
 guides = (
 {
 pos = (12,2140);
@@ -118,258 +23,33 @@ pos = (12,-600);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(706,-6,l,{
-name = hr00;
-}),
-(706,1160,ls),
-(707,1228,o),
-(761,1260,o),
-(858,1260,cs),
-(904,1260,o),
-(919,1257,o),
-(942,1250,c),
-(940,1534,l),
-(895,1545,o),
-(840,1556,o),
-(768,1556,cs),
-(500,1556,o),
-(323,1420,o),
-(322,1160,cs),
-(322,-6,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(529,-442,o),
-(707,-303,o),
-(706,-46,cs),
-(706,1120,l),
-(322,1120,l),
-(322,-46,ls),
-(323,-108,o),
-(270,-145,o),
-(172,-146,cs),
-(130,-145,o),
-(107,-143,o),
-(88,-136,c),
-(90,-418,l),
-(133,-431,o),
-(194,-442,o),
-(262,-442,cs)
-);
+alignment = 1;
+ref = integral;
 }
 );
-width = 1030;
-},
-{
-anchors = (
-{
-name = cross;
-pos = (402,72);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(424,-178,l),
-(424,1280,ls),
-(425,1404,o),
-(513,1489,o),
-(634,1490,cs),
-(663,1489,o),
-(703,1485,o),
-(738,1476,c),
-(738,1520,l),
-(711,1530,o),
-(671,1536,o),
-(634,1536,cs),
-(487,1536,o),
-(378,1427,o),
-(378,1280,cs),
-(378,-178,l)
-);
+width = 838;
 },
 {
-closed = 1;
-nodes = (
-(316,-435,o),
-(425,-326,o),
-(424,-178,cs),
-(424,1280,l),
-(378,1280,l),
-(378,-178,ls),
-(378,-300,o),
-(289,-388,o),
-(164,-388,cs),
-(138,-388,o),
-(93,-384,o),
-(58,-376,c),
-(58,-424,l),
-(93,-432,o),
-(138,-435,o),
-(166,-434,cs)
-);
-}
-);
-};
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(424,-186,l),
-(424,1300,ls),
-(425,1424,o),
-(513,1510,o),
-(634,1510,cs),
-(663,1510,o),
-(703,1505,o),
-(738,1496,c),
-(738,1540,l),
-(711,1551,o),
-(671,1556,o),
-(634,1556,cs),
-(487,1556,o),
-(378,1447,o),
-(378,1300,cs),
-(378,-186,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(316,-442,o),
-(425,-333,o),
-(424,-186,cs),
-(424,1300,l),
-(378,1300,l),
-(378,-186,ls),
-(378,-307,o),
-(289,-396,o),
-(164,-396,cs),
-(138,-396,o),
-(93,-391,o),
-(58,-384,c),
-(58,-430,l),
-(93,-439,o),
-(138,-442,o),
-(166,-442,cs)
-);
+alignment = 1;
+ref = integral;
 }
 );
-width = 792;
+width = 660;
 },
 {
-anchors = (
-{
-name = cross;
-pos = (428,90);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(550,1082,l),
-(550,1192,ls),
-(550,1321,o),
-(611,1385,o),
-(728,1384,cs),
-(762,1385,o),
-(788,1379,o),
-(808,1374,c),
-(852,1530,l),
-(815,1545,o),
-(736,1556,o),
-(680,1556,cs),
-(500,1556,o),
-(369,1428,o),
-(370,1192,cs),
-(370,1082,l),
-(190,1082,l),
-(190,934,l),
-(370,934,l),
-(370,-90,ls),
-(369,-207,o),
-(311,-276,o),
-(232,-276,cs),
-(215,-276,o),
-(154,-273,o),
-(134,-264,c),
-(120,-422,l),
-(157,-433,o),
-(192,-436,o),
-(232,-436,cs),
-(436,-436,o),
-(550,-314,o),
-(550,-90,cs),
-(550,934,l),
-(754,934,l),
-(754,1082,l)
-);
-}
-);
-};
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(526,-6,l),
-(526,1192,ls),
-(527,1321,o),
-(596,1391,o),
-(710,1390,cs),
-(745,1391,o),
-(783,1388,o),
-(808,1382,c),
-(820,1542,l),
-(777,1551,o),
-(733,1556,o),
-(692,1556,cs),
-(465,1556,o),
-(329,1428,o),
-(328,1192,cs),
-(328,-6,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(390,-442,o),
-(527,-314,o),
-(526,-78,cs),
-(526,1120,l),
-(328,1120,l),
-(328,-78,ls),
-(329,-207,o),
-(262,-276,o),
-(146,-276,cs),
-(111,-276,o),
-(73,-273,o),
-(46,-268,c),
-(38,-428,l),
-(79,-436,o),
-(122,-442,o),
-(162,-442,cs)
-);
+alignment = 1;
+ref = integral;
 }
 );
-width = 856;
+width = 710;
 },
 {
-anchors = (
-{
-name = cross;
-pos = (498,122);
-}
-);
 guides = (
 {
 pos = (-84,2140);
@@ -381,151 +61,21 @@ pos = (-84,-600);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(690,-6,l,{
-name = hr00;
-}),
-(690,1160,ls),
-(691,1228,o),
-(745,1260,o),
-(842,1260,cs),
-(888,1260,o),
-(903,1257,o),
-(926,1250,c),
-(924,1534,l),
-(879,1545,o),
-(824,1556,o),
-(752,1556,cs),
-(484,1556,o),
-(307,1420,o),
-(306,1160,cs),
-(306,-6,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(513,-442,o),
-(691,-303,o),
-(690,-46,cs),
-(690,1120,l),
-(306,1120,l),
-(306,-46,ls),
-(307,-108,o),
-(254,-145,o),
-(156,-146,cs),
-(114,-145,o),
-(91,-143,o),
-(72,-136,c),
-(74,-418,l),
-(117,-431,o),
-(178,-442,o),
-(246,-442,cs)
-);
+alignment = 1;
+ref = integral;
 }
 );
-width = 998;
-},
-{
-anchors = (
-{
-name = cross;
-pos = (338,72);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(424,-178,l),
-(424,1280,ls),
-(425,1404,o),
-(513,1489,o),
-(634,1490,cs),
-(663,1489,o),
-(703,1485,o),
-(738,1476,c),
-(738,1520,l),
-(711,1530,o),
-(671,1536,o),
-(634,1536,cs),
-(487,1536,o),
-(378,1427,o),
-(378,1280,cs),
-(378,-178,l)
-);
+width = 710;
 },
 {
-closed = 1;
-nodes = (
-(316,-435,o),
-(425,-326,o),
-(424,-178,cs),
-(424,1280,l),
-(378,1280,l),
-(378,-178,ls),
-(378,-300,o),
-(289,-388,o),
-(164,-388,cs),
-(138,-388,o),
-(93,-384,o),
-(58,-376,c),
-(58,-424,l),
-(93,-432,o),
-(138,-435,o),
-(166,-434,cs)
-);
-}
-);
-};
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(360,-186,l),
-(360,1300,ls),
-(361,1424,o),
-(449,1510,o),
-(570,1510,cs),
-(599,1510,o),
-(639,1505,o),
-(674,1496,c),
-(674,1540,l),
-(647,1551,o),
-(607,1556,o),
-(570,1556,cs),
-(423,1556,o),
-(314,1447,o),
-(314,1300,cs),
-(314,-186,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(252,-442,o),
-(361,-333,o),
-(360,-186,cs),
-(360,1300,l),
-(314,1300,l),
-(314,-186,ls),
-(314,-307,o),
-(225,-396,o),
-(100,-396,cs),
-(74,-396,o),
-(29,-391,o),
-(-6,-384,c),
-(-6,-430,l),
-(29,-439,o),
-(74,-442,o),
-(102,-442,cs)
-);
+alignment = 1;
+ref = integral;
 }
 );
-width = 664;
+width = 532;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/integral.glyph b/src/Inter-Roman.glyphspackage/glyphs/integral.glyph
index 955f3c057..72fb7f204 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/integral.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/integral.glyph
@@ -3,240 +3,278 @@ color = (204,240,242,1);
 glyphname = integral;
 layers = (
 {
+anchors = (
+{
+name = cross;
+pos = (318,67);
+}
+);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 closed = 1;
 nodes = (
-(348,1198,ls),
-(348,1335,o),
-(398,1398,o),
-(506,1398,cs),
-(544,1398,o),
-(605,1395,o),
-(628,1390,c),
-(652,1538,l),
-(602,1549,o),
-(556,1558,o),
-(506,1558,cs),
-(293,1558,o),
-(176,1430,o),
-(176,1198,cs),
-(176,-110,ls),
-(176,-224,o),
-(132,-276,o),
-(34,-276,cs),
-(17,-276,o),
-(-44,-271,o),
-(-64,-264,c),
-(-82,-418,l),
-(-44,-431,o),
-(-6,-436,o),
-(34,-436,cs),
-(237,-436,o),
-(348,-321,o),
-(348,-110,cs)
+(293,-436,o),
+(403,-321,o),
+(403,-110,cs),
+(403,1198,ls),
+(403,1335,o),
+(454,1398,o),
+(562,1398,cs),
+(600,1398,o),
+(661,1395,o),
+(684,1390,c),
+(708,1538,l),
+(658,1549,o),
+(612,1558,o),
+(562,1558,cs),
+(349,1558,o),
+(233,1430,o),
+(233,1198,cs),
+(233,-110,ls),
+(233,-224,o),
+(188,-276,o),
+(90,-276,cs),
+(73,-276,o),
+(12,-271,o),
+(-8,-264,c),
+(-26,-418,l),
+(12,-431,o),
+(50,-436,o),
+(90,-436,cs)
 );
 }
 );
-width = 570;
+width = 736;
 },
 {
+anchors = (
+{
+name = cross;
+pos = (373,108);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
-(614,1148,ls),
-(614,1220,o),
-(647,1254,o),
-(720,1254,cs),
-(772,1254,o),
-(817,1251,o),
-(850,1246,c),
-(876,1534,l),
-(808,1551,o),
-(750,1556,o),
-(698,1556,cs),
-(399,1556,o),
-(236,1391,o),
-(236,1088,cs),
-(236,8,ls),
-(236,-91,o),
-(195,-137,o),
-(108,-136,cs),
-(49,-137,o),
-(37,-131,o),
-(8,-126,c),
-(-6,-422,l),
-(49,-433,o),
-(101,-436,o),
-(168,-436,cs),
-(456,-436,o),
-(614,-268,o),
-(614,38,cs)
+(416,-436,o),
+(574,-268,o),
+(574,38,cs),
+(574,1148,ls),
+(574,1220,o),
+(607,1254,o),
+(680,1254,cs),
+(732,1254,o),
+(777,1251,o),
+(810,1246,c),
+(836,1534,l),
+(768,1551,o),
+(710,1556,o),
+(634,1556,cs),
+(335,1556,o),
+(172,1391,o),
+(172,1088,cs),
+(172,8,ls),
+(172,-91,o),
+(131,-136,o),
+(44,-136,cs),
+(9,-136,o),
+(-27,-131,o),
+(-56,-126,c),
+(-70,-422,l),
+(-15,-433,o),
+(61,-436,o),
+(128,-436,cs)
 );
 }
 );
-width = 870;
+width = 838;
 },
 {
+anchors = (
+{
+name = cross;
+pos = (298,24);
+}
+);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 closed = 1;
 nodes = (
-(216,1300,ls),
-(215,1431,o),
-(314,1510,o),
-(424,1510,cs),
-(454,1510,o),
-(476,1505,o),
-(498,1496,c),
-(514,1540,l),
-(486,1551,o),
-(460,1556,o),
-(424,1556,cs),
-(288,1556,o),
-(169,1457,o),
-(168,1300,cs),
-(168,-178,ls),
-(169,-310,o),
-(70,-388,o),
-(-40,-388,cs),
-(-70,-388,o),
-(-92,-384,o),
-(-116,-376,c),
-(-130,-418,l),
-(-102,-429,o),
-(-76,-435,o),
-(-40,-434,cs),
-(96,-435,o),
-(215,-336,o),
-(216,-178,cs)
+(202,-434,o),
+(322,-336,o),
+(322,-178,cs),
+(322,1300,ls),
+(322,1431,o),
+(420,1510,o),
+(530,1510,cs),
+(560,1510,o),
+(582,1505,o),
+(604,1496,c),
+(620,1540,l),
+(592,1551,o),
+(566,1556,o),
+(530,1556,cs),
+(394,1556,o),
+(274,1457,o),
+(274,1300,cs),
+(274,-178,ls),
+(274,-310,o),
+(176,-388,o),
+(66,-388,cs),
+(36,-388,o),
+(14,-384,o),
+(-10,-376,c),
+(-24,-418,l),
+(4,-429,o),
+(30,-434,o),
+(66,-434,cs)
 );
 }
 );
-width = 390;
+width = 660;
 },
 {
+anchors = (
+{
+name = cross;
+pos = (280,73);
+}
+);
 layerId = m007;
 shapes = (
 {
 closed = 1;
 nodes = (
-(316,1198,ls),
-(316,1335,o),
-(366,1398,o),
-(474,1398,cs),
-(512,1398,o),
-(573,1395,o),
-(596,1390,c),
-(620,1538,l),
-(570,1549,o),
-(524,1558,o),
-(474,1558,cs),
-(261,1558,o),
-(144,1430,o),
-(144,1198,cs),
-(144,-110,ls),
-(144,-224,o),
-(100,-276,o),
-(2,-276,cs),
-(-15,-276,o),
-(-76,-271,o),
-(-96,-264,c),
-(-114,-418,l),
-(-76,-431,o),
-(-38,-436,o),
-(2,-436,cs),
-(205,-436,o),
-(316,-321,o),
-(316,-110,cs)
+(255,-436,o),
+(365,-321,o),
+(365,-110,cs),
+(365,1198,ls),
+(365,1335,o),
+(416,1398,o),
+(524,1398,cs),
+(567,1398,o),
+(611,1398,o),
+(654,1398,c),
+(654,1558,l),
+(611,1558,o),
+(567,1558,o),
+(524,1558,cs),
+(311,1558,o),
+(195,1430,o),
+(195,1198,cs),
+(195,-110,ls),
+(195,-224,o),
+(150,-276,o),
+(52,-276,cs),
+(16,-276,o),
+(-20,-276,o),
+(-56,-276,c),
+(-56,-436,l),
+(-20,-436,o),
+(16,-436,o),
+(52,-436,cs)
 );
 }
 );
-width = 506;
+width = 710;
 },
 {
+anchors = (
+{
+name = cross;
+pos = (288,108);
+}
+);
 layerId = m009;
 shapes = (
 {
 closed = 1;
 nodes = (
-(598,1148,ls),
-(598,1220,o),
-(631,1254,o),
-(704,1254,cs),
-(756,1254,o),
-(801,1251,o),
-(834,1246,c),
-(860,1534,l),
-(792,1551,o),
-(734,1556,o),
-(682,1556,cs),
-(383,1556,o),
-(220,1391,o),
-(220,1088,cs),
-(220,8,ls),
-(220,-91,o),
-(179,-137,o),
-(92,-136,cs),
-(33,-137,o),
-(21,-131,o),
-(-8,-126,c),
-(-22,-422,l),
-(33,-433,o),
-(85,-436,o),
-(152,-436,cs),
-(440,-436,o),
-(598,-268,o),
-(598,38,cs)
+(349,-418,o),
+(488,-292,o),
+(488,-38,cs),
+(488,1072,ls),
+(488,1154,o),
+(517,1186,o),
+(588,1186,cs),
+(613,1186,o),
+(637,1186,o),
+(662,1186,c),
+(662,1490,l),
+(611,1490,o),
+(559,1490,o),
+(508,1490,cs),
+(227,1490,o),
+(88,1364,o),
+(88,1110,cs),
+(88,0,ls),
+(88,-82,o),
+(59,-114,o),
+(-12,-114,cs),
+(-37,-114,o),
+(-61,-114,o),
+(-86,-114,c),
+(-86,-418,l),
+(-35,-418,o),
+(17,-418,o),
+(68,-418,cs)
 );
 }
 );
-width = 838;
+width = 710;
 },
 {
+anchors = (
+{
+name = cross;
+pos = (234,24);
+}
+);
 layerId = m011;
 shapes = (
 {
 closed = 1;
 nodes = (
-(152,1300,ls),
-(151,1431,o),
-(250,1510,o),
-(360,1510,cs),
-(390,1510,o),
-(412,1505,o),
-(434,1496,c),
-(450,1540,l),
-(422,1551,o),
-(396,1556,o),
-(360,1556,cs),
-(224,1556,o),
-(105,1457,o),
-(104,1300,cs),
-(104,-178,ls),
-(105,-310,o),
-(6,-388,o),
-(-104,-388,cs),
-(-134,-388,o),
-(-156,-384,o),
-(-180,-376,c),
-(-194,-418,l),
-(-166,-429,o),
-(-140,-435,o),
-(-104,-434,cs),
-(32,-435,o),
-(151,-336,o),
-(152,-178,cs)
+(138,-434,o),
+(258,-336,o),
+(258,-178,cs),
+(258,1300,ls),
+(258,1431,o),
+(356,1510,o),
+(466,1510,cs),
+(496,1510,o),
+(518,1505,o),
+(540,1496,c),
+(556,1540,l),
+(528,1551,o),
+(502,1556,o),
+(466,1556,cs),
+(330,1556,o),
+(210,1457,o),
+(210,1300,cs),
+(210,-178,ls),
+(210,-310,o),
+(112,-388,o),
+(2,-388,cs),
+(-28,-388,o),
+(-50,-384,o),
+(-74,-376,c),
+(-88,-418,l),
+(-60,-429,o),
+(-34,-434,o),
+(2,-434,cs)
 );
 }
 );
-width = 262;
+width = 532;
 }
 );
+metricLeft = jdotless;
+metricRight = f;
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/jhookdblbar.glyph b/src/Inter-Roman.glyphspackage/glyphs/jhookdblbar.glyph
index df521e116..1182f7e92 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/jhookdblbar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/jhookdblbar.glyph
@@ -8,11 +8,11 @@ shapes = (
 ref = esh;
 },
 {
-pos = (0,-631);
+pos = (-142,-654);
 ref = crossbar;
 }
 );
-width = 920;
+width = 736;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -21,11 +21,11 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-6,-599);
+pos = (-147,-613);
 ref = crossbar;
 }
 );
-width = 1030;
+width = 838;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -34,11 +34,11 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-22,-650);
+pos = (-126,-698);
 ref = crossbar;
 }
 );
-width = 792;
+width = 660;
 },
 {
 layerId = m007;
@@ -47,11 +47,11 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-20,-630);
+pos = (-168,-647);
 ref = crossbar;
 }
 );
-width = 856;
+width = 710;
 },
 {
 layerId = m009;
@@ -60,11 +60,11 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-22,-599);
+pos = (-232,-613);
 ref = crossbar;
 }
 );
-width = 998;
+width = 710;
 },
 {
 layerId = m011;
@@ -73,11 +73,11 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-22,-650);
+pos = (-126,-698);
 ref = crossbar;
 }
 );
-width = 664;
+width = 532;
 }
 );
 tags = (