From 8870075faf87aa0a90f025f7a822b45b126d251c Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Sun, 5 Jun 2022 10:08:57 -0700
Subject: componentize /btopbar and touch up /crossbar

---
 src/Inter.glyphspackage/glyphs/D_bar1.glyph        |   2 +-
 .../glyphs/G_hestrokecyrillic.glyph                |   2 +-
 src/Inter.glyphspackage/glyphs/I_stroke.1.glyph    |   2 +-
 src/Inter.glyphspackage/glyphs/I_stroke.glyph      |   2 +-
 src/Inter.glyphspackage/glyphs/L_bar.glyph         |   2 +-
 src/Inter.glyphspackage/glyphs/T_bar.glyph         |   2 +-
 .../glyphs/U_straightstrokecyrillic.glyph          |   2 +-
 src/Inter.glyphspackage/glyphs/Z_bar.glyph         |   2 +-
 src/Inter.glyphspackage/glyphs/_part.topbar.glyph  | 274 +++++++++++++++++++++
 src/Inter.glyphspackage/glyphs/afii10146.glyph     |   2 +-
 src/Inter.glyphspackage/glyphs/b.glyph             | 221 ++++++++++-------
 src/Inter.glyphspackage/glyphs/bbar.glyph          |  28 +--
 src/Inter.glyphspackage/glyphs/bdotaccent.glyph    |  10 +-
 src/Inter.glyphspackage/glyphs/bdotbelow.glyph     |   8 +-
 src/Inter.glyphspackage/glyphs/blinebelow.glyph    |   8 +-
 src/Inter.glyphspackage/glyphs/btopbar.glyph       | 146 ++---------
 src/Inter.glyphspackage/glyphs/crossbar.glyph      |  16 +-
 src/Inter.glyphspackage/glyphs/dcroat.glyph        |   2 +-
 src/Inter.glyphspackage/glyphs/dong.glyph          |   2 +-
 src/Inter.glyphspackage/glyphs/franc.glyph         |   2 +-
 src/Inter.glyphspackage/glyphs/gbar.glyph          |   2 +-
 .../glyphs/ghestrokecyrillic.glyph                 |   2 +-
 .../glyphs/glottalstopbarrev.glyph                 |   2 +-
 src/Inter.glyphspackage/glyphs/hbar.glyph          |   2 +-
 src/Inter.glyphspackage/glyphs/ibar.glyph          |   2 +-
 src/Inter.glyphspackage/glyphs/jdotlessbar.glyph   |   2 +-
 src/Inter.glyphspackage/glyphs/jhookdblbar.glyph   |   2 +-
 src/Inter.glyphspackage/glyphs/lbar.glyph          |   2 +-
 src/Inter.glyphspackage/glyphs/lbar.ss02.glyph     |   2 +-
 src/Inter.glyphspackage/glyphs/twostroke.glyph     |   2 +-
 src/Inter.glyphspackage/glyphs/uni0248.glyph       |   2 +-
 src/Inter.glyphspackage/glyphs/uni0249.ccmp.glyph  |   2 +-
 src/Inter.glyphspackage/glyphs/uni024D_.1.glyph    |   2 +-
 src/Inter.glyphspackage/glyphs/uni024D_.glyph      |   2 +-
 src/Inter.glyphspackage/glyphs/uni0268.ccmp.glyph  |   2 +-
 src/Inter.glyphspackage/glyphs/uni03F_C_.glyph     |   2 +-
 src/Inter.glyphspackage/glyphs/uni04F_A_.glyph     |   2 +-
 src/Inter.glyphspackage/glyphs/uni04F_B_.glyph     |   2 +-
 src/Inter.glyphspackage/glyphs/uni04F_E_.glyph     |   2 +-
 src/Inter.glyphspackage/glyphs/uni04F_F_.glyph     |   2 +-
 .../glyphs/ustraightstrokecyrillic.glyph           |   2 +-
 src/Inter.glyphspackage/glyphs/zbar.glyph          |   2 +-
 42 files changed, 499 insertions(+), 280 deletions(-)
 create mode 100644 src/Inter.glyphspackage/glyphs/_part.topbar.glyph

