componentize /btopbar and touch up /crossbar

1 files changed, 130 insertions, 91 deletions

diff --git a/src/Inter.glyphspackage/glyphs/b.glyph b/src/Inter.glyphspackage/glyphs/b.glyph
index 565558823..5834a8e04 100644
--- a/src/Inter.glyphspackage/glyphs/b.glyph
+++ b/src/Inter.glyphspackage/glyphs/b.glyph
@@ -12,11 +12,15 @@ pos = (630,0);
 },
 {
 name = cross;
-pos = (222,1280);
+pos = (244,1304);
 },
 {
 name = top;
 pos = (630,1304);
+},
+{
+name = topbar;
+pos = (198,1490);
 }
 );
 guides = (
@@ -171,11 +175,15 @@ pos = (535,0);
 },
 {
 name = cross;
-pos = (341,1280);
+pos = (367,1304);
 },
 {
 name = top;
 pos = (751,1304);
+},
+{
+name = topbar;
+pos = (351,1490);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -232,11 +240,15 @@ pos = (666,0);
 },
 {
 name = cross;
-pos = (243,1280);
+pos = (328,1304);
 },
 {
 name = top;
 pos = (662,1304);
+},
+{
+name = topbar;
+pos = (158,1490);
 }
 );
 guides = (
@@ -244,13 +256,8 @@ guides = (
 pos = (480,168);
 },
 {
-orientation = center;
 angle = 90;
-pos = (-338,536);
-},
-{
-angle = 90;
-pos = (920,1628);
+pos = (662,1218);
 },
 {
 angle = 90;
@@ -307,15 +314,19 @@ width = 1246;
 anchors = (
 {
 name = bottom;
-pos = (656,0);
+pos = (624,0);
 },
 {
 name = cross;
-pos = (211,1280);
+pos = (296,1262);
 },
 {
 name = top;
-pos = (652,1262);
+pos = (644,1262);
+},
+{
+name = topbar;
+pos = (126,1490);
 }
 );
 guides = (
@@ -329,7 +340,7 @@ pos = (-5934,536);
 },
 {
 angle = 90;
-pos = (629,1628);
+pos = (624,1628);
 },
 {
 angle = 90;
@@ -390,11 +401,15 @@ pos = (533,0);
 },
 {
 name = cross;
-pos = (363,1280);
+pos = (453,1304);
 },
 {
 name = top;
 pos = (779,1304);
+},
+{
+name = topbar;
+pos = (311,1490);
 }
 );
 guides = (
@@ -456,24 +471,24 @@ width = 1250;
 anchors = (
 {
 name = bottom;
-pos = (500,0);
+pos = (530,0);
 },
 {
 name = cross;
-pos = (330,1280);
+pos = (411,1262);
 },
 {
 name = top;
-pos = (746,1304);
+pos = (759,1262);
+},
+{
+name = topbar;
+pos = (278,1490);
 }
 );
 guides = (
 {
-pos = (120,168);
-},
-{
-angle = -99.4;
-pos = (808,536);
+pos = (113,168);
 }
 );
 layerId = m008;
@@ -481,46 +496,46 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(820,-23,o),
-(1052,201,o),
-(1110,556,cs),
-(1169,908,o),
-(1012,1132,o),
-(730,1132,cs),
-(511,1132,o),
-(421,998,o),
-(374,940,c),
-(360,940,l),
-(450,1490,l),
+(805,-20,o),
+(1025,203,o),
+(1079,528,cs),
+(1133,854,o),
+(987,1076,o),
+(712,1076,cs),
+(575,1076,o),
+(440,1018,o),
+(353,900,c),
+(351,900,l),
+(448,1490,l),
 (278,1490,l),
 (32,0,l),
 (198,0,l),
-(226,172,l),
-(246,172,l),
-(276,111,o),
-(325,-23,o),
-(540,-24,cs)
+(224,160,l),
+(226,160,l),
+(282,38,o),
+(393,-20,o),
+(530,-20,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(337,131,o),
-(252,305,o),
-(294,558,cs),
-(334,809,o),
-(473,977,o),
-(682,978,cs),
-(901,977,o),
-(977,794,o),
-(938,558,cs),
-(898,320,o),
-(759,131,o),
-(544,130,cs)
+(334,133,o),
+(235,289,o),
+(275,528,cs),
+(315,767,o),
+(465,924,o),
+(661,924,cs),
+(844,924,o),
+(950,787,o),
+(907,528,cs),
+(864,269,o),
+(713,133,o),
+(530,133,cs)
 );
 }
 );
