From f6138896ca9a652f74873982365b9d2a408aff59 Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Thu, 6 Oct 2022 12:16:39 -0700
Subject: improved /integral /esh and /jhookdblbar

---
 src/Inter-Italic.glyphspackage/glyphs/esh.glyph    | 506 ++-------------------
 .../glyphs/integral.glyph                          | 387 +++++++++-------
 .../glyphs/jhookdblbar.glyph                       |  24 +-
 src/Inter-Roman.glyphspackage/glyphs/esh.glyph     | 486 +-------------------
 .../glyphs/integral.glyph                          | 386 +++++++++-------
 .../glyphs/jhookdblbar.glyph                       |  24 +-
 6 files changed, 495 insertions(+), 1318 deletions(-)

(limited to 'src')

diff --git a/src/Inter-Italic.glyphspackage/glyphs/esh.glyph b/src/Inter-Italic.glyphspackage/glyphs/esh.glyph
index 83f35be81..8d1b241a3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/esh.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/esh.glyph
@@ -2,536 +2,86 @@
 glyphname = esh;
 layers = (
 {
-anchors = (
-{
-name = cross;
-pos = (382,90);
-}
-);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(464,-6,l),
-(664,1192,ls),
-(684,1321,o),
-(765,1391,o),
-(878,1390,cs),
-(913,1391,o),
-(951,1388,o),
-(978,1382,c),
-(1016,1542,l),
-(972,1551,o),
-(931,1556,o),
-(890,1556,cs),
-(663,1556,o),
-(505,1428,o),
-(466,1192,cs),
-(266,-6,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(255,-442,o),
-(413,-314,o),
-(452,-78,cs),
-(652,1120,l),
-(454,1120,l),
-(254,-78,ls),
-(233,-207,o),
-(156,-276,o),
-(40,-276,cs),
-(4,-276,o),
-(-33,-273,o),
-(-60,-268,c),
-(-94,-428,l),
-(-54,-436,o),
-(-13,-442,o),
-(28,-442,cs)
-);
-}
-);
-width = 920;
-},
-{
-anchors = (
-{
-name = cross;
-pos = (442,122);
+alignment = 1;
+ref = integral;
 }
 );
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(614,0,l,{
-name = hr00;
-}),
-(806,1160,ls),
-(817,1228,o),
-(878,1260,o),
-(974,1260,cs),
-(1020,1260,o),
-(1035,1257,o),
-(1056,1250,c),
-(1100,1534,l),
-(1058,1545,o),
-(1006,1556,o),
-(934,1556,cs),
-(665,1556,o),
-(465,1420,o),
-(422,1160,cs),
-(230,0,l)
-);
+width = 736;
 },
 {
-closed = 1;
-nodes = (
-(363,-436,o),
-(564,-297,o),
-(608,-40,cs),
-(800,1120,l),
-(416,1120,l),
-(224,-40,ls),
-(212,-102,o),
-(153,-140,o),
-(56,-140,cs),
-(14,-140,o),
-(-9,-137,o),
-(-26,-130,c),
-(-70,-414,l),
-(-30,-425,o),
-(28,-436,o),
-(96,-436,cs)
-);
-}
-);
-};
 guides = (
 {
-pos = (468,2140);
+pos = (12,2140);
 },
 {
-pos = (-440,-600);
+pos = (12,-600);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(612,-6,l,{
-name = hr00;
-}),
-(806,1160,ls),
-(817,1228,o),
-(878,1260,o),
-(974,1260,cs),
-(1020,1260,o),
-(1035,1257,o),
-(1056,1250,c),
-(1100,1534,l),
-(1058,1545,o),
-(1006,1556,o),
-(934,1556,cs),
-(665,1556,o),
-(465,1420,o),
-(422,1160,cs),
-(228,-6,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(361,-442,o),
-(564,-303,o),
-(606,-46,cs),
-(800,1120,l),
-(416,1120,l),
-(222,-46,ls),
-(212,-108,o),
-(152,-145,o),
-(54,-146,cs),
-(12,-145,o),
-(-11,-143,o),
-(-28,-136,c),
-(-72,-418,l),
-(-31,-431,o),
-(27,-442,o),
-(94,-442,cs)
-);
+alignment = 1;
+ref = integral;
 }
 );