(limited to 'src/Inter.glyphspackage/glyphs')

diff --git a/src/Inter.glyphspackage/glyphs/D_bar1.glyph b/src/Inter.glyphspackage/glyphs/D_bar1.glyph
index bd1ddd062..167a9f45c 100644
--- a/src/Inter.glyphspackage/glyphs/D_bar1.glyph
+++ b/src/Inter.glyphspackage/glyphs/D_bar1.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (-190,46);
+pos = (-210,-494);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/G_hestrokecyrillic.glyph b/src/Inter.glyphspackage/glyphs/G_hestrokecyrillic.glyph
index 203c889ba..f5a0ccc62 100644
--- a/src/Inter.glyphspackage/glyphs/G_hestrokecyrillic.glyph
+++ b/src/Inter.glyphspackage/glyphs/G_hestrokecyrillic.glyph
@@ -87,7 +87,7 @@ shapes = (
 ref = Gamma;
 },
 {
-pos = (-190,46);
+pos = (-210,-494);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/I_stroke.1.glyph b/src/Inter.glyphspackage/glyphs/I_stroke.1.glyph
index 78114b7b2..9f2f8802f 100644
--- a/src/Inter.glyphspackage/glyphs/I_stroke.1.glyph
+++ b/src/Inter.glyphspackage/glyphs/I_stroke.1.glyph
@@ -87,7 +87,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-6,46);
+pos = (-26,-494);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/I_stroke.glyph b/src/Inter.glyphspackage/glyphs/I_stroke.glyph
index fcaa7f046..3a933cfd1 100644
--- a/src/Inter.glyphspackage/glyphs/I_stroke.glyph
+++ b/src/Inter.glyphspackage/glyphs/I_stroke.glyph
@@ -86,7 +86,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-190,46);
+pos = (-210,-494);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/L_bar.glyph b/src/Inter.glyphspackage/glyphs/L_bar.glyph
index 749720d22..1bf878647 100644
--- a/src/Inter.glyphspackage/glyphs/L_bar.glyph
+++ b/src/Inter.glyphspackage/glyphs/L_bar.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-190,46);
+pos = (-210,-494);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/T_bar.glyph b/src/Inter.glyphspackage/glyphs/T_bar.glyph
index 004b4dcb5..ba8874c14 100644
--- a/src/Inter.glyphspackage/glyphs/T_bar.glyph
+++ b/src/Inter.glyphspackage/glyphs/T_bar.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (198,46);
+pos = (178,-494);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/U_straightstrokecyrillic.glyph b/src/Inter.glyphspackage/glyphs/U_straightstrokecyrillic.glyph
index 95794fa38..0aa82bf19 100644
--- a/src/Inter.glyphspackage/glyphs/U_straightstrokecyrillic.glyph
+++ b/src/Inter.glyphspackage/glyphs/U_straightstrokecyrillic.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (220,-128);
+pos = (200,-668);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/Z_bar.glyph b/src/Inter.glyphspackage/glyphs/Z_bar.glyph
index afaaad3a7..09bdb963e 100644
--- a/src/Inter.glyphspackage/glyphs/Z_bar.glyph
+++ b/src/Inter.glyphspackage/glyphs/Z_bar.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (194,46);
+pos = (174,-494);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/_part.topbar.glyph b/src/Inter.glyphspackage/glyphs/_part.topbar.glyph
new file mode 100644
index 000000000..07f7a1a7c
--- /dev/null
+++ b/src/Inter.glyphspackage/glyphs/_part.topbar.glyph
@@ -0,0 +1,274 @@
+{
+export = 0;
+glyphname = _part.topbar;
+layers = (
+{
+anchors = (
+{
+name = _topbar;
+pos = (198,1490);
+}
+);
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+closed = 1;
+nodes = (
+(885,1444,l),
+(885,1490,l,{
+name = hr00;
+}),
+(198,1490,l),
+(222,1444,l)
+);
+}
+);
+width = 1190;
+},
+{
+anchors = (
+{
+name = _topbar;
+pos = (134,1490);
+}
+);
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(820,1444,l),
+(820,1490,l,{
+name = hr00;
+}),
+(134,1490,l),
+(158,1444,l)
+);
+}
+);
+width = 1062;
+},
+{
+anchors = (
+{
+name = _topbar;
+pos = (158,1490);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+closed = 1;
+nodes = (
+(992,1344,l),
+(992,1490,l),
+(158,1490,l),
+(246,1344,l)
+);
+}
+);
+width = 1246;
+},
+{
+anchors = (
+{
+name = _topbar;
+pos = (126,1490);
+}
+);
+layerId = m007;
+shapes = (
+{
+closed = 1;
+nodes = (
+(944,1338,l),
+(944,1490,l),
+(126,1490,l),
+(214,1338,l)
+);
+}
+);
+width = 1150;
+},
+{
+anchors = (
+{
+name = _topbar;
+pos = (102,1490);
+}
+);
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+closed = 1;
+nodes = (
+(994,1198,l),
+(994,1490,l,{
+name = hr00;
+}),
+(102,1490,l),
+(302,1198,l)
+);
+}
+);
+width = 1322;
+},
+{
+anchors = (
+{
+name = _topbar;
+pos = (86,1490);
+}
+);
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(986,1186,l),
+(986,1490,l,{
+name = hr00;
+}),
+(86,1490,l),
+(291,1186,l)
+);
+}
+);
+width = 1282;
+},
+{
+anchors = (
+{
+name = _topbar;
+pos = (351,1490);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1030,1444,l),
+(1037,1490,l,{
+name = hr00;
+}),
+(351,1490,l),
+(368,1444,l)
+);
+}
+);
+width = 1188;
+},
+{
+anchors = (
+{
+name = _topbar;
+pos = (287,1490);
+}
+);
+layerId = m012;
+shapes = (
+{
+closed = 1;
+nodes = (
+(966,1444,l),
+(973,1490,l,{
+name = hr00;
+}),
+(287,1490,l),
+(304,1444,l)
+);
+}
+);
+width = 1060;
+},
+{
+anchors = (
+{
+name = _topbar;
+pos = (311,1490);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1121,1344,l),
+(1145,1490,l),
+(311,1490,l),
+(375,1344,l)
+);
+}
+);
+width = 1250;
+},
+{
+anchors = (
+{
+name = _topbar;
+pos = (278,1490);
+}
+);
+layerId = m008;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1071,1338,l),
+(1096,1490,l),
+(278,1490,l),
+(341,1338,l)
+);
+}
+);
+width = 1185;
+},
+{
+anchors = (
+{
+name = _topbar;
+pos = (256,1490);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1100,1198,l),
+(1148,1490,l,{
+name = hr00;
+}),
+(256,1490,l),
+(408,1198,l)
+);
+}
+);
+width = 1322;
+},
+{
+anchors = (
+{
+name = _topbar;
+pos = (238,1490);
+}
+);
+layerId = m010;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1088,1186,l),
+(1138,1490,l,{
+name = hr00;
+}),
+(238,1490,l),
+(393,1186,l)
+);
+}
+);
+width = 1280;
+}
+);
+}
diff --git a/src/Inter.glyphspackage/glyphs/afii10146.glyph b/src/Inter.glyphspackage/glyphs/afii10146.glyph
index f81648b35..a099c47ba 100644
--- a/src/Inter.glyphspackage/glyphs/afii10146.glyph
+++ b/src/Inter.glyphspackage/glyphs/afii10146.glyph
@@ -87,7 +87,7 @@ shapes = (
 ref = afii10046;
 },
 {
-pos = (-174,454);
+pos = (-194,-86);
 ref = crossbar;
 }
 );
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;
diff --git a/src/Inter.glyphspackage/glyphs/bbar.glyph b/src/Inter.glyphspackage/glyphs/bbar.glyph
index 211e36b95..71d5c19a5 100644
--- a/src/Inter.glyphspackage/glyphs/bbar.glyph
+++ b/src/Inter.glyphspackage/glyphs/bbar.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-217,558);
+pos = (-132,582);
 ref = crossbar;
 }
 );
