improvements to /guilsinglleft /guilsinglright /guillemetleft /guillemetright

8 files changed, 239 insertions, 478 deletions

diff --git a/src/Inter-Italic.glyphspackage/glyphs/guillemetleft.glyph b/src/Inter-Italic.glyphspackage/glyphs/guillemetleft.glyph
index 023b7be99..df7dd2be4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/guillemetleft.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/guillemetleft.glyph
@@ -5,16 +5,17 @@ kernRight = guillemetleft;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = guilsinglleft;
 },
 {
-pos = (734,0);
+pos = (406,0);
 ref = guilsinglleft;
 }
 );
-width = 1468;
+width = 1183;
 },
 {
 guides = (
@@ -26,19 +27,21 @@ pos = (-56,764);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = guilsinglleft;
 },
 {
-pos = (850,0);
+pos = (522,0);
 ref = guilsinglleft;
 }
 );
-width = 1700;
+width = 1487;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
@@ -46,48 +49,51 @@ ref = guilsinglleft;
 },
 {
 alignment = -1;
-pos = (372,0);
+pos = (240,0);
 ref = guilsinglleft;
 }
 );
-width = 1076;
+width = 898;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = guilsinglleft;
 },
 {
-pos = (670,0);
+pos = (406,0);
 ref = guilsinglleft;
 }
 );
-width = 1340;
+width = 1071;
 },
 {
 guides = (
 {
-pos = (-88,1240);
+pos = (-152,1240);
 },
 {
-pos = (-88,764);
+pos = (-152,764);
 }
 );
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = guilsinglleft;
 },
 {
-pos = (818,0);
+pos = (522,0);
 ref = guilsinglleft;
 }
 );
-width = 1636;
+width = 1429;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
@@ -95,11 +101,11 @@ ref = guilsinglleft;
 },
 {
 alignment = -1;
-pos = (372,0);
+pos = (240,0);
 ref = guilsinglleft;
 }
 );
-width = 948;
+width = 818;
 }
 );
 metricLeft = guilsinglleft;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/guillemetright.glyph b/src/Inter-Italic.glyphspackage/glyphs/guillemetright.glyph
index 49c08c682..6c635046e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/guillemetright.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/guillemetright.glyph
@@ -5,40 +5,35 @@ kernRight = guillemetright;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = guilsinglright;
 },
 {
-pos = (734,0);
+pos = (406,0);
 ref = guilsinglright;
 }
 );
-width = 1468;
+width = 1184;
 },
 {
-guides = (
-{
-pos = (-132,136);
-},
-{
-pos = (-132,608);
-}
-);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = guilsinglright;
 },
 {
-pos = (850,0);
+pos = (522,0);
 ref = guilsinglright;
 }
 );
-width = 1700;
+width = 1488;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
@@ -46,48 +41,51 @@ ref = guilsinglright;
 },
 {
 alignment = -1;
-pos = (386,0);
+pos = (240,0);
 ref = guilsinglright;
 }
 );
-width = 1090;
+width = 899;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = guilsinglright;
 },
 {
-pos = (670,0);
+pos = (406,0);
 ref = guilsinglright;
 }
 );
-width = 1340;
+width = 1071;
 },
 {
 guides = (
 {
-pos = (-164,136);
+pos = (-228,136);
 },
 {
-pos = (-164,608);
+pos = (-228,608);
 }
 );
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = guilsinglright;
 },
 {
-pos = (818,0);
+pos = (522,0);
 ref = guilsinglright;
 }
 );
-width = 1636;
+width = 1429;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
@@ -95,11 +93,11 @@ ref = guilsinglright;
 },
 {
 alignment = -1;
-pos = (386,0);
+pos = (240,0);
 ref = guilsinglright;
 }
 );
-width = 962;
+width = 819;
 }
 );
 metricLeft = guilsinglright;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/guilsinglleft.glyph b/src/Inter-Italic.glyphspackage/glyphs/guilsinglleft.glyph