-width = 1030;
+width = 839;
 },
 {
-anchors = (
-{
-name = cross;
-pos = (318,72);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(302,-178,l),
-(542,1280,ls),
-(562,1401,o),
-(665,1489,o),
-(786,1490,cs),
-(817,1489,o),
-(855,1484,o),
-(888,1476,c),
-(894,1520,l),
-(870,1529,o),
-(831,1536,o),
-(794,1536,cs),
-(640,1536,o),
-(520,1433,o),
-(496,1280,cs),
-(254,-178,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(151,-435,o),
-(276,-329,o),
-(302,-178,cs),
-(542,1280,l),
-(496,1280,l),
-(254,-178,ls),
-(234,-299,o),
-(128,-388,o),
-(6,-388,cs),
-(-23,-388,o),
-(-68,-383,o),
-(-100,-376,c),
-(-108,-420,l),
-(-76,-429,o),
-(-32,-435,o),
-(-2,-434,cs)
-);
-}
-);
-};
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(300,-186,l),
-(546,1300,ls),
-(566,1423,o),
-(668,1510,o),
-(790,1510,cs),
-(820,1510,o),
-(858,1505,o),
-(890,1496,c),
-(898,1540,l),
-(873,1551,o),
-(833,1556,o),
-(798,1556,cs),
-(643,1556,o),
-(524,1455,o),
-(498,1300,cs),
-(254,-186,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(150,-442,o),
-(275,-337,o),
-(300,-186,cs),
-(544,1300,l),
-(498,1300,l),
-(254,-186,ls),
-(233,-307,o),
-(127,-396,o),
-(4,-396,cs),
-(-25,-396,o),
-(-70,-391,o),
-(-102,-384,c),
-(-110,-428,l),
-(-79,-436,o),
-(-33,-442,o),
-(-2,-442,cs)
-);
+alignment = 1;
+ref = integral;
 }
 );
-width = 792;
+width = 660;
 },
 {
-anchors = (
-{
-name = cross;
-pos = (350,90);
-}
-);
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(432,-6,l),
-(632,1192,ls),
-(652,1321,o),
-(733,1391,o),
-(846,1390,cs),
-(881,1391,o),
-(919,1388,o),
-(946,1382,c),
-(984,1542,l),
-(940,1551,o),
-(899,1556,o),
-(858,1556,cs),
-(631,1556,o),
-(473,1428,o),
-(434,1192,cs),
-(234,-6,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(223,-442,o),
-(381,-314,o),
-(420,-78,cs),
-(620,1120,l),
-(422,1120,l),
-(222,-78,ls),
-(201,-207,o),
-(124,-276,o),
-(8,-276,cs),
-(-28,-276,o),
-(-65,-273,o),
-(-92,-268,c),
-(-126,-428,l),
-(-86,-436,o),
-(-45,-442,o),
-(-4,-442,cs)
-);
-}
-);
-width = 856;
-},
-{
-anchors = (
-{
-name = cross;
-pos = (426,122);
+alignment = 1;
+ref = integral;
 }
 );
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(614,0,l,{
-name = hr00;
-}),
-(806,1160,ls),
-(817,1228,o),
-(878,1260,o),
-(974,1260,cs),
-(1020,1260,o),
-(1035,1257,o),
-(1056,1250,c),
-(1100,1534,l),
-(1058,1545,o),
-(1006,1556,o),
-(934,1556,cs),
-(665,1556,o),
-(465,1420,o),
-(422,1160,cs),
-(230,0,l)
-);
+width = 710;
 },
 {
-closed = 1;
-nodes = (
-(363,-436,o),
-(564,-297,o),
-(608,-40,cs),
-(800,1120,l),
-(416,1120,l),
-(224,-40,ls),
-(212,-102,o),
-(153,-140,o),
-(56,-140,cs),
-(14,-140,o),
-(-9,-137,o),
-(-26,-130,c),
-(-70,-414,l),
-(-30,-425,o),
-(28,-436,o),
-(96,-436,cs)
-);
-}
-);
-};
 guides = (
 {
-pos = (436,2140);
+pos = (-84,2140);
 },
 {
-pos = (-472,-600);
+pos = (-84,-600);
 }
 );
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(596,-6,l,{
-name = hr00;
-}),
-(790,1160,ls),
-(801,1228,o),
-(862,1260,o),
-(958,1260,cs),
-(1004,1260,o),
-(1019,1257,o),
-(1040,1250,c),
-(1084,1534,l),
-(1042,1545,o),
-(990,1556,o),
-(918,1556,cs),
-(649,1556,o),
-(449,1420,o),
-(406,1160,cs),
-(212,-6,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(345,-442,o),
-(548,-303,o),
-(590,-46,cs),
-(784,1120,l),
-(400,1120,l),
-(206,-46,ls),
-(196,-108,o),
-(136,-145,o),
-(38,-146,cs),
-(-4,-145,o),
-(-27,-143,o),
-(-44,-136,c),
-(-88,-418,l),
-(-47,-431,o),
-(11,-442,o),
-(78,-442,cs)
-);
+alignment = 1;
+ref = integral;
 }
 );