@@ -22,7 +22,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-220,474);
+pos = (-136,498);
 ref = crossbar;
 }
 );
@@ -35,7 +35,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-123,558);
+pos = (-33,582);
 ref = crossbar;
 }
 );
@@ -48,7 +48,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-142,474);
+pos = (-49,498);
 ref = crossbar;
 }
 );
@@ -61,7 +61,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-202,558);
+pos = (-180,582);
 ref = crossbar;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-109,558);
+pos = (-83,582);
 ref = crossbar;
 }
 );
@@ -87,7 +87,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-217,558);
+pos = (-152,0);
 ref = crossbar;
 }
 );
@@ -100,11 +100,11 @@ shapes = (
 ref = b;
 },
 {
-pos = (-124,558);
+pos = (-43,540);
 ref = crossbar;
 }
 );
-width = 1185;
+width = 1159;
 },
 {
 layerId = m009;
@@ -113,7 +113,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-219,752);
+pos = (-119,734);
 ref = crossbar;
 }
 );
@@ -126,11 +126,11 @@ shapes = (
 ref = b;
 },
 {
-pos = (-142,474);
+pos = (-47,456);
 ref = crossbar;
 }
 );
-width = 1290;
+width = 1280;
 },
 {
 layerId = m011;
@@ -139,7 +139,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-169,558);
+pos = (-180,540);
 ref = crossbar;
 }
 );
