remove /enclosingcirclecomb and /enclosingsquarecomb, reassign their codepoints to /largeCircle and /whiteLargeSquare, respectively

4 files changed, 866 insertions, 1348 deletions

diff --git a/src/Inter.glyphspackage/glyphs/enclosingcirclecomb.glyph b/src/Inter.glyphspackage/glyphs/enclosingcirclecomb.glyph
deleted file mode 100644
index f442bb199..000000000
--- a/src/Inter.glyphspackage/glyphs/enclosingcirclecomb.glyph
+++ /dev/null
@@ -1,514 +0,0 @@
-{
-glyphname = enclosingcirclecomb;
-layers = (
-{
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1372,-655,o),
-(1999,-28,o),
-(1998,744,cs),
-(1999,1518,o),
-(1372,2144,o),
-(600,2144,cs),
-(-174,2144,o),
-(-800,1518,o),
-(-800,744,cs),
-(-800,-28,o),
-(-174,-655,o),
-(600,-654,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-148,-608,o),
-(-753,-3,o),
-(-754,744,cs),
-(-753,1492,o),
-(-148,2097,o),
-(600,2098,cs),
-(1347,2097,o),
-(1952,1492,o),
-(1952,744,cs),
-(1952,-3,o),
-(1347,-608,o),
-(600,-608,cs)
-);
-}
-);
-width = 0;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1171,-655,o),
-(1900,-31,o),
-(2029,742,cs),
-(2156,1516,o),
-(1632,2144,o),
-(857,2144,cs),
-(86,2144,o),
-(-642,1520,o),
-(-769,748,cs),
-(-898,-26,o),
-(-375,-655,o),
-(401,-654,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-346,-608,o),
-(-848,-6,o),
-(-723,740,cs),
-(-600,1489,o),
-(108,2097,o),
-(857,2098,cs),
-(1603,2097,o),
-(2106,1495,o),
-(1983,750,cs),
-(1858,0,o),
-(1150,-608,o),
-(401,-608,cs)
-);
-}
-);
-width = 0;
-},
-{
-guides = (
-{
-angle = 90;
-pos = (904,1214);
-}
-);
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1431,-655,o),
-(2057,-28,o),
-(2056,744,cs),
-(2057,1518,o),
-(1431,2144,o),
-(658,2144,cs),
-(-116,2144,o),
-(-742,1518,o),
-(-742,744,cs),
-(-742,-28,o),
-(-116,-655,o),
-(658,-654,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-23,-486,o),
-(-573,65,o),
-(-574,744,cs),
-(-573,1425,o),
-(-23,1975,o),
-(658,1976,cs),
-(1338,1975,o),
-(1888,1425,o),
-(1888,744,cs),
-(1888,65,o),
-(1338,-486,o),
-(658,-486,cs)
-);
-}
-);
-width = 0;
-},
-{
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1235,-655,o),
-(1959,-33,o),
-(2086,734,cs),
-(2215,1513,o),
-(1687,2144,o),
-(910,2144,cs),
-(141,2144,o),
-(-582,1523,o),
-(-710,756,cs),
-(-838,-23,o),
-(-311,-655,o),
-(466,-654,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-207,-486,o),
-(-655,52,o),
-(-544,728,cs),
-(-429,1415,o),
-(225,1975,o),
-(910,1976,cs),
-(1583,1975,o),
-(2032,1437,o),
-(1920,760,cs),
-(1807,75,o),
-(1152,-486,o),
-(466,-486,cs)
-);
-}
-);
-width = 0;
-},
-{
-guides = (
-{
-angle = 90;
-pos = (1072,1468);
-}
-);
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1553,-655,o),
-(2179,-28,o),
-(2178,744,cs),
-(2179,1518,o),
-(1553,2144,o),
-(780,2144,cs),
-(7,2144,o),
-(-620,1518,o),
-(-620,744,cs),
-(-620,-28,o),
-(7,-655,o),
-(780,-654,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(135,-422,o),
-(-387,100,o),
-(-386,744,cs),
-(-387,1389,o),
-(135,1911,o),
-(780,1912,cs),
-(1424,1911,o),
-(1946,1389,o),
-(1946,744,cs),
-(1946,100,o),
-(1424,-422,o),
-(780,-422,cs)
-);
-}
-);
-width = 0;
-},
-{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1363,-655,o),
-(2080,-41,o),
-(2206,718,cs),
-(2336,1505,o),
-(1805,2144,o),
-(1022,2144,cs),
-(259,2144,o),
-(-458,1530,o),
-(-584,770,cs),
-(-714,-16,o),
-(-183,-655,o),
-(600,-654,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-39,-422,o),
-(-461,88,o),
-(-354,734,cs),
-(-247,1380,o),
-(373,1911,o),
-(1022,1912,cs),
-(1661,1911,o),
-(2083,1402,o),
-(1976,756,cs),
-(1869,109,o),
-(1249,-422,o),
-(600,-422,cs)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m007;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1399,-655,o),
-(2025,-27,o),
-(2024,745,cs),
-(2025,1519,o),
-(1399,2145,o),
-(626,2145,cs),
-(-148,2145,o),
-(-774,1519,o),
-(-774,745,cs),
-(-774,-27,o),
-(-148,-655,o),
-(626,-654,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-55,-486,o),
-(-605,66,o),
-(-606,745,cs),
-(-605,1426,o),
-(-55,1976,o),
-(626,1977,cs),
-(1306,1976,o),
-(1856,1426,o),
-(1856,745,cs),
-(1856,66,o),
-(1306,-486,o),
-(626,-486,cs)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m008;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1203,-655,o),
-(1927,-33,o),
-(2054,734,cs),
-(2183,1513,o),
-(1655,2144,o),
-(878,2144,cs),
-(109,2144,o),
-(-614,1523,o),
-(-742,756,cs),
-(-870,-23,o),
-(-343,-655,o),
-(434,-654,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-239,-486,o),
-(-687,52,o),
-(-576,728,cs),
-(-461,1415,o),
-(193,1975,o),
-(878,1976,cs),
-(1551,1975,o),
-(2000,1437,o),
-(1888,760,cs),
-(1775,75,o),
-(1120,-486,o),
-(434,-486,cs)
-);
-}
-);
-width = 0;
-},
-{
-guides = (
-{
-angle = 90;
-pos = (976,1468);
-}
-);
-layerId = m009;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1537,-655,o),
-(2163,-28,o),
-(2162,744,cs),
-(2163,1518,o),
-(1537,2144,o),
-(764,2144,cs),
-(-9,2144,o),
-(-636,1518,o),
-(-636,744,cs),
-(-636,-28,o),
-(-9,-655,o),
-(764,-654,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(119,-422,o),
-(-403,100,o),
-(-402,744,cs),
-(-403,1389,o),
-(119,1911,o),
-(764,1912,cs),
-(1408,1911,o),
-(1930,1389,o),
-(1930,744,cs),
-(1930,100,o),
-(1408,-422,o),
-(764,-422,cs)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m010;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1347,-655,o),
-(2064,-41,o),
-(2190,718,cs),
-(2320,1505,o),
-(1789,2144,o),
-(1006,2144,cs),
-(243,2144,o),
-(-474,1530,o),
-(-600,770,cs),
-(-730,-16,o),
-(-199,-655,o),
-(584,-654,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-55,-422,o),
-(-477,88,o),
-(-370,734,cs),
-(-263,1380,o),
-(357,1911,o),
-(1006,1912,cs),
-(1645,1911,o),
-(2067,1402,o),
-(1960,756,cs),
-(1853,109,o),
-(1233,-422,o),
-(584,-422,cs)
-);
-}
-);
-width = 0;
-},
-{
-guides = (
-{
-angle = 90;
-pos = (696,1086);
-}
-);
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1308,-655,o),
-(1935,-28,o),
-(1934,744,cs),
-(1935,1518,o),
-(1308,2144,o),
-(536,2144,cs),
-(-238,2144,o),
-(-864,1518,o),
-(-864,744,cs),
-(-864,-28,o),
-(-238,-655,o),
-(536,-654,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-212,-608,o),
-(-817,-3,o),
-(-818,744,cs),
-(-817,1492,o),
-(-212,2097,o),
-(536,2098,cs),
-(1283,2097,o),
-(1888,1492,o),
-(1888,744,cs),
-(1888,-3,o),
-(1283,-608,o),
-(536,-608,cs)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m012;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1107,-655,o),
-(1836,-31,o),
-(1965,742,cs),
-(2092,1516,o),
-(1568,2144,o),
-(793,2144,cs),
-(22,2144,o),
-(-706,1520,o),
-(-833,748,cs),
-(-962,-26,o),
-(-439,-655,o),
-(337,-654,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-410,-608,o),
-(-912,-6,o),
-(-787,740,cs),
-(-664,1489,o),
-(44,2097,o),
-(793,2098,cs),
-(1539,2097,o),
-(2042,1495,o),
-(1919,750,cs),
-(1794,0,o),
-(1086,-608,o),
-(337,-608,cs)
-);
-}
-);
-width = 0;
-}
-);
-note = "Origin aligned to /X (blue guide should align with center of /X when following this glyph.)";
-tags = (
-"TODO-opsz"
-);
-unicode = 8413;
-}
diff --git a/src/Inter.glyphspackage/glyphs/enclosingsquarecomb.glyph b/src/Inter.glyphspackage/glyphs/enclosingsquarecomb.glyph
deleted file mode 100644
index f99e857c4..000000000
--- a/src/Inter.glyphspackage/glyphs/enclosingsquarecomb.glyph
+++ /dev/null
@@ -1,784 +0,0 @@
-{
-glyphname = enclosingsquarecomb;
-layers = (
-{
-guides = (
-{
-angle = 90;
-pos = (824,964);
-}
-);
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1698,-606,ls),
-(1862,-605,o),
-(1949,-518,o),
-(1950,-354,cs),
-(1950,1844,ls),
-(1949,2007,o),
-(1862,2095,o),
-(1698,2094,cs),
-(-500,2094,ls),
-(-663,2095,o),
-(-751,2007,o),
-(-750,1844,cs),
-(-750,-354,ls),
-(-751,-518,o),
-(-663,-605,o),
-(-500,-606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-637,-559,o),
-(-704,-492,o),
-(-704,-354,cs),
-(-704,1844,ls),
-(-704,1981,o),
-(-637,2048,o),
-(-500,2048,cs),
-(1698,2048,ls),
-(1836,2048,o),
-(1903,1981,o),
-(1902,1844,cs),
-(1902,-354,ls),
-(1903,-492,o),
-(1836,-559,o),
-(1698,-558,cs),
-(-500,-558,ls)
-);
-}
-);
-width = 0;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1506,-606,ls),
-(1670,-605,o),
-(1770,-518,o),
-(1798,-354,cs),
-(2162,1844,ls),
-(2189,2007,o),
-(2116,2095,o),
-(1954,2094,cs),
-(-246,2094,ls),
-(-409,2095,o),
-(-511,2007,o),
-(-538,1844,cs),
-(-902,-354,ls),
-(-929,-518,o),
-(-855,-605,o),
-(-692,-606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-827,-559,o),
-(-879,-496,o),
-(-856,-362,cs),
-(-492,1836,ls),
-(-468,1977,o),
-(-385,2048,o),
-(-246,2048,cs),
-(1954,2048,ls),
-(2087,2048,o),
-(2138,1986,o),
-(2116,1852,cs),
-(1752,-346,ls),
-(1728,-488,o),
-(1647,-559,o),
-(1506,-558,cs),
-(-692,-558,ls)
-);
-}
-);
-width = 0;
-},
-{
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(1431,-655,o),
-(2057,-28,o),
-(2056,744,cs),
-(2057,1518,o),
-(1431,2144,o),
-(658,2144,cs),
-(-116,2144,o),
-(-742,1518,o),
-(-742,744,cs),
-(-742,-28,o),
-(-116,-655,o),
-(658,-654,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-23,-486,o),
-(-573,65,o),
-(-574,744,cs),
-(-573,1425,o),
-(-23,1975,o),
-(658,1976,cs),
-(1337,1975,o),
-(1888,1425,o),
-(1888,744,cs),
-(1888,65,o),
-(1337,-486,o),
-(658,-486,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-692,-606,l),
-(2008,-606,l),
-(2008,2094,l),
-(-692,2094,l)
-);
-}
-);
-};
-guides = (
-{
-angle = 90;
-pos = (904,1204);
-}
-);
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1758,-606,ls),
-(1920,-605,o),
-(2007,-518,o),
-(2008,-354,cs),
-(2008,1844,ls),
-(2007,2007,o),
-(1920,2095,o),
-(1758,2094,cs),
-(-442,2094,ls),
-(-605,2095,o),
-(-692,2007,o),
-(-692,1844,cs),
-(-692,-354,ls),
-(-692,-518,o),
-(-605,-605,o),
-(-442,-606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-500,-436,o),
-(-524,-413,o),
-(-524,-380,cs),
-(-524,1870,ls),
-(-524,1903,o),
-(-500,1926,o),
-(-466,1926,cs),
-(1782,1926,ls),
-(1815,1926,o),
-(1839,1903,o),
-(1838,1870,cs),
-(1838,-380,ls),
-(1839,-413,o),
-(1815,-436,o),
-(1782,-436,cs),
-(-466,-436,ls)
-);
-}
-);
-width = 0;
-},
-{
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1566,-606,ls),
-(1728,-605,o),
-(1828,-518,o),
-(1856,-354,cs),
-(2220,1844,ls),
-(2247,2007,o),
-(2175,2095,o),
-(2012,2094,cs),
-(-188,2094,ls),
-(-351,2095,o),
-(-452,2007,o),
-(-480,1844,cs),
-(-844,-354,ls),
-(-871,-518,o),
-(-797,-605,o),
-(-634,-606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-665,-436,o),
-(-685,-413,o),
-(-680,-380,cs),
-(-306,1870,ls),
-(-301,1903,o),
-(-273,1926,o),
-(-240,1926,cs),
-(2008,1926,ls),
-(2042,1926,o),
-(2061,1903,o),
-(2056,1870,cs),
-(1682,-380,ls),
-(1677,-413,o),
-(1651,-436,o),
-(1618,-436,cs),
-(-632,-436,ls)
-);
-}
-);
-width = 0;
-},
-{
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(-570,-354,ls),
-(-570,-518,o),
-(-483,-605,o),
-(-320,-606,cs),
-(1880,-606,ls),
-(2042,-605,o),
-(2129,-518,o),
-(2130,-354,cs),
-(2130,1844,ls),
-(2129,2007,o),
-(2042,2095,o),
-(1880,2094,cs),
-(-320,2094,ls),
-(-483,2095,o),
-(-570,2007,o),
-(-570,1844,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(1896,1862,l),
-(1896,-372,l),
-(-338,-372,l),
-(-338,1862,l)
-);
-}
-);
-};
-guides = (
-{
-angle = 90;
-pos = (1072,1454);
-}
-);
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1880,-606,ls),
-(2042,-605,o),
-(2129,-518,o),
-(2130,-354,cs),
-(2130,1844,ls),
-(2129,2007,o),
-(2042,2095,o),
-(1880,2094,cs),
-(-320,2094,ls),
-(-483,2095,o),
-(-570,2007,o),
-(-570,1844,cs),
-(-570,-354,ls),
-(-570,-518,o),
-(-483,-605,o),
-(-320,-606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-333,-372,o),
-(-337,-368,o),
-(-338,-360,cs),
-(-338,1850,ls),
-(-337,1857,o),
-(-333,1862,o),
-(-326,1862,cs),
-(1886,1862,ls),
-(1892,1862,o),
-(1897,1857,o),
-(1896,1850,cs),
-(1896,-360,ls),
-(1897,-368,o),
-(1892,-372,o),
-(1886,-372,cs),
-(-326,-372,ls)
-);
-}
-);
-width = 0;
-},
-{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1688,-606,ls),
-(1850,-605,o),
-(1951,-518,o),
-(1978,-354,cs),
-(2342,1844,ls),
-(2369,2007,o),
-(2297,2095,o),
-(2134,2094,cs),
-(-66,2094,ls),
-(-228,2095,o),
-(-330,2007,o),
-(-358,1844,cs),
-(-722,-354,ls),
-(-749,-518,o),
-(-675,-605,o),
-(-512,-606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-487,-372,o),
-(-490,-368,o),
-(-490,-360,cs),
-(-124,1850,ls),
-(-122,1857,o),
-(-118,1862,o),
-(-110,1862,cs),
-(2100,1862,ls),
-(2108,1862,o),
-(2112,1857,o),
-(2110,1850,cs),
-(1744,-360,ls),
-(1744,-368,o),
-(1738,-372,o),
-(1730,-372,cs),
-(-480,-372,ls)
-);
-}
-);
-width = 0;
-},
-{
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(1431,-655,o),
-(2057,-28,o),
-(2056,744,cs),
-(2057,1518,o),
-(1431,2144,o),
-(658,2144,cs),
-(-116,2144,o),
-(-742,1518,o),
-(-742,744,cs),
-(-742,-28,o),
-(-116,-655,o),
-(658,-654,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-23,-486,o),
-(-573,65,o),
-(-574,744,cs),
-(-573,1425,o),
-(-23,1975,o),
-(658,1976,cs),
-(1337,1975,o),
-(1888,1425,o),
-(1888,744,cs),
-(1888,65,o),
-(1337,-486,o),
-(658,-486,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-692,-606,l),
-(2008,-606,l),
-(2008,2094,l),
-(-692,2094,l)
-);
-}
-);
-};
-guides = (
-{
-angle = 90;
-pos = (612,1204);
-}
-);
-layerId = m007;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1726,-606,ls),
-(1888,-605,o),
-(1975,-518,o),
-(1976,-354,cs),
-(1976,1844,ls),
-(1975,2007,o),
-(1888,2095,o),
-(1726,2094,cs),
-(-474,2094,ls),
-(-637,2095,o),
-(-724,2007,o),
-(-724,1844,cs),
-(-724,-354,ls),
-(-724,-518,o),
-(-637,-605,o),
-(-474,-606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-532,-436,o),
-(-556,-413,o),
-(-556,-380,cs),
-(-556,1870,ls),
-(-556,1903,o),
-(-532,1926,o),
-(-498,1926,cs),
-(1750,1926,ls),
-(1783,1926,o),
-(1807,1903,o),
-(1806,1870,cs),
-(1806,-380,ls),
-(1807,-413,o),
-(1783,-436,o),
-(1750,-436,cs),
-(-498,-436,ls)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m008;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1534,-606,ls),
-(1696,-605,o),
-(1796,-518,o),
-(1824,-354,cs),
-(2188,1844,ls),
-(2215,2007,o),
-(2143,2095,o),
-(1980,2094,cs),
-(-220,2094,ls),
-(-383,2095,o),
-(-484,2007,o),
-(-512,1844,cs),
-(-876,-354,ls),
-(-903,-518,o),
-(-829,-605,o),
-(-666,-606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-697,-436,o),
-(-717,-413,o),
-(-712,-380,cs),
-(-338,1870,ls),
-(-333,1903,o),
-(-305,1926,o),
-(-272,1926,cs),
-(1976,1926,ls),
-(2010,1926,o),
-(2029,1903,o),
-(2024,1870,cs),
-(1650,-380,ls),
-(1645,-413,o),
-(1619,-436,o),
-(1586,-436,cs),
-(-664,-436,ls)
-);
-}
-);
-width = 0;
-},
-{
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(-570,-354,ls),
-(-570,-518,o),
-(-483,-605,o),
-(-320,-606,cs),
-(1880,-606,ls),
-(2042,-605,o),
-(2129,-518,o),
-(2130,-354,cs),
-(2130,1844,ls),
-(2129,2007,o),
-(2042,2095,o),
-(1880,2094,cs),
-(-320,2094,ls),
-(-483,2095,o),
-(-570,2007,o),
-(-570,1844,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(1896,1862,l),
-(1896,-372,l),
-(-338,-372,l),
-(-338,1862,l)
-);
-}
-);
-};
-guides = (
-{
-angle = 90;
-pos = (976,1454);
-}
-);
-layerId = m009;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1864,-606,ls),
-(2026,-605,o),
-(2113,-518,o),
-(2114,-354,cs),
-(2114,1844,ls),
-(2113,2007,o),
-(2026,2095,o),
-(1864,2094,cs),
-(-336,2094,ls),
-(-499,2095,o),
-(-586,2007,o),
-(-586,1844,cs),
-(-586,-354,ls),
-(-586,-518,o),
-(-499,-605,o),
-(-336,-606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-349,-372,o),
-(-353,-368,o),
-(-354,-360,cs),
-(-354,1850,ls),
-(-353,1857,o),
-(-349,1862,o),
-(-342,1862,cs),
-(1870,1862,ls),
-(1876,1862,o),
-(1881,1857,o),
-(1880,1850,cs),
-(1880,-360,ls),
-(1881,-368,o),
-(1876,-372,o),
-(1870,-372,cs),
-(-342,-372,ls)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m010;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1672,-606,ls),
-(1834,-605,o),
-(1935,-518,o),
-(1962,-354,cs),
-(2326,1844,ls),
-(2353,2007,o),
-(2281,2095,o),
-(2118,2094,cs),
-(-82,2094,ls),
-(-244,2095,o),
-(-346,2007,o),
-(-374,1844,cs),
-(-738,-354,ls),
-(-765,-518,o),
-(-691,-605,o),
-(-528,-606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-503,-372,o),
-(-506,-368,o),
-(-506,-360,cs),
-(-140,1850,ls),
-(-138,1857,o),
-(-134,1862,o),
-(-126,1862,cs),
-(2084,1862,ls),
-(2092,1862,o),
-(2096,1857,o),
-(2094,1850,cs),
-(1728,-360,ls),
-(1728,-368,o),
-(1722,-372,o),
-(1714,-372,cs),
-(-496,-372,ls)
-);
-}
-);
-width = 0;
-},
-{
-guides = (
-{
-angle = 90;
-pos = (696,964);
-}
-);
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1634,-606,ls),
-(1798,-605,o),
-(1885,-518,o),
-(1886,-354,cs),
-(1886,1844,ls),
-(1885,2007,o),
-(1798,2095,o),
-(1634,2094,cs),
-(-564,2094,ls),
-(-727,2095,o),
-(-815,2007,o),
-(-814,1844,cs),
-(-814,-354,ls),
-(-815,-518,o),
-(-727,-605,o),
-(-564,-606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-701,-559,o),
-(-768,-492,o),
-(-768,-354,cs),
-(-768,1844,ls),
-(-768,1981,o),
-(-701,2048,o),
-(-564,2048,cs),
-(1634,2048,ls),
-(1772,2048,o),
-(1839,1981,o),
-(1838,1844,cs),
-(1838,-354,ls),
-(1839,-492,o),
-(1772,-559,o),
-(1634,-558,cs),
-(-564,-558,ls)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m012;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1442,-606,ls),
-(1606,-605,o),
-(1706,-518,o),
-(1734,-354,cs),
-(2098,1844,ls),
-(2125,2007,o),
-(2052,2095,o),
-(1890,2094,cs),
-(-310,2094,ls),
-(-473,2095,o),
-(-575,2007,o),
-(-602,1844,cs),
-(-966,-354,ls),
-(-993,-518,o),
-(-919,-605,o),
-(-756,-606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-891,-559,o),
-(-943,-496,o),
-(-920,-362,cs),
-(-556,1836,ls),
-(-532,1977,o),
-(-449,2048,o),
-(-310,2048,cs),
-(1890,2048,ls),
-(2023,2048,o),
-(2074,1986,o),
-(2052,1852,cs),
-(1688,-346,ls),
-(1664,-488,o),
-(1583,-559,o),
-(1442,-558,cs),
-(-756,-558,ls)
-);
-}
-);
-width = 0;
-}
-);
-note = "Origin aligned to /X (blue guide should align with center of /X when following this glyph.)\012\012corner radius outer:\012R: 344, visual corrections on\012corner radius inner:\012R: 76, v.c. off\012B: 16, v.c. off\012L: Made from stroke outer";
-tags = (
-"TODO-opsz"
-);
-unicode = 8414;
-}
diff --git a/src/Inter.glyphspackage/glyphs/largeC_ircle.glyph b/src/Inter.glyphspackage/glyphs/largeC_ircle.glyph
index 4208129ea..cca9c07e4 100644
--- a/src/Inter.glyphspackage/glyphs/largeC_ircle.glyph
+++ b/src/Inter.glyphspackage/glyphs/largeC_ircle.glyph
@@ -11,8 +11,38 @@ pos = (1423,745);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (824,0);
-ref = enclosingcirclecomb;
+closed = 1;
+nodes = (
+(2196,-655,o),
+(2823,-28,o),
+(2822,744,cs),
+(2823,1518,o),
+(2196,2144,o),
+(1424,2144,cs),
+(650,2144,o),
+(24,1518,o),
+(24,744,cs),
+(24,-28,o),
+(650,-655,o),
+(1424,-654,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(676,-608,o),
+(71,-3,o),
+(70,744,cs),
+(71,1492,o),
+(676,2097,o),
+(1424,2098,cs),
+(2171,2097,o),
+(2776,1492,o),
+(2776,744,cs),
+(2776,-3,o),
+(2171,-608,o),
+(1424,-608,cs)
+);
 }
 );
 width = 2846;