-width = 998;
+width = 711;
 },
 {
-anchors = (
-{
-name = cross;
-pos = (254,72);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(302,-178,l),
-(542,1280,ls),
-(562,1401,o),
-(665,1489,o),
-(786,1490,cs),
-(817,1489,o),
-(855,1484,o),
-(888,1476,c),
-(894,1520,l),
-(870,1529,o),
-(831,1536,o),
-(794,1536,cs),
-(640,1536,o),
-(520,1433,o),
-(496,1280,cs),
-(254,-178,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(151,-435,o),
-(276,-329,o),
-(302,-178,cs),
-(542,1280,l),
-(496,1280,l),
-(254,-178,ls),
-(234,-299,o),
-(128,-388,o),
-(6,-388,cs),
-(-23,-388,o),
-(-68,-383,o),
-(-100,-376,c),
-(-108,-420,l),
-(-76,-429,o),
-(-32,-435,o),
-(-2,-434,cs)
-);
-}
-);
-};
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(236,-186,l),
-(482,1300,ls),
-(502,1423,o),
-(604,1510,o),
-(726,1510,cs),
-(756,1510,o),
-(794,1505,o),
-(826,1496,c),
-(834,1540,l),
-(809,1551,o),
-(769,1556,o),
-(734,1556,cs),
-(579,1556,o),
-(460,1455,o),
-(434,1300,cs),
-(190,-186,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(86,-442,o),
-(211,-337,o),
-(236,-186,cs),
-(480,1300,l),
-(434,1300,l),
-(190,-186,ls),
-(169,-307,o),
-(63,-396,o),
-(-60,-396,cs),
-(-89,-396,o),
-(-134,-391,o),
-(-166,-384,c),
-(-174,-428,l),
-(-143,-436,o),
-(-97,-442,o),
-(-66,-442,cs)
-);
+alignment = 1;
+ref = integral;
 }
 );
-width = 664;
+width = 532;
 }
 );
 unicode = 643;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/integral.glyph b/src/Inter-Italic.glyphspackage/glyphs/integral.glyph
index 148d78510..459b05e41 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/integral.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/integral.glyph
@@ -3,241 +3,280 @@ color = (204,240,242,1);
 glyphname = integral;
 layers = (
 {
+anchors = (
+{
+name = cross;
+pos = (236,67);
+}
+);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(454,1198,ls),
-(476,1335,o),
-(537,1398,o),
-(646,1398,cs),
-(684,1398,o),
-(743,1395,o),
-(766,1390,c),
-(814,1538,l),
-(767,1549,o),
-(721,1558,o),
-(672,1558,cs),
-(458,1558,o),
-(320,1430,o),
-(282,1198,cs),
-(66,-110,ls),
-(47,-224,o),
-(-7,-276,o),
-(-104,-276,cs),
-(-121,-276,o),
-(-180,-271,o),
-(-200,-264,c),
-(-242,-418,l),
-(-208,-431,o),
-(-170,-436,o),
-(-130,-436,cs),
-(73,-436,o),
-(202,-321,o),
-(238,-110,cs)
+(128,-436,o),
+(257,-321,o),
+(292,-110,cs),
+(508,1198,ls),
+(531.008,1335,o),
+(592,1398,o),
+(700,1398,cs),
+(738,1398,o),
+(799,1395,o),
+(821,1390,c),
+(870,1538,l),
+(821,1549,o),
+(777,1558,o),
+(727,1558,cs),
+(514,1558,o),
+(377,1430,o),
+(338,1198,cs),
+(122,-110,ls),
+(103,-224,o),
+(49,-276,o),
+(-49,-276,cs),
+(-66,-276,o),
+(-126,-271,o),
+(-145,-264,c),
+(-188,-418,l),
+(-152,-431,o),
+(-115,-436,o),
+(-75,-436,cs)
 );
 }
 );
