From cbd32b8b1a002ced5ee3adf5e29472f03f46925b Mon Sep 17 00:00:00 2001 From: Rasmus Andersson Date: Sun, 18 Sep 2022 15:24:16 -0700 Subject: /r.1 for Display --- src/Inter.glyphspackage/glyphs/r.1.glyph | 229 +++++++++++---------- src/Inter.glyphspackage/glyphs/racute.1.glyph | 7 +- src/Inter.glyphspackage/glyphs/rcaron.1.glyph | 7 +- .../glyphs/rcommaaccent.1.glyph | 7 +- src/Inter.glyphspackage/glyphs/rdblgrave.1.glyph | 7 +- src/Inter.glyphspackage/glyphs/rdescend.1.glyph | 23 +-- src/Inter.glyphspackage/glyphs/rdotaccent.1.glyph | 7 +- src/Inter.glyphspackage/glyphs/rdotbelow.1.glyph | 7 +- .../glyphs/rdotbelowmacron.1.glyph | 11 +- .../glyphs/rinvertedbreve.1.glyph | 7 +- src/Inter.glyphspackage/glyphs/rlinebelow.1.glyph | 7 +- src/Inter.glyphspackage/glyphs/rrthook.1.glyph | 113 +++++----- 12 files changed, 200 insertions(+), 232 deletions(-) (limited to 'src') diff --git a/src/Inter.glyphspackage/glyphs/r.1.glyph b/src/Inter.glyphspackage/glyphs/r.1.glyph index 9447acead..86ee592c0 100644 --- a/src/Inter.glyphspackage/glyphs/r.1.glyph +++ b/src/Inter.glyphspackage/glyphs/r.1.glyph @@ -26,17 +26,17 @@ closed = 1; nodes = ( (328,0,l), (328,706,ls), -(329,857,o), -(448,969,o), +(328,857,o), +(448,968,o), (610,968,cs), -(654,969,o), +(654,968,o), (686,961,o), (710,948,c), (768,1094,l), (733,1119,o), -(687,1135,o), +(687,1134,o), (626,1134,cs), -(490,1135,o), +(490,1134,o), (375,1059,o), (334,948,c), (322,948,l), @@ -79,9 +79,9 @@ nodes = ( (504,0,l), (504,582,ls), (504,709,o), -(590,791,o), +(590,792,o), (690,792,cs), -(732,791,o), +(732,792,o), (767,777,o), (800,762,c), (916,1090,l), @@ -333,9 +333,9 @@ nodes = ( (244,0,l), (244,750,ls), (244,945,o), -(387,1085,o), +(387,1084,o), (584,1086,cs), -(628,1085,o), +(628,1086,o), (665,1079,o), (696,1068,c), (712,1112,l), @@ -402,59 +402,66 @@ width = 742; anchors = ( { name = bottom; -pos = (212,0); +pos = (210,0); }, { name = cross; -pos = (214,536); +pos = (212,536); }, { name = top; -pos = (392,1304); +pos = (426,1262); } ); +background = { +shapes = ( +{ +ref = r; +} +); +}; layerId = m007; shapes = ( { closed = 1; nodes = ( -(298,0,l), -(298,706,ls), -(299,857,o), -(418,969,o), -(580,968,cs), -(624,969,o), -(656,961,o), -(680,948,c), -(738,1094,l), -(703,1119,o), -(657,1135,o), -(596,1134,cs), -(460,1135,o), -(345,1059,o), -(304,948,c), -(292,948,l), -(292,1118,l), -(128,1118,l), -(128,0,l) -); -} -); -width = 724; +(296,0,l), +(296,644,ls), +(296,795,o), +(403,906,o), +(578,906,cs), +(622,906,o), +(654,899,o), +(678,886,c), +(736,1032,l), +(701,1057,o), +(657,1072,o), +(594,1072,cs), +(458,1072,o), +(333,1001,o), +(292,890,c), +(288,890,l), +(288,1056,l), +(126,1056,l), +(126,0,l) +); +} +); +width = 728; }, { anchors = ( { name = bottom; -pos = (124.59,0); +pos = (123,0); }, { name = cross; -pos = (215.324,536); +pos = (214,536); }, { name = top; -pos = (520.466,1304); +pos = (548,1262); } ); layerId = m008; @@ -463,29 +470,29 @@ shapes = ( { closed = 1; nodes = ( -(210.59,0,l), -(327.468,706,ls), -(353.466,857,o), -(491.007,969,o), -(652.842,968,cs), -(697.007,969,o), -(727.683,961,o), -(749.531,948,c), -(831.701,1094,l), -(800.839,1119,o), -(757.488,1135,o), -(696.323,1134,cs), -(560.488,1135,o), -(432.906,1059,o), -(373.531,948,c), -(361.531,948,l), -(389.674,1118,l), -(225.674,1118,l), -(40.59,0,l) -); -} -); -width = 724; +(209,0,l), +(316,644,ls), +(341,795,o), +(466,906,o), +(641,906,cs), +(685,906,o), +(716,899,o), +(738,886,c), +(820,1032,l), +(789,1057,o), +(748,1072,o), +(685,1072,cs), +(549,1072,o), +(412,1001,o), +(353,890,c), +(349,890,l), +(376,1056,l), +(214,1056,l), +(39,0,l) +); +} +); +width = 729; }, { anchors = ( @@ -502,6 +509,13 @@ name = top; pos = (470,1262); } ); +background = { +shapes = ( +{ +ref = r; +} +); +}; guides = ( { pos = (-84,1240); @@ -518,20 +532,20 @@ nodes = ( (488,0,l), (488,520,ls), (488,647,o), -(574,729,o), -(674,730,cs), -(716,729,o), -(751,715,o), +(570,730,o), +(672,730,cs), +(714,730,o), +(752,716,o), (784,700,c), (900,1028,l), (855,1054,o), -(799,1070,o), -(740,1070,cs), -(621,1070,o), -(529,1000,o), -(488,842,c), -(476,842,l), -(476,1056,l), +(797,1070,o), +(732,1070,cs), +(619,1070,o), +(517,1022,o), +(476,864,c), +(474,864,l), +(474,1056,l), (86,1056,l), (86,0,l) ); @@ -543,25 +557,15 @@ width = 884; anchors = ( { name = bottom; -pos = (202.59,0); +pos = (203,0); }, { name = cross; -pos = (287.324,536); +pos = (288,536); }, { name = top; -pos = (591.513,1262); -} -); -guides = ( -{ -angle = -9.4; -pos = (-84,1240); -}, -{ -angle = -9.4; -pos = (-84,764); +pos = (592,1262); } ); layerId = m010; @@ -570,29 +574,29 @@ shapes = ( { closed = 1; nodes = ( -(400.59,0,l), -(486.676,520,ls), -(507.7,647,o), -(607.275,729,o), -(707.441,730,cs), -(749.275,729,o), -(781.958,715,o), -(812.474,700,c), -(982.774,1028,l), -(942.079,1054,o), -(888.728,1070,o), -(829.728,1070,cs), -(710.728,1070,o), -(607.139,1000,o), -(539.982,842,c), -(527.982,842,l), -(563.41,1056,l), -(173.41,1056,l), -(-1.41,0,l) -); -} -); -width = 884; +(401,0,l), +(487,520,ls), +(508,647,o), +(604,730,o), +(706,730,cs), +(748,730,o), +(784,716,o), +(813,700,c), +(984,1028,l), +(943,1054,o), +(887,1070,o), +(822,1070,cs), +(709,1070,o), +(600,1022,o), +(532,864,c), +(530,864,l), +(562,1056,l), +(174,1056,l), +(-1,0,l) +); +} +); +width = 885; }, { anchors = ( @@ -623,9 +627,9 @@ nodes = ( (180,0,l), (180,750,ls), (180,945,o), -(323,1085,o), +(323,1086,o), (520,1086,cs), -(564,1085,o), +(564,1086,o), (601,1079,o), (632,1068,c), (648,1112,l), @@ -696,10 +700,7 @@ nodes = ( width = 614; } ); -metricLeft = m; -tags = ( -"TODO-opsz" -); +metricLeft = n; unicode = 57439; userData = { "interface.width-adjustments" = ( diff --git a/src/Inter.glyphspackage/glyphs/racute.1.glyph b/src/Inter.glyphspackage/glyphs/racute.1.glyph index de86093bc..bd7d5b4ac 100644 --- a/src/Inter.glyphspackage/glyphs/racute.1.glyph +++ b/src/Inter.glyphspackage/glyphs/racute.1.glyph @@ -89,7 +89,7 @@ shapes = ( ref = r.1; }, { -pos = (41,42); +pos = (75,0); ref = acute; } ); @@ -102,7 +102,7 @@ shapes = ( ref = r.1; }, { -pos = (47,42); +pos = (75,0); ref = acute; } ); @@ -161,8 +161,5 @@ ref = acute; width = 614; } ); -tags = ( -"TODO-opsz" -); unicode = 57441; } diff --git a/src/Inter.glyphspackage/glyphs/rcaron.1.glyph b/src/Inter.glyphspackage/glyphs/rcaron.1.glyph index 28e885664..45f83e906 100644 --- a/src/Inter.glyphspackage/glyphs/rcaron.1.glyph +++ b/src/Inter.glyphspackage/glyphs/rcaron.1.glyph @@ -89,7 +89,7 @@ shapes = ( ref = r.1; }, { -pos = (-42,0); +pos = (-8,-42); ref = caron; } ); @@ -102,7 +102,7 @@ shapes = ( ref = r.1; }, { -pos = (-38,0); +pos = (-10,-42); ref = caron; } ); @@ -161,8 +161,5 @@ ref = caron; width = 614; } ); -tags = ( -"TODO-opsz" -); unicode = 57443; } diff --git a/src/Inter.glyphspackage/glyphs/rcommaaccent.1.glyph b/src/Inter.glyphspackage/glyphs/rcommaaccent.1.glyph index 2f527220a..593804390 100644 --- a/src/Inter.glyphspackage/glyphs/rcommaaccent.1.glyph +++ b/src/Inter.glyphspackage/glyphs/rcommaaccent.1.glyph @@ -89,7 +89,7 @@ shapes = ( ref = r.1; }, { -pos = (-36,0); +pos = (-38,0); ref = commaaccent; } ); @@ -102,7 +102,7 @@ shapes = ( ref = r.1; }, { -pos = (-29,0); +pos = (-31,0); ref = commaaccent; } ); @@ -161,8 +161,5 @@ ref = commaaccent; width = 614; } ); -tags = ( -"TODO-opsz" -); unicode = 57442; } diff --git a/src/Inter.glyphspackage/glyphs/rdblgrave.1.glyph b/src/Inter.glyphspackage/glyphs/rdblgrave.1.glyph index 0b301e26a..14be028cf 100644 --- a/src/Inter.glyphspackage/glyphs/rdblgrave.1.glyph +++ b/src/Inter.glyphspackage/glyphs/rdblgrave.1.glyph @@ -89,7 +89,7 @@ shapes = ( ref = r.1; }, { -pos = (896,0); +pos = (930,-42); ref = dblgravecmb; } ); @@ -102,7 +102,7 @@ shapes = ( ref = r.1; }, { -pos = (900,0); +pos = (928,-42); ref = dblgravecmb; } ); @@ -161,8 +161,5 @@ ref = dblgravecmb; width = 614; } ); -tags = ( -"TODO-opsz" -); unicode = 57444; } diff --git a/src/Inter.glyphspackage/glyphs/rdescend.1.glyph b/src/Inter.glyphspackage/glyphs/rdescend.1.glyph index 4fb285ce5..2411ffee5 100644 --- a/src/Inter.glyphspackage/glyphs/rdescend.1.glyph +++ b/src/Inter.glyphspackage/glyphs/rdescend.1.glyph @@ -123,17 +123,17 @@ shapes = ( { closed = 1; nodes = ( -(296,-418,l), -(296,0,l), -(126,0,l), -(126,-418,l) +(298,-418,l), +(298,0,l), +(128,0,l), +(128,-418,l) ); }, { ref = r.1; } ); -width = 724; +width = 728; }, { layerId = m008; @@ -142,17 +142,17 @@ shapes = ( { closed = 1; nodes = ( -(139.391,-418,l), -(208.59,0,l), -(38.59,0,l), -(-30.609,-418,l) +(141,-418,l), +(211,0,l), +(41,0,l), +(-29,-418,l) ); }, { ref = r.1; } ); -width = 724; +width = 729; }, { layerId = m009; @@ -233,9 +233,6 @@ width = 614; ); metricLeft = r; metricRight = r.1; -tags = ( -"TODO-opsz" -); unicode = 636; userData = { interface.gridadjust.original = "{'width': 956, 'leftMargin': 188, 'rightMargin': 42}"; diff --git a/src/Inter.glyphspackage/glyphs/rdotaccent.1.glyph b/src/Inter.glyphspackage/glyphs/rdotaccent.1.glyph index 9db2b5d79..0e43959c2 100644 --- a/src/Inter.glyphspackage/glyphs/rdotaccent.1.glyph +++ b/src/Inter.glyphspackage/glyphs/rdotaccent.1.glyph @@ -89,7 +89,7 @@ shapes = ( ref = r.1; }, { -pos = (180,0); +pos = (214,-42); ref = dotaccent; } ); @@ -102,7 +102,7 @@ shapes = ( ref = r.1; }, { -pos = (184,0); +pos = (212,-42); ref = dotaccent; } ); @@ -161,8 +161,5 @@ ref = dotaccent; width = 614; } ); -tags = ( -"TODO-opsz" -); unicode = 57446; } diff --git a/src/Inter.glyphspackage/glyphs/rdotbelow.1.glyph b/src/Inter.glyphspackage/glyphs/rdotbelow.1.glyph index 221f0d11b..6105fa83c 100644 --- a/src/Inter.glyphspackage/glyphs/rdotbelow.1.glyph +++ b/src/Inter.glyphspackage/glyphs/rdotbelow.1.glyph @@ -89,7 +89,7 @@ shapes = ( ref = r.1; }, { -pos = (850,0); +pos = (848,0); ref = dotbelow; } ); @@ -102,7 +102,7 @@ shapes = ( ref = r.1; }, { -pos = (853,0); +pos = (851,0); ref = dotbelow; } ); @@ -161,8 +161,5 @@ ref = dotbelow; width = 614; } ); -tags = ( -"TODO-opsz" -); unicode = 57447; } diff --git a/src/Inter.glyphspackage/glyphs/rdotbelowmacron.1.glyph b/src/Inter.glyphspackage/glyphs/rdotbelowmacron.1.glyph index 0027e2278..163e542db 100644 --- a/src/Inter.glyphspackage/glyphs/rdotbelowmacron.1.glyph +++ b/src/Inter.glyphspackage/glyphs/rdotbelowmacron.1.glyph @@ -113,11 +113,11 @@ shapes = ( ref = r.1; }, { -pos = (850,0); +pos = (848,0); ref = dotbelow; }, { -pos = (-36,0); +pos = (-2,-42); ref = macron; } ); @@ -130,11 +130,11 @@ shapes = ( ref = r.1; }, { -pos = (853,0); +pos = (851,0); ref = dotbelow; }, { -pos = (-30,0); +pos = (-2,-42); ref = macron; } ); @@ -209,8 +209,5 @@ ref = macron; width = 614; } ); -tags = ( -"TODO-opsz" -); unicode = 57448; } diff --git a/src/Inter.glyphspackage/glyphs/rinvertedbreve.1.glyph b/src/Inter.glyphspackage/glyphs/rinvertedbreve.1.glyph index 6fb296848..e25fb49ca 100644 --- a/src/Inter.glyphspackage/glyphs/rinvertedbreve.1.glyph +++ b/src/Inter.glyphspackage/glyphs/rinvertedbreve.1.glyph @@ -89,7 +89,7 @@ shapes = ( ref = r.1; }, { -pos = (1048,32); +pos = (1082,-10); ref = breveinvnosp; } ); @@ -102,7 +102,7 @@ shapes = ( ref = r.1; }, { -pos = (1054,42); +pos = (1082,0); ref = breveinvnosp; } ); @@ -161,8 +161,5 @@ ref = breveinvnosp; width = 614; } ); -tags = ( -"TODO-opsz" -); unicode = 57445; } diff --git a/src/Inter.glyphspackage/glyphs/rlinebelow.1.glyph b/src/Inter.glyphspackage/glyphs/rlinebelow.1.glyph index c94fd62d1..5b3834373 100644 --- a/src/Inter.glyphspackage/glyphs/rlinebelow.1.glyph +++ b/src/Inter.glyphspackage/glyphs/rlinebelow.1.glyph @@ -89,7 +89,7 @@ shapes = ( ref = r.1; }, { -pos = (850,0); +pos = (848,0); ref = macronsubnosp; } ); @@ -102,7 +102,7 @@ shapes = ( ref = r.1; }, { -pos = (855,0); +pos = (853,0); ref = macronsubnosp; } ); @@ -161,8 +161,5 @@ ref = macronsubnosp; width = 614; } ); -tags = ( -"TODO-opsz" -); unicode = 57449; } diff --git a/src/Inter.glyphspackage/glyphs/rrthook.1.glyph b/src/Inter.glyphspackage/glyphs/rrthook.1.glyph index aaa2c752f..ee4092788 100644 --- a/src/Inter.glyphspackage/glyphs/rrthook.1.glyph +++ b/src/Inter.glyphspackage/glyphs/rrthook.1.glyph @@ -110,11 +110,11 @@ nodes = ( (545,-120,cs), (476,-119,o), (393,-111,o), -(409,-18,cs), +(408,-18,cs), (411,0,l), (9,0,l), (3,-34,ls), -(-51,-364,o), +(-55,-363,o), (138,-419,o), (385,-418,cs) ); @@ -173,12 +173,12 @@ nodes = ( (262,-369,o), (234,-370,c), (119,-369,o), -(95,-321,o), +(97,-321,o), (118,-198,cs), -(150,0,l), +(152,0,l), (104,0,l), (70,-206,ls), -(45,-341,o), +(48,-341,o), (95,-416,o), (224,-416,c) ); @@ -196,29 +196,29 @@ shapes = ( { closed = 1; nodes = ( -(451,-419,o), -(489,-419,o), -(514,-410,c), -(514,-264,l), -(500,-268,o), -(480,-271,o), -(460,-270,cs), -(367,-271,o), -(297,-236,o), -(296,-120,cs), -(296,0,l), -(126,0,l), -(126,-120,ls), -(125,-311,o), -(253,-419,o), -(416,-418,cs) +(453,-419,o), +(491,-419,o), +(516,-410,c), +(516,-264,l), +(502,-268,o), +(482,-271,o), +(462,-270,cs), +(369,-271,o), +(299,-236,o), +(298,-120,cs), +(298,0,l), +(128,0,l), +(128,-120,ls), +(127,-311,o), +(255,-419,o), +(418,-418,cs) ); }, { ref = r.1; } ); -width = 724; +width = 728; }, { layerId = m008; @@ -227,29 +227,29 @@ shapes = ( { closed = 1; nodes = ( -(294.225,-419,o), -(332.225,-419,o), -(358.715,-410,c), -(382.885,-264,l), -(368.223,-268,o), -(347.726,-271,o), -(327.892,-270,cs), -(234.726,-271,o), -(170.521,-236,o), -(188.724,-120,cs), -(208.59,0,l), -(38.59,0,l), -(18.724,-120,ls), -(-13.896,-311,o), -(96.225,-419,o), -(259.391,-418,cs) +(296,-419,o), +(334,-419,o), +(361,-410,c), +(385,-264,l), +(370,-268,o), +(350,-271,o), +(330,-270,cs), +(237,-271,o), +(173,-236,o), +(191,-120,cs), +(211,0,l), +(41,0,l), +(21,-120,ls), +(-12,-311,o), +(98,-419,o), +(261,-418,cs) ); }, { ref = r.1; } ); -width = 724; +width = 729; }, { layerId = m009; @@ -352,24 +352,24 @@ shapes = ( { closed = 1; nodes = ( -(181.722,-416,o), -(208.887,-415,o), -(234.384,-412,c), -(242,-366,l), -(215.668,-368,o), -(188.503,-369,o), -(169.337,-370,cs), -(67.503,-369,o), -(38.952,-324,o), -(59.48,-200,cs), -(94.908,14,l,{ +(180,-430,o), +(207,-429,o), +(232,-426,c), +(240,-380,l), +(214,-382,o), +(186,-383,o), +(167,-384,cs), +(65,-383,o), +(37,-338,o), +(57,-214,cs), +(93,0,l,{ name = hr00; }), -(48.908,14,l), -(13.48,-200,ls), -(-11.518,-351,o), -(34.722,-416,o), -(161.722,-416,cs) +(47,0,l), +(11,-214,ls), +(-14,-365,o), +(33,-430,o), +(160,-430,cs) ); }, { @@ -382,9 +382,6 @@ width = 614; ); metricLeft = r; metricRight = r.1; -tags = ( -"TODO-opsz" -); unicode = 637; userData = { interface.gridadjust.original = "{'width': 956, 'leftMargin': 188, 'rightMargin': -68}"; -- cgit v1.2.3