braces

4 files changed, 1128 insertions, 768 deletions

diff --git a/src/Inter.glyphspackage/glyphs/braceleft.glyph b/src/Inter.glyphspackage/glyphs/braceleft.glyph
index 5f93449ad..1a5f1a248 100644
--- a/src/Inter.glyphspackage/glyphs/braceleft.glyph
+++ b/src/Inter.glyphspackage/glyphs/braceleft.glyph
@@ -5,14 +5,6 @@ kernRight = parenleft;
 layers = (
 {
 background = {
-guides = (
-{
-pos = (748,1480);
-},
-{
-pos = (784,864);
-}
-);
 shapes = (
 {
 ref = bracketleft;
@@ -21,17 +13,14 @@ ref = bracketleft;
 };
 guides = (
 {
-angle = 90;
-pos = (924,2204);
+pos = (120,2144);
 },
 {
-pos = (52,2144);
+pos = (120,-416);
 },
 {
-pos = (52,-416);
-},
-{
-pos = (784,864);
+name = "Mid center";
+pos = (68,651);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -39,62 +28,62 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(390,625,o),
-(451,727,o),
-(450,878,cs),
-(450,1170,ls),
-(451,1340,o),
-(503,1417,o),
-(672,1416,c),
-(672,1560,l),
-(387,1559,o),
-(294,1437,o),
-(294,1170,cs),
-(294,936,ls),
-(294,777,o),
-(238,716,o),
-(76,716,c),
-(76,626,l)
+(458,647,o),
+(518,748,o),
+(518,899,cs),
+(518,1191,ls),
+(518,1361,o),
+(571,1438,o),
+(740,1437,c),
+(740,1581,l),
+(455,1581,o),
+(362,1458,o),
+(362,1191,cs),
+(362,957,ls),
+(362,798,o),
+(306,737,o),
+(144,737,c),
+(144,647,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(672,-160,l),
-(503,-160,o),
-(451,-83,o),
-(450,88,cs),
-(450,378,ls),
-(451,529,o),
-(390,631,o),
-(76,632,c),
-(76,542,l),
-(238,541,o),
-(294,479,o),
-(294,320,cs),
-(294,88,ls),
-(294,-180,o),
-(387,-303,o),
-(672,-302,c)
+(740,-137,l),
+(571,-137,o),
+(518,-60,o),
+(518,111,cs),
+(518,401,ls),
+(518,551,o),
+(458,655,o),
+(144,655,c),
+(144,565,l),
+(306,564,o),
+(362,502,o),
+(362,343,cs),
+(362,111,ls),
+(362,-157,o),
+(455,-279,o),
+(740,-279,c)
 );
 },
 {
 closed = 1;
 nodes = (
-(248,542,l),
-(248,716,l),
-(76,716,l),
-(76,542,l)
+(316,564,l),
+(316,738,l),
+(144,738,l),
+(144,564,l)
 );
 }
 );
-width = 742;
+width = 862;
 },
 {
 background = {
 guides = (
 {
-pos = (1212,792);
+pos = (1292,792);
 }
 );
 shapes = (
@@ -105,10 +94,11 @@ ref = bracketleft;
 };
 guides = (
 {
-pos = (1212,792);
+pos = (1296,-464);
 },
 {
-pos = (1216,-464);
+name = "Mid center";
+pos = (80,651);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -116,181 +106,202 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(572,567,o),
-(672,713,o),
-(672,858,cs),
-(672,1018,ls),
-(672,1140,o),
-(695,1199,o),
-(870,1198,c),
-(870,1490,l),
-(570,1489,o),
-(282,1489,o),
-(282,1070,cs),
-(282,958,ls),
-(282,815,o),
-(225,751,o),
-(56,750,c),
-(56,568,l)
+(652,627,o),
+(736,804,o),
+(736,949,cs),
+(736,1109,ls),
+(736,1231,o),
+(775,1289,o),
+(950,1289,c),
+(950,1581,l),
+(650,1581,o),
+(362,1580,o),
+(362,1161,cs),
+(362,1033,ls),
+(362,890,o),
+(305,825,o),
+(136,825,c),
+(136,627,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(870,-46,l),
-(695,-47,o),
-(672,12,o),
-(672,134,cs),
-(672,294,ls),
-(672,439,o),
-(572,585,o),
-(56,584,c),
-(56,402,l),
-(225,401,o),
-(282,337,o),
-(282,194,cs),
-(282,82,ls),
-(282,-337,o),
-(570,-337,o),
-(870,-338,c)
+(950,13,l),
+(775,13,o),
+(736,71,o),
+(736,193,cs),
+(736,353,ls),
+(736,498,o),
+(652,675,o),
+(136,675,c),
+(136,477,l),
+(305,477,o),
+(362,412,o),
+(362,269,cs),
+(362,141,ls),
+(362,-278,o),
+(650,-279,o),
+(950,-279,c)
 );
 },
 {
 closed = 1;
 nodes = (
-(376,402,l),
-(376,750,l),
-(56,750,l),
-(56,402,l)
+(476,477,l),
+(476,825,l),
+(136,825,l),
+(136,477,l)
 );
 }
 );
-width = 902;
+width = 1034;
 },
 {
+guides = (
+{
+name = "Mid center";
+pos = (2,651);
+}
+);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
 closed = 1;
 nodes = (
-(401,625,o),
-(480,727,o),
-(504,878,cs),
-(552,1170,ls),
-(579,1341,o),
-(646,1417,o),
-(814,1416,c),
-(838,1560,l),
-(553,1559,o),
-(439,1437,o),
-(396,1170,cs),
-(358,936,ls),
-(332,776,o),
-(265,716,o),
-(102,716,c),
-(88,626,l)
+(475,647,o),
+(551,748,o),
+(576,899,cs),
+(625,1191,ls),
+(653,1361,o),
+(719,1438,o),
+(887,1437,c),
+(911,1581,l),
+(626,1581,o),
+(513,1458,o),
+(469,1191,cs),
+(430,957,ls),
+(404,798,o),
+(337,737,o),
+(175,737,c),
+(161,647,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(552,-160,l),
-(384,-160,o),
-(343,-84,o),
-(372,88,cs),
-(422,378,ls),
-(445,529,o),
-(401,631,o),
-(88,632,c),
-(72,542,l),
-(236,541,o),
-(279,480,o),
-(254,320,cs),
-(216,88,ls),
-(172,-180,o),
-(244,-303,o),
-(530,-302,c)
+(627,-137,l),
+(458,-137,o),
+(418,-60,o),
+(446,111,cs),
+(494,401,ls),
+(519,551,o),
+(476,655,o),
+(162,655,c),
+(147,565,l),
+(309,564,o),
+(355,502,o),
+(328,343,cs),
+(290,111,ls),
+(245,-157,o),
+(318,-279,o),
+(603,-279,c)
 );
 },
 {
 closed = 1;
 nodes = (
-(242,542,l),
-(270,716,l),
-(98,716,l),
-(70,542,l)
+(319,564,l),
+(348,738,l),
+(176,738,l),
+(147,564,l)
 );
 }
 );
-width = 742;
+width = 864;
 },
 {
+guides = (
+{
+name = "Mid center";
+pos = (1,651);
+}
+);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
 closed = 1;
 nodes = (
-(570,567,o),
-(695,713,o),
-(718,858,cs),
-(744,1018,ls),
-(765,1140,o),
-(797,1199,o),
-(972,1198,c),
-(1022,1490,l),
-(721,1489,o),
-(428,1490,o),
-(364,1070,cs),
-(346,958,ls),
-(324,815,o),
-(253,751,o),
-(84,750,c),
-(52,568,l)
+(664,627,o),
+(778,804,o),
+(802,949,cs),
+(828,1109,ls),
+(848,1231,o),
+(897,1289,o),
+(1072,1289,c),
+(1120,1581,l),
+(820,1581,o),
+(532,1580,o),
+(463,1161,cs),
+(441,1033,ls),
+(418,890,o),
+(350,825,o),
+(181,825,c),
+(148,627,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(768,-46,l),
-(593,-47,o),
-(579,12,o),
-(600,134,cs),
-(626,294,ls),
-(649,439,o),
-(573,585,o),
-(56,584,c),
-(26,402,l),
-(198,401,o),
-(240,337,o),
-(218,194,cs),
-(200,82,ls),
-(136,-338,o),
-(419,-337,o),
-(718,-338,c)
+(861,13,l),
+(686,13,o),
+(656,71,o),
+(676,193,cs),
+(703,353,ls),
+(727,498,o),
+(672,675,o),
+(156,675,c),
+(123,477,l),
+(292,477,o),
+(339,412,o),
+(315,269,cs),
+(294,141,ls),
+(224,-278,o),
+(512,-279,o),
+(812,-279,c)
 );
 },
 {
 closed = 1;
 nodes = (
-(344,402,l),
-(402,750,l),
-(82,750,l),
-(24,402,l)
+(463,477,l),
+(521,825,l),
+(181,825,l),
+(123,477,l)
 );
 }
 );
-width = 902;
+width = 1035;
 },
 {
+background = {
+shapes = (
+{
+pos = (38,0);
+ref = bracketleft;
+}
+);
+};
 guides = (
 {
-pos = (52,2144);
+pos = (90,2144);
 },
 {
-pos = (52,-416);
+pos = (90,-416);
 },
 {
-pos = (636,864);
+name = "Mid center";
+pos = (38,651);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -298,113 +309,119 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(328,606,o),
-(396,675,o),
-(396,866,cs),
-(396,1248,ls),
-(396,1434,o),
-(462,1513,o),
-(614,1512,c),
-(614,1560,l),
-(434,1560,o),
-(349,1459,o),
-(350,1248,cs),
-(350,866,ls),
-(349,700,o),
-(302,652,o),
-(134,652,c),
-(134,606,l)
+(366,629,o),
+(434,698,o),
+(434,889,cs),
+(434,1271,ls),
+(434,1457,o),
+(500,1536,o),
+(652,1536,c),
+(652,1582,l),
+(472,1582,o),
+(388,1482,o),
+(388,1271,cs),
+(388,889,ls),
+(388,723,o),
+(340,675,o),
+(172,675,c),
+(172,629,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(614,-256,l),
-(462,-257,o),
-(396,-177,o),
-(396,8,cs),
-(396,390,ls),
-(396,581,o),
-(328,650,o),
-(134,652,c),
-(134,606,l),
-(302,604,o),
-(349,556,o),
-(350,390,cs),
-(350,8,ls),
-(349,-202,o),
-(434,-303,o),
-(614,-302,c)
+(652,-234,l),
+(500,-234,o),
+(434,-154,o),
+(434,31,cs),
+(434,413,ls),
+(434,604,o),
+(366,675,o),
+(172,675,c),
+(172,629,l),
+(340,629,o),
+(388,579,o),
+(388,413,cs),
+(388,31,ls),
+(388,-179,o),
+(472,-280,o),
+(652,-280,c)
 );
 },
 {
 closed = 1;
 nodes = (
-(290,606,l),
-(290,652,l),
-(134,652,l),
-(134,606,l)
+(328,629,l),
+(328,675,l),
+(172,675,l),
+(172,629,l)
 );
 }
 );
-width = 646;
+width = 810;
 },
 {
+guides = (
+{
+name = "Mid center";
+pos = (-1,651);
+}
+);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
 closed = 1;
 nodes = (
-(335,605,o),
-(416,675,o),
-(448,866,cs),
-(510,1248,ls),
-(541,1434,o),
-(620,1513,o),
-(770,1512,c),
-(780,1560,l),
-(599,1559,o),
-(497,1460,o),
-(462,1248,cs),
-(402,866,ls),
-(372,701,o),
-(317,652,o),
-(148,652,c),
-(142,606,l)
+(377,629,o),
+(457,698,o),
+(489,889,cs),
+(552,1271,ls),
+(583,1457,o),
+(661,1536,o),
+(813,1536,c),
+(820,1582,l),
+(640,1582,o),
+(540,1482,o),
+(505,1271,cs),
+(442,889,ls),
+(415,723,o),
+(358,675,o),
+(190,675,c),
+(183,629,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(480,-256,l),
-(326,-256,o),
-(273,-177,o),
-(306,8,cs),
-(366,390,ls),
-(399,582,o),
-(343,652,o),
-(148,652,c),
-(142,606,l),
-(308,605,o),
-(349,556,o),
-(320,390,cs),
-(258,8,ls),
-(224,-204,o),
-(291,-303,o),
-(472,-302,c)
+(520,-234,l),
+(368,-234,o),
+(316,-154,o),
+(347,31,cs),
+(410,413,ls),
+(441,604,o),
+(384,675,o),
+(190,675,c),
+(183,629,l),
+(351,629,o),
+(390,579,o),
+(363,413,cs),
+(300,31,ls),
+(265,-179,o),
+(332,-280,o),
+(512,-280,c)
 );
 },
 {
 closed = 1;
 nodes = (
-(300,606,l),
-(306,652,l),
-(146,652,l),
-(140,606,l)
+(339,629,l),
+(346,675,l),
+(190,675,l),
+(183,629,l)
 );
 }
 );
-width = 646;
+width = 809;
 },
 {
 associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -638,10 +655,10 @@ width = 646;
 background = {
 guides = (
 {
-pos = (748,1480);
+pos = (718,1480);
 },
 {
-pos = (784,864);
+pos = (754,864);
 }
 );
 shapes = (
@@ -652,17 +669,14 @@ ref = bracketleft;
 };
 guides = (
 {
-angle = 90;
-pos = (632,2204);
+pos = (-270,2144);
 },
 {
-pos = (-240,2144);
+pos = (-270,-416);
 },
 {
-pos = (-240,-416);
-},
-{
-pos = (492,864);
+name = "Mid center";
+pos = (-30,636);
 }
 );
 layerId = m007;
@@ -670,133 +684,141 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(358,625,o),
-(419,727,o),
-(418,878,cs),
-(418,1170,ls),
-(419,1340,o),
-(471,1417,o),
-(640,1416,c),
-(640,1560,l),
-(355,1559,o),
-(262,1437,o),
-(262,1170,cs),
-(262,936,ls),
-(262,777,o),
-(206,716,o),
-(44,716,c),
-(44,626,l)
+(428,608,o),
+(496,733,o),
+(496,884,cs),
+(496,1176,ls),
+(496,1346,o),
+(541,1420,o),
+(710,1420,c),
+(710,1566,l),
+(425,1566,o),
+(332,1443,o),
+(332,1176,cs),
+(332,942,ls),
+(332,783,o),
+(276,722,o),
+(114,722,c),
+(114,608,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(640,-160,l),
-(471,-160,o),
-(419,-83,o),
-(418,88,cs),
-(418,378,ls),
-(419,529,o),
-(358,631,o),
-(44,632,c),
-(44,542,l),
-(206,541,o),
-(262,479,o),
-(262,320,cs),
-(262,88,ls),
-(262,-180,o),
-(355,-303,o),
-(640,-302,c)
+(710,-148,l),
+(541,-148,o),
+(496,-75,o),
+(496,96,cs),
+(496,386,ls),
+(496,536,o),
+(428,664,o),
+(114,664,c),
+(114,550,l),
+(276,549,o),
+(332,487,o),
+(332,328,cs),
+(332,96,ls),
+(332,-172,o),
+(425,-294,o),
+(710,-294,c)
 );
 },
 {
 closed = 1;
 nodes = (
-(216,542,l),
-(216,716,l),
-(44,716,l),
-(44,542,l)
+(288,549,l),
+(288,723,l),
+(114,723,l),
+(114,549,l)
 );
 }
 );
-width = 678;
+width = 789;
 },
 {
+guides = (
+{
+name = "Mid center";
+pos = (-5,636);
+}
+);
 layerId = m008;
 shapes = (
 {
 closed = 1;
 nodes = (
-(369,625,o),
-(448,727,o),
-(472,878,cs),
-(520,1170,ls),
-(547,1341,o),
-(614,1417,o),
-(782,1416,c),
-(806,1560,l),
-(521,1559,o),
-(407,1437,o),
-(364,1170,cs),
-(326,936,ls),
-(300,776,o),
-(233,716,o),
-(70,716,c),
-(56,626,l)
+(436,608,o),
+(525,733,o),
+(550,884,cs),
+(598,1176,ls),
+(626,1346,o),
+(684,1420,o),
+(853,1420,c),
+(877,1566,l),
+(592,1566,o),
+(478,1443,o),
+(434,1176,cs),
+(396,942,ls),
+(369,783,o),
+(303,722,o),
+(141,722,c),
+(122,608,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(520,-160,l),
-(352,-160,o),
-(311,-84,o),
-(340,88,cs),
-(390,378,ls),
-(413,529,o),
-(369,631,o),
-(56,632,c),
-(40,542,l),
-(204,541,o),
-(247,480,o),
-(222,320,cs),
-(184,88,ls),
-(140,-180,o),
-(212,-303,o),
-(498,-302,c)
+(593,-148,l),
+(424,-148,o),
+(391,-75,o),
+(419,96,cs),
+(467,386,ls),
+(492,536,o),
+(446,664,o),
+(132,664,c),
+(113,550,l),
+(274,549,o),
+(320,487,o),
+(294,328,cs),
+(255,96,ls),
+(211,-172,o),
+(284,-294,o),
+(569,-294,c)
 );
 },
 {
 closed = 1;
 nodes = (
-(210,542,l),
-(238,716,l),
-(66,716,l),
-(38,542,l)
+(286,549,l),
+(315,723,l),
+(141,723,l),
+(112,549,l)
 );
 }
 );
-width = 678;
+width = 784;
 },
 {
 background = {
 guides = (
 {
-pos = (1212,792);
+pos = (1196,792);
 }
 );
 shapes = (
 {
+pos = (-16,0);
 ref = bracketleft;
 }
 );
 };
 guides = (
 {
-pos = (1116,792);
+pos = (1104,-464);
 },
 {
-pos = (1120,-464);
+name = "Mid center";
+pos = (-16,636);
 }
 );
 layerId = m009;
@@ -804,469 +826,255 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(556,567,o),
-(656,713,o),
-(656,858,cs),
-(656,1018,ls),
-(656,1140,o),
-(679,1199,o),
-(854,1198,c),
-(854,1490,l),
-(554,1489,o),
-(266,1489,o),
-(266,1070,cs),
-(266,958,ls),
-(266,815,o),
-(209,751,o),
-(40,750,c),
-(40,568,l)
+(636,596,o),
+(736,773,o),
+(736,918,cs),
+(736,1094,ls),
+(736,1233,o),
+(778,1270,o),
+(934,1270,c),
+(934,1566,l),
+(634,1566,o),
+(346,1565,o),
+(346,1146,cs),
+(346,1018,ls),
+(346,875,o),
+(289,810,o),
+(120,810,c),
+(120,596,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(854,-46,l),
-(679,-47,o),
-(656,12,o),
-(656,134,cs),
-(656,294,ls),
-(656,439,o),
-(556,585,o),
-(40,584,c),
-(40,402,l),
-(209,401,o),
-(266,337,o),
-(266,194,cs),
-(266,82,ls),
-(266,-337,o),
-(554,-337,o),
-(854,-338,c)
+(934,2,l),
+(778,2,o),
+(736,39,o),
+(736,178,cs),
+(736,354,ls),
+(736,499,o),
+(636,676,o),
+(120,676,c),
+(120,462,l),
+(289,462,o),
+(346,397,o),
+(346,254,cs),
+(346,126,ls),
+(346,-293,o),
+(634,-294,o),
+(934,-294,c)
 );
 },
 {
 closed = 1;
 nodes = (
-(360,402,l),
-(360,750,l),
-(40,750,l),
-(40,402,l)
+(480,462,l),
+(480,810,l),
+(120,810,l),
+(120,462,l)
 );
 }
 );