@@ -27,8 +57,38 @@ pos = (1454,745);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (824,0);
-ref = enclosingcirclecomb;
+closed = 1;
+nodes = (
+(1995,-655,o),
+(2724,-31,o),
+(2853,742,cs),
+(2980,1516,o),
+(2456,2144,o),
+(1681,2144,cs),
+(910,2144,o),
+(182,1520,o),
+(55,748,cs),
+(-74,-26,o),
+(449,-655,o),
+(1225,-654,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(478,-608,o),
+(-24,-6,o),
+(101,740,cs),
+(224,1489,o),
+(932,2097,o),
+(1681,2098,cs),
+(2427,2097,o),
+(2930,1495,o),
+(2807,750,cs),
+(2682,0,o),
+(1974,-608,o),
+(1225,-608,cs)
+);
 }
 );
 width = 2846;
@@ -43,8 +103,38 @@ pos = (1423,745);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (766,0);
-ref = enclosingcirclecomb;
+closed = 1;
+nodes = (
+(2197,-655,o),
+(2823,-28,o),
+(2822,744,cs),
+(2823,1518,o),
+(2197,2144,o),
+(1424,2144,cs),
+(650,2144,o),
+(24,1518,o),
+(24,744,cs),
+(24,-28,o),
+(650,-655,o),
+(1424,-654,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(743,-486,o),
+(193,65,o),
+(192,744,cs),
+(193,1425,o),
+(743,1975,o),
+(1424,1976,cs),
+(2104,1975,o),
+(2654,1425,o),
+(2654,744,cs),
+(2654,65,o),
+(2104,-486,o),
+(1424,-486,cs)
+);
 }
 );
 width = 2846;