index d77fd8762..f4226d58c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/guilsinglleft.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/guilsinglleft.glyph
@@ -5,89 +5,65 @@ kernRight = guillemetleft;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(312,610,l),
-(146,610,l),
-(142,596,l),
-(364,160,l),
-(514,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(512,1054,l),
-(146,616,l),
-(142,602,l),
-(308,602,l),
-(664,1054,l)
+(628,144,l),
+(312,616,l),
+(784,1088,l),
+(588,1088,l),
+(109,616,l),
+(432,144,l)
 );
 }
 );
-width = 734;
+width = 777;
 },
 {
 guides = (
 {
-pos = (332,1240);
+pos = (4,1240);
 },
 {
-pos = (20,764);
+pos = (4,764);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(498,610,l),
-(116,610,l),
-(114,596,l),
-(334,160,l),
-(702,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(482,1054,l),
-(116,616,l),
-(114,602,l),
-(494,602,l),
-(850,1054,l)
+(826,144,l),
+(510,616,l),
+(982,1088,l),
+(568,1088,l),
+(89,616,l),
+(412,144,l)
 );
 }
 );
-width = 850;
+width = 965;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(218,610,l),
-(178,610,l),
-(174,596,l),
-(396,160,l),
-(450,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(542,1054,l),
-(178,616,l),
-(174,602,l),
-(222,596,l),
-(600,1054,l)
+(489,144,l),
+(170,616,l),
+(645,1088,l),
+(588,1088,l),
+(109,616,l),
+(432,144,l)
 );
 }
 );
-width = 704;
+width = 658;
 },
 {
 layerId = m008;
@@ -96,34 +72,23 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(283.575,610,l),
-(117.575,610,l),
-(115.257,596,l),
-(337.078,160,l),
-(489.078,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(485.079,1054,l),
-(118.568,616,l),
-(116.251,602,l),
-(282.251,602,l),
-(637.079,1054,l)
+(561,144,l),
+(272,584,l),
+(707,1024,l),
+(511,1024,l),
+(69,584,l),
+(365,144,l)
 );
 }
 );
-width = 670;
+width = 665;
 },
 {
 guides = (
 {
-angle = -9.4;
 pos = (-72,1240);
 },
 {
-angle = -9.4;
 pos = (-72,764);
 }
 );
@@ -133,25 +98,16 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(485.575,610,l),
-(105.575,610,l),
-(103.257,596,l),
-(325.078,160,l),
-(691.078,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(473.079,1054,l),
-(106.568,616,l),
-(104.251,602,l),
-(484.251,602,l),
-(839.079,1054,l)
+(803,144,l),
+(514,584,l),
+(949,1024,l),
+(511,1024,l),
+(69,584,l),
+(365,144,l)
 );
 }
 );
-width = 818;
+width = 907;
 },
 {
 layerId = m012;
@@ -160,25 +116,16 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(165.575,610,l),
-(117.575,610,l),
-(115.257,596,l),
-(337.078,160,l),
-(393.078,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(485.079,1054,l),
-(118.568,616,l),
-(116.251,602,l),
-(164.251,602,l),
-(541.079,1054,l)
+(449,144,l),
+(130,616,l),
+(605,1088,l),
+(548,1088,l),
+(69,616,l),
+(392,144,l)
 );
 }
 );
-width = 576;
+width = 578;
 }
 );
 unicode = 8249;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/guilsinglright.glyph b/src/Inter-Italic.glyphspackage/glyphs/guilsinglright.glyph
index 8ddbcfbe1..67b22bc34 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/guilsinglright.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/guilsinglright.glyph
@@ -5,89 +5,57 @@ kernRight = guillemetright;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(222,160,l),
-(588,596,l),
-(590,610,l),
-(424,610,l),
-(70,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(422,602,l),
-(588,602,l),
-(590,616,l),
-(370,1054,l),
-(218,1054,l)
+(208,144,l),
+(687,616,l),
+(364,1088,l),
+(168,1088,l),
+(484,616,l),
+(12,144,l)
 );
 }
 );