-width = 870;
-},
-{
-layerId = m010;
-shapes = (
-{
-closed = 1;
-nodes = (
-(554,567,o),
-(679,713,o),
-(702,858,cs),
-(728,1018,ls),
-(749,1140,o),
-(781,1199,o),
-(956,1198,c),
-(1006,1490,l),
-(705,1489,o),
-(412,1490,o),
-(348,1070,cs),
-(330,958,ls),
-(308,815,o),
-(237,751,o),
-(68,750,c),
-(36,568,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(752,-46,l),
-(577,-47,o),
-(563,12,o),
-(584,134,cs),
-(610,294,ls),
-(633,439,o),
-(557,585,o),
-(40,584,c),
-(10,402,l),
-(182,401,o),
-(224,337,o),
-(202,194,cs),
-(184,82,ls),
-(120,-338,o),
-(403,-337,o),
-(702,-338,c)
-);
-},
-{
-closed = 1;
-nodes = (
-(328,402,l),
-(386,750,l),
-(66,750,l),
-(8,402,l)
-);
-}
-);
-width = 870;
+width = 994;
 },
 {
 guides = (
 {
-pos = (-76,2144);
-},
-{
-pos = (-76,-416);
-},
-{
-pos = (508,864);
+name = "Mid center";
+pos = (-4,636);
 }
 );
-layerId = m011;
+layerId = m010;
 shapes = (
 {
 closed = 1;
 nodes = (
-(264,606,o),
-(332,675,o),
-(332,866,cs),
-(332,1248,ls),
-(332,1434,o),
-(398,1513,o),
-(550,1512,c),
-(550,1560,l),
-(370,1560,o),
-(285,1459,o),
-(286,1248,cs),
-(286,866,ls),
-(285,700,o),
-(238,652,o),
-(70,652,c),
-(70,606,l)
+(643,596,o),
+(773,773,o),
+(797,918,cs),
+(826,1094,ls),
+(849,1233,o),
+(897,1270,o),
+(1053,1270,c),
+(1102,1566,l),
+(802,1566,o),
+(514,1565,o),
+(444,1146,cs),
+(423,1018,ls),
+(399,875,o),
+(332,810,o),
+(163,810,c),
+(127,596,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(550,-256,l),
-(398,-257,o),
-(332,-177,o),
-(332,8,cs),
-(332,390,ls),
-(332,581,o),
-(264,650,o),
-(70,652,c),
-(70,606,l),
-(238,604,o),
-(285,556,o),
-(286,390,cs),
-(286,8,ls),
-(285,-202,o),
-(370,-303,o),
-(550,-302,c)
+(843,2,l),
+(687,2,o),
+(651,39,o),
+(674,178,cs),
+(703,354,ls),
+(727,499,o),
+(657,676,o),
+(141,676,c),
+(105,462,l),
+(274,462,o),
+(320,397,o),
+(297,254,cs),
+(275,126,ls),
+(206,-293,o),
+(494,-294,o),
+(794,-294,c)
 );
 },
 {
 closed = 1;
 nodes = (
-(226,606,l),
-(226,652,l),
-(70,652,l),
-(70,606,l)
+(465,462,l),
+(523,810,l),
+(163,810,l),
+(105,462,l)
 );
 }
 );
-width = 518;
+width = 990;
 },
 {
-associatedMasterId = m011;
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(280,660,o),
-(319,736,o),
-(320,890,cs),
-(320,1260,ls),
-(319,1460,o),
-(388,1548,o),
-(552,1548,c),
-(552,1602,l),
-(277,1601,o),
-(301,1406,o),
-(302,1230,cs),
-(302,926,ls),
-(301,755,o),
-(245,695,o),
-(88,696,c),
-(88,660,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(552,-230,l),
-(388,-228,o),
-(319,-140,o),
-(320,62,cs),
-(320,430,ls),
-(319,583,o),
-(280,659,o),
-(88,660,c),
-(88,626,l),
-(245,625,o),
-(301,564,o),
-(302,396,cs),
-(302,90,ls),
-(301,-86,o),
-(277,-281,o),
-(552,-282,c)
-);
-},
-{
-closed = 1;
-nodes = (
-(172,626,l),
-(172,696,l),
-(88,696,l),
-(88,626,l)
-);
-}
-);
-};
 guides = (
 {
-pos = (52,2144);
+pos = (-140,2144);
 },
 {
-pos = (52,-416);
+pos = (-140,-416);
 },
 {
-pos = (636,864);
+name = "Mid center";
+pos = (-64,636);
 }
 );