@@ -59,8 +149,38 @@ pos = (1454,745);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (766,0);
-ref = enclosingcirclecomb;
+closed = 1;
+nodes = (
+(2001,-655,o),
+(2725,-33,o),
+(2852,734,cs),
+(2981,1513,o),
+(2453,2144,o),
+(1676,2144,cs),
+(907,2144,o),
+(184,1523,o),
+(56,756,cs),
+(-72,-23,o),
+(455,-655,o),
+(1232,-654,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(559,-486,o),
+(111,52,o),
+(222,728,cs),
+(337,1415,o),
+(991,1975,o),
+(1676,1976,cs),
+(2349,1975,o),
+(2798,1437,o),
+(2686,760,cs),
+(2573,75,o),
+(1918,-486,o),
+(1232,-486,cs)
+);
 }
 );
 width = 2846;
@@ -75,8 +195,38 @@ pos = (1421,745);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (642,0);
-ref = enclosingcirclecomb;
+closed = 1;
+nodes = (
+(2195,-655,o),
+(2821,-28,o),
+(2820,744,cs),
+(2821,1518,o),
+(2195,2144,o),
+(1422,2144,cs),
+(649,2144,o),
+(22,1518,o),
+(22,744,cs),
+(22,-28,o),
+(649,-655,o),
+(1422,-654,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(777,-422,o),
+(255,100,o),
+(256,744,cs),
+(255,1389,o),
+(777,1911,o),
+(1422,1912,cs),
+(2066,1911,o),
+(2588,1389,o),
+(2588,744,cs),
+(2588,100,o),
+(2066,-422,o),
+(1422,-422,cs)
+);
 }
 );
 width = 2846;
