summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Inter-Italic.glyphspackage/glyphs/H_aabkhasiancyrillic.glyph592
-rw-r--r--src/Inter-Roman.glyphspackage/fontinfo.plist4
-rw-r--r--src/Inter-Roman.glyphspackage/glyphs/H_aabkhasiancyrillic.glyph1229
3 files changed, 1353 insertions, 472 deletions
diff --git a/src/Inter-Italic.glyphspackage/glyphs/H_aabkhasiancyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/H_aabkhasiancyrillic.glyph
index c1ac2223d..f00ef707b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/H_aabkhasiancyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/H_aabkhasiancyrillic.glyph
@@ -3,176 +3,189 @@ glyphname = Haabkhasiancyrillic;
layers = (
{
layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
-(1021,143,o),
-(806,364,o),
-(862,702,c),
-(904,962,ls),
-(940,1178,o),
-(1073,1338,o),
-(1202,1338,c),
-(1329,1338,o),
-(1411,1187,o),
-(1374,960,c),
-(1326,680,ls),
-(1277,381,o),
-(1030,151,o),
-(722,152,cs),
-(465,151,o),
-(317,378,o),
-(366,674,cs),
-(398,878,ls),
-(442,1140,o),
-(596,1338,o),
-(754,1338,c),
-(782,1512,l),
-(506,1513,o),
-(279,1236,o),
-(218,876,cs),
-(186,674,ls),
-(119,282,o),
-(320,-20,o),
-(692,-20,cs),
-(1111,-20,o),
-(1440,285,o),
-(1506,680,cs),
-(1554,958,l),
-(1606,1280,o),
-(1478,1510,o),
-(1230,1510,c),
-(980,1510,o),
-(777,1271,o),
-(724,960,cs),
-(680,704,l),
-(611,271,o),
-(899,-29,o),
-(1402,-30,c),
-(1428,142,l)
+(1645,-21,o),
+(1740,8,o),
+(1820,43,c),
+(1791,189,l),
+(1700,152,o),
+(1624,140,o),
+(1556,140,cs),
+(1431,140,o),
+(1348,154,o),
+(1287,208,c),
+(1095,316,o),
+(1003,549,o),
+(1041,780,cs),
+(1079,1009,o),
+(1221,1153,o),
+(1409,1153,cs),
+(1593,1153,o),
+(1693,1016,o),
+(1657,797,cs),
+(1597,434,o),
+(1174,148,o),
+(778,148,cs),
+(435,148,o),
+(266,372,o),
+(327,744,cs),
+(391,1132,o),
+(640,1342,o),
+(911,1342,c),
+(939,1510,l),
+(558,1510,o),
+(231,1216,o),
+(153,744,cs),
+(76,276,o),
+(307,-20,o),
+(750,-20,cs),
+(1175,-20,o),
+(1748,261,o),
+(1837,797,cs),
+(1888,1105,o),
+(1723,1321,o),
+(1437,1321,cs),
+(1152,1321,o),
+(915,1105,o),
+(860,775,cs),
+(815,503,o),
+(912,262,o),
+(1102,118,c),
+(1186,30,o),
+(1353,-21,o),
+(1527,-21,cs)
);
}
);
-width = 1664;
-},
-{
-guides = (
-{
-pos = (324,1240);
+width = 2004;
},
{
-pos = (12,764);
-}
-);
layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
-(1271,288,o),
-(1079,509,o),
-(1122,762,c),
-(1154,962,ls),
-(1178,1108,o),
-(1231,1184,o),
-(1306,1184,c),
-(1382,1184,o),
-(1408,1100,o),
-(1378,934,c),
-(1346,738,ls),
-(1306,492,o),
-(1111,305,o),
-(850,306,cs),
-(611,305,o),
-(497,445,o),
-(530,646,cs),
-(576,934,ls),
-(599,1076,o),
-(687,1184,o),
-(800,1184,c),
-(852,1510,l),
-(495,1510,o),
-(209,1257,o),
-(154,934,cs),
-(108,646,ls),
-(47,271,o),
-(317,-20,o),
-(794,-20,cs),
-(1283,-20,o),
-(1673,308,o),
-(1742,738,cs),
-(1766,870,l),
-(1827,1245,o),
-(1655,1510,o),
-(1346,1510,c),
-(1068,1510,o),
-(847,1271,o),
-(794,960,cs),
-(762,762,l),
-(687,311,o),
-(1033,0,o),
-(1630,0,c),
-(1678,288,l)
+(1788,-21,o),
+(1989,-14,o),
+(2127,46,c),
+(2065,361,l),
+(1939,314,o),
+(1831,303,o),
+(1743,303,cs),
+(1675,303,o),
+(1612,305,o),
+(1560,347,c),
+(1368,410,o),
+(1260,589,o),
+(1293,793,cs),
+(1316,930,o),
+(1425,1037,o),
+(1542,1037,cs),
+(1659,1037,o),
+(1735,940,o),
+(1714,816,cs),
+(1666,528,o),
+(1344,332,o),
+(872,332,cs),
+(576,332,o),
+(493,477,o),
+(537,744,cs),
+(582,1012,o),
+(714,1158,o),
+(914,1158,c),
+(972,1510,l),
+(565,1510,o),
+(204,1242,o),
+(121,744,cs),
+(39,250,o),
+(311,-20,o),
+(814,-20,cs),
+(1487,-20,o),
+(2038,331,o),
+(2118,816,cs),
+(2175,1159,o),
+(1971,1381,o),
+(1599,1381,cs),
+(1228,1381,o),
+(948,1149,o),
+(889,793,cs),
+(847,535,o),
+(968,310,o),
+(1115,161,c),
+(1300,59,o),
+(1499,-21,o),
+(1688,-21,cs)
);
}
);
-width = 1816;
+width = 2279;
},
{
layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
-(852,15,o),
-(625,260,o),
-(690,648,cs),
-(742,948,ls),
-(796,1278,o),
-(943,1468,o),
-(1140,1468,cs),
-(1343,1468,o),
-(1425,1283,o),
-(1368,948,cs),
-(1316,646,ls),
-(1253,265,o),
-(1004,26,o),
-(668,26,cs),
+(1670,-25,o),
+(1758,-7,o),
+(1860,38,c),
+(1844,82,l),
+(1747,39,o),
+(1669,21,o),
+(1570,21,cs),
+(1449,21,o),
+(1331,48,o),
+(1253,97,c),
+(1048,202,o),
+(910,463,o),
+(960,768,cs),
+(1010,1065,o),
+(1227,1271,o),
+(1487,1271,cs),
+(1744,1271,o),
+(1893,1078,o),
+(1846,796,cs),
+(1775,366,o),
+(1319,26,o),
+(810,26,cs),
(340,26,o),
-(191,249,o),
-(258,648,cs),
-(298,890,ls),
-(358,1241,o),
-(529,1468,o),
-(736,1470,c),
-(744,1516,l),
-(501,1514,o),
-(316,1276,o),
-(252,884,cs),
-(210,648,ls),
-(141,230,o),
+(154,318,o),
+(224,741,cs),
+(296,1173,o),
+(579,1464,o),
+(917,1464,c),
+(922,1510,l),
+(554,1510,o),
+(254,1201,o),
+(179,747,cs),
+(104,293,o),
(310,-20,o),
-(670,-20,cs),
-(1027,-20,o),
-(1295,234,o),
-(1364,646,cs),
-(1412,942,ls),
-(1473,1305,o),
-(1375,1514,o),
-(1148,1514,cs),
-(916,1514,o),
-(754,1311,o),
-(694,946,cs),
-(642,648,ls),
-(576,239,o),
-(824,-31,o),
-(1266,-32,c),
-(1274,14,l)
+(808,-20,cs),
+(1340,-20,o),
+(1816,336,o),
+(1891,790,cs),
+(1942,1099,o),
+(1776,1317,o),
+(1488,1317,cs),
+(1205,1317,o),
+(968,1094,o),
+(915,774,cs),
+(865,470,o),
+(994,190,o),
+(1209,77,c),
+(1296,12,o),
+(1424,-25,o),
+(1568,-25,cs)
);
}
);
-width = 1560;
+width = 2073;
},
{
layerId = m008;
@@ -181,64 +194,65 @@ shapes = (
{
closed = 1;
nodes = (
-(995.264,143,o),
-(778.85,364,o),
-(834.806,702,c),
-(877.848,962,ls),
-(913.607,1178,o),
-(1047.095,1338,o),
-(1176.095,1338,c),
-(1303.095,1338,o),
-(1383.097,1187,o),
-(1345.517,960,c),
-(1299.163,680,ls),
-(1249.664,381,o),
-(1002.588,151,o),
-(693.754,152,cs),
-(437.588,151,o),
-(289.168,378,o),
-(338.17,674,cs),
-(371.942,878,ls),
-(415.316,1140,o),
-(570.095,1338,o),
-(728.095,1338,c),
-(756.9,1512,l),
-(480.066,1513,o),
-(251.209,1236,o),
-(191.611,876,cs),
-(158.17,674,ls),
-(93.275,282,o),
-(293.279,-20,o),
-(665.279,-20,cs),
-(1084.279,-20,o),
-(1414.772,285,o),
-(1479.163,680,cs),
-(1525.186,958,l),
-(1579.493,1280,o),
-(1451.569,1510,o),
-(1204.569,1510,c),
-(953.569,1510,o),
-(748.003,1271,o),
-(697.517,960,cs),
-(655.137,704,l),
-(582.454,271,o),
-(870.789,-29,o),
-(1373.624,-30,c),
-(1402.098,142,l)
+(1646,-25,o),
+(1741,2,o),
+(1821,37,c),
+(1782,187,l),
+(1692,150,o),
+(1616,136,o),
+(1542,136,cs),
+(1423,136,o),
+(1340,147,o),
+(1274,198,c),
+(1087,309,o),
+(999,539,o),
+(1036,765,cs),
+(1075,999,o),
+(1223,1149,o),
+(1416,1149,cs),
+(1595,1149,o),
+(1691,1018,o),
+(1655,804,cs),
+(1594,436,o),
+(1165,144,o),
+(764,144,cs),
+(415,144,o),
+(244,364,o),
+(305,733,cs),
+(370,1126,o),
+(637,1346,o),
+(908,1346,c),
+(926,1514,l),
+(531,1514,o),
+(202,1199,o),
+(128,755,cs),
+(51,286,o),
+(301,-24,o),
+(757,-24,cs),
+(1177,-24,o),
+(1744,251,o),
+(1832,782,cs),
+(1884,1095,o),
+(1714,1317,o),
+(1423,1317,cs),
+(1143,1317,o),
+(913,1107,o),
+(859,782,cs),
+(813,505,o),
+(914,261,o),
+(1108,121,c),
+(1187,30,o),
+(1354,-25,o),
+(1534,-25,cs)
);
}
);
-width = 1600;
+width = 1968;
},
{
guides = (
{
-angle = -9.4;
-pos = (-84,1240);
-},
-{
-angle = -9.4;
-pos = (-84,764);
+pos = (-24,1240);
}
);
layerId = m010;
@@ -247,54 +261,60 @@ shapes = (
{
closed = 1;
nodes = (
-(1259.268,288,o),
-(1068.855,509,o),
-(1110.738,762,c),
-(1143.848,962,ls),
-(1168.018,1108,o),
-(1219.6,1184,o),
-(1294.6,1184,c),
-(1370.6,1184,o),
-(1396.363,1098,o),
-(1369.213,934,c),
-(1336.765,738,ls),
-(1296.04,492,o),
-(1099.083,305,o),
-(837.248,306,cs),
-(599.083,305,o),
-(485.259,445,o),
-(517.535,646,cs),
-(565.213,934,ls),
-(589.721,1076,o),
-(674.6,1184,o),
-(788.6,1184,c),
-(842.569,1510,l),
-(483.569,1510,o),
-(197.685,1257,o),
-(145.213,934,cs),
-(97.535,646,ls),
-(34.454,271,o),
-(306.279,-20,o),
-(783.279,-20,cs),
-(1272.279,-20,o),
-(1660.579,308,o),
-(1732.765,738,cs),
-(1754.618,870,l),
-(1815.699,1245,o),
-(1644.569,1510,o),
-(1336.569,1510,c),
-(1057.569,1510,o),
-(834.003,1271,o),
-(783.517,960,cs),
-(750.738,762,l),
-(675.076,311,o),
-(1022.59,0,o),
-(1618.59,0,c),
-(1666.268,288,l)
+(1752,-21,o),
+(1951,-20,o),
+(2089,40,c),
+(2007,366,l),
+(1885,319,o),
+(1775,311,o),
+(1677,311,cs),
+(1619,311,o),
+(1541,281,o),
+(1479,319,c),
+(1296,390,o),
+(1212,576,o),
+(1243,767,cs),
+(1268,917,o),
+(1390,1037,o),
+(1517,1037,cs),
+(1623,1037,o),
+(1691,953,o),
+(1673,842,cs),
+(1616,501,o),
+(1329,332,o),
+(806,332,cs),
+(520,332,o),
+(445,464,o),
+(487,718,cs),
+(534,999,o),
+(678,1158,o),
+(878,1158,c),
+(916,1510,l),
+(509,1510,o),
+(160,1255,o),
+(80,770,cs),
+(-4,263,o),
+(275,-20,o),
+(789,-20,cs),
+(1430,-20,o),
+(1993,336,o),
+(2068,790,cs),
+(2127,1146,o),
+(1915,1381,o),
+(1532,1381,cs),
+(1172,1381,o),
+(905,1162,o),
+(848,819,cs),
+(803,548,o),
+(916,303,o),
+(1072,160,c),
+(1248,50,o),
+(1463,-21,o),
+(1662,-21,cs)
);
}
);
-width = 1784;
+width = 2222;
},
{
layerId = m012;
@@ -303,56 +323,64 @@ shapes = (
{
closed = 1;
nodes = (
-(795.073,15,o),
-(566.964,262,o),
-(629.866,648,cs),
-(679.531,948,ls),
-(735.658,1281,o),
-(879.616,1468,o),
-(1079.616,1468,cs),
-(1279.616,1468,o),
-(1362.658,1281,o),
-(1307.531,948,cs),
-(1257.535,646,ls),
-(1193.964,262,o),
-(947.894,26,o),
-(610.894,26,cs),
-(281.894,26,o),
-(133.143,251,o),
-(197.866,648,cs),
-(237.929,890,ls),
-(297.036,1241,o),
-(468.616,1468,o),
-(675.947,1470,c),
-(683.562,1516,l),
-(445.231,1514,o),
-(254.672,1269,o),
-(190.935,884,cs),
-(151.866,648,ls),
-(81.839,225,o),
-(248.279,-20,o),
-(603.279,-20,cs),
-(966.279,-20,o),
-(1235.66,236,o),
-(1303.535,646,cs),
-(1352.537,942,ls),
-(1412.963,1307,o),
-(1316.231,1514,o),
-(1087.231,1514,cs),
-(858.231,1514,o),
-(693.128,1308,o),
-(633.199,946,cs),
-(583.866,648,ls),
-(515.825,237,o),
-(761.458,-31,o),
-(1205.293,-32,c),
-(1212.908,14,l)
+(1606,-25,o),
+(1694,-7,o),
+(1796,38,c),
+(1780,82,l),
+(1683,39,o),
+(1605,21,o),
+(1506,21,cs),
+(1385,21,o),
+(1267,48,o),
+(1189,97,c),
+(984,202,o),
+(846,463,o),
+(896,768,cs),
+(946,1065,o),
+(1163,1271,o),
+(1423,1271,cs),
+(1680,1271,o),
+(1829,1078,o),
+(1782,796,cs),
+(1711,366,o),
+(1255,26,o),
+(746,26,cs),
+(276,26,o),
+(90,318,o),
+(160,741,cs),
+(232,1173,o),
+(515,1464,o),
+(853,1464,c),
+(858,1510,l),
+(490,1510,o),
+(190,1201,o),
+(115,747,cs),
+(40,293,o),
+(246,-20,o),
+(744,-20,cs),
+(1276,-20,o),
+(1752,336,o),
+(1827,790,cs),
+(1878,1099,o),
+(1712,1317,o),
+(1424,1317,cs),
+(1141,1317,o),
+(904,1094,o),
+(851,774,cs),
+(801,470,o),
+(930,190,o),
+(1145,77,c),
+(1232,12,o),
+(1360,-25,o),
+(1504,-25,cs)
);
}
);
-width = 1432;
+width = 1940;
}
);
+metricLeft = O;
+metricRight = L;
unicode = 1192;
userData = {
interface.gridadjust.original = "{'width': 2087, 'leftMargin': 153, 'rightMargin': 100}";
diff --git a/src/Inter-Roman.glyphspackage/fontinfo.plist b/src/Inter-Roman.glyphspackage/fontinfo.plist
index 947b80b68..a03e60fba 100644
--- a/src/Inter-Roman.glyphspackage/fontinfo.plist
+++ b/src/Inter-Roman.glyphspackage/fontinfo.plist
@@ -3462,11 +3462,11 @@ userData = {
GSCornerRadius = 16;
GSExtrudeAngle = 30;
GSExtrudeOffset = 15;
-GSOffsetHorizontal = 200;
+GSOffsetHorizontal = 210;
GSOffsetKeepCompatible = 1;
GSOffsetMakeStroke = 1;
GSOffsetPosition = 1;
-GSOffsetVertical = 156;
+GSOffsetVertical = 180;
};
}
);
diff --git a/src/Inter-Roman.glyphspackage/glyphs/H_aabkhasiancyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/H_aabkhasiancyrillic.glyph
index 9fe3660c2..700337a46 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/H_aabkhasiancyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/H_aabkhasiancyrillic.glyph
@@ -7,175 +7,508 @@ shapes = (
{
closed = 1;
nodes = (
-(1091,143,o),
-(838,364,o),
-(838,702,c),
-(838,962,ls),
-(838,1178,o),
-(945,1338,o),
-(1074,1338,c),
-(1201,1338,o),
-(1306,1187,o),
-(1306,960,c),
-(1306,680,ls),
-(1306,381,o),
-(1097,151,o),
-(788,152,cs),
-(532,151,o),
-(346,378,o),
-(346,674,cs),
-(346,878,ls),
-(346,1140,o),
-(468,1338,o),
-(626,1338,c),
-(626,1512,l),
-(349,1513,o),
-(166,1236,o),
-(166,876,cs),
-(166,674,ls),
-(166,282,o),
-(416,-20,o),
-(788,-20,cs),
-(1207,-20,o),
-(1487,285,o),
-(1486,680,cs),
-(1486,958,l),
-(1487,1280,o),
-(1321,1510,o),
-(1074,1510,c),
-(823,1510,o),
-(657,1271,o),
-(658,960,cs),
-(658,704,l),
-(657,271,o),
-(995,-29,o),
-(1498,-30,c),
-(1498,142,l)
+(1740,-21,o),
+(1831,8,o),
+(1905,43,c),
+(1852,189,l),
+(1767,152,o),
+(1693,140,o),
+(1625,140,cs),
+(1500,140,o),
+(1415,154,o),
+(1345,208,c),
+(1135,316,o),
+(1004,549,o),
+(1004,780,cs),
+(1004,1009,o),
+(1122,1153,o),
+(1310,1153,cs),
+(1494,1153,o),
+(1617,1016,o),
+(1617,797,cs),
+(1617,434,o),
+(1241,148,o),
+(845,148,cs),
+(502,148,o),
+(296,372,o),
+(296,744,cs),
+(296,1132,o),
+(510,1342,o),
+(781,1342,c),
+(781,1510,l),
+(400,1510,o),
+(122,1216,o),
+(122,744,cs),
+(122,276,o),
+(402,-20,o),
+(845,-20,cs),
+(1270,-20,o),
+(1797,261,o),
+(1797,797,cs),
+(1797,1105,o),
+(1596,1321,o),
+(1310,1321,cs),
+(1025,1321,o),
+(824,1105,o),
+(824,775,cs),
+(824,503,o),
+(961,262,o),
+(1174,118,c),
+(1273,30,o),
+(1448,-21,o),
+(1622,-21,cs)
);
}
);
-width = 1664;
+width = 2003;
},
{
-guides = (
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
{
-pos = (12,1240);
+closed = 1;
+nodes = (
+(1883,-21,o),
+(2083,-14,o),
+(2211,46,c),
+(2097,361,l),
+(1979,314,o),
+(1873,303,o),
+(1785,303,cs),
+(1717,303,o),
+(1654,305,o),
+(1595,347,c),
+(1392,410,o),
+(1254,589,o),
+(1254,793,cs),
+(1254,930,o),
+(1346,1037,o),
+(1462,1037,cs),
+(1579,1037,o),
+(1671,940,o),
+(1671,816,cs),
+(1671,528,o),
+(1381,332,o),
+(909,332,cs),
+(613,332,o),
+(506,477,o),
+(506,744,cs),
+(506,1012,o),
+(614,1158,o),
+(814,1158,c),
+(814,1510,l),
+(407,1510,o),
+(90,1242,o),
+(90,744,cs),
+(90,250,o),
+(406,-20,o),
+(909,-20,cs),
+(1582,-20,o),
+(2075,331,o),
+(2075,816,cs),
+(2075,1159,o),
+(1834,1381,o),
+(1462,1381,cs),
+(1091,1381,o),
+(850,1149,o),
+(850,793,cs),
+(850,535,o),
+(1009,310,o),
+(1180,161,c),
+(1382,59,o),
+(1594,-21,o),
+(1783,-21,cs)
+);
+}
+);
+width = 2279;
},
{
-pos = (12,764);
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1765,-25,o),
+(1850,-6,o),
+(1945,39,c),
+(1925,81,l),
+(1835,38,o),
+(1760,21,o),
+(1662,21,cs),
+(1540,21,o),
+(1417,49,o),
+(1332,98,c),
+(1109,203,o),
+(926,465,o),
+(926,771,cs),
+(926,1067,o),
+(1108,1271,o),
+(1366,1271,cs),
+(1625,1271,o),
+(1807,1076,o),
+(1807,793,cs),
+(1807,364,o),
+(1409,26,o),
+(901,26,cs),
+(430,26,o),
+(194,320,o),
+(194,744,cs),
+(194,1175,o),
+(428,1464,o),
+(766,1464,c),
+(766,1510,l),
+(398,1510,o),
+(148,1199,o),
+(148,744,cs),
+(148,291,o),
+(404,-20,o),
+(901,-20,cs),
+(1434,-20,o),
+(1853,338,o),
+(1853,793,cs),
+(1853,1101,o),
+(1652,1317,o),
+(1366,1317,cs),
+(1081,1317,o),
+(880,1092,o),
+(880,771,cs),
+(880,468,o),
+(1054,189,o),
+(1286,75,c),
+(1385,11,o),
+(1519,-25,o),
+(1662,-25,cs)
+);
}
);
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+width = 2073;
+},
+{
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(1860,185,l),
+(1775,148,o),
+(1701,136,o),
+(1633,136,cs),
+(1242,136,o),
+(996,456,o),
+(996,776,cs),
+(996,1005,o),
+(1114,1149,o),
+(1302,1149,cs),
+(1486,1149,o),
+(1609,1012,o),
+(1609,793,cs),
+(1609,430,o),
+(1233,144,o),
+(837,144,cs),
+(494,144,o),
+(270,358,o),
+(270,744,cs),
+(270,1132,o),
+(496,1346,o),
+(767,1346,c),
+(767,1514,l),
+(372,1514,o),
+(90,1193,o),
+(90,744,cs),
+(90,297,o),
+(370,-24,o),
+(837,-24,cs),
+(1262,-24,o),
+(1789,257,o),
+(1789,793,cs),
+(1789,1101,o),
+(1588,1317,o),
+(1302,1317,cs),
+(1017,1317,o),
+(816,1101,o),
+(816,771,cs),
+(816,333,o),
+(1170,-25,o),
+(1630,-25,cs),
+(1748,-25,o),
+(1839,4,o),
+(1913,39,c)
+);
+}
+);
+};
+layerId = m007;
shapes = (
{
closed = 1;
nodes = (
-(1315,288,o),
-(1088,509,o),
-(1088,762,c),
-(1088,962,ls),
-(1088,1108,o),
-(1127,1184,o),
-(1202,1184,c),
-(1278,1184,o),
-(1318,1098,o),
-(1318,934,c),
-(1318,738,ls),
-(1318,492,o),
-(1152,305,o),
-(890,306,cs),
-(652,305,o),
-(515,445,o),
-(514,646,cs),
-(514,934,ls),
-(515,1076,o),
-(582,1184,o),
-(696,1184,c),
-(696,1510,l),
-(337,1510,o),
-(93,1257,o),
-(94,934,cs),
-(94,646,ls),
-(93,271,o),
-(413,-20,o),
-(890,-20,cs),
-(1379,-20,o),
-(1713,308,o),
-(1714,738,cs),
-(1714,870,l),
-(1713,1245,o),
-(1498,1510,o),
-(1190,1510,c),
-(911,1510,o),
-(727,1271,o),
-(728,960,cs),
-(728,762,l),
-(727,311,o),
-(1126,0,o),
-(1722,0,c),
-(1722,288,l)
+(1732,-25,o),
+(1823,4,o),
+(1897,39,c),
+(1844,185,l),
+(1759,148,o),
+(1685,136,o),
+(1617,136,cs),
+(1492,136,o),
+(1407,150,o),
+(1337,204,c),
+(1127,312,o),
+(996,545,o),
+(996,776,cs),
+(996,1005,o),
+(1114,1149,o),
+(1302,1149,cs),
+(1486,1149,o),
+(1609,1012,o),
+(1609,793,cs),
+(1609,430,o),
+(1233,144,o),
+(837,144,cs),
+(483,144,o),
+(270,370,o),
+(270,744,cs),
+(270,1132,o),
+(496,1346,o),
+(767,1346,c),
+(767,1514,l),
+(372,1514,o),
+(90,1193,o),
+(90,744,cs),
+(90,280,o),
+(386,-24,o),
+(837,-24,cs),
+(1262,-24,o),
+(1789,257,o),
+(1789,793,cs),
+(1789,1101,o),
+(1588,1317,o),
+(1302,1317,cs),
+(1017,1317,o),
+(816,1101,o),
+(816,771,cs),
+(816,499,o),
+(953,258,o),
+(1166,114,c),
+(1265,26,o),
+(1440,-25,o),
+(1614,-25,cs)
);
}
);
-width = 1816;
+width = 1963;
},
{
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+guides = (
+{
+pos = (-134,1240);
+}
+);
+layerId = m009;
shapes = (
{
closed = 1;
nodes = (
-(944,15,o),
-(675,262,o),
-(674,648,cs),
-(674,948,ls),
-(675,1281,o),
-(788,1468,o),
-(988,1468,cs),
-(1188,1468,o),
-(1302,1281,o),
-(1302,948,cs),
-(1302,646,ls),
-(1302,262,o),
-(1095,26,o),
-(758,26,cs),
-(429,26,o),
-(243,251,o),
-(242,648,cs),
-(242,890,ls),
-(243,1241,o),
-(377,1468,o),
-(584,1470,c),
-(584,1516,l),
-(346,1514,o),
-(196,1269,o),
-(196,884,cs),
-(196,648,ls),
-(196,225,o),
-(403,-20,o),
-(758,-20,cs),
-(1121,-20,o),
-(1348,236,o),
-(1348,646,cs),
-(1348,942,ls),
-(1348,1307,o),
-(1217,1514,o),
-(988,1514,cs),
-(759,1514,o),
-(628,1308,o),
-(628,946,cs),
-(628,648,ls),
-(628,237,o),
-(918,-31,o),
-(1362,-32,c),
-(1362,14,l)
+(1883,-25,o),
+(2083,-18,o),
+(2211,42,c),
+(2057,377,l),
+(1939,330,o),
+(1889,319,o),
+(1801,319,cs),
+(1733,319,o),
+(1670,321,o),
+(1611,363,c),
+(1408,426,o),
+(1262,589,o),
+(1262,793,cs),
+(1262,927,o),
+(1349,1021,o),
+(1462,1021,cs),
+(1575,1021,o),
+(1663,936,o),
+(1663,816,cs),
+(1663,528,o),
+(1413,336,o),
+(909,336,cs),
+(597,336,o),
+(460,460,o),
+(460,744,cs),
+(460,1004,o),
+(571,1154,o),
+(764,1154,c),
+(764,1514,l),
+(326,1514,o),
+(40,1209,o),
+(40,744,cs),
+(40,251,o),
+(352,-24,o),
+(909,-24,cs),
+(1582,-24,o),
+(2075,331,o),
+(2075,816,cs),
+(2075,1159,o),
+(1834,1381,o),
+(1462,1381,cs),
+(1091,1381,o),
+(850,1149,o),
+(850,793,cs),
+(850,535,o),
+(972,310,o),
+(1180,161,c),
+(1344,20,o),
+(1594,-25,o),
+(1783,-25,cs)
);
}
);
-width = 1560;
+width = 2263;
},
{
-layerId = m007;
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(1732,-25,o),
+(1823,4,o),
+(1897,39,c),
+(1844,185,l),
+(1759,148,o),
+(1685,136,o),
+(1617,136,cs),
+(1492,136,o),
+(1407,150,o),
+(1337,204,c),
+(1127,312,o),
+(996,545,o),
+(996,776,cs),
+(996,1005,o),
+(1114,1149,o),
+(1302,1149,cs),
+(1486,1149,o),
+(1609,1012,o),
+(1609,793,cs),
+(1609,430,o),
+(1233,144,o),
+(837,144,cs),
+(483,144,o),
+(270,370,o),
+(270,744,cs),
+(270,1132,o),
+(496,1346,o),
+(767,1346,c),
+(767,1514,l),
+(372,1514,o),
+(90,1193,o),
+(90,744,cs),
+(90,280,o),
+(386,-24,o),
+(837,-24,cs),
+(1262,-24,o),
+(1789,257,o),
+(1789,793,cs),
+(1789,1101,o),
+(1588,1317,o),
+(1302,1317,cs),
+(1017,1317,o),
+(816,1101,o),
+(816,771,cs),
+(816,385,o),
+(1120,-25,o),
+(1614,-25,cs)
+);
+},
+{
+closed = 0;
+nodes = (
+(702,1510,l),
+(334,1510,o),
+(84,1199,o),
+(84,744,cs),
+(84,291,o),
+(333,-20,o),
+(702,-20,c)
+);
+},
+{
+closed = 0;
+nodes = (
+(702,26,l),
+(359,26,o),
+(130,320,o),
+(130,744,cs),
+(130,1175,o),
+(364,1464,o),
+(702,1464,c)
+);
+}
+);
+};
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1701,-25,o),
+(1786,-6,o),
+(1881,39,c),
+(1861,81,l),
+(1771,38,o),
+(1696,21,o),
+(1598,21,cs),
+(1476,21,o),
+(1353,49,o),
+(1268,98,c),
+(1045,203,o),
+(862,465,o),
+(862,771,cs),
+(862,1067,o),
+(1044,1271,o),
+(1302,1271,cs),
+(1561,1271,o),
+(1743,1076,o),
+(1743,793,cs),
+(1743,364,o),
+(1345,26,o),
+(837,26,cs),
+(366,26,o),
+(130,320,o),
+(130,744,cs),
+(130,1175,o),
+(364,1464,o),
+(702,1464,c),
+(702,1510,l),
+(334,1510,o),
+(84,1199,o),
+(84,744,cs),
+(84,291,o),
+(340,-20,o),
+(837,-20,cs),
+(1370,-20,o),
+(1789,338,o),
+(1789,793,cs),
+(1789,1101,o),
+(1588,1317,o),
+(1302,1317,cs),
+(1017,1317,o),
+(816,1092,o),
+(816,771,cs),
+(816,468,o),
+(990,189,o),
+(1222,75,c),
+(1321,11,o),
+(1455,-25,o),
+(1598,-25,cs)
+);
+}
+);
+width = 1945;
+},
+{
+associatedMasterId = m007;
+layerId = "808A8E09-7888-4881-84D5-7F405086C74C";
+name = "Oct 20, 22, 16:51";
shapes = (
{
closed = 1;
@@ -230,6 +563,343 @@ nodes = (
width = 1600;
},
{
+associatedMasterId = m007;
+layerId = "B1772C9E-6967-4B24-BBA8-341090FBFB6A";
+name = "Oct 20, 22, 17:00";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1860,185,l),
+(1775,148,o),
+(1701,136,o),
+(1633,136,cs),
+(1242,136,o),
+(996,456,o),
+(996,776,cs),
+(996,1005,o),
+(1114,1149,o),
+(1302,1149,cs),
+(1486,1149,o),
+(1609,1012,o),
+(1609,793,cs),
+(1609,430,o),
+(1233,144,o),
+(837,144,cs),
+(494,144,o),
+(270,358,o),
+(270,744,cs),
+(270,1132,o),
+(496,1346,o),
+(767,1346,c),
+(767,1514,l),
+(372,1514,o),
+(90,1193,o),
+(90,744,cs),
+(90,297,o),
+(370,-24,o),
+(837,-24,cs),
+(1262,-24,o),
+(1789,257,o),
+(1789,793,cs),
+(1789,1101,o),
+(1588,1317,o),
+(1302,1317,cs),
+(1017,1317,o),
+(816,1101,o),
+(816,771,cs),
+(816,333,o),
+(1170,-25,o),
+(1630,-25,cs),
+(1748,-25,o),
+(1839,4,o),
+(1913,39,c)
+);
+}
+);
+width = 1979;
+},
+{
+associatedMasterId = m011;
+layerId = "80A10AFC-6B98-47CF-BB0A-76C1BF563483";
+name = "Oct 20, 22, 17:05";
+shapes = (
+{
+closed = 1;
+nodes = (
+(880,15,o),
+(611,262,o),
+(610,648,cs),
+(610,948,ls),
+(611,1281,o),
+(724,1468,o),
+(924,1468,cs),
+(1124,1468,o),
+(1238,1281,o),
+(1238,948,cs),
+(1238,646,ls),
+(1238,262,o),
+(1031,26,o),
+(694,26,cs),
+(365,26,o),
+(179,251,o),
+(178,648,cs),
+(178,890,ls),
+(179,1241,o),
+(313,1468,o),
+(520,1470,c),
+(520,1516,l),
+(282,1514,o),
+(132,1269,o),
+(132,884,cs),
+(132,648,ls),
+(132,225,o),
+(339,-20,o),
+(694,-20,cs),
+(1057,-20,o),
+(1284,236,o),
+(1284,646,cs),
+(1284,942,ls),
+(1284,1307,o),
+(1153,1514,o),
+(924,1514,cs),
+(695,1514,o),
+(564,1308,o),
+(564,946,cs),
+(564,648,ls),
+(564,237,o),
+(854,-31,o),
+(1298,-32,c),
+(1298,14,l)
+);
+}
+);
+width = 1432;
+},
+{
+associatedMasterId = m011;
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(1732,-25,o),
+(1823,4,o),
+(1897,39,c),
+(1844,185,l),
+(1759,148,o),
+(1685,136,o),
+(1617,136,cs),
+(1492,136,o),
+(1407,150,o),
+(1337,204,c),
+(1127,312,o),
+(996,545,o),
+(996,776,cs),
+(996,1005,o),
+(1114,1149,o),
+(1302,1149,cs),
+(1486,1149,o),
+(1609,1012,o),
+(1609,793,cs),
+(1609,430,o),
+(1233,144,o),
+(837,144,cs),
+(483,144,o),
+(270,370,o),
+(270,744,cs),
+(270,1132,o),
+(496,1346,o),
+(767,1346,c),
+(767,1514,l),
+(372,1514,o),
+(90,1193,o),
+(90,744,cs),
+(90,280,o),
+(386,-24,o),
+(837,-24,cs),
+(1262,-24,o),
+(1789,257,o),
+(1789,793,cs),
+(1789,1101,o),
+(1588,1317,o),
+(1302,1317,cs),
+(1017,1317,o),
+(816,1101,o),
+(816,771,cs),
+(816,385,o),
+(1120,-25,o),
+(1614,-25,cs)
+);
+}
+);
+};
+layerId = "88DD94A9-AA53-44A1-8F5A-1F844252F97D";
+name = "Oct 20, 22, 17:05";
+shapes = (
+{
+closed = 0;
+nodes = (
+(837,-24,l),
+(1362,-24,o),
+(1789,343,o),
+(1789,793,cs),
+(1789,1101,o),
+(1588,1317,o),
+(1302,1317,cs),
+(1013,1317,o),
+(816,1096,o),
+(816,771,cs),
+(816,332,o),
+(1174,-25,o),
+(1614,-25,cs),
+(1717,-25,o),
+(1802,-6,o),
+(1897,39,c)
+);
+}
+);
+width = 1432;
+},
+{
+associatedMasterId = m011;
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(1732,-25,o),
+(1823,4,o),
+(1897,39,c),
+(1844,185,l),
+(1759,148,o),
+(1685,136,o),
+(1617,136,cs),
+(1492,136,o),
+(1407,150,o),
+(1337,204,c),
+(1127,312,o),
+(996,545,o),
+(996,776,cs),
+(996,1005,o),
+(1114,1149,o),
+(1302,1149,cs),
+(1486,1149,o),
+(1609,1012,o),
+(1609,793,cs),
+(1609,430,o),
+(1233,144,o),
+(837,144,cs),
+(483,144,o),
+(270,370,o),
+(270,744,cs),
+(270,1132,o),
+(496,1346,o),
+(767,1346,c),
+(767,1514,l),
+(372,1514,o),
+(90,1193,o),
+(90,744,cs),
+(90,280,o),
+(386,-24,o),
+(837,-24,cs),
+(1262,-24,o),
+(1789,257,o),
+(1789,793,cs),
+(1789,1101,o),
+(1588,1317,o),
+(1302,1317,cs),
+(1017,1317,o),
+(816,1101,o),
+(816,771,cs),
+(816,385,o),
+(1120,-25,o),
+(1614,-25,cs)
+);
+},
+{
+closed = 0;
+nodes = (
+(702,1510,l),
+(334,1510,o),
+(84,1199,o),
+(84,744,cs),
+(84,291,o),
+(333,-20,o),
+(702,-20,c)
+);
+},
+{
+closed = 0;
+nodes = (
+(702,26,l),
+(359,26,o),
+(130,320,o),
+(130,744,cs),
+(130,1175,o),
+(364,1464,o),
+(702,1464,c)
+);
+}
+);
+};
+layerId = "BB04D5C7-7D49-4BD4-A3F7-CC64A2A45DC2";
+name = "Oct 20, 22, 17:08";
+shapes = (
+{
+closed = 1;
+nodes = (
+(702,1510,l),
+(334,1510,o),
+(84,1199,o),
+(84,744,cs),
+(84,291,o),
+(340,-20,o),
+(837,-20,cs),
+(1370,-20,o),
+(1789,338,o),
+(1789,793,cs),
+(1789,1101,o),
+(1588,1317,o),
+(1302,1317,cs),
+(1017,1317,o),
+(816,1092,o),
+(816,771,cs),
+(816,325,o),
+(1167,-25,o),
+(1614,-25,cs),
+(1717,-25,o),
+(1802,-6,o),
+(1897,39,c),
+(1877,81,l),
+(1787,38,o),
+(1712,21,o),
+(1614,21,cs),
+(1193,21,o),
+(862,351,o),
+(862,771,cs),
+(862,1067,o),
+(1044,1271,o),
+(1302,1271,cs),
+(1561,1271,o),
+(1743,1076,o),
+(1743,793,cs),
+(1743,364,o),
+(1345,26,o),
+(837,26,cs),
+(366,26,o),
+(130,320,o),
+(130,744,cs),
+(130,1175,o),
+(364,1464,o),
+(702,1464,c)
+);
+}
+);
+width = 1961;
+},
+{
+associatedMasterId = m009;
guides = (
{
pos = (-84,1240);
@@ -238,7 +908,8 @@ pos = (-84,1240);
pos = (-84,764);
}
);
-layerId = m009;
+layerId = "028B1A6E-F61C-47D2-84EC-73EFC074785F";
+name = "Oct 20, 22, 17:10";
shapes = (
{
closed = 1;
@@ -293,61 +964,243 @@ nodes = (
width = 1784;
},
{
-layerId = m011;
+associatedMasterId = m009;
+background = {
shapes = (
{
closed = 1;
nodes = (
-(880,15,o),
-(611,262,o),
-(610,648,cs),
-(610,948,ls),
-(611,1281,o),
-(724,1468,o),
-(924,1468,cs),
-(1124,1468,o),
-(1238,1281,o),
-(1238,948,cs),
-(1238,646,ls),
-(1238,262,o),
-(1031,26,o),
-(694,26,cs),
-(365,26,o),
-(179,251,o),
-(178,648,cs),
-(178,890,ls),
-(179,1241,o),
-(313,1468,o),
-(520,1470,c),
-(520,1516,l),
-(282,1514,o),
-(132,1269,o),
-(132,884,cs),
-(132,648,ls),
-(132,225,o),
-(339,-20,o),
-(694,-20,cs),
-(1057,-20,o),
-(1284,236,o),
-(1284,646,cs),
-(1284,942,ls),
-(1284,1307,o),
-(1153,1514,o),
-(924,1514,cs),
-(695,1514,o),
-(564,1308,o),
-(564,946,cs),
-(564,648,ls),
-(564,237,o),
-(854,-31,o),
-(1298,-32,c),
-(1298,14,l)
+(1682,-25,o),
+(1773,4,o),
+(1847,39,c),
+(1794,185,l),
+(1709,148,o),
+(1635,136,o),
+(1567,136,cs),
+(1442,136,o),
+(1357,150,o),
+(1287,204,c),
+(1077,312,o),
+(946,545,o),
+(946,776,cs),
+(946,1005,o),
+(1064,1149,o),
+(1252,1149,cs),
+(1436,1149,o),
+(1559,1012,o),
+(1559,793,cs),
+(1559,430,o),
+(1183,144,o),
+(787,144,cs),
+(433,144,o),
+(220,370,o),
+(220,744,cs),
+(220,1132,o),
+(446,1346,o),
+(717,1346,c),
+(717,1514,l),
+(322,1514,o),
+(40,1193,o),
+(40,744,cs),
+(40,280,o),
+(336,-24,o),
+(787,-24,cs),
+(1212,-24,o),
+(1739,257,o),
+(1739,793,cs),
+(1739,1101,o),
+(1538,1317,o),
+(1252,1317,cs),
+(967,1317,o),
+(766,1101,o),
+(766,771,cs),
+(766,385,o),
+(1070,-25,o),
+(1564,-25,cs)
);
}
);
-width = 1432;
+};
+guides = (
+{
+pos = (-134,1240);
+},
+{
+pos = (-134,764);
+}
+);
+layerId = "473A4978-95B2-4F2C-9873-167B480F8391";
+name = "Oct 20, 22, 17:17";
+shapes = (
+{
+closed = 0;
+nodes = (
+(877,-24,l),
+(1569,-24,o),
+(2075,338,o),
+(2075,832,cs),
+(2075,1170,o),
+(1839,1381,o),
+(1462,1381,cs),
+(1086,1381,o),
+(850,1160,o),
+(850,809,cs),
+(850,328,o),
+(1275,-25,o),
+(1855,-25,cs),
+(1989,-25,o),
+(2089,-6,o),
+(2211,42,c)
+);
+},
+{
+closed = 0;
+nodes = (
+(764,1514,ls),
+(357,1514,o),
+(40,1242,o),
+(40,744,cs),
+(40,250,o),
+(357,-24,o),
+(764,-24,cs)
+);
+},
+{
+closed = 0;
+nodes = (
+(764,336,ls),
+(569,336,o),
+(460,487,o),
+(460,744,cs),
+(460,1002,o),
+(569,1154,o),
+(764,1154,cs)
+);
+}
+);
+width = 2295;
+},
+{
+associatedMasterId = m009;
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(1682,-25,o),
+(1773,4,o),
+(1847,39,c),
+(1794,185,l),
+(1709,148,o),
+(1635,136,o),
+(1567,136,cs),
+(1442,136,o),
+(1357,150,o),
+(1287,204,c),
+(1077,312,o),
+(946,545,o),
+(946,776,cs),
+(946,1005,o),
+(1064,1149,o),
+(1252,1149,cs),
+(1436,1149,o),
+(1559,1012,o),
+(1559,793,cs),
+(1559,430,o),
+(1183,144,o),
+(787,144,cs),
+(433,144,o),
+(220,370,o),
+(220,744,cs),
+(220,1132,o),
+(446,1346,o),
+(717,1346,c),
+(717,1514,l),
+(322,1514,o),
+(40,1193,o),
+(40,744,cs),
+(40,280,o),
+(336,-24,o),
+(787,-24,cs),
+(1212,-24,o),
+(1739,257,o),
+(1739,793,cs),
+(1739,1101,o),
+(1538,1317,o),
+(1252,1317,cs),
+(967,1317,o),
+(766,1101,o),
+(766,771,cs),
+(766,385,o),
+(1070,-25,o),
+(1564,-25,cs)
+);
+}
+);
+};
+guides = (
+{
+pos = (-134,1240);
+}
+);
+layerId = "DDA27FAA-A503-425A-B157-17BD5B2DF33A";
+name = "Oct 20, 22, 17:22";
+shapes = (
+{
+closed = 1;
+nodes = (
+(764,1514,l),
+(326,1514,o),
+(40,1209,o),
+(40,744,cs),
+(40,251,o),
+(352,-24,o),
+(909,-24,cs),
+(1582,-24,o),
+(2075,331,o),
+(2075,816,cs),
+(2075,1159,o),
+(1834,1381,o),
+(1462,1381,cs),
+(1091,1381,o),
+(850,1149,o),
+(850,793,cs),
+(850,331,o),
+(1241,-25,o),
+(1815,-25,cs),
+(1963,-25,o),
+(2099,-2,o),
+(2211,42,c),
+(2057,377,l),
+(1976,345,o),
+(1917,335,o),
+(1801,335,cs),
+(1498,335,o),
+(1270,531,o),
+(1270,793,cs),
+(1270,927,o),
+(1349,1021,o),
+(1462,1021,cs),
+(1575,1021,o),
+(1655,936,o),
+(1655,816,cs),
+(1655,528,o),
+(1381,336,o),
+(909,336,cs),
+(597,336,o),
+(460,460,o),
+(460,744,cs),
+(460,1004,o),
+(571,1154,o),
+(764,1154,c)
+);
+}
+);
+width = 2295;
}
);
+metricLeft = O;
+metricRight = L;
tags = (
"TODO-opsz"
);