@@ -152,7 +152,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-74,558);
+pos = (-82,582);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/bdotaccent.glyph b/src/Inter.glyphspackage/glyphs/bdotaccent.glyph
index e5d0bdd52..5332a7b3c 100644
--- a/src/Inter.glyphspackage/glyphs/bdotaccent.glyph
+++ b/src/Inter.glyphspackage/glyphs/bdotaccent.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (440,-42);
+pos = (432,-42);
 ref = dotaccent;
 }
 );
@@ -101,11 +101,11 @@ shapes = (
 ref = b;
 },
 {
-pos = (410,0);
+pos = (423,-42);
 ref = dotaccent;
 }
 );
-width = 1185;
+width = 1159;
 },
 {
 layerId = m009;
@@ -127,11 +127,11 @@ shapes = (
 ref = b;
 },
 {
-pos = (502,0);
+pos = (501,0);
 ref = dotaccent;
 }
 );
-width = 1290;
+width = 1280;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/bdotbelow.glyph b/src/Inter.glyphspackage/glyphs/bdotbelow.glyph
index 8d82e26b6..dc7f1fbb5 100644
--- a/src/Inter.glyphspackage/glyphs/bdotbelow.glyph
+++ b/src/Inter.glyphspackage/glyphs/bdotbelow.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (1294,0);
+pos = (1262,0);
 ref = dotbelow;
 }
 );
@@ -101,11 +101,11 @@ shapes = (
 ref = b;
 },
 {
-pos = (1228,0);
+pos = (1258,0);
 ref = dotbelow;
 }
 );
-width = 1185;
+width = 1159;
 },
 {
 layerId = m009;
@@ -131,7 +131,7 @@ pos = (1174,0);
 ref = dotbelow;
 }
 );
-width = 1290;
+width = 1280;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/blinebelow.glyph b/src/Inter.glyphspackage/glyphs/blinebelow.glyph
index 99b036c75..554d4f730 100644
--- a/src/Inter.glyphspackage/glyphs/blinebelow.glyph
+++ b/src/Inter.glyphspackage/glyphs/blinebelow.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (1294,0);
+pos = (1262,0);
 ref = macronsubnosp;
 }
 );