@@ -91,8 +241,38 @@ pos = (1454,745);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (643,0);
-ref = enclosingcirclecomb;
+closed = 1;
+nodes = (
+(2006,-655,o),
+(2723,-41,o),
+(2849,718,cs),
+(2979,1505,o),
+(2448,2144,o),
+(1665,2144,cs),
+(902,2144,o),
+(185,1530,o),
+(59,770,cs),
+(-71,-16,o),
+(460,-655,o),
+(1243,-654,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(604,-422,o),
+(182,88,o),
+(289,734,cs),
+(396,1380,o),
+(1016,1911,o),
+(1665,1912,cs),
+(2304,1911,o),
+(2726,1402,o),
+(2619,756,cs),
+(2512,109,o),
+(1892,-422,o),
+(1243,-422,cs)
+);
 }
 );
 width = 2847;
@@ -107,8 +287,38 @@ pos = (1423,745);
 layerId = m007;
 shapes = (
 {
-pos = (798,0);
-ref = enclosingcirclecomb;
+closed = 1;
+nodes = (
+(2197,-655,o),
+(2823,-27,o),
+(2822,745,cs),
+(2823,1519,o),
+(2197,2145,o),
+(1424,2145,cs),
+(650,2145,o),
+(24,1519,o),
+(24,745,cs),
+(24,-27,o),
+(650,-655,o),
+(1424,-654,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(743,-486,o),
+(193,66,o),
+(192,745,cs),
+(193,1426,o),
+(743,1976,o),
+(1424,1977,cs),
+(2104,1976,o),
+(2654,1426,o),
+(2654,745,cs),
+(2654,66,o),
+(2104,-486,o),
+(1424,-486,cs)
+);
 }
 );
 width = 2846;
@@ -123,8 +333,38 @@ pos = (1460,745);
 layerId = m008;
 shapes = (
 {
-pos = (804,0);
-ref = enclosingcirclecomb;
+closed = 1;
+nodes = (
+(2007,-655,o),
+(2731,-33,o),
+(2858,734,cs),
+(2987,1513,o),
+(2459,2144,o),
+(1682,2144,cs),
+(913,2144,o),
+(190,1523,o),
+(62,756,cs),
+(-66,-23,o),
+(461,-655,o),
+(1238,-654,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(565,-486,o),
+(117,52,o),
+(228,728,cs),
+(343,1415,o),
+(997,1975,o),
+(1682,1976,cs),
+(2355,1975,o),
+(2804,1437,o),
+(2692,760,cs),
+(2579,75,o),
+(1924,-486,o),
+(1238,-486,cs)
+);
 }
 );
 width = 2848;
@@ -139,8 +379,38 @@ pos = (1423,745);
 layerId = m009;
 shapes = (
 {
-pos = (660,0);
-ref = enclosingcirclecomb;
+closed = 1;
+nodes = (
+(2197,-655,o),
+(2823,-28,o),
+(2822,744,cs),
+(2823,1518,o),
+(2197,2144,o),
+(1424,2144,cs),
+(651,2144,o),
+(24,1518,o),
+(24,744,cs),
+(24,-28,o),
+(651,-655,o),
+(1424,-654,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(779,-422,o),
+(257,100,o),
+(258,744,cs),
+(257,1389,o),
+(779,1911,o),
+(1424,1912,cs),
+(2068,1911,o),
+(2590,1389,o),
+(2590,744,cs),
+(2590,100,o),
+(2068,-422,o),
+(1424,-422,cs)
+);
 }
 );
 width = 2846;
@@ -155,8 +425,38 @@ pos = (1459,745);
 layerId = m010;
 shapes = (
 {
-pos = (664,0);
-ref = enclosingcirclecomb;
+closed = 1;
+nodes = (
+(2011,-655,o),
+(2728,-41,o),
+(2854,718,cs),
+(2984,1505,o),
+(2453,2144,o),
+(1670,2144,cs),
+(907,2144,o),
+(190,1530,o),
+(64,770,cs),
+(-66,-16,o),
+(465,-655,o),
+(1248,-654,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(609,-422,o),
+(187,88,o),
+(294,734,cs),
+(401,1380,o),
+(1021,1911,o),
+(1670,1912,cs),
+(2309,1911,o),
+(2731,1402,o),
+(2624,756,cs),
+(2517,109,o),
+(1897,-422,o),
+(1248,-422,cs)
+);
 }
 );
 width = 2847;
@@ -171,8 +471,38 @@ pos = (1423,745);
 layerId = m011;
 shapes = (
 {
-pos = (888,0);
-ref = enclosingcirclecomb;
+closed = 1;
+nodes = (
+(2196,-655,o),
+(2823,-28,o),
+(2822,744,cs),
+(2823,1518,o),
+(2196,2144,o),
+(1424,2144,cs),
+(650,2144,o),
+(24,1518,o),
+(24,744,cs),
+(24,-28,o),
+(650,-655,o),
+(1424,-654,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(676,-608,o),
+(71,-3,o),
+(70,744,cs),
+(71,1492,o),
+(676,2097,o),
+(1424,2098,cs),
+(2171,2097,o),
+(2776,1492,o),
+(2776,744,cs),
+(2776,-3,o),
+(2171,-608,o),
+(1424,-608,cs)
+);
 }
 );
 width = 2846;
@@ -187,8 +517,38 @@ pos = (1459,745);
 layerId = m012;
 shapes = (
 {
-pos = (893,0);
-ref = enclosingcirclecomb;
+closed = 1;
+nodes = (
+(2000,-655,o),
+(2729,-31,o),
+(2858,742,cs),
+(2985,1516,o),
+(2461,2144,o),
+(1686,2144,cs),
+(915,2144,o),
+(187,1520,o),
+(60,748,cs),
+(-69,-26,o),
+(454,-655,o),
+(1230,-654,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(483,-608,o),
+(-19,-6,o),
+(106,740,cs),
+(229,1489,o),
+(937,2097,o),
+(1686,2098,cs),
+(2432,2097,o),
+(2935,1495,o),
+(2812,750,cs),
+(2687,0,o),
+(1979,-608,o),
+(1230,-608,cs)
+);
 }
 );
 width = 2847;
@@ -197,5 +557,5 @@ width = 2847;
 tags = (
 "TODO-opsz"
 );
-unicode = 9711;
+unicode = (9711,8413);
 }
diff --git a/src/Inter.glyphspackage/glyphs/whiteL_argeS_quare.glyph b/src/Inter.glyphspackage/glyphs/whiteL_argeS_quare.glyph
index 81dcbf6ac..c0ee36f30 100644
--- a/src/Inter.glyphspackage/glyphs/whiteL_argeS_quare.glyph
+++ b/src/Inter.glyphspackage/glyphs/whiteL_argeS_quare.glyph
@@ -11,8 +11,46 @@ pos = (1414,745);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (814,0);
-ref = enclosingsquarecomb;
+closed = 1;
+nodes = (
+(2512,-606,ls),
+(2676,-605,o),
+(2763,-518,o),
+(2764,-354,cs),
+(2764,1844,ls),
+(2763,2007,o),
+(2676,2095,o),
+(2512,2094,cs),
+(314,2094,ls),
+(151,2095,o),
+(63,2007,o),
+(64,1844,cs),
+(64,-354,ls),
+(63,-518,o),
+(151,-605,o),
+(314,-606,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(177,-559,o),
+(110,-492,o),
+(110,-354,cs),
+(110,1844,ls),
+(110,1981,o),
+(177,2048,o),
+(314,2048,cs),
+(2512,2048,ls),
+(2650,2048,o),
+(2717,1981,o),
+(2716,1844,cs),
+(2716,-354,ls),
+(2717,-492,o),
+(2650,-559,o),
+(2512,-558,cs),
+(314,-558,ls)
+);
 }
 );
 width = 2828;
@@ -27,8 +65,46 @@ pos = (1445,745);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (815,0);
-ref = enclosingsquarecomb;
+closed = 1;
+nodes = (
+(2321,-606,ls),
+(2485,-605,o),
+(2585,-518,o),
+(2613,-354,cs),
+(2977,1844,ls),
+(3004,2007,o),
+(2931,2095,o),
+(2769,2094,cs),
+(569,2094,ls),
+(406,2095,o),
+(304,2007,o),
+(277,1844,cs),
+(-87,-354,ls),
+(-114,-518,o),
+(-40,-605,o),
+(123,-606,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(-12,-559,o),
+(-64,-496,o),
+(-41,-362,cs),
+(323,1836,ls),
+(347,1977,o),
+(430,2048,o),
+(569,2048,cs),
+(2769,2048,ls),
+(2902,2048,o),
+(2953,1986,o),
+(2931,1852,cs),
+(2567,-346,ls),
+(2543,-488,o),
+(2462,-559,o),
+(2321,-558,cs),
+(123,-558,ls)
+);
 }
 );
 width = 2828;
@@ -43,8 +119,46 @@ pos = (1414,745);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (756,0);
-ref = enclosingsquarecomb;
+closed = 1;
+nodes = (
+(2514,-606,ls),
+(2676,-605,o),
+(2763,-518,o),
+(2764,-354,cs),
+(2764,1844,ls),
+(2763,2007,o),
+(2676,2095,o),
+(2514,2094,cs),
+(314,2094,ls),
+(151,2095,o),
+(64,2007,o),
+(64,1844,cs),
+(64,-354,ls),
+(64,-518,o),
+(151,-605,o),
+(314,-606,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(256,-436,o),
+(232,-413,o),
+(232,-380,cs),
+(232,1870,ls),
+(232,1903,o),
+(256,1926,o),
+(290,1926,cs),
+(2538,1926,ls),
+(2571,1926,o),
+(2595,1903,o),
+(2594,1870,cs),
+(2594,-380,ls),
+(2595,-413,o),
+(2571,-436,o),
+(2538,-436,cs),
+(290,-436,ls)
+);
 }
 );
 width = 2828;
@@ -59,8 +173,46 @@ pos = (1445,745);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (757,0);
-ref = enclosingsquarecomb;
+closed = 1;
+nodes = (
+(2323,-606,ls),
+(2485,-605,o),
+(2585,-518,o),
+(2613,-354,cs),
+(2977,1844,ls),
+(3004,2007,o),
+(2932,2095,o),
+(2769,2094,cs),
+(569,2094,ls),
+(406,2095,o),
+(305,2007,o),
+(277,1844,cs),
+(-87,-354,ls),
+(-114,-518,o),
+(-40,-605,o),
+(123,-606,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(92,-436,o),
+(72,-413,o),
+(77,-380,cs),
+(451,1870,ls),
+(456,1903,o),
+(484,1926,o),
+(517,1926,cs),
+(2765,1926,ls),
+(2799,1926,o),
+(2818,1903,o),
+(2813,1870,cs),
+(2439,-380,ls),
+(2434,-413,o),
+(2408,-436,o),
+(2375,-436,cs),
+(125,-436,ls)
+);
 }
 );
 width = 2828;
@@ -75,8 +227,46 @@ pos = (1414,745);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (634,0);
-ref = enclosingsquarecomb;
+closed = 1;
+nodes = (
+(2514,-606,ls),
+(2676,-605,o),
+(2763,-518,o),
+(2764,-354,cs),
+(2764,1844,ls),
+(2763,2007,o),
+(2676,2095,o),
+(2514,2094,cs),
+(314,2094,ls),
+(151,2095,o),
+(64,2007,o),
+(64,1844,cs),
+(64,-354,ls),
+(64,-518,o),
+(151,-605,o),
+(314,-606,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(301,-372,o),
+(297,-368,o),
+(296,-360,cs),
+(296,1850,ls),
+(297,1857,o),
+(301,1862,o),
+(308,1862,cs),
+(2520,1862,ls),
+(2526,1862,o),
+(2531,1857,o),
+(2530,1850,cs),
+(2530,-360,ls),
+(2531,-368,o),
+(2526,-372,o),
+(2520,-372,cs),
+(308,-372,ls)
+);
 }
 );
 width = 2828;