-width = 734;
+width = 778;
 },
 {
-guides = (
-{
-pos = (-392,136);
-},
-{
-pos = (-80,608);
-}
-);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(382,160,l),
-(748,596,l),
-(750,610,l),
-(370,610,l),
-(14,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(366,602,l),
-(748,602,l),
-(750,616,l),
-(530,1054,l),
-(162,1054,l)
+(416,144,l),
+(895,616,l),
+(572,1088,l),
+(158,1088,l),
+(474,616,l),
+(2,144,l)
 );
 }
 );
-width = 850;
+width = 966;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(178,160,l),
-(542,596,l),
-(544,610,l),
-(498,614,l),
-(120,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(500,602,l),
-(542,602,l),
-(544,616,l),
-(320,1054,l),
-(268,1054,l)
+(89,144,l),
+(568,616,l),
+(245,1088,l),
+(188,1088,l),
+(507,616,l),
+(32,144,l)
 );
 }
 );
-width = 704;
+width = 659;
 },
 {
 layerId = m008;
@@ -96,62 +64,34 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(195.078,160,l),
-(561.257,596,l),
-(563.575,610,l),
-(397.575,610,l),
-(43.078,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(396.251,602,l),
-(562.251,602,l),
-(564.568,616,l),
-(343.079,1054,l),
-(191.079,1054,l)
+(172,144,l),
+(614,584,l),
+(318,1024,l),
+(122,1024,l),
+(411,584,l),
+(-24,144,l)
 );
 }
 );
-width = 670;
+width = 665;
 },
 {
-guides = (
-{
-angle = -9.4;
-pos = (-108,136);
-},
-{
-angle = -9.4;
-pos = (-108,608);
-}
-);
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(371.078,160,l),
-(737.257,596,l),
-(739.575,610,l),
-(357.575,610,l),
-(5.078,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(356.251,602,l),
-(738.251,602,l),
-(740.568,616,l),
-(519.079,1054,l),
-(153.079,1054,l)
+(414,144,l),
+(856,584,l),
+(560,1024,l),
+(122,1024,l),
+(411,584,l),
+(-24,144,l)
 );
 }
 );
-width = 818;
+width = 907;
 },
 {
 layerId = m012;
@@ -160,25 +100,16 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(117.078,160,l),
-(483.257,596,l),
-(485.575,610,l),
-(437.575,610,l),
-(61.078,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(436.251,602,l),
-(484.251,602,l),
-(486.568,616,l),
-(265.079,1054,l),
-(209.079,1054,l)
+(49,144,l),
+(528,616,l),
+(205,1088,l),
+(148,1088,l),
+(467,616,l),
+(-8,144,l)
 );
 }
 );
-width = 576;
+width = 579;
 }
 );
 unicode = 8250;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/guillemetleft.glyph b/src/Inter-Roman.glyphspackage/glyphs/guillemetleft.glyph
index aa24f30fc..4c4e3e7a3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/guillemetleft.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/guillemetleft.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = guilsinglleft;
 },
 {
-pos = (734,0);
+pos = (406,0);
 ref = guilsinglleft;
 }
 );
-width = 1468;
+width = 1183;
 },
 {
 guides = (
@@ -31,11 +31,11 @@ shapes = (
 ref = guilsinglleft;
 },
 {
-pos = (850,0);
+pos = (522,0);
 ref = guilsinglleft;
 }
 );
-width = 1700;
+width = 1487;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -46,11 +46,11 @@ ref = guilsinglleft;
 },
 {
 alignment = -1;
-pos = (372,0);
+pos = (240,0);
 ref = guilsinglleft;
 }
 );
-width = 1076;
+width = 898;
 },
 {
 layerId = m007;
@@ -59,11 +59,11 @@ shapes = (
 ref = guilsinglleft;
 },
 {
-pos = (670,0);
+pos = (406,0);
 ref = guilsinglleft;
 }
 );
-width = 1340;
+width = 1071;
 },
 {
 guides = (
@@ -80,11 +80,11 @@ shapes = (
 ref = guilsinglleft;
 },
 {
-pos = (818,0);
+pos = (522,0);
 ref = guilsinglleft;
 }
 );
-width = 1636;
+width = 1429;
 },
 {
 layerId = m011;
@@ -95,11 +95,11 @@ ref = guilsinglleft;
 },
 {
 alignment = -1;
-pos = (372,0);
+pos = (240,0);
 ref = guilsinglleft;
 }
 );