@@ -101,11 +101,11 @@ shapes = (
 ref = b;
 },
 {
-pos = (1230,0);
+pos = (1260,0);
 ref = macronsubnosp;
 }
 );
-width = 1185;
+width = 1159;
 },
 {
 layerId = m009;
@@ -131,7 +131,7 @@ pos = (1264,0);
 ref = macronsubnosp;
 }
 );
-width = 1290;
+width = 1280;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/btopbar.glyph b/src/Inter.glyphspackage/glyphs/btopbar.glyph
index 2d2ca8282..cf3c1da3a 100644
--- a/src/Inter.glyphspackage/glyphs/btopbar.glyph
+++ b/src/Inter.glyphspackage/glyphs/btopbar.glyph
@@ -7,16 +7,10 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(328,1490,l),
-(328,1330,l),
-(1018,1330,l),
-(1018,1490,l)
-);
+ref = b;
 },
 {
-ref = b;
+ref = _part.topbar;
 }
 );
 width = 1246;
@@ -25,19 +19,10 @@ width = 1246;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(300,1490,l),
-(300,1224,l),
-(1088,1224,l),
-(1088,1490,l,{
-name = hr00;
-})
-);
+ref = b;
 },
 {
-alignment = -1;
-ref = b;
+ref = _part.topbar;
 }
 );
 width = 1322;
@@ -46,16 +31,10 @@ width = 1322;
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-closed = 1;
-nodes = (
-(482,1490,l),
-(454,1330,l),
-(1146,1330,l),
-(1172,1490,l)
-);
+ref = b;
 },
 {
-ref = b;
+ref = _part.topbar;
 }
 );
 width = 1250;
@@ -64,18 +43,10 @@ width = 1250;
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-closed = 1;
-nodes = (
-(454,1490,l),
-(408,1224,l),
-(1198,1224,l),
-(1242,1490,l,{
-name = hr00;
-})
-);
+ref = b;
 },
 {
-ref = b;
+ref = _part.topbar;
 }
 );
 width = 1322;
@@ -84,19 +55,10 @@ width = 1322;
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(256,1490,l),
-(256,1442,l),
-(978,1442,l),
-(978,1490,l,{
-name = hr00;
-})
-);
+ref = b;
 },
 {
-alignment = -1;
-ref = b;
+ref = _part.topbar;
 }
 );
 width = 1190;
@@ -105,19 +67,10 @@ width = 1190;
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-closed = 1;
-nodes = (
-(410,1490,l),
-(402,1442,l),
-(1122,1442,l),
-(1132,1490,l,{
-name = hr00;
-})
-);
+ref = b;
 },
 {
-alignment = -1;
-ref = b;
+ref = _part.topbar;
 }
 );
 width = 1188;
@@ -126,16 +79,10 @@ width = 1188;
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(296,1490,l),
-(296,1330,l),
-(986,1330,l),
-(986,1490,l)
-);
+ref = b;
 },
 {
-ref = b;
+ref = _part.topbar;
 }
 );
 width = 1150;
@@ -144,37 +91,22 @@ width = 1150;
 layerId = m008;
 shapes = (
 {
-closed = 1;
-nodes = (
-(450,1490,l),
-(422,1330,l),
-(1114,1330,l),
-(1140,1490,l)
-);
+ref = b;
 },
 {
-ref = b;
+ref = _part.topbar;
 }
 );
-width = 1185;
+width = 1159;
 },
 {
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(284,1490,l),
-(284,1224,l),
-(1072,1224,l),
-(1072,1490,l,{
-name = hr00;
-})
-);
+ref = b;
 },
 {
-alignment = -1;
-ref = b;
+ref = _part.topbar;
 }
 );
 width = 1282;
@@ -183,39 +115,22 @@ width = 1282;
 layerId = m010;
 shapes = (
 {
-closed = 1;
-nodes = (
-(438,1490,l),
-(392,1224,l),
-(1182,1224,l),
-(1226,1490,l,{
-name = hr00;
-})
-);
+ref = b;
 },
 {
-ref = b;
+ref = _part.topbar;
 }
 );