-width = 570;
+width = 736;
 },
 {
+anchors = (
+{
+name = cross;
+pos = (299,108);
+}
+);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(712,1148,ls),
-(723,1220,o),
-(762,1254,o),
-(834,1254,cs),
-(887,1254,o),
-(931,1251,o),
-(962,1246,c),
-(1038,1534,l),
-(972,1551,o),
-(915,1556,o),
-(864,1556,cs),
-(564,1556,o),
-(374,1391,o),
-(322,1088,cs),
-(144,8,ls),
-(128,-92,o),
-(80,-137,o),
-(-8,-136,cs),
-(-67,-137,o),
-(-77,-131,o),
-(-104,-126,c),
-(-168,-422,l),
-(-115,-433,o),
-(-64,-436,o),
-(4,-436,cs),
-(291,-436,o),
-(477,-269,o),
-(528,38,cs)
+(252,-436,o),
+(438,-268,o),
+(488,38,cs),
+(672,1148,ls),
+(684,1220,o),
+(723,1254,o),
+(796,1254,cs),
+(848,1254,o),
+(892,1251,o),
+(924,1246,c),
+(998,1534,l),
+(933,1551,o),
+(876,1556,o),
+(800,1556,cs),
+(501,1556,o),
+(310,1391,o),
+(260,1088,cs),
+(81,8,ls),
+(65,-91,o),
+(16,-136,o),
+(-71,-136,cs),
+(-106,-136,o),
+(-141,-131,o),
+(-169,-126,c),
+(-232,-422,l),
+(-179,-433,o),
+(-103,-436,o),
+(-36,-436,cs)
 );
 }
 );
-width = 870;
+width = 839;
 },
 {
+anchors = (
+{
+name = cross;
+pos = (209,24);
+}
+);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(334,1300,ls),
-(355,1431,o),
-(467,1510,o),
-(578,1510,cs),
-(607,1510,o),
-(627,1504,o),
-(650,1498,c),
-(670,1542,l),
-(644,1551,o),
-(621,1556,o),
-(586,1556,cs),
-(447,1556,o),
-(313,1457,o),
-(286,1300,cs),
-(40,-180,ls),
-(19,-311,o),
-(-93,-390,o),
-(-204,-390,cs),
-(-233,-390,o),
-(-253,-384,o),
-(-276,-378,c),
-(-296,-422,l),
-(-271,-431,o),
-(-247,-436,o),
-(-212,-436,cs),
-(-73,-436,o),
-(61,-337,o),
-(88,-180,cs)
+(37,-434,o),
+(173,-336,o),
+(200,-178,cs),
+(444,1300,ls),
+(466,1431,o),
+(577,1510,o),
+(687,1510,cs),
+(717,1510,o),
+(738,1505,o),
+(759,1496,c),
+(782,1540,l),
+(756,1551,o),
+(731,1556,o),
+(695,1556,cs),
+(559,1556,o),
+(422,1457,o),
+(396,1300,cs),
+(152,-178,ls),
+(130,-310,o),
+(19,-388,o),
+(-91,-388,cs),
+(-121,-388,o),
+(-143,-384,o),
+(-165,-376,c),
+(-186,-418,l),
+(-160,-429,o),
+(-135,-434,o),
+(-99,-434,cs)
 );
 }
 );
-width = 390;
+width = 660;
 },
 {
+anchors = (
+{
+name = cross;
+pos = (205,73);
+}
+);
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(426,1198,ls),
-(449,1335,o),
-(509,1398,o),
-(617,1398,cs),
-(655,1398,o),
-(716,1395,o),
-(738,1390,c),
-(787,1538,l),
-(738,1549,o),
-(694,1558,o),
-(644,1558,cs),
-(431,1558,o),
-(293,1430,o),
-(254,1198,cs),
-(38,-110,ls),
-(19,-224,o),
-(-34,-276,o),
-(-132,-276,cs),
-(-149,-276,o),
-(-209,-271,o),
-(-228,-264,c),
-(-271,-418,l),
-(-235,-431,o),
-(-198,-436,o),
-(-158,-436,cs),
-(45,-436,o),
-(175,-321,o),
-(210,-110,cs)
+(96,-436,o),
+(225,-321,o),
+(260,-110,cs),
+(476,1198,ls),
+(499,1335,o),
+(560,1398,o),
+(668,1398,cs),
+(711,1398,o),
+(755,1398,o),
+(798,1398,c),
+(825,1558,l),
+(782,1558,o),
+(738,1558,o),
+(695,1558,cs),
+(482,1558,o),
+(345,1430,o),
+(306,1198,cs),
+(90,-110,ls),
+(71,-224,o),
+(17,-276,o),
+(-81,-276,cs),
+(-117,-276,o),
+(-153,-276,o),
+(-189,-276,c),
+(-215,-436,l),
+(-179,-436,o),
+(-143,-436,o),
+(-107,-436,cs)
 );
 }
 );
