summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Andersson <rasmus@notion.se>2022-10-21 02:50:35 +0300
committerRasmus Andersson <rasmus@notion.se>2022-10-21 02:50:35 +0300
commite6488b7479c2e7efc50f5090fc8b2d40f7d177f1 (patch)
treeb5f6a3f4ca3b3fa4a53a7fb503e445db5c8863a9
parentf5d92da0b818ecc81da4d46ae858f883a425d4ba (diff)
downloadinter-e6488b7479c2e7efc50f5090fc8b2d40f7d177f1.tar.xz
improvements to /haabkhasiancyrillic
-rw-r--r--src/Inter-Italic.glyphspackage/glyphs/haabkhasiancyrillic.glyph586
-rw-r--r--src/Inter-Roman.glyphspackage/fontinfo.plist4
-rw-r--r--src/Inter-Roman.glyphspackage/glyphs/haabkhasiancyrillic.glyph1257
3 files changed, 1373 insertions, 474 deletions
diff --git a/src/Inter-Italic.glyphspackage/glyphs/haabkhasiancyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/haabkhasiancyrillic.glyph
index 84b80e03f..d9cc26b67 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/haabkhasiancyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/haabkhasiancyrillic.glyph
@@ -5,173 +5,194 @@ kernRight = e;
layers = (
{
layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
-(806,148,o),
-(628,326,o),
-(670,574,cs),
-(690,706,ls),
-(716,861,o),
-(797,972,o),
-(884,972,cs),
-(969,972,o),
-(1012,855,o),
-(984,686,cs),
-(962,552,ls),
-(922,320,o),
-(739,140,o),
-(532,140,cs),
-(349,140,o),
-(241,332,o),
-(282,574,cs),
-(294,654,ls),
-(326,832,o),
-(431,969,o),
-(526,968,c),
-(552,1128,l),
-(343,1129,o),
-(169,925,o),
-(122,654,cs),
-(110,574,ls),
-(55,239,o),
-(209,-20,o),
-(506,-20,cs),
-(823,-20,o),
-(1079,227,o),
-(1134,552,cs),
-(1154,684,ls),
-(1199,937,o),
-(1108,1132,o),
-(910,1132,cs),
-(713,1132,o),
-(561,954,o),
-(518,704,cs),
-(498,576,ls),
-(442,244,o),
-(666,-12,o),
-(1094,-12,c),
-(1120,148,l)
+(954,-24,o),
+(1365,174,o),
+(1428,554,cs),
+(1468,800,o),
+(1332,982,o),
+(1094,982,cs),
+(857,982,o),
+(660,800,o),
+(620,554,cs),
+(583,334,o),
+(673,168,o),
+(818,81,c),
+(924,19,o),
+(1057,-16,o),
+(1189,-16,cs),
+(1276,-16,o),
+(1363,-5,o),
+(1454,36,c),
+(1426,166,l),
+(1361,138,o),
+(1290,120,o),
+(1213,120,cs),
+(1158,120,o),
+(1091,123,o),
+(1029,155,c),
+(885,209,o),
+(755,332,o),
+(792,554,cs),
+(819,717,o),
+(930,828,o),
+(1068,828,cs),
+(1207,828,o),
+(1283,717,o),
+(1256,554,cs),
+(1203,236,o),
+(843,130,o),
+(620,130,cs),
+(352,130,o),
+(232,287,o),
+(275,552,cs),
+(313,777,o),
+(451,978,o),
+(680,978,c),
+(705,1132,l),
+(403,1132,o),
+(161,902,o),
+(103,552,cs),
+(43,188,o),
+(223,-24,o),
+(594,-24,cs)
);
}
);
-width = 1292;
+width = 1622;
},
{
guides = (
{
-pos = (1408,2860);
+pos = (73,2860);
}
);
layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
-(1088,125,o),
-(919,285,o),
-(952,468,cs),
-(986,686,ls),
-(1001,768,o),
-(1041,817,o),
-(1094,818,cs),
-(1143,817,o),
-(1169,768,o),
-(1154,686,cs),
-(1120,468,ls),
-(1103,364,o),
-(969,262,o),
-(792,262,cs),
-(640,262,o),
-(559,372,o),
-(578,492,cs),
-(608,658,ls),
-(623,751,o),
-(669,803,o),
-(738,824,c),
-(792,1132,l),
-(483,1132,o),
-(247,928,o),
-(204,658,cs),
-(174,492,ls),
-(125,198,o),
-(355,-20,o),
-(744,-20,cs),
-(1146,-20,o),
-(1446,177,o),
-(1490,440,cs),
-(1524,654,ls),
-(1568,922,o),
-(1440,1132,o),
-(1202,1132,cs),
-(977,1132,o),
-(794,945,o),
-(756,724,cs),
-(718,492,ls),
-(669,192,o),
-(849,-41,o),
-(1410,-40,c),
-(1438,126,l)
+(1078,-20,o),
+(1558,253,o),
+(1608,554,cs),
+(1649,801,o),
+(1490,966,o),
+(1215,966,cs),
+(943,966,o),
+(721,801,o),
+(677,538,cs),
+(650,375,o),
+(722,244,o),
+(831,138,c),
+(940,26,o),
+(1112,-20,o),
+(1332,-20,cs),
+(1445,-20,o),
+(1598,-8,o),
+(1706,39,c),
+(1627,320,l),
+(1560,285,o),
+(1485,259,o),
+(1433,259,cs),
+(1357,259,o),
+(1281,273,o),
+(1234,295,c),
+(1092,333,o),
+(1058,423,o),
+(1076,532,cs),
+(1089,610,o),
+(1120,654,o),
+(1163,654,cs),
+(1207,654,o),
+(1226,616,o),
+(1215,548,cs),
+(1186,376,o),
+(1068,272,o),
+(803,272,cs),
+(517,272,o),
+(443,383,o),
+(472,558,cs),
+(502,734,o),
+(611,832,o),
+(718,832,c),
+(767,1132,l),
+(403,1132,o),
+(119,899,o),
+(62,556,cs),
+(5,212,o),
+(207,-20,o),
+(695,-20,cs)
);
}
);
-width = 1694;
+width = 1835;
},
{
layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
shapes = (
{
closed = 1;
nodes = (
-(527,46,o),
-(363,199,o),
-(414,512,cs),
-(442,678,ls),
-(487,953,o),
-(583,1087,o),
-(742,1086,cs),
-(894,1084,o),
-(940,961,o),
-(892,672,cs),
-(864,504,ls),
-(814,199,o),
-(648,28,o),
-(398,26,cs),
-(148,25,o),
-(42,191,o),
-(94,506,cs),
-(114,626,ls),
-(159,892,o),
-(281,1082,o),
-(408,1082,c),
-(414,1128,l),
-(252,1127,o),
-(120,935,o),
-(68,626,cs),
-(48,506,ls),
-(-7,170,o),
-(120,-20,o),
-(398,-20,cs),
-(671,-20,o),
-(855,168,o),
-(910,506,cs),
-(938,672,ls),
-(990,982,o),
-(927,1132,o),
-(740,1132,cs),
-(556,1132,o),
-(447,988,o),
-(396,678,cs),
-(368,512,ls),
-(313,180,o),
-(500,0,o),
-(904,0,c),
-(910,46,l)
+(987,-24,o),
+(1316,219,o),
+(1371,551,cs),
+(1412,803,o),
+(1269,982,o),
+(1034,982,cs),
+(802,982,o),
+(605,807,o),
+(564,557,cs),
+(525,326,o),
+(638,128,o),
+(849,36,c),
+(929,-10,o),
+(1049,-24,o),
+(1134,-24,cs),
+(1223,-24,o),
+(1303,-10,o),
+(1399,35,c),
+(1382,78,l),
+(1292,36,o),
+(1238,22,o),
+(1136,22,cs),
+(1080,22,o),
+(979,25,o),
+(913,56,c),
+(689,137,o),
+(572,328,o),
+(609,551,cs),
+(646,776,o),
+(821,936,o),
+(1032,936,cs),
+(1242,936,o),
+(1362,780,o),
+(1326,557,cs),
+(1274,245,o),
+(963,22,o),
+(618,22,cs),
+(270,22,o),
+(125,250,o),
+(175,553,cs),
+(225,857,o),
+(446,1088,o),
+(683,1088,c),
+(687,1134,l),
+(424,1134,o),
+(184,887,o),
+(130,559,cs),
+(75,228,o),
+(240,-24,o),
+(616,-24,cs)
);
}
);
-width = 1050;
+width = 1582;
},
{
layerId = m008;
@@ -180,60 +201,65 @@ shapes = (
{
closed = 1;
nodes = (
-(778.091,148,o),
-(600.559,326,o),
-(641.615,574,cs),
-(663.468,706,ls),
-(689.293,862,o),
-(769.504,972,o),
-(855.504,972,cs),
-(942.504,972,o),
-(984.969,854,o),
-(956.157,686,cs),
-(933.973,552,ls),
-(896.566,320,o),
-(712.767,140,o),
-(505.767,140,cs),
-(322.767,140,o),
-(214.552,332,o),
-(255.615,574,cs),
-(268.859,654,ls),
-(297.327,832,o),
-(405.007,969,o),
-(500.842,968,c),
-(527.329,1128,l),
-(317.495,1129,o),
-(141.723,925,o),
-(96.859,654,cs),
-(83.615,574,ls),
-(28.156,239,o),
-(182.279,-20,o),
-(479.279,-20,cs),
-(796.279,-20,o),
-(1053.17,227,o),
-(1105.973,552,cs),
-(1127.826,684,ls),
-(1170.71,937,o),
-(1079.992,1132,o),
-(881.992,1132,cs),
-(684.992,1132,o),
-(533.524,954,o),
-(491.137,704,cs),
-(469.946,576,ls),
-(415.984,244,o),
-(637.604,-12,o),
-(1064.604,-12,c),
-(1091.091,148,l)
+(932,-24,o),
+(1319,160,o),
+(1381,535,cs),
+(1423,787,o),
+(1280,966,o),
+(1037,966,cs),
+(805,966,o),
+(617,799,o),
+(577,557,cs),
+(541,344,o),
+(635,172,o),
+(794,76,c),
+(882,5,o),
+(1004,-24,o),
+(1139,-24,cs),
+(1228,-24,o),
+(1321,-8,o),
+(1415,34,c),
+(1377,168,l),
+(1303,137,o),
+(1248,118,o),
+(1141,118,cs),
+(1087,118,o),
+(1004,122,o),
+(959,138,c),
+(805,221,o),
+(715,352,o),
+(745,535,cs),
+(773,703,o),
+(885,812,o),
+(1032,812,cs),
+(1170,812,o),
+(1239,715,o),
+(1213,557,cs),
+(1169,296,o),
+(925,130,o),
+(581,130,cs),
+(296,130,o),
+(203,280,o),
+(242,515,cs),
+(283,762,o),
+(434,926,o),
+(633,926,c),
+(648,1080,l),
+(355,1080,o),
+(126,856,o),
+(73,537,cs),
+(19,210,o),
+(188,-24,o),
+(577,-24,cs)
);
}
);
-width = 1228;
+width = 1553;
},
{
guides = (
{
-angle = -9.4;
-pos = (-72,2860);
+pos = (104,2860);
}
);
layerId = m010;
@@ -242,54 +268,60 @@ shapes = (
{
closed = 1;
nodes = (
-(1077.284,125,o),
-(909.772,285,o),
-(940.067,468,cs),
-(976.157,686,ls),
-(989.732,768,o),
-(1029.844,817,o),
-(1082.009,818,cs),
-(1133.844,817,o),
-(1157.732,768,o),
-(1144.157,686,cs),
-(1108.067,468,ls),
-(1091.85,364,o),
-(956.964,262,o),
-(779.964,262,cs),
-(628.964,262,o),
-(549.174,372,o),
-(568.04,492,cs),
-(595.521,658,ls),
-(611.917,751,o),
-(657.526,803,o),
-(729.002,824,c),
-(779.992,1132,l),
-(472.992,1132,o),
-(236.22,928,o),
-(191.521,658,cs),
-(164.04,492,ls),
-(115.369,198,o),
-(343.279,-20,o),
-(733.279,-20,cs),
-(1134.279,-20,o),
-(1435.892,177,o),
-(1479.432,440,cs),
-(1514.859,654,ls),
-(1558.226,922,o),
-(1429.992,1132,o),
-(1189.992,1132,cs),
-(967.992,1132,o),
-(783.034,945,o),
-(746.448,724,cs),
-(708.04,492,ls),
-(657.376,192,o),
-(837.803,-41,o),
-(1399.968,-40,c),
-(1427.449,126,l)
+(1134,-24,o),
+(1525,219,o),
+(1577,528,cs),
+(1620,788,o),
+(1453,966,o),
+(1168,966,cs),
+(906,966,o),
+(696,814,o),
+(655,564,cs),
+(626,389,o),
+(710,238,o),
+(839,139,c),
+(938,26,o),
+(1105,-24,o),
+(1325,-24,cs),
+(1460,-24,o),
+(1605,-4,o),
+(1688,31,c),
+(1588,322,l),
+(1492,282,o),
+(1446,265,o),
+(1371,265,cs),
+(1302,265,o),
+(1240,276,o),
+(1180,287,c),
+(1055,334,o),
+(1031,420,o),
+(1046,514,cs),
+(1061,605,o),
+(1096,654,o),
+(1149,654,cs),
+(1183,654,o),
+(1200,621,o),
+(1191,566,cs),
+(1160,381,o),
+(968,280,o),
+(725,280,cs),
+(516,280,o),
+(420,345,o),
+(448,510,cs),
+(473,661,o),
+(569,768,o),
+(689,768,c),
+(719,1080,l),
+(361,1080,o),
+(105,878,o),
+(52,562,cs),
+(-12,176,o),
+(264,-24,o),
+(688,-24,cs)
);
}
);
-width = 1662;
+width = 1818;
},
{
layerId = m012;
@@ -298,56 +330,64 @@ shapes = (
{
closed = 1;
nodes = (
-(501.205,46,o),
-(300.223,179,o),
-(355.351,512,cs),
-(382.832,678,ls),
-(427.862,950,o),
-(520.542,1087,o),
-(676.376,1086,cs),
-(832.045,1084,o),
-(879.689,955,o),
-(831.839,672,cs),
-(804.027,504,ls),
-(753.21,191,o),
-(586.226,28,o),
-(340.894,26,cs),
-(99.729,25,o),
-(-16.459,193,o),
-(36.358,506,cs),
-(56.224,626,ls),
-(100.419,899,o),
-(223.714,1082,o),
-(347.714,1082,c),
-(355.329,1128,l),
-(202.164,1127,o),
-(59.385,929,o),
-(8.224,626,cs),
-(-11.642,506,ls),
-(-67.26,164,o),
-(62.279,-20,o),
-(333.279,-20,cs),
-(603.279,-20,o),
-(795.071,166,o),
-(852.358,506,cs),
-(879.839,672,ls),
-(930.325,983,o),
-(866.992,1132,o),
-(683.992,1132,cs),
-(500.992,1132,o),
-(386.159,982,o),
-(336.832,678,cs),
-(309.351,512,ls),
-(248.919,153,o),
-(465.59,0,o),
-(842.59,0,c),
-(850.205,46,l)
+(923,-24,o),
+(1252,219,o),
+(1307,551,cs),
+(1348,803,o),
+(1205,982,o),
+(970,982,cs),
+(738,982,o),
+(541,807,o),
+(500,557,cs),
+(461,326,o),
+(574,128,o),
+(785,36,c),
+(865,-10,o),
+(985,-24,o),
+(1070,-24,cs),
+(1159,-24,o),
+(1239,-10,o),
+(1335,35,c),
+(1318,78,l),
+(1228,36,o),
+(1174,22,o),
+(1072,22,cs),
+(1016,22,o),
+(915,25,o),
+(849,56,c),
+(625,137,o),
+(508,328,o),
+(545,551,cs),
+(582,776,o),
+(757,936,o),
+(968,936,cs),
+(1178,936,o),
+(1298,780,o),
+(1262,557,cs),
+(1210,245,o),
+(899,22,o),
+(554,22,cs),
+(206,22,o),
+(61,250,o),
+(111,553,cs),
+(161,857,o),
+(382,1088,o),
+(619,1088,c),
+(623,1134,l),
+(360,1134,o),
+(120,887,o),
+(66,559,cs),
+(11,228,o),
+(176,-24,o),
+(552,-24,cs)
);
}
);
-width = 922;
+width = 1460;
}
);
+metricLeft = o;
+metricRight = t;
unicode = 1193;
userData = {
interface.gridadjust.original = "{'width': 1705.0, 'leftMargin': 149, 'rightMargin': 73.0}";
diff --git a/src/Inter-Roman.glyphspackage/fontinfo.plist b/src/Inter-Roman.glyphspackage/fontinfo.plist
index a03e60fba..947b80b68 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 = 210;
+GSOffsetHorizontal = 200;
GSOffsetKeepCompatible = 1;
GSOffsetMakeStroke = 1;
GSOffsetPosition = 1;
-GSOffsetVertical = 180;
+GSOffsetVertical = 156;
};
}
);
diff --git a/src/Inter-Roman.glyphspackage/glyphs/haabkhasiancyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/haabkhasiancyrillic.glyph
index 0ab39bbca..f631ce5e5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/haabkhasiancyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/haabkhasiancyrillic.glyph
@@ -9,59 +9,65 @@ shapes = (
{
closed = 1;
nodes = (
-(873,148,o),
-(666,326,o),
-(666,574,cs),
-(666,706,ls),
-(666,862,o),
-(728,972,o),
-(814,972,cs),
-(901,972,o),
-(963,854,o),
-(962,686,cs),
-(962,552,ls),
-(963,320,o),
-(809,140,o),
-(602,140,cs),
-(419,140,o),
-(279,332,o),
-(280,574,cs),
-(280,654,ls),
-(279,832,o),
-(364,969,o),
-(460,968,c),
-(460,1128,l),
-(250,1129,o),
-(108,925,o),
-(108,654,cs),
-(108,574,ls),
-(108,239,o),
-(305,-20,o),
-(602,-20,cs),
-(919,-20,o),
-(1135,227,o),
-(1134,552,cs),
-(1134,684,ls),
-(1135,937,o),
-(1012,1132,o),
-(814,1132,cs),
-(617,1132,o),
-(495,954,o),
-(494,704,cs),
-(494,576,ls),
-(495,244,o),
-(759,-12,o),
-(1186,-12,c),
-(1186,148,l)
+(1050,-24,o),
+(1428,174,o),
+(1428,554,cs),
+(1428,800,o),
+(1261,982,o),
+(1023,982,cs),
+(786,982,o),
+(620,800,o),
+(620,554,cs),
+(620,334,o),
+(737,168,o),
+(897,81,c),
+(1013,19,o),
+(1152,-16,o),
+(1284,-16,cs),
+(1371,-16,o),
+(1456,-5,o),
+(1540,36,c),
+(1491,166,l),
+(1430,138,o),
+(1362,120,o),
+(1285,120,cs),
+(1230,120,o),
+(1163,123,o),
+(1096,155,c),
+(943,209,o),
+(792,332,o),
+(792,554,cs),
+(792,717,o),
+(885,828,o),
+(1023,828,cs),
+(1162,828,o),
+(1256,717,o),
+(1256,554,cs),
+(1256,236,o),
+(913,130,o),
+(690,130,cs),
+(422,130,o),
+(276,287,o),
+(276,552,cs),
+(276,777,o),
+(381,978,o),
+(610,978,c),
+(610,1132,l),
+(308,1132,o),
+(104,902,o),
+(104,552,cs),
+(104,188,o),
+(319,-24,o),
+(690,-24,cs)
);
}
);
-width = 1292;
+width = 1620;
},
{
guides = (
{
-pos = (24,2860);
+pos = (72,2860);
}
);
layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -69,54 +75,60 @@ shapes = (
{
closed = 1;
nodes = (
-(1160,125,o),
-(966,285,o),
-(966,468,cs),
-(966,686,ls),
-(966,768,o),
-(998,817,o),
-(1050,818,cs),
-(1102,817,o),
-(1134,768,o),
-(1134,686,cs),
-(1134,468,ls),
-(1135,364,o),
-(1017,262,o),
-(840,262,cs),
-(689,262,o),
-(591,372,o),
-(590,492,cs),
-(590,658,ls),
-(591,751,o),
-(628,803,o),
-(696,824,c),
-(696,1132,l),
-(389,1132,o),
-(186,928,o),
-(186,658,cs),
-(186,492,ls),
-(186,198,o),
-(450,-20,o),
-(840,-20,cs),
-(1241,-20,o),
-(1510,177,o),
-(1510,440,cs),
-(1510,654,ls),
-(1509,922,o),
-(1346,1132,o),
-(1106,1132,cs),
-(884,1132,o),
-(730,945,o),
-(730,724,cs),
-(730,492,ls),
-(729,192,o),
-(948,-41,o),
-(1510,-40,c),
-(1510,126,l)
+(1173,-20,o),
+(1608,253,o),
+(1608,554,cs),
+(1608,801,o),
+(1422,966,o),
+(1147,966,cs),
+(875,966,o),
+(680,801,o),
+(680,538,cs),
+(680,375,o),
+(774,244,o),
+(900,138,c),
+(1028,26,o),
+(1207,-20,o),
+(1427,-20,cs),
+(1540,-20,o),
+(1691,-8,o),
+(1792,39,c),
+(1666,320,l),
+(1605,285,o),
+(1534,259,o),
+(1482,259,cs),
+(1406,259,o),
+(1328,273,o),
+(1277,295,c),
+(1129,333,o),
+(1080,423,o),
+(1080,532,cs),
+(1080,610,o),
+(1104,654,o),
+(1147,654,cs),
+(1191,654,o),
+(1216,616,o),
+(1216,548,cs),
+(1216,376,o),
+(1115,272,o),
+(850,272,cs),
+(564,272,o),
+(472,383,o),
+(472,558,cs),
+(472,734,o),
+(565,832,o),
+(672,832,c),
+(672,1132,l),
+(308,1132,o),
+(62,899,o),
+(62,556,cs),
+(62,212,o),
+(302,-20,o),
+(790,-20,cs)
);
}
);
-width = 1694;
+width = 1834;
},
{
layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -124,80 +136,335 @@ shapes = (
{
closed = 1;
nodes = (
-(645,46,o),
-(422,179,o),
-(422,512,cs),
-(422,678,ls),
-(422,950,o),
-(492,1087,o),
-(648,1086,cs),
-(804,1084,o),
-(873,955,o),
-(872,672,cs),
-(872,504,ls),
-(873,191,o),
-(733,28,o),
-(488,26,cs),
-(247,25,o),
-(103,193,o),
-(104,506,cs),
-(104,626,ls),
-(103,899,o),
-(196,1082,o),
-(320,1082,c),
-(320,1128,l),
-(167,1127,o),
-(57,929,o),
-(56,626,cs),
-(56,506,ls),
-(57,164,o),
-(217,-20,o),
-(488,-20,cs),
-(758,-20,o),
-(919,166,o),
-(920,506,cs),
-(920,672,ls),
-(919,983,o),
-(831,1132,o),
-(648,1132,cs),
-(465,1132,o),
-(375,982,o),
-(376,678,cs),
-(376,512,ls),
-(375,153,o),
-(617,0,o),
-(994,0,c),
-(994,46,l)
+(1082,-24,o),
+(1372,221,o),
+(1372,554,cs),
+(1372,805,o),
+(1201,982,o),
+(967,982,cs),
+(734,982,o),
+(564,805,o),
+(564,554,cs),
+(564,324,o),
+(708,127,o),
+(933,35,c),
+(1022,-11,o),
+(1144,-24,o),
+(1228,-24,cs),
+(1318,-24,o),
+(1396,-9,o),
+(1484,36,c),
+(1464,77,l),
+(1380,35,o),
+(1329,22,o),
+(1228,22,cs),
+(1171,22,o),
+(1069,26,o),
+(999,57,c),
+(760,138,o),
+(610,330,o),
+(610,554,cs),
+(610,778,o),
+(757,936,o),
+(967,936,cs),
+(1178,936,o),
+(1326,778,o),
+(1326,554,cs),
+(1326,243,o),
+(1054,22,o),
+(710,22,cs),
+(361,22,o),
+(176,252,o),
+(176,556,cs),
+(176,859,o),
+(357,1088,o),
+(594,1088,c),
+(594,1134,l),
+(330,1134,o),
+(130,885,o),
+(130,556,cs),
+(130,226,o),
+(335,-24,o),
+(710,-24,cs)
);
}
);
-width = 1050;
+width = 1582;
},
{
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(1018,-24,o),
+(1380,166,o),
+(1380,546,cs),
+(1380,793,o),
+(1213,966,o),
+(975,966,cs),
+(738,966,o),
+(572,793,o),
+(572,546,cs),
+(572,338,o),
+(690,169,o),
+(860,70,c),
+(965,2,o),
+(1090,-24,o),
+(1220,-24,cs),
+(1314,-24,o),
+(1405,-6,o),
+(1492,36,c),
+(1443,166,l),
+(1373,135,o),
+(1329,118,o),
+(1244,118,cs),
+(1174,118,o),
+(1100,123,o),
+(1040,151,c),
+(862,213,o),
+(744,358,o),
+(744,546,cs),
+(744,709,o),
+(833,812,o),
+(975,812,cs),
+(1118,812,o),
+(1208,709,o),
+(1208,546,cs),
+(1208,290,o),
+(996,130,o),
+(658,130,cs),
+(367,130,o),
+(244,286,o),
+(244,526,cs),
+(244,768,o),
+(363,926,o),
+(562,926,c),
+(562,1080,l),
+(269,1080,o),
+(72,850,o),
+(72,526,cs),
+(72,204,o),
+(274,-24,o),
+(658,-24,cs)
+);
+}
+);
+};
layerId = m007;
shapes = (
{
closed = 1;
nodes = (
+(1018,-24,o),
+(1380,166,o),
+(1380,546,cs),
+(1380,793,o),
+(1213,966,o),
+(975,966,cs),
+(738,966,o),
+(572,793,o),
+(572,546,cs),
+(572,338,o),
+(690,169,o),
+(860,70,c),
+(965,2,o),
+(1090,-24,o),
+(1220,-24,cs),
+(1314,-24,o),
+(1405,-6,o),
+(1492,36,c),
+(1443,166,l),
+(1373,135,o),
+(1321,118,o),
+(1220,118,cs),
+(1160,118,o),
+(1076,124,o),
+(1033,143,c),
+(861,224,o),
+(744,358,o),
+(744,546,cs),
+(744,709,o),
+(833,812,o),
+(975,812,cs),
+(1118,812,o),
+(1208,709,o),
+(1208,546,cs),
+(1208,290,o),
+(996,130,o),
+(658,130,cs),
+(367,130,o),
+(244,286,o),
+(244,526,cs),
+(244,768,o),
+(363,926,o),
+(562,926,c),
+(562,1080,l),
+(269,1080,o),
+(72,850,o),
+(72,526,cs),
+(72,204,o),
+(274,-24,o),
+(658,-24,cs)
+);
+}
+);
+width = 1548;
+},
+{
+guides = (
+{
+pos = (-56,2860);
+}
+);
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1269,-24,o),
+(1576,253,o),
+(1576,554,cs),
+(1576,801,o),
+(1390,966,o),
+(1115,966,cs),
+(843,966,o),
+(648,801,o),
+(648,538,cs),
+(648,376,o),
+(749,230,o),
+(887,122,c),
+(1013,17,o),
+(1185,-24,o),
+(1395,-24,cs),
+(1540,-24,o),
+(1683,1,o),
+(1760,36,c),
+(1634,317,l),
+(1541,277,o),
+(1499,265,o),
+(1434,265,cs),
+(1355,265,o),
+(1291,280,o),
+(1239,295,c),
+(1096,338,o),
+(1048,433,o),
+(1048,540,cs),
+(1048,618,o),
+(1072,654,o),
+(1115,654,cs),
+(1159,654,o),
+(1184,608,o),
+(1184,540,cs),
+(1184,368,o),
+(1019,280,o),
+(786,280,cs),
+(567,280,o),
+(450,358,o),
+(450,536,cs),
+(450,674,o),
+(518,768,o),
+(638,768,c),
+(638,1080,l),
+(279,1080,o),
+(46,865,o),
+(46,536,cs),
+(46,163,o),
+(344,-24,o),
+(758,-24,cs)
+);
+}
+);
+width = 1808;
+},
+{
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1018,-24,o),
+(1308,221,o),
+(1308,554,cs),
+(1308,805,o),
+(1137,982,o),
+(903,982,cs),
+(670,982,o),
+(500,805,o),
+(500,554,cs),
+(500,324,o),
+(644,127,o),
+(869,35,c),
+(958,-11,o),
+(1080,-24,o),
+(1164,-24,cs),
+(1254,-24,o),
+(1332,-9,o),
+(1420,36,c),
+(1400,77,l),
+(1316,35,o),
+(1265,22,o),
+(1164,22,cs),
+(1107,22,o),
+(1005,26,o),
+(935,57,c),
+(696,138,o),
+(546,330,o),
+(546,554,cs),
+(546,778,o),
+(693,936,o),
+(903,936,cs),
+(1114,936,o),
+(1262,778,o),
+(1262,554,cs),
+(1262,243,o),
+(990,22,o),
+(646,22,cs),
+(297,22,o),
+(112,252,o),
+(112,556,cs),
+(112,859,o),
+(293,1088,o),
+(530,1088,c),
+(530,1134,l),
+(266,1134,o),
+(66,885,o),
+(66,556,cs),
+(66,226,o),
+(271,-24,o),
+(646,-24,cs)
+);
+}
+);
+width = 1454;
+},
+{
+associatedMasterId = m007;
+layerId = "1961C0F6-4C66-4BF6-9305-F1FA6BCA63CC";
+name = "Oct 20, 22, 15:43";
+shapes = (
+{
+closed = 1;
+nodes = (
(841,148,o),
-(634,326,o),
-(634,574,cs),
-(634,706,ls),
-(634,862,o),
+(632,326,o),
+(632,574,cs),
+(632,706,ls),
+(632,862,o),
(696,972,o),
(782,972,cs),
(869,972,o),
-(931,854,o),
-(930,686,cs),
-(930,552,ls),
-(931,320,o),
+(932,854,o),
+(932,686,cs),
+(932,552,ls),
+(932,320,o),
(777,140,o),
(570,140,cs),
(387,140,o),
-(247,332,o),
-(248,574,cs),
-(248,654,ls),
-(247,832,o),
+(246,332,o),
+(246,574,cs),
+(246,654,ls),
+(246,832,o),
(332,969,o),
(428,968,c),
(428,1128,l),
@@ -209,17 +476,17 @@ nodes = (
(273,-20,o),
(570,-20,cs),
(887,-20,o),
-(1103,227,o),
+(1102,227,o),
(1102,552,cs),
(1102,684,ls),
-(1103,937,o),
+(1102,937,o),
(980,1132,o),
(782,1132,cs),
(585,1132,o),
-(463,954,o),
+(462,954,o),
(462,704,cs),
(462,576,ls),
-(463,244,o),
+(462,244,o),
(727,-12,o),
(1154,-12,c),
(1154,148,l)
@@ -229,12 +496,124 @@ nodes = (
width = 1228;
},
{
+associatedMasterId = m011;
+layerId = "6E7CDFB1-DE0B-46D2-A2BB-D722A73CE311";
+name = "Oct 20, 22, 16:02";
+shapes = (
+{
+closed = 0;
+nodes = (
+(530,1134,ls),
+(266,1134,o),
+(66,885,o),
+(66,556,cs),
+(66,226,o),
+(266,-24,o),
+(658,-24,cs)
+);
+},
+{
+closed = 0;
+nodes = (
+(658,22,ls),
+(292,22,o),
+(112,252,o),
+(112,556,cs),
+(112,857,o),
+(294,1088,o),
+(530,1088,cs)
+);
+},
+{
+closed = 0;
+nodes = (
+(740,-24,ls),
+(1165,-24,o),
+(1478,221,o),
+(1478,554,cs),
+(1478,802,o),
+(1307,982,o),
+(1073,982,cs),
+(841,982,o),
+(670,801,o),
+(670,554,cs),
+(670,232,o),
+(964,-24,o),
+(1334,-24,cs),
+(1429,-24,o),
+(1502,-7,o),
+(1590,36,c)
+);
+}
+);
+width = 922;
+},
+{
+associatedMasterId = m007;
+layerId = "2F402B06-793E-4E2F-9AB4-CA578A38BB64";
+name = "Oct 20, 22, 16:05";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1018,-24,o),
+(1396,174,o),
+(1396,554,cs),
+(1396,800,o),
+(1229,982,o),
+(991,982,cs),
+(754,982,o),
+(588,800,o),
+(588,554,cs),
+(588,174,o),
+(939,-24,o),
+(1252,-24,cs),
+(1339,-24,o),
+(1424,-5,o),
+(1508,36,c),
+(1459,166,l),
+(1398,138,o),
+(1330,120,o),
+(1253,120,cs),
+(1072,120,o),
+(760,235,o),
+(760,554,cs),
+(760,717,o),
+(853,828,o),
+(991,828,cs),
+(1130,828,o),
+(1224,717,o),
+(1224,554,cs),
+(1224,236,o),
+(897,130,o),
+(658,130,cs),
+(367,130,o),
+(244,286,o),
+(244,526,cs),
+(244,768,o),
+(363,926,o),
+(562,926,c),
+(562,1080,l),
+(269,1080,o),
+(72,850,o),
+(72,526,cs),
+(72,204,o),
+(274,-24,o),
+(658,-24,cs)
+);
+}
+);
+width = 1564;
+},
+{
+associatedMasterId = m009;
guides = (
{
pos = (-72,2860);
}
);
-layerId = m009;
+layerId = "5704B485-1586-4CC4-8B68-C1DEEE7898BB";
+name = "Oct 20, 22, 16:09";
shapes = (
{
closed = 1;
@@ -289,61 +668,541 @@ nodes = (
width = 1662;
},
{
-layerId = m011;
+associatedMasterId = m009;
+guides = (
+{
+pos = (-72,2860);
+}
+);
+layerId = "A3FFAC3D-9338-46C3-BF0F-5B8787E0166A";
+name = "Oct 20, 22, 16:10";
+shapes = (
+{
+closed = 0;
+nodes = (
+(958,-24,ls),
+(1379,-24,o),
+(1680,214,o),
+(1680,546,cs),
+(1680,793,o),
+(1513,966,o),
+(1275,966,cs),
+(1038,966,o),
+(872,793,o),
+(872,546,cs),
+(872,211,o),
+(1178,-24,o),
+(1520,-24,cs),
+(1614,-24,o),
+(1705,-6,o),
+(1792,36,c)
+);
+},
+{
+closed = 0;
+nodes = (
+(750,288,ls),
+(527,288,o),
+(450,369,o),
+(450,528,cs),
+(450,687,o),
+(527,768,o),
+(622,768,c),
+(622,1080,l),
+(279,1080,o),
+(46,865,o),
+(46,528,cs),
+(46,189,o),
+(279,-24,o),
+(750,-24,cs)
+);
+}
+);
+width = 1840;
+},
+{
+associatedMasterId = m009;
+background = {
+shapes = (
+{
+closed = 0;
+nodes = (
+(958,-24,l),
+(1419,-24,o),
+(1744,211,o),
+(1744,546,cs),
+(1744,793,o),
+(1550,966,o),
+(1275,966,cs),
+(1001,966,o),
+(808,793,o),
+(808,546,cs),
+(808,211,o),
+(1102,-24,o),
+(1520,-24,cs),
+(1614,-24,o),
+(1705,-6,o),
+(1792,36,c),
+(1618,317,l),
+(1558,288,o),
+(1558,288,o),
+(1520,288,cs),
+(1338,288,o),
+(1208,338,o),
+(1208,546,cs),
+(1208,615,o),
+(1232,654,o),
+(1275,654,cs),
+(1319,654,o),
+(1344,615,o),
+(1344,546,cs),
+(1344,339,o),
+(1216,288,o),
+(958,288,c)
+);
+},
+{
+closed = 0;
+nodes = (
+(750,288,l),
+(527,288,o),
+(450,369,o),
+(450,528,cs),
+(450,687,o),
+(527,768,o),
+(622,768,c),
+(622,1080,l),
+(279,1080,o),
+(46,865,o),
+(46,528,cs),
+(46,189,o),
+(279,-24,o),
+(750,-24,c)
+);
+}
+);
+};
+guides = (
+{
+pos = (-72,2860);
+}
+);
+layerId = "F87D0A7F-6EA8-4FDE-AD1E-D9BE05ADB4C6";
+name = "Oct 20, 22, 16:18";
shapes = (
{
closed = 1;
nodes = (
-(581,46,o),
-(358,179,o),
-(358,512,cs),
-(358,678,ls),
-(358,950,o),
-(428,1087,o),
-(584,1086,cs),
-(740,1084,o),
-(809,955,o),
-(808,672,cs),
-(808,504,ls),
-(809,191,o),
-(669,28,o),
-(424,26,cs),
-(183,25,o),
-(39,193,o),
-(40,506,cs),
-(40,626,ls),
-(39,899,o),
-(132,1082,o),
-(256,1082,c),
-(256,1128,l),
-(103,1127,o),
-(-7,929,o),
-(-8,626,cs),
-(-8,506,ls),
-(-7,164,o),
-(153,-20,o),
-(424,-20,cs),
-(694,-20,o),
-(855,166,o),
-(856,506,cs),
-(856,672,ls),
-(855,983,o),
-(767,1132,o),
-(584,1132,cs),
-(401,1132,o),
-(311,982,o),
-(312,678,cs),
-(312,512,ls),
-(311,153,o),
-(553,0,o),
-(930,0,c),
-(930,46,l)
+(1253,-24,o),
+(1568,221,o),
+(1568,554,cs),
+(1568,801,o),
+(1374,966,o),
+(1099,966,cs),
+(825,966,o),
+(632,801,o),
+(632,554,cs),
+(632,219,o),
+(900,-24,o),
+(1366,-24,cs),
+(1511,-24,o),
+(1667,1,o),
+(1744,36,c),
+(1618,317,l),
+(1572,296,o),
+(1515,284,o),
+(1432,284,cs),
+(1186,284,o),
+(1032,388,o),
+(1032,554,cs),
+(1032,623,o),
+(1056,654,o),
+(1099,654,cs),
+(1143,654,o),
+(1168,623,o),
+(1168,554,cs),
+(1168,396,o),
+(1033,288,o),
+(742,288,cs),
+(539,288,o),
+(450,361,o),
+(450,528,cs),
+(450,687,o),
+(527,768,o),
+(622,768,c),
+(622,1080,l),
+(279,1080,o),
+(46,865,o),
+(46,528,cs),
+(46,174,o),
+(296,-24,o),
+(742,-24,cs)
);
}
);
-width = 922;
+width = 1840;
+},
+{
+associatedMasterId = m009;
+guides = (
+{
+pos = (-72,2860);
+}
+);
+layerId = "41FB3426-1A77-4963-89DF-EF114AA8887F";
+name = "Oct 20, 22, 16:28";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1253,-24,o),
+(1560,253,o),
+(1560,554,cs),
+(1560,801,o),
+(1374,966,o),
+(1099,966,cs),
+(827,966,o),
+(632,801,o),
+(632,538,cs),
+(632,259,o),
+(913,-24,o),
+(1379,-24,cs),
+(1524,-24,o),
+(1667,1,o),
+(1744,36,c),
+(1618,317,l),
+(1549,287,o),
+(1488,271,o),
+(1418,271,cs),
+(1120,271,o),
+(1032,386,o),
+(1032,532,cs),
+(1032,610,o),
+(1056,654,o),
+(1099,654,cs),
+(1143,654,o),
+(1168,616,o),
+(1168,548,cs),
+(1168,376,o),
+(1035,288,o),
+(802,288,cs),
+(535,288,o),
+(450,361,o),
+(450,528,cs),
+(450,687,o),
+(527,768,o),
+(622,768,c),
+(622,1080,l),
+(279,1080,o),
+(46,865,o),
+(46,528,cs),
+(46,174,o),
+(296,-24,o),
+(742,-24,cs)
+);
+}
+);
+width = 1792;
+},
+{
+associatedMasterId = m009;
+guides = (
+{
+pos = (-72,2860);
+}
+);
+layerId = "024A580C-A887-4139-9DA8-ED01C516DF5E";
+name = "Oct 20, 22, 16:32";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1253,-24,o),
+(1560,253,o),
+(1560,554,cs),
+(1560,801,o),
+(1374,966,o),
+(1099,966,cs),
+(827,966,o),
+(632,801,o),
+(632,538,cs),
+(632,259,o),
+(913,-24,o),
+(1379,-24,cs),
+(1524,-24,o),
+(1667,1,o),
+(1744,36,c),
+(1618,317,l),
+(1525,277,o),
+(1483,271,o),
+(1418,271,cs),
+(1120,271,o),
+(1032,394,o),
+(1032,540,cs),
+(1032,618,o),
+(1056,654,o),
+(1099,654,cs),
+(1143,654,o),
+(1168,608,o),
+(1168,540,cs),
+(1168,368,o),
+(1003,280,o),
+(770,280,cs),
+(551,280,o),
+(434,358,o),
+(434,536,cs),
+(434,674,o),
+(502,768,o),
+(622,768,c),
+(622,1080,l),
+(263,1080,o),
+(30,865,o),
+(30,536,cs),
+(30,163,o),
+(328,-24,o),
+(742,-24,cs)
+);
+}
+);
+width = 1792;
+},
+{
+associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+guides = (
+{
+pos = (72,2860);
+}
+);
+layerId = "D770789F-B6F6-411C-B775-23126F3E5CE7";
+name = "Oct 20, 22, 16:34";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1173,-20,o),
+(1608,253,o),
+(1608,554,cs),
+(1608,801,o),
+(1422,966,o),
+(1147,966,cs),
+(875,966,o),
+(680,801,o),
+(680,538,cs),
+(680,259,o),
+(961,-20,o),
+(1427,-20,cs),
+(1572,-20,o),
+(1715,4,o),
+(1792,39,c),
+(1666,320,l),
+(1597,290,o),
+(1536,274,o),
+(1466,274,cs),
+(1168,274,o),
+(1080,386,o),
+(1080,532,cs),
+(1080,610,o),
+(1104,654,o),
+(1147,654,cs),
+(1191,654,o),
+(1216,616,o),
+(1216,548,cs),
+(1216,376,o),
+(1115,272,o),
+(850,272,cs),
+(564,272,o),
+(472,383,o),
+(472,558,cs),
+(472,734,o),
+(565,832,o),
+(672,832,c),
+(672,1132,l),
+(308,1132,o),
+(62,899,o),
+(62,556,cs),
+(62,212,o),
+(302,-20,o),
+(790,-20,cs)
+);
+}
+);
+width = 1834;
+},
+{
+associatedMasterId = m007;
+layerId = "8516CEDE-AE93-4368-BC8E-C59857D8BBF3";
+name = "Oct 20, 22, 16:37";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1018,-24,o),
+(1380,166,o),
+(1380,546,cs),
+(1380,793,o),
+(1213,966,o),
+(975,966,cs),
+(738,966,o),
+(572,793,o),
+(572,546,cs),
+(572,211,o),
+(878,-24,o),
+(1220,-24,cs),
+(1314,-24,o),
+(1405,-6,o),
+(1492,36,c),
+(1443,166,l),
+(1370,133,o),
+(1313,120,o),
+(1236,120,cs),
+(954,120,o),
+(744,296,o),
+(744,546,cs),
+(744,709,o),
+(833,812,o),
+(975,812,cs),
+(1118,812,o),
+(1208,709,o),
+(1208,546,cs),
+(1208,290,o),
+(996,130,o),
+(658,130,cs),
+(367,130,o),
+(244,286,o),
+(244,526,cs),
+(244,768,o),
+(363,926,o),
+(562,926,c),
+(562,1080,l),
+(269,1080,o),
+(72,850,o),
+(72,526,cs),
+(72,204,o),
+(274,-24,o),
+(658,-24,cs)
+);
+}
+);
+width = 1564;
+},
+{
+associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+layerId = "97D7122A-D803-4345-83FA-54ACCDF79063";
+name = "Oct 20, 22, 16:40";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1050,-24,o),
+(1428,174,o),
+(1428,554,cs),
+(1428,800,o),
+(1261,982,o),
+(1023,982,cs),
+(786,982,o),
+(620,800,o),
+(620,554,cs),
+(620,174,o),
+(971,-24,o),
+(1284,-24,cs),
+(1371,-24,o),
+(1456,-5,o),
+(1540,36,c),
+(1491,166,l),
+(1430,138,o),
+(1362,120,o),
+(1285,120,cs),
+(1104,120,o),
+(792,235,o),
+(792,554,cs),
+(792,717,o),
+(885,828,o),
+(1023,828,cs),
+(1162,828,o),
+(1256,717,o),
+(1256,554,cs),
+(1256,236,o),
+(913,130,o),
+(690,130,cs),
+(422,130,o),
+(276,287,o),
+(276,552,cs),
+(276,777,o),
+(381,978,o),
+(610,978,c),
+(610,1132,l),
+(308,1132,o),
+(104,902,o),
+(104,552,cs),
+(104,188,o),
+(319,-24,o),
+(690,-24,cs)
+);
+}
+);
+width = 1620;
+},
+{
+associatedMasterId = m011;
+layerId = "6FA1168A-8DE4-4A89-A3F9-A1726AEFEDE1";
+name = "Oct 20, 22, 16:41";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1018,-24,o),
+(1308,221,o),
+(1308,554,cs),
+(1308,802,o),
+(1137,982,o),
+(903,982,cs),
+(671,982,o),
+(500,801,o),
+(500,554,cs),
+(500,232,o),
+(794,-24,o),
+(1164,-24,cs),
+(1259,-24,o),
+(1332,-7,o),
+(1420,36,c),
+(1400,77,l),
+(1316,37,o),
+(1254,22,o),
+(1164,22,cs),
+(811,22,o),
+(546,253,o),
+(546,554,cs),
+(546,783,o),
+(691,936,o),
+(903,936,cs),
+(1117,936,o),
+(1262,784,o),
+(1262,554,cs),
+(1262,243,o),
+(990,22,o),
+(646,22,cs),
+(297,22,o),
+(112,252,o),
+(112,556,cs),
+(112,857,o),
+(294,1088,o),
+(530,1088,c),
+(530,1134,l),
+(266,1134,o),
+(66,885,o),
+(66,556,cs),
+(66,226,o),
+(271,-24,o),
+(646,-24,cs)
+);
+}
+);
+width = 1454;
}
);
+metricLeft = o;
+metricRight = t;
+note = "/o + loop\012https://en.wikipedia.org/wiki/O-hook";
tags = (
"TODO-opsz"
);