-width = 948;
+width = 818;
 }
 );
 metricLeft = guilsinglleft;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/guillemetright.glyph b/src/Inter-Roman.glyphspackage/glyphs/guillemetright.glyph
index 2c47a3c89..75b698c0f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/guillemetright.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/guillemetright.glyph
@@ -10,32 +10,24 @@ shapes = (
 ref = guilsinglright;
 },
 {
-pos = (734,0);
+pos = (406,0);
 ref = guilsinglright;
 }
 );
-width = 1468;
+width = 1183;
 },
 {
-guides = (
-{
-pos = (-132,136);
-},
-{
-pos = (-132,608);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 ref = guilsinglright;
 },
 {
-pos = (850,0);
+pos = (522,0);
 ref = guilsinglright;
 }
 );
-width = 1700;
+width = 1487;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -46,11 +38,11 @@ ref = guilsinglright;
 },
 {
 alignment = -1;
-pos = (386,0);
+pos = (240,0);
 ref = guilsinglright;
 }
 );
-width = 1090;
+width = 898;
 },
 {
 layerId = m007;
@@ -59,11 +51,11 @@ shapes = (
 ref = guilsinglright;
 },
 {
-pos = (670,0);
+pos = (406,0);
 ref = guilsinglright;
 }
 );
-width = 1340;
+width = 1071;
 },
 {
 guides = (
@@ -80,11 +72,11 @@ shapes = (
 ref = guilsinglright;
 },
 {
-pos = (818,0);
+pos = (522,0);
 ref = guilsinglright;
 }
 );
-width = 1636;
+width = 1429;
 },
 {
 layerId = m011;
@@ -95,15 +87,15 @@ ref = guilsinglright;
 },
 {
 alignment = -1;
-pos = (386,0);
+pos = (240,0);
 ref = guilsinglright;
 }
 );
-width = 962;
+width = 818;
 }
 );
-metricLeft = guilsinglright;
-metricRight = guilsinglright;
+metricLeft = "=|guilsinglleft";
+metricRight = "=|guilsinglleft";
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/guilsinglleft.glyph b/src/Inter-Roman.glyphspackage/glyphs/guilsinglleft.glyph
index aef9afa79..b3543e9eb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/guilsinglleft.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/guilsinglleft.glyph
@@ -9,33 +9,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(302,610,l),
-(136,610,l),
-(136,596,l),
-(430,160,l),
-(582,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(430,1054,l),
-(136,616,l),
-(136,602,l),
-(302,602,l),
-(582,1054,l)
+(697,144,l),
+(303,616,l),
+(697,1088,l),
+(501,1088,l),
+(100,616,l),
+(501,144,l)
 );
 }
 );
-width = 734;
+width = 777;
 },
 {
 guides = (
 {
-pos = (24,1240);
+pos = (4,1240);
 },
 {
-pos = (24,764);
+pos = (4,764);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -43,25 +34,16 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(488,610,l),
-(108,610,l),
-(108,596,l),
-(402,160,l),
-(768,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(402,1054,l),
-(108,616,l),
-(108,602,l),
-(488,602,l),
-(768,1054,l)
+(895,144,l),
+(501,616,l),
+(895,1088,l),
+(481,1088,l),
+(80,616,l),
+(481,144,l)
 );
 }
 );
-width = 850;
+width = 965;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -69,25 +51,16 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(216,610,l),
-(168,610,l),
-(168,596,l),
-(462,160,l),
-(518,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(462,1054,l),
-(168,616,l),
-(168,602,l),
-(216,602,l),
-(518,1054,l)
+(558,144,l),
+(161,616,l),
+(558,1088,l),
+(501,1088,l),
+(100,616,l),
+(501,144,l)
 );
 }
 );
-width = 704;
+width = 658;
 },
 {
 layerId = m007;
@@ -120,25 +93,16 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(472,610,l),
-(92,610,l),
-(92,596,l),
-(386,160,l),
-(752,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(386,1054,l),
-(92,616,l),
-(92,602,l),
-(472,602,l),
-(752,1054,l)
+(867,144,l),
+(505,584,l),
+(867,1024,l),
+(429,1024,l),
+(60,584,l),
+(429,144,l)
 );
 }
 );