-width = 1185;
+width = 1159;
 },
 {
 anchors = (
@@ -530,11 +545,15 @@ pos = (638,0);
 },
 {
 name = cross;
-pos = (300,1280);
+pos = (384,1304);
 },
 {
 name = top;
 pos = (838,1304);
+},
+{
+name = topbar;
+pos = (102,1490);
 }
 );
 background = {
@@ -606,11 +625,15 @@ pos = (622,0);
 },
 {
 name = cross;
-pos = (284,1280);
+pos = (384,1262);
 },
 {
 name = top;
 pos = (822,1304);
+},
+{
+name = topbar;
+pos = (86,1490);
 }
 );
 guides = (
@@ -789,11 +812,15 @@ pos = (544,0);
 },
 {
 name = cross;
-pos = (420,1280);
+pos = (513,1304);
 },
 {
 name = top;
 pos = (960,1304);
+},
+{
+name = topbar;
+pos = (256,1490);
 }
 );
 background = {
@@ -865,17 +892,21 @@ pos = (528,0);
 },
 {
 name = cross;
-pos = (404,1280);
+pos = (499,1262);
 },
 {
 name = top;
-pos = (944,1304);
+pos = (943,1304);
+},
+{
+name = topbar;
+pos = (238,1490);
 }
 );
 background = {
 shapes = (
 {
-pos = (78,0);
+pos = (71,0);
 ref = o;
 }
 );
@@ -884,7 +915,7 @@ guides = (
 {
 orientation = center;
 angle = 90;
-pos = (-1254,128);
+pos = (-1906,128);
 }
 );
 layerId = m010;
@@ -892,46 +923,46 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(947,-15,o),
-(1180,172,o),
-(1244,558,cs),
-(1311,963,o),
-(1125,1132,o),
-(904,1132,cs),
-(738,1132,o),
-(615,1036,o),
-(554,922,c),
-(548,922,l),
-(642,1490,l),
-(240,1490,l),
+(959,-24,o),
+(1174,194,o),
+(1229,530,cs),
+(1283,853,o),
+(1133,1080,o),
+(868,1080,cs),
+(731,1080,o),
+(631,1027,o),
+(552,924,c),
+(547,924,l),
+(640,1490,l),
+(238,1490,l),
 (-8,0,l),
-(392,0,l),
-(420,184,l),
-(432,184,l),
-(458,70,o),
-(551,-15,o),
-(708,-14,cs)
+(390,0,l),
+(415,156,l),
+(419,156,l),
+(448,40,o),
+(542,-24,o),
+(682,-24,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(502,294,o),
-(453,396,o),
-(478,558,cs),
-(505,724,o),
-(589,823,o),
-(700,824,cs),
-(810,823,o),
-(857,724,o),
-(830,558,cs),
-(805,393,o),
-(723,294,o),
-(612,294,cs)
+(506,290,o),
+(443,384,o),
+(467,530,cs),
+(491,675,o),
+(585,768,o),
+(694,768,cs),
+(803,768,o),
+(849,675,o),
+(825,530,cs),
+(801,384,o),
+(724,290,o),
+(615,290,cs)
 );
 }
 );
-width = 1290;
+width = 1280;
 },
 {
 anchors = (
@@ -1033,11 +1064,15 @@ pos = (599,0);
 },
 {
 name = cross;
-pos = (191,1280);
+pos = (180,1262);
 },
 {
 name = top;
 pos = (599,1304);
+},
+{
+name = topbar;
+pos = (134,1490);
 }
 );
 guides = (
@@ -1101,11 +1136,15 @@ pos = (506,0);
 },
 {
 name = cross;
-pos = (312,1280);
+pos = (304,1304);
 },
 {
 name = top;
 pos = (722,1304);
+},
+{
+name = topbar;
+pos = (287,1490);
 }
 );
 layerId = m012;