-width = 1290;
+width = 1280;
 },
 {
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(192,1490,l),
-(192,1442,l),
-(914,1442,l),
-(914,1490,l,{
-name = hr00;
-})
-);
+ref = b;
 },
 {
-alignment = -1;
-ref = b;
+ref = _part.topbar;
 }
 );
 width = 1062;
@@ -224,19 +139,10 @@ width = 1062;
 layerId = m012;
 shapes = (
 {
-closed = 1;
-nodes = (
-(346,1490,l),
-(338,1442,l),
-(1058,1442,l),
-(1068,1490,l,{
-name = hr00;
-})
-);
+ref = b;
 },
 {
-alignment = -1;
-ref = b;
+ref = _part.topbar;
 }
 );
 width = 1060;
diff --git a/src/Inter.glyphspackage/glyphs/crossbar.glyph b/src/Inter.glyphspackage/glyphs/crossbar.glyph
index 7bfc93919..176055aac 100644
--- a/src/Inter.glyphspackage/glyphs/crossbar.glyph
+++ b/src/Inter.glyphspackage/glyphs/crossbar.glyph
@@ -153,18 +153,18 @@ width = 850;
 anchors = (
 {
 name = _cross;
-pos = (428,722);
+pos = (448,1262);
 }
 );
 guides = (
 {
 orientation = center;
 angle = 90;
-pos = (-3374,1168);
+pos = (-3786,1168);
 },
 {
 orientation = center;
-pos = (-3706,992);
+pos = (-4118,992);
 }
 );
 layerId = m007;
@@ -172,14 +172,14 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(748,654,l),
-(748,788,l),
-(108,788,l),
-(108,654,l)
+(768,1189,l),
+(768,1335,l),
+(128,1335,l),
+(128,1189,l)
 );
 }
 );