-width = 506;
+width = 710;
 },
 {
+anchors = (
+{
+name = cross;
+pos = (219,108);
+}
+);
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(701,1148,ls),
-(713,1220,o),
-(752,1254,o),
-(825,1254,cs),
-(877,1254,o),
-(921,1251,o),
-(953,1246,c),
-(1027,1534,l),
-(962,1551,o),
-(905,1556,o),
-(853,1556,cs),
-(554,1556,o),
-(363,1391,o),
-(313,1088,cs),
-(134,8,ls),
-(118,-91,o),
-(69,-137,o),
-(-18,-136,cs),
-(-77,-137,o),
-(-88,-131,o),
-(-116,-126,c),
-(-179,-422,l),
-(-126,-433,o),
-(-74,-436,o),
-(-7,-436,cs),
-(281,-436,o),
-(467,-268,o),
-(517,38,cs)
+(193,-418,o),
+(353,-292,o),
+(395,-38,cs),
+(578,1072,ls),
+(592,1154,o),
+(626,1186,o),
+(697,1186,cs),
+(722,1186,o),
+(747,1186,o),
+(771,1186,c),
+(822,1490,l),
+(770,1490,o),
+(719,1490,o),
+(668,1490,cs),
+(387,1490,o),
+(227,1364,o),
+(185,1110,cs),
+(1,0,ls),
+(-13,-82,o),
+(-47,-114,o),
+(-118,-114,cs),
+(-143,-114,o),
+(-167,-114,o),
+(-192,-114,c),
+(-242,-418,l),
+(-191,-418,o),
+(-140,-418,o),
+(-88,-418,cs)
 );
 }
 );
-width = 838;
+width = 711;
 },
 {
+anchors = (
+{
+name = cross;
+pos = (145,24);
+}
+);
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(279,1300,ls),
-(300,1431,o),
-(412,1510,o),
-(522,1510,cs),
-(552,1510,o),
-(573,1505,o),
-(594,1496,c),
-(617,1540,l),
-(591,1551,o),
-(566,1556,o),
-(530,1556,cs),
-(394,1556,o),
-(258,1457,o),
-(231,1300,cs),
-(-13,-178,ls),
-(-34,-310,o),
-(-146,-388,o),
-(-256,-388,cs),
-(-286,-388,o),
-(-308,-384,o),
-(-330,-376,c),
-(-351,-418,l),
-(-325,-429,o),
-(-300,-435,o),
-(-264,-434,cs),
-(-128,-435,o),
-(7,-336,o),
-(35,-178,cs)
+(-27,-434,o),
+(109,-336,o),
+(136,-178,cs),
+(380,1300,ls),
+(402,1431,o),
+(513,1510,o),
+(623,1510,cs),
+(653,1510,o),
+(674,1505,o),
+(695,1496,c),
+(718,1540,l),
+(692,1551,o),
+(667,1556,o),
+(631,1556,cs),
+(495,1556,o),
+(358,1457,o),
+(332,1300,cs),
+(88,-178,ls),
+(66,-310,o),
+(-45,-388,o),
+(-155,-388,cs),
+(-185,-388,o),
+(-207,-384,o),
+(-229,-376,c),
+(-250,-418,l),
+(-224,-429,o),
+(-199,-434,o),
+(-163,-434,cs)
 );
 }
 );
-width = 261;
+width = 532;
 }
 );
 unicode = 8747;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/jhookdblbar.glyph b/src/Inter-Italic.glyphspackage/glyphs/jhookdblbar.glyph
index 5ed434423..5a11e6eaf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/jhookdblbar.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/jhookdblbar.glyph
@@ -9,11 +9,11 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-105,-631);
+pos = (-251,-654);
 ref = crossbar;
 }
 );
-width = 920;
+width = 736;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -23,11 +23,11 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-105,-599);
+pos = (-248,-613);
 ref = crossbar;
 }
 );
-width = 1030;
+width = 839;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -37,11 +37,11 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-133,-650);
+pos = (-242,-698);
 ref = crossbar;
 }
 );
-width = 792;
+width = 660;
 },
 {
 layerId = m008;
@@ -51,11 +51,11 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-130,-630);
+pos = (-275,-647);
 ref = crossbar;
 }
 );
-width = 856;
+width = 710;
 },
 {
 layerId = m010;
@@ -65,11 +65,11 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-126,-599);
+pos = (-333,-613);
 ref = crossbar;
 }
 );
-width = 998;
+width = 711;
 },
 {
 layerId = m012;
@@ -79,11 +79,11 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-133,-650);
+pos = (-242,-698);
 ref = crossbar;
 }
 );
-width = 664;
+width = 532;
 }
 );
 unicode = 644;
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 = (
-- 
cgit v1.2.3