-layerId = "BEB33951-EFA5-4BCE-9065-C22EDEF23B13";
-name = "Dec 27 18, 14:58";
-shapes = (
-{
-closed = 0;
-nodes = (
-(134,634,l),
-(336,635,o),
-(372,716,o),
-(372,872,cs),
-(372,1248,ls),
-(372,1452,o),
-(452,1537,o),
-(614,1536,c)
-);
-},
-{
-closed = 0;
-nodes = (
-(614,-280,l),
-(452,-280,o),
-(372,-195,o),
-(372,8,cs),
-(372,384,ls),
-(372,540,o),
-(336,622,o),
-(134,622,c)
-);
-}
-);
-width = 646;
-},
-{
-associatedMasterId = m011;
-background = {
+layerId = m011;
 shapes = (
 {
 closed = 1;
 nodes = (
-(280,660,o),
-(319,736,o),
-(320,890,cs),
-(320,1260,ls),
-(319,1460,o),
-(388,1548,o),
-(552,1548,c),
-(552,1602,l),
-(277,1601,o),
-(301,1406,o),
-(302,1230,cs),
-(302,926,ls),
-(301,755,o),
-(245,695,o),
-(88,696,c),
-(88,660,l)
+(302,614,o),
+(370,683,o),
+(370,874,cs),
+(370,1256,ls),
+(370,1442,o),
+(436,1521,o),
+(588,1521,c),
+(588,1567,l),
+(408,1567,o),
+(324,1467,o),
+(324,1256,cs),
+(324,874,ls),
+(324,708,o),
+(276,660,o),
+(108,660,c),
+(108,614,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(552,-230,l),
-(388,-228,o),
-(319,-140,o),
-(320,62,cs),
-(320,430,ls),
-(319,583,o),
-(280,659,o),
-(88,660,c),
-(88,626,l),
-(245,625,o),
-(301,564,o),
-(302,396,cs),
-(302,90,ls),
-(301,-86,o),
-(277,-281,o),
-(552,-282,c)
+(588,-249,l),
+(436,-249,o),
+(370,-169,o),
+(370,16,cs),
+(370,398,ls),
+(370,589,o),
+(302,660,o),
+(108,660,c),
+(108,614,l),
+(276,614,o),
+(324,564,o),
+(324,398,cs),
+(324,16,ls),
+(324,-194,o),
+(408,-295,o),
+(588,-295,c)
 );
 },
 {
 closed = 1;
 nodes = (
-(172,626,l),
-(172,696,l),
-(88,696,l),
-(88,626,l)
+(256,614,l),
+(256,660,l),
+(108,660,l),
+(108,614,l)
 );
 }
 );
-};
-guides = (
-{
-pos = (52,2144);
+width = 682;
 },
 {
-pos = (52,-416);
-},
+guides = (
 {
-pos = (636,864);
+name = "Mid center";
+pos = (-65,636);
 }
 );
-layerId = "AA3D65AE-A4A1-4896-AED6-053EE82B667E";
-name = "Dec 27 18, 15:03";
-shapes = (
-{
-closed = 0;
-nodes = (
-(614,-280,l),
-(452,-280,o),
-(372,-195,o),
-(372,8,cs),
-(372,390,ls),
-(372,546,o),
-(336,628,o),
-(134,628,c),
-(336,629,o),
-(372,711,o),
-(372,866,cs),
-(372,1248,ls),
-(372,1452,o),
-(452,1537,o),
-(614,1536,c)
-);
-}
-);
-width = 646;
-},
-{
 layerId = m012;
 shapes = (
 {
 closed = 1;
 nodes = (
-(271,605,o),
-(352,675,o),
-(384,866,cs),
-(446,1248,ls),
-(477,1434,o),
-(556,1513,o),
-(706,1512,c),
-(716,1560,l),
-(535,1559,o),
-(433,1460,o),
-(398,1248,cs),
-(338,866,ls),
-(308,701,o),
-(253,652,o),
-(84,652,c),
-(78,606,l)
+(310,614,o),
+(391,683,o),
+(422,874,cs),
+(485,1256,ls),
+(516,1442,o),
+(594,1521,o),
+(746,1521,c),
+(754,1567,l),
+(574,1567,o),
+(473,1467,o),
+(438,1256,cs),
+(375,874,ls),
+(348,708,o),
+(292,660,o),
+(124,660,c),
+(116,614,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(416,-256,l),
-(262,-256,o),
-(209,-177,o),
-(242,8,cs),
-(302,390,ls),
-(335,582,o),
-(279,652,o),
-(84,652,c),
-(78,606,l),
-(244,605,o),
-(285,556,o),
-(256,390,cs),
-(194,8,ls),
-(160,-204,o),
-(227,-303,o),
-(408,-302,c)
+(453,-249,l),
+(301,-249,o),
+(249,-169,o),
+(280,16,cs),
+(343,398,ls),
+(375,589,o),
+(318,660,o),
+(124,660,c),
+(116,614,l),
+(284,614,o),
+(323,564,o),
+(296,398,cs),
+(233,16,ls),
+(198,-194,o),
+(266,-295,o),
+(446,-295,c)
 );
 },
 {
 closed = 1;
 nodes = (
-(236,606,l),
-(242,652,l),
-(82,652,l),
-(76,606,l)
+(264,614,l),
+(272,660,l),
+(124,660,l),
+(116,614,l)
 );
 }
 );
-width = 518;
-},
-{
-associatedMasterId = m012;
-layerId = "3994FE67-FE29-4AC8-8878-1844B7EAD793";
-name = "Dec 27 18, 14:59";
-shapes = (
-{
-closed = 0;
-nodes = (
-(146,634,l),
-(349,634,o),
-(399,716,o),
-(424,872,cs),
-(486,1248,ls),
-(521,1452,o),
-(614,1536,o),
-(776,1536,c)
-);
-},
-{
-closed = 0;
-nodes = (
-(474,-280,l),
-(314,-279,o),
-(247,-195,o),
-(282,8,cs),
-(344,384,ls),
-(369,541,o),
-(346,623,o),
-(146,622,c)
-);
-}
-);
-width = 646;
+width = 681;
 }
 );
-metricWidth = parenleft;
+metricLeft = hyphen;
+metricRight = bracketleft;
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter.glyphspackage/glyphs/braceright.glyph b/src/Inter.glyphspackage/glyphs/braceright.glyph
index a070f6a7b..ec49c9573 100644
--- a/src/Inter.glyphspackage/glyphs/braceright.glyph
+++ b/src/Inter.glyphspackage/glyphs/braceright.glyph
@@ -7,6 +7,7 @@ layers = (
 background = {
 shapes = (
 {
+pos = (-22,0);
 ref = bracketright;
 }
 );
@@ -14,82 +15,357 @@ ref = bracketright;
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-angle = 180;
-pos = (742,1984);
-ref = braceleft;
+closed = 1;
+nodes = (
+(718,737,l),
+(556,737,o),
+(500,798,o),
+(500,957,cs),
+(500,1191,ls),
+(500,1458,o),
+(407,1581,o),
+(122,1581,c),
+(122,1437,l),
+(291,1438,o),
+(344,1361,o),
+(344,1191,cs),
+(344,899,ls),
+(344,748,o),
+(404,647,o),
+(718,647,c)
+);
+},
+{
+closed = 1;
+nodes = (
+(407,-279,o),
+(500,-157,o),
+(500,111,cs),
+(500,343,ls),
+(500,502,o),
+(556,564,o),
+(718,565,c),
+(718,655,l),
+(404,655,o),
+(344,551,o),
+(344,401,cs),
+(344,111,ls),
+(344,-60,o),
+(291,-137,o),
+(122,-137,c),
+(122,-279,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(718,738,l),
+(546,738,l),
+(546,564,l),
+(718,564,l)
+);
 }
 );
-width = 742;
+width = 862;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-angle = 180;
-pos = (902,1984);
-ref = braceleft;
+closed = 1;
+nodes = (
+(898,825,l),
+(729,825,o),
+(672,890,o),
+(672,1033,cs),
+(672,1161,ls),
+(672,1580,o),
+(384,1581,o),
+(84,1581,c),
+(84,1289,l),
+(259,1289,o),
+(298,1231,o),
+(298,1109,cs),
+(298,949,ls),
+(298,804,o),
+(382,627,o),
+(898,627,c)
+);
+},
+{
+closed = 1;
+nodes = (
+(384,-279,o),
+(672,-278,o),
+(672,141,cs),
+(672,269,ls),
+(672,412,o),
+(729,477,o),
+(898,477,c),
+(898,675,l),
+(382,675,o),
+(298,498,o),
+(298,353,cs),
+(298,193,ls),
+(298,71,o),
+(259,13,o),
+(84,13,c),
+(84,-279,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(898,825,l),
+(558,825,l),
+(558,477,l),
+(898,477,l)
+);
 }
 );
-width = 902;
+width = 1034;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-angle = 180;
-pos = (885,1984);
-ref = braceleft;
+closed = 1;
+nodes = (
+(747,737,l),
+(585,737,o),
+(540,798,o),
+(566,957,cs),
+(605,1191,ls),
+(649,1458,o),
+(576,1581,o),
+(291,1581,c),
+(267,1437,l),
+(437,1438,o),
+(477,1361,o),
+(449,1191,cs),
+(400,899,ls),
+(375,748,o),
+(419,647,o),
+(733,647,c)
+);
+},
+{
+closed = 1;
+nodes = (
+(268,-279,o),
+(381,-157,o),
+(426,111,cs),
+(464,343,ls),
+(491,502,o),
+(557,564,o),
+(719,565,c),
+(734,655,l),
+(420,655,o),
+(343,551,o),
+(318,401,cs),
+(270,111,ls),
+(242,-60,o),
+(176,-137,o),
+(7,-137,c),
+(-17,-279,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(748,738,l),
+(576,738,l),
+(547,564,l),
+(719,564,l)
+);
 }
 );
-width = 742;
+width = 864;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-angle = 180;
-pos = (1045,1984);
-ref = braceleft;
+closed = 1;
+nodes = (
+(942,825,l),
+(773,825,o),
+(727,890,o),
+(750,1033,cs),
+(772,1161,ls),
+(841,1580,o),
+(553,1581,o),
+(253,1581,c),
+(205,1289,l),
+(380,1289,o),
+(409,1231,o),
+(389,1109,cs),
+(363,949,ls),
+(339,804,o),
+(393,627,o),
+(909,627,c)
+);
+},
+{
+closed = 1;
+nodes = (
+(245,-279,o),
+(533,-278,o),
+(603,141,cs),
+(624,269,ls),
+(648,412,o),
+(715,477,o),
+(884,477,c),
+(917,675,l),
+(401,675,o),
+(288,498,o),
+(264,353,cs),
+(237,193,ls),
+(217,71,o),
+(169,13,o),
+(-6,13,c),
+(-55,-279,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(942,825,l),
+(602,825,l),
+(544,477,l),
+(884,477,l)
+);
 }
 );