-width = 856;
+width = 896;
 },
 {
 anchors = (
diff --git a/src/Inter.glyphspackage/glyphs/dcroat.glyph b/src/Inter.glyphspackage/glyphs/dcroat.glyph
index f829caa3e..943151598 100644
--- a/src/Inter.glyphspackage/glyphs/dcroat.glyph
+++ b/src/Inter.glyphspackage/glyphs/dcroat.glyph
@@ -87,7 +87,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (436,558);
+pos = (416,18);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/dong.glyph b/src/Inter.glyphspackage/glyphs/dong.glyph
index 105cc3fe8..cd00d6c0f 100644
--- a/src/Inter.glyphspackage/glyphs/dong.glyph
+++ b/src/Inter.glyphspackage/glyphs/dong.glyph
@@ -117,7 +117,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (436,558);
+pos = (416,18);
 ref = crossbar;
 },
 {
diff --git a/src/Inter.glyphspackage/glyphs/franc.glyph b/src/Inter.glyphspackage/glyphs/franc.glyph
index 3497283ac..9b9312015 100644
--- a/src/Inter.glyphspackage/glyphs/franc.glyph
+++ b/src/Inter.glyphspackage/glyphs/franc.glyph
@@ -86,7 +86,7 @@ shapes = (
 ref = F;
 },
 {
-pos = (-190,-372);
+pos = (-210,-912);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/gbar.glyph b/src/Inter.glyphspackage/glyphs/gbar.glyph
index 7e4379fd9..8f3c28bd0 100644
--- a/src/Inter.glyphspackage/glyphs/gbar.glyph
+++ b/src/Inter.glyphspackage/glyphs/gbar.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (494,-158);
+pos = (474,-698);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/ghestrokecyrillic.glyph b/src/Inter.glyphspackage/glyphs/ghestrokecyrillic.glyph
index 2bcb87b8e..20491c539 100644
--- a/src/Inter.glyphspackage/glyphs/ghestrokecyrillic.glyph
+++ b/src/Inter.glyphspackage/glyphs/ghestrokecyrillic.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = gecyrillic;
 },
 {
-pos = (-216,-164);
+pos = (-236,-704);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/glottalstopbarrev.glyph b/src/Inter.glyphspackage/glyphs/glottalstopbarrev.glyph
index 94a69154d..0d8001078 100644
--- a/src/Inter.glyphspackage/glyphs/glottalstopbarrev.glyph
+++ b/src/Inter.glyphspackage/glyphs/glottalstopbarrev.glyph
@@ -86,7 +86,7 @@ shapes = (
 ref = glottalstoprevinv;
 },
 {
-pos = (110,-512);
+pos = (90,-1052);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/hbar.glyph b/src/Inter.glyphspackage/glyphs/hbar.glyph
index bedee4b51..fdc233e7e 100644
--- a/src/Inter.glyphspackage/glyphs/hbar.glyph
+++ b/src/Inter.glyphspackage/glyphs/hbar.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-216,582);
+pos = (-236,42);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/ibar.glyph b/src/Inter.glyphspackage/glyphs/ibar.glyph
index 599e014af..62acc187c 100644
--- a/src/Inter.glyphspackage/glyphs/ibar.glyph
+++ b/src/Inter.glyphspackage/glyphs/ibar.glyph
@@ -118,7 +118,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (-216,-128);
+pos = (-236,-668);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/jdotlessbar.glyph b/src/Inter.glyphspackage/glyphs/jdotlessbar.glyph
index 1632c6023..6d164655f 100644
--- a/src/Inter.glyphspackage/glyphs/jdotlessbar.glyph
+++ b/src/Inter.glyphspackage/glyphs/jdotlessbar.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-218,-74);
+pos = (-238,-614);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/jhookdblbar.glyph b/src/Inter.glyphspackage/glyphs/jhookdblbar.glyph
index d0e80a119..6b640efa0 100644
--- a/src/Inter.glyphspackage/glyphs/jhookdblbar.glyph
+++ b/src/Inter.glyphspackage/glyphs/jhookdblbar.glyph
@@ -86,7 +86,7 @@ shapes = (
 ref = esh;
 },
 {
-pos = (0,-632);
+pos = (-20,-1172);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/lbar.glyph b/src/Inter.glyphspackage/glyphs/lbar.glyph
index 1e8837c03..6c1b1b40b 100644
--- a/src/Inter.glyphspackage/glyphs/lbar.glyph
+++ b/src/Inter.glyphspackage/glyphs/lbar.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-218,46);
+pos = (-238,-494);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/lbar.ss02.glyph b/src/Inter.glyphspackage/glyphs/lbar.ss02.glyph
index 5134ff0b6..824743280 100644
--- a/src/Inter.glyphspackage/glyphs/lbar.ss02.glyph
+++ b/src/Inter.glyphspackage/glyphs/lbar.ss02.glyph
@@ -89,7 +89,7 @@ shapes = (
 ref = l.ss02;
 },
 {
-pos = (-216,46);
+pos = (-236,-494);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/twostroke.glyph b/src/Inter.glyphspackage/glyphs/twostroke.glyph
index f9fca5676..1e75c571d 100644
--- a/src/Inter.glyphspackage/glyphs/twostroke.glyph
+++ b/src/Inter.glyphspackage/glyphs/twostroke.glyph
@@ -111,7 +111,7 @@ alignment = 1;
 ref = two;
 },
 {
-pos = (380,46);
+pos = (360,-494);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni0248.glyph b/src/Inter.glyphspackage/glyphs/uni0248.glyph
index f9884b77e..8201f6700 100644
--- a/src/Inter.glyphspackage/glyphs/uni0248.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni0248.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (380,162);
+pos = (360,-378);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni0249.ccmp.glyph b/src/Inter.glyphspackage/glyphs/uni0249.ccmp.glyph
index d7608df14..b6f07cf9e 100644
--- a/src/Inter.glyphspackage/glyphs/uni0249.ccmp.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni0249.ccmp.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-218,-74);
+pos = (-238,-614);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni024D_.1.glyph b/src/Inter.glyphspackage/glyphs/uni024D_.1.glyph
index 480c683cf..843de2df1 100644
--- a/src/Inter.glyphspackage/glyphs/uni024D_.1.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni024D_.1.glyph
@@ -89,7 +89,7 @@ shapes = (
 ref = r.1;
 },
 {
-pos = (-216,-186);
+pos = (-236,-726);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni024D_.glyph b/src/Inter.glyphspackage/glyphs/uni024D_.glyph
index a78c6c52c..f49005da5 100644
--- a/src/Inter.glyphspackage/glyphs/uni024D_.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni024D_.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (-216,-186);
+pos = (-236,-726);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni0268.ccmp.glyph b/src/Inter.glyphspackage/glyphs/uni0268.ccmp.glyph
index 490e59b11..6bac3d68c 100644
--- a/src/Inter.glyphspackage/glyphs/uni0268.ccmp.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni0268.ccmp.glyph
@@ -86,7 +86,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-216,-128);
+pos = (-236,-668);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni03F_C_.glyph b/src/Inter.glyphspackage/glyphs/uni03F_C_.glyph
index dc26828ba..738b397fa 100644
--- a/src/Inter.glyphspackage/glyphs/uni03F_C_.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni03F_C_.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (-230,-908);
+pos = (-250,-1448);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni04F_A_.glyph b/src/Inter.glyphspackage/glyphs/uni04F_A_.glyph
index b307a85c3..dbdbcfd71 100644
--- a/src/Inter.glyphspackage/glyphs/uni04F_A_.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni04F_A_.glyph
@@ -111,7 +111,7 @@ shapes = (
 ref = Gamma;
 },
 {
-pos = (-190,46);
+pos = (-210,-494);
 ref = crossbar;
 },
 {
diff --git a/src/Inter.glyphspackage/glyphs/uni04F_B_.glyph b/src/Inter.glyphspackage/glyphs/uni04F_B_.glyph
index e1c646aef..e3c82ea4d 100644
--- a/src/Inter.glyphspackage/glyphs/uni04F_B_.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni04F_B_.glyph
@@ -122,7 +122,7 @@ shapes = (
 ref = gecyrillic;
 },
 {
-pos = (-216,-164);
+pos = (-236,-704);
 ref = crossbar;
 },
 {
diff --git a/src/Inter.glyphspackage/glyphs/uni04F_E_.glyph b/src/Inter.glyphspackage/glyphs/uni04F_E_.glyph
index a9309de77..2fe5aeded 100644
--- a/src/Inter.glyphspackage/glyphs/uni04F_E_.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni04F_E_.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = X;
 },
 {
-pos = (198,22);
+pos = (178,-518);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni04F_F_.glyph b/src/Inter.glyphspackage/glyphs/uni04F_F_.glyph
index c733875fa..65aa7cb56 100644
--- a/src/Inter.glyphspackage/glyphs/uni04F_F_.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni04F_F_.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = x;
 },
 {
-pos = (92,-164);
+pos = (72,-704);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/ustraightstrokecyrillic.glyph b/src/Inter.glyphspackage/glyphs/ustraightstrokecyrillic.glyph
index 77ba19ca0..161368970 100644
--- a/src/Inter.glyphspackage/glyphs/ustraightstrokecyrillic.glyph
+++ b/src/Inter.glyphspackage/glyphs/ustraightstrokecyrillic.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = gamma;
 },
 {
-pos = (86,-658);
+pos = (66,-1198);
 ref = crossbar;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/zbar.glyph b/src/Inter.glyphspackage/glyphs/zbar.glyph
index 900e4c018..0d4d034d1 100644
--- a/src/Inter.glyphspackage/glyphs/zbar.glyph
+++ b/src/Inter.glyphspackage/glyphs/zbar.glyph
@@ -88,7 +88,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (84,-164);
+pos = (64,-704);
 ref = crossbar;
 }
 );
-- 
cgit v1.2.3