@@ -91,8 +281,46 @@ pos = (1445,745);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (635,0);
-ref = enclosingsquarecomb;
+closed = 1;
+nodes = (
+(2323,-606,ls),
+(2485,-605,o),
+(2586,-518,o),
+(2613,-354,cs),
+(2977,1844,ls),
+(3004,2007,o),
+(2932,2095,o),
+(2769,2094,cs),
+(569,2094,ls),
+(407,2095,o),
+(305,2007,o),
+(277,1844,cs),
+(-87,-354,ls),
+(-114,-518,o),
+(-40,-605,o),
+(123,-606,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(148,-372,o),
+(145,-368,o),
+(145,-360,cs),
+(511,1850,ls),
+(513,1857,o),
+(517,1862,o),
+(525,1862,cs),
+(2735,1862,ls),
+(2743,1862,o),
+(2747,1857,o),
+(2745,1850,cs),
+(2379,-360,ls),
+(2379,-368,o),
+(2373,-372,o),
+(2365,-372,cs),
+(155,-372,ls)
+);
 }
 );
 width = 2828;
@@ -107,8 +335,46 @@ pos = (1414,745);
 layerId = m007;
 shapes = (
 {
-pos = (788,0);
-ref = enclosingsquarecomb;
+closed = 1;
+nodes = (
+(2514,-606,ls),
+(2676,-605,o),
+(2763,-518,o),
+(2764,-354,cs),
+(2764,1844,ls),
+(2763,2007,o),
+(2676,2095,o),
+(2514,2094,cs),
+(314,2094,ls),
+(151,2095,o),
+(64,2007,o),
+(64,1844,cs),
+(64,-354,ls),
+(64,-518,o),
+(151,-605,o),
+(314,-606,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(256,-436,o),
+(232,-413,o),
+(232,-380,cs),
+(232,1870,ls),
+(232,1903,o),
+(256,1926,o),
+(290,1926,cs),
+(2538,1926,ls),
+(2571,1926,o),
+(2595,1903,o),
+(2594,1870,cs),
+(2594,-380,ls),
+(2595,-413,o),
+(2571,-436,o),
+(2538,-436,cs),
+(290,-436,ls)
+);
 }
 );
 width = 2828;
@@ -123,8 +389,46 @@ pos = (1450,745);
 layerId = m008;
 shapes = (
 {
-pos = (794,0);
-ref = enclosingsquarecomb;
+closed = 1;
+nodes = (
+(2328,-606,ls),
+(2490,-605,o),
+(2590,-518,o),
+(2618,-354,cs),
+(2982,1844,ls),
+(3009,2007,o),
+(2937,2095,o),
+(2774,2094,cs),
+(574,2094,ls),
+(411,2095,o),
+(310,2007,o),
+(282,1844,cs),
+(-82,-354,ls),
+(-109,-518,o),
+(-35,-605,o),
+(128,-606,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(97,-436,o),
+(77,-413,o),
+(82,-380,cs),
+(456,1870,ls),
+(461,1903,o),
+(489,1926,o),
+(522,1926,cs),
+(2770,1926,ls),
+(2804,1926,o),
+(2823,1903,o),
+(2818,1870,cs),
+(2444,-380,ls),
+(2439,-413,o),
+(2413,-436,o),
+(2380,-436,cs),
+(130,-436,ls)
+);
 }
 );
 width = 2828;
@@ -139,8 +443,46 @@ pos = (1414,745);
 layerId = m009;
 shapes = (
 {
-pos = (650,0);
-ref = enclosingsquarecomb;
+closed = 1;
+nodes = (
+(2514,-606,ls),
+(2676,-605,o),
+(2763,-518,o),
+(2764,-354,cs),
+(2764,1844,ls),
+(2763,2007,o),
+(2676,2095,o),
+(2514,2094,cs),
+(314,2094,ls),
+(151,2095,o),
+(64,2007,o),
+(64,1844,cs),
+(64,-354,ls),
+(64,-518,o),
+(151,-605,o),
+(314,-606,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(301,-372,o),
+(297,-368,o),
+(296,-360,cs),
+(296,1850,ls),
+(297,1857,o),
+(301,1862,o),
+(308,1862,cs),
+(2520,1862,ls),
+(2526,1862,o),
+(2531,1857,o),
+(2530,1850,cs),
+(2530,-360,ls),
+(2531,-368,o),
+(2526,-372,o),
+(2520,-372,cs),
+(308,-372,ls)
+);
 }
 );
 width = 2828;
@@ -155,8 +497,46 @@ pos = (1450,745);
 layerId = m010;
 shapes = (
 {
-pos = (656,0);
-ref = enclosingsquarecomb;
+closed = 1;
+nodes = (
+(2328,-606,ls),
+(2490,-605,o),
+(2591,-518,o),
+(2618,-354,cs),
+(2982,1844,ls),
+(3009,2007,o),
+(2937,2095,o),
+(2774,2094,cs),
+(574,2094,ls),
+(412,2095,o),
+(310,2007,o),
+(282,1844,cs),
+(-82,-354,ls),
+(-109,-518,o),
+(-35,-605,o),
+(128,-606,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(153,-372,o),
+(150,-368,o),
+(150,-360,cs),
+(516,1850,ls),
+(518,1857,o),
+(522,1862,o),
+(530,1862,cs),
+(2740,1862,ls),
+(2748,1862,o),
+(2752,1857,o),
+(2750,1850,cs),
+(2384,-360,ls),
+(2384,-368,o),
+(2378,-372,o),
+(2370,-372,cs),
+(160,-372,ls)
+);
 }
 );
 width = 2828;
@@ -171,8 +551,46 @@ pos = (1414,745);
 layerId = m011;
 shapes = (
 {
-pos = (878,0);
-ref = enclosingsquarecomb;
+closed = 1;
+nodes = (
+(2512,-606,ls),
+(2676,-605,o),
+(2763,-518,o),
+(2764,-354,cs),
+(2764,1844,ls),
+(2763,2007,o),
+(2676,2095,o),
+(2512,2094,cs),
+(314,2094,ls),
+(151,2095,o),
+(63,2007,o),
+(64,1844,cs),
+(64,-354,ls),
+(63,-518,o),
+(151,-605,o),
+(314,-606,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(177,-559,o),
+(110,-492,o),
+(110,-354,cs),
+(110,1844,ls),
+(110,1981,o),
+(177,2048,o),
+(314,2048,cs),
+(2512,2048,ls),
+(2650,2048,o),
+(2717,1981,o),
+(2716,1844,cs),
+(2716,-354,ls),
+(2717,-492,o),
+(2650,-559,o),
+(2512,-558,cs),
+(314,-558,ls)
+);
 }
 );
 width = 2828;
@@ -187,8 +605,46 @@ pos = (1450,745);
 layerId = m012;
 shapes = (
 {
-pos = (884,0);
-ref = enclosingsquarecomb;
+closed = 1;
+nodes = (
+(2326,-606,ls),
+(2490,-605,o),
+(2590,-518,o),
+(2618,-354,cs),
+(2982,1844,ls),
+(3009,2007,o),
+(2936,2095,o),
+(2774,2094,cs),
+(574,2094,ls),
+(411,2095,o),
+(309,2007,o),
+(282,1844,cs),
+(-82,-354,ls),
+(-109,-518,o),
+(-35,-605,o),
+(128,-606,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(-7,-559,o),
+(-59,-496,o),
+(-36,-362,cs),
+(328,1836,ls),
+(352,1977,o),
+(435,2048,o),
+(574,2048,cs),
+(2774,2048,ls),
+(2907,2048,o),
+(2958,1986,o),
+(2936,1852,cs),
+(2572,-346,ls),
+(2548,-488,o),
+(2467,-559,o),
+(2326,-558,cs),
+(128,-558,ls)
+);
 }
 );
 width = 2828;
@@ -197,5 +653,5 @@ width = 2828;
 tags = (
 "TODO-opsz"
 );
-unicode = 11036;
+unicode = (11036,8414);
 }