-width = 818;
+width = 907;
 },
 {
 layerId = m011;
@@ -146,25 +110,16 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(152,610,l),
-(104,610,l),
-(104,596,l),
-(398,160,l),
-(454,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(398,1054,l),
-(104,616,l),
-(104,602,l),
-(152,602,l),
-(454,1054,l)
+(518,144,l),
+(121,616,l),
+(518,1088,l),
+(461,1088,l),
+(60,616,l),
+(461,144,l)
 );
 }
 );
-width = 576;
+width = 578;
 },
 {
 associatedMasterId = m007;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/guilsinglright.glyph b/src/Inter-Roman.glyphspackage/glyphs/guilsinglright.glyph
index c1fb5d1a9..7cb884f6b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/guilsinglright.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/guilsinglright.glyph
@@ -9,59 +9,33 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(288,160,l),
-(582,596,l),
-(582,610,l),
-(416,610,l),
-(136,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(416,602,l),
-(582,602,l),
-(582,616,l),
-(288,1054,l),
-(136,1054,l)
+(276,144,l),
+(677,616,l),
+(276,1088,l),
+(80,1088,l),
+(474,616,l),
+(80,144,l)
 );
 }
 );
-width = 734;
+width = 777;
 },
 {
-guides = (
-{
-pos = (-12,136);
-},
-{
-pos = (-12,608);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
-(448,160,l),
-(742,596,l),
-(742,610,l),
-(360,610,l),
-(82,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(360,602,l),
-(742,602,l),
-(742,616,l),
-(448,1054,l),
-(82,1054,l)
+(484,144,l),
+(885,616,l),
+(484,1088,l),
+(70,1088,l),
+(464,616,l),
+(70,144,l)
 );
 }
 );
-width = 850;
+width = 965;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -69,25 +43,16 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(242,160,l),
-(536,596,l),
-(536,610,l),
-(488,610,l),
-(186,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(488,602,l),
-(536,602,l),
-(536,616,l),
-(242,1054,l),
-(186,1054,l)
+(157,144,l),
+(558,616,l),
+(157,1088,l),
+(100,1088,l),
+(497,616,l),
+(100,144,l)
 );
 }
 );
-width = 704;
+width = 658;
 },
 {
 layerId = m007;
@@ -95,59 +60,33 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(256,160,l),
-(550,596,l),
-(550,610,l),
-(384,610,l),
-(104,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(384,602,l),
-(550,602,l),
-(550,616,l),
-(256,1054,l),
-(104,1054,l)
+(236,144,l),
+(605,584,l),
+(236,1024,l),
+(40,1024,l),
+(402,584,l),
+(40,144,l)
 );
 }
 );
-width = 670;
+width = 665;
 },
 {
-guides = (
-{
-pos = (-108,136);
-},
-{
-pos = (-108,608);
-}
-);
 layerId = m009;
 shapes = (
 {
 closed = 1;
 nodes = (
-(432,160,l),
-(726,596,l),
-(726,610,l),
-(344,610,l),
-(66,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(344,602,l),
-(726,602,l),
-(726,616,l),
-(432,1054,l),
-(66,1054,l)
+(478,144,l),
+(847,584,l),
+(478,1024,l),
+(40,1024,l),
+(402,584,l),
+(40,144,l)
 );
 }
 );
-width = 818;
+width = 907;
 },
 {
 layerId = m011;
@@ -155,27 +94,20 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(178,160,l),
-(472,596,l),
-(472,610,l),
-(424,610,l),
-(122,160,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(424,602,l),
-(472,602,l),
-(472,616,l),
-(178,1054,l),
-(122,1054,l)
+(117,144,l),
+(518,616,l),
+(117,1088,l),
+(60,1088,l),
+(457,616,l),
+(60,144,l)
 );
 }
 );
-width = 576;
+width = 578;
 }
 );
+metricLeft = "=|guilsinglleft";
+metricRight = "=|guilsinglleft";
 tags = (
 "TODO-opsz"
 );