-width = 902;
+width = 1035;
 },
 {
 guides = (
 {
-pos = (52,2144);
+pos = (38,2144);
 },
 {
-pos = (52,-416);
+pos = (38,-416);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (646,1256);
-ref = braceleft;
+closed = 1;
+nodes = (
+(638,675,l),
+(470,675,o),
+(422,723,o),
+(422,889,cs),
+(422,1271,ls),
+(422,1482,o),
+(338,1582,o),
+(158,1582,c),
+(158,1536,l),
+(310,1536,o),
+(376,1457,o),
+(376,1271,cs),
+(376,889,ls),
+(376,698,o),
+(444,629,o),
+(638,629,c)
+);
+},
+{
+closed = 1;
+nodes = (
+(338,-280,o),
+(422,-179,o),
+(422,31,cs),
+(422,413,ls),
+(422,579,o),
+(470,629,o),
+(638,629,c),
+(638,675,l),
+(444,675,o),
+(376,604,o),
+(376,413,cs),
+(376,31,ls),
+(376,-154,o),
+(310,-234,o),
+(158,-234,c),
+(158,-280,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(638,675,l),
+(482,675,l),
+(482,629,l),
+(638,629,l)
+);
 }
 );
-width = 646;
+width = 810;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (670,1256);
-ref = braceleft;
+closed = 1;
+nodes = (
+(657,675,l),
+(489,675,o),
+(450,723,o),
+(477,889,cs),
+(540,1271,ls),
+(575,1482,o),
+(507,1582,o),
+(327,1582,c),
+(320,1536,l),
+(472,1536,o),
+(524,1457,o),
+(493,1271,cs),
+(430,889,ls),
+(398,698,o),
+(456,629,o),
+(650,629,c)
+);
+},
+{
+closed = 1;
+nodes = (
+(199,-280,o),
+(300,-179,o),
+(335,31,cs),
+(398,413,ls),
+(425,579,o),
+(482,629,o),
+(650,629,c),
+(657,675,l),
+(463,675,o),
+(382,604,o),
+(351,413,cs),
+(288,31,ls),
+(257,-154,o),
+(179,-234,o),
+(27,-234,c),
+(19,-280,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(657,675,l),
+(501,675,l),
+(494,629,l),
+(650,629,l)
+);
 }
 );
-width = 646;
+width = 809;
 },
 {
 background = {
 shapes = (
 {
+pos = (-35,0);
 ref = bracketright;
 }
 );
@@ -97,80 +373,355 @@ ref = bracketright;
 layerId = m007;
 shapes = (
 {
-angle = 180;
-pos = (678,1984);
-ref = braceleft;
+closed = 1;
+nodes = (
+(675,722,l),
+(513,722,o),
+(457,783,o),
+(457,942,cs),
+(457,1176,ls),
+(457,1443,o),
+(364,1566,o),
+(79,1566,c),
+(79,1420,l),
+(248,1420,o),
+(293,1346,o),
+(293,1176,cs),
+(293,884,ls),
+(293,733,o),
+(361,608,o),
+(675,608,c)
+);
+},
+{
+closed = 1;
+nodes = (
+(364,-294,o),
+(457,-172,o),
+(457,96,cs),
+(457,328,ls),
+(457,487,o),
+(513,549,o),
+(675,550,c),
+(675,664,l),
+(361,664,o),
+(293,536,o),
+(293,386,cs),
+(293,96,ls),
+(293,-75,o),
+(248,-148,o),
+(79,-148,c),
+(79,-294,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(675,723,l),
+(501,723,l),
+(501,549,l),
+(675,549,l)
+);
 }
 );
-width = 678;
+width = 789;
 },
 {
 layerId = m008;
 shapes = (
 {
-angle = 180;
-pos = (832,1984);
-ref = braceleft;
+closed = 1;
+nodes = (
+(707,722,l),
+(545,722,o),
+(499,783,o),
+(526,942,cs),
+(564,1176,ls),
+(608,1443,o),
+(536,1566,o),
+(251,1566,c),
+(227,1420,l),
+(396,1420,o),
+(428,1346,o),
+(400,1176,cs),
+(352,884,ls),
+(327,733,o),
+(374,608,o),
+(688,608,c)
+);
+},
+{
+closed = 1;
+nodes = (
+(228,-294,o),
+(341,-172,o),
+(385,96,cs),
+(424,328,ls),
+(450,487,o),
+(516,549,o),
+(679,550,c),
+(698,664,l),
+(384,664,o),
+(294,536,o),
+(269,386,cs),
+(221,96,ls),
+(193,-75,o),
+(136,-148,o),
+(-33,-148,c),
+(-57,-294,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(707,723,l),
+(533,723,l),
+(504,549,l),
+(678,549,l)
+);
 }
 );
-width = 678;
+width = 784;
 },
 {
 layerId = m009;
 shapes = (
 {
-angle = 180;
-pos = (870,1984);
-ref = braceleft;
+closed = 1;
+nodes = (
+(874,810,l),
+(705,810,o),
+(648,875,o),
+(648,1018,cs),
+(648,1146,ls),
+(648,1565,o),
+(360,1566,o),
+(60,1566,c),
+(60,1270,l),
+(216,1270,o),
+(258,1233,o),
+(258,1094,cs),
+(258,918,ls),
+(258,773,o),
+(358,596,o),
+(874,596,c)
+);
+},
+{
+closed = 1;
+nodes = (
+(360,-294,o),
+(648,-293,o),
+(648,126,cs),
+(648,254,ls),
+(648,397,o),
+(705,462,o),
+(874,462,c),
+(874,676,l),
+(358,676,o),
+(258,499,o),
+(258,354,cs),
+(258,178,ls),
+(258,39,o),
+(216,2,o),
+(60,2,c),
+(60,-294,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(874,810,l),
+(514,810,l),
+(514,462,l),
+(874,462,l)
+);
 }
 );
-width = 870;
+width = 994;
 },
 {
 layerId = m010;
 shapes = (
 {
-angle = 180;
-pos = (1024,1984);
-ref = braceleft;
+closed = 1;
+nodes = (
+(921,810,l),
+(752,810,o),
+(705,875,o),
+(729,1018,cs),
+(750,1146,ls),
+(820,1565,o),
+(532,1566,o),
+(232,1566,c),
+(183,1270,l),
+(339,1270,o),
+(375,1233,o),
+(352,1094,cs),
+(323,918,ls),
+(299,773,o),
+(369,596,o),
+(885,596,c)
+);
+},
+{
+closed = 1;
+nodes = (
+(224,-294,o),
+(512,-293,o),
+(581,126,cs),
+(603,254,ls),
+(626,397,o),
+(694,462,o),
+(863,462,c),
+(899,676,l),
+(383,676,o),
+(253,499,o),
+(229,354,cs),
+(200,178,ls),
+(177,39,o),
+(129,2,o),
+(-27,2,c),
+(-76,-294,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(921,810,l),
+(561,810,l),
+(503,462,l),
+(863,462,l)
+);
 }
 );
-width = 870;
+width = 990;
 },
 {
 guides = (
 {
-pos = (-76,2144);
+pos = (-104,2144);
 },
 {
-pos = (-76,-416);
+pos = (-104,-416);
 }
 );
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (518,1256);
-ref = braceleft;
+closed = 1;
+nodes = (
+(574,660,l),
+(406,660,o),
+(358,708,o),
+(358,874,cs),
+(358,1256,ls),
+(358,1467,o),
+(274,1567,o),
+(94,1567,c),
+(94,1521,l),
+(246,1521,o),
+(312,1442,o),
+(312,1256,cs),
+(312,874,ls),
+(312,683,o),
+(380,614,o),
+(574,614,c)
+);
+},
+{
+closed = 1;
+nodes = (
+(274,-295,o),
+(358,-194,o),
+(358,16,cs),
+(358,398,ls),
+(358,564,o),
+(406,614,o),
+(574,614,c),
+(574,660,l),
+(380,660,o),
+(312,589,o),
+(312,398,cs),
+(312,16,ls),
+(312,-169,o),
+(246,-249,o),
+(94,-249,c),
+(94,-295,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(574,660,l),
+(426,660,l),
+(426,614,l),
+(574,614,l)
+);
 }
 );
-width = 518;
+width = 682;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (542,1256);
-ref = braceleft;
+closed = 1;
+nodes = (
+(591,660,l),
+(423,660,o),
+(383,708,o),
+(410,874,cs),
+(473,1256,ls),
+(508,1467,o),
+(441,1567,o),
+(261,1567,c),
+(253,1521,l),
+(405,1521,o),
+(457,1442,o),
+(426,1256,cs),
+(363,874,ls),
+(332,683,o),
+(389,614,o),
+(583,614,c)
+);
+},
+{
+closed = 1;
+nodes = (
+(133,-295,o),
+(233,-194,o),
+(268,16,cs),
+(331,398,ls),
+(358,564,o),
+(415,614,o),
+(583,614,c),
+(591,660,l),
+(397,660,o),
+(316,589,o),
+(284,398,cs),
+(221,16,ls),
+(190,-169,o),
+(112,-249,o),
+(-40,-249,c),
+(-47,-295,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(591,660,l),
+(443,660,l),
+(435,614,l),
+(583,614,l)
+);
 }
 );
-width = 518;
+width = 681;
 }
 );
-metricWidth = parenleft;
+metricLeft = "=|braceleft";
+metricRight = "=|braceleft";
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter.glyphspackage/glyphs/hyphen.glyph b/src/Inter.glyphspackage/glyphs/hyphen.glyph
index b83d72109..47c639ff4 100644
--- a/src/Inter.glyphspackage/glyphs/hyphen.glyph
+++ b/src/Inter.glyphspackage/glyphs/hyphen.glyph
@@ -7,6 +7,7 @@ layers = (
 background = {
 shapes = (
 {
+pos = (-2,0);
 ref = x;
 }
 );
@@ -14,7 +15,7 @@ ref = x;
 guides = (
 {
 orientation = center;
-pos = (1102,878);
+pos = (629,878);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -22,14 +23,14 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(146,718,l),
-(146,558,l),
-(798,558,l),
-(798,718,l)
+(144,718,l),
+(144,558,l),
+(796,558,l),
+(796,718,l)
 );
 }
 );
-width = 942;
+width = 940;
 },
 {
 background = {
diff --git a/src/Inter.glyphspackage/glyphs/softhyphen.glyph b/src/Inter.glyphspackage/glyphs/softhyphen.glyph
index b330e5b66..a95f1ea1d 100644
--- a/src/Inter.glyphspackage/glyphs/softhyphen.glyph
+++ b/src/Inter.glyphspackage/glyphs/softhyphen.glyph
@@ -11,7 +11,7 @@ alignment = 1;
 ref = hyphen;
 }
 );
-width = 942;
+width = 940;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";