diff --git a/sources/Merriweather-Italic.glyphspackage/UIState.plist b/sources/Merriweather-Italic.glyphspackage/UIState.plist index a3148662e..9c6bb3835 100644 --- a/sources/Merriweather-Italic.glyphspackage/UIState.plist +++ b/sources/Merriweather-Italic.glyphspackage/UIState.plist @@ -7,6 +7,7 @@ displayStrings = ( "/plus.case", "/divide.case", "/multiply.case", -"/minus.case" +"/minus.case", +y ); } diff --git a/sources/Merriweather-Italic.glyphspackage/glyphs/udieresis-cy.glyph b/sources/Merriweather-Italic.glyphspackage/glyphs/udieresis-cy.glyph index 090fde80d..b46428d77 100644 --- a/sources/Merriweather-Italic.glyphspackage/glyphs/udieresis-cy.glyph +++ b/sources/Merriweather-Italic.glyphspackage/glyphs/udieresis-cy.glyph @@ -8,7 +8,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (241,0); +pos = (247,0); ref = dieresiscomb; } ); @@ -21,7 +21,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (119,0); +pos = (151,0); ref = dieresiscomb; } ); @@ -34,7 +34,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (176,0); +pos = (186,0); ref = dieresiscomb; } ); @@ -47,7 +47,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (270,0); +pos = (267,0); ref = dieresiscomb; } ); @@ -60,7 +60,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (130,0); +pos = (129,0); ref = dieresiscomb; } ); @@ -73,7 +73,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (136,0); +pos = (137,0); ref = dieresiscomb; } ); @@ -86,7 +86,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (170,0); +pos = (189,0); ref = dieresiscomb; } ); @@ -99,7 +99,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (184,0); +pos = (181,0); ref = dieresiscomb; } ); @@ -112,7 +112,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (207,0); +pos = (197,0); ref = dieresiscomb; } ); @@ -125,7 +125,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (127,0); +pos = (137,0); ref = dieresiscomb; } ); @@ -138,7 +138,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (106,0); +pos = (107,0); ref = dieresiscomb; } ); @@ -151,7 +151,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (120,0); +pos = (129,0); ref = dieresiscomb; } ); diff --git a/sources/Merriweather-Italic.glyphspackage/glyphs/uhungarumlaut-cy.glyph b/sources/Merriweather-Italic.glyphspackage/glyphs/uhungarumlaut-cy.glyph index ae0dab676..91dd31efe 100644 --- a/sources/Merriweather-Italic.glyphspackage/glyphs/uhungarumlaut-cy.glyph +++ b/sources/Merriweather-Italic.glyphspackage/glyphs/uhungarumlaut-cy.glyph @@ -8,7 +8,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (258,0); +pos = (264,0); ref = hungarumlautcomb; } ); @@ -21,7 +21,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (134,0); +pos = (166,0); ref = hungarumlautcomb; } ); @@ -34,7 +34,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (171,0); +pos = (181,0); ref = hungarumlautcomb; } ); @@ -47,7 +47,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (247,0); +pos = (244,0); ref = hungarumlautcomb; } ); @@ -60,7 +60,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (288,0); +pos = (287,0); ref = hungarumlautcomb; } ); @@ -73,7 +73,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (248,0); +pos = (249,0); ref = hungarumlautcomb; } ); @@ -86,7 +86,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (328,0); +pos = (347,0); ref = hungarumlautcomb; } ); @@ -99,7 +99,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (286,0); +pos = (283,0); ref = hungarumlautcomb; } ); @@ -112,7 +112,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (219,0); +pos = (209,0); ref = hungarumlautcomb; } ); @@ -140,7 +140,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (188,0); +pos = (189,0); ref = hungarumlautcomb; } ); @@ -153,7 +153,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (258,0); +pos = (267,0); ref = hungarumlautcomb; } ); diff --git a/sources/Merriweather-Italic.glyphspackage/glyphs/umacron-cy.glyph b/sources/Merriweather-Italic.glyphspackage/glyphs/umacron-cy.glyph index b2f8e5390..f6ecdcb85 100644 --- a/sources/Merriweather-Italic.glyphspackage/glyphs/umacron-cy.glyph +++ b/sources/Merriweather-Italic.glyphspackage/glyphs/umacron-cy.glyph @@ -8,7 +8,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (280,0); +pos = (286,0); ref = macroncomb; } ); @@ -21,7 +21,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (217,0); +pos = (249,0); ref = macroncomb; } ); @@ -34,7 +34,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (274,0); +pos = (284,0); ref = macroncomb; } ); @@ -47,7 +47,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (299,0); +pos = (296,0); ref = macroncomb; } ); @@ -60,7 +60,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (199,0); +pos = (198,0); ref = macroncomb; } ); @@ -73,7 +73,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (157,0); +pos = (158,0); ref = macroncomb; } ); @@ -86,7 +86,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (240,0); +pos = (259,0); ref = macroncomb; } ); @@ -99,7 +99,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (202,0); +pos = (199,0); ref = macroncomb; } ); @@ -112,7 +112,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (230,0); +pos = (220,0); ref = macroncomb; } ); @@ -140,7 +140,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (124,0); +pos = (125,0); ref = macroncomb; } ); @@ -153,7 +153,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (190,0); +pos = (199,0); ref = macroncomb; } ); diff --git a/sources/Merriweather-Italic.glyphspackage/glyphs/ushort-cy.glyph b/sources/Merriweather-Italic.glyphspackage/glyphs/ushort-cy.glyph index 2a9631bab..9b5d36141 100644 --- a/sources/Merriweather-Italic.glyphspackage/glyphs/ushort-cy.glyph +++ b/sources/Merriweather-Italic.glyphspackage/glyphs/ushort-cy.glyph @@ -8,7 +8,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (197,0); +pos = (203,0); ref = "brevecomb-cy"; } ); @@ -21,7 +21,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (78,0); +pos = (110,0); ref = "brevecomb-cy"; } ); @@ -34,7 +34,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (102,0); +pos = (112,0); ref = "brevecomb-cy"; } ); @@ -47,7 +47,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (140,0); +pos = (137,0); ref = "brevecomb-cy"; } ); @@ -60,7 +60,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (102,0); +pos = (101,0); ref = "brevecomb-cy"; } ); @@ -73,7 +73,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (99,0); +pos = (100,0); ref = "brevecomb-cy"; } ); @@ -86,7 +86,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (143,0); +pos = (162,0); ref = "brevecomb-cy"; } ); @@ -99,7 +99,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (130,0); +pos = (127,0); ref = "brevecomb-cy"; } ); @@ -112,7 +112,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (110,0); +pos = (100,0); ref = "brevecomb-cy"; } ); @@ -125,7 +125,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (98,0); +pos = (108,0); ref = "brevecomb-cy"; } ); @@ -138,7 +138,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (83,0); +pos = (84,0); ref = "brevecomb-cy"; } ); @@ -151,7 +151,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (32,0); +pos = (41,0); ref = "brevecomb-cy"; } ); diff --git a/sources/Merriweather-Italic.glyphspackage/glyphs/y.glyph b/sources/Merriweather-Italic.glyphspackage/glyphs/y.glyph index 139129ef3..46b226f88 100644 --- a/sources/Merriweather-Italic.glyphspackage/glyphs/y.glyph +++ b/sources/Merriweather-Italic.glyphspackage/glyphs/y.glyph @@ -14,7 +14,7 @@ pos = (577,644); }, { name = top; -pos = (606,1110); +pos = (612,1110); } ); layerId = "0C3FD5EE-D923-4A4A-8FDE-164881635915"; @@ -31,7 +31,7 @@ nodes = ( (-39,-347,o), (-59,-335,c), (-98,-464,l), -(-58,-478,o), +(-58,-483,o), (28,-495,o), (86,-495,cs), (265,-495,o), @@ -90,7 +90,7 @@ pos = (594,667); }, { name = top; -pos = (583,1110); +pos = (615,1110); } ); layerId = "27298932-82AF-4578-9425-6304FDB19058"; @@ -166,7 +166,7 @@ pos = (624,667); }, { name = top; -pos = (640,1110); +pos = (650,1110); } ); guides = ( @@ -247,7 +247,7 @@ pos = (607,644); }, { name = top; -pos = (625,1110); +pos = (622,1110); } ); layerId = "AB43ED1F-BEAA-4517-9B18-06741265F15E"; @@ -323,7 +323,7 @@ pos = (508,624); }, { name = top; -pos = (560,1005); +pos = (559,1005); } ); layerId = "0E81F995-ADCA-4265-BF48-502C19DBCB17"; @@ -399,7 +399,7 @@ pos = (504,630); }, { name = top; -pos = (490,1005); +pos = (491,1005); } ); layerId = "10D406F4-E64B-40B9-806E-EB589F33F511"; @@ -409,20 +409,20 @@ closed = 1; nodes = ( (314,-50,l), (411,-50,l), -(288,-272,o), -(185,-403,o), -(63,-403,cs), -(-10,-403,o), -(-61,-357,o), -(-97,-325,c), -(-134,-450,l), -(-87,-482,o), -(-44,-495,o), -(29,-495,cs), -(137,-495,o), -(252,-411,o), -(360,-243,cs), -(482,-54,o), +(290,-272,o), +(187,-403,o), +(65,-403,cs), +(-4,-403,o), +(-55,-357,o), +(-91,-325,c), +(-128,-450,l), +(-81,-482,o), +(-38,-495,o), +(31,-495,cs), +(139,-495,o), +(254,-411,o), +(362,-243,cs), +(484,-54,o), (667,297,o), (755,473,cs), (846,656,o), @@ -475,7 +475,7 @@ pos = (598,624); }, { name = top; -pos = (600,1005); +pos = (619,1005); } ); layerId = "2795BD5C-FE1E-44B5-B1D3-799347E852FC"; @@ -551,7 +551,7 @@ pos = (504,630); }, { name = top; -pos = (538,1005); +pos = (535,1005); } ); layerId = "95CCB04D-97EC-4126-A206-216E0B8EC505"; @@ -627,7 +627,7 @@ pos = (537,644); }, { name = top; -pos = (556,1110); +pos = (546,1110); } ); guides = ( @@ -711,7 +711,7 @@ pos = (574,667); }, { name = top; -pos = (591,1110); +pos = (601,1110); } ); guides = ( @@ -792,7 +792,7 @@ pos = (454,630); }, { name = top; -pos = (460,1005); +pos = (461,1005); } ); layerId = "F318CEA5-7792-49D8-B68D-92025E304353"; @@ -868,7 +868,7 @@ pos = (498,624); }, { name = top; -pos = (550,1005); +pos = (559,1005); } ); layerId = "7A2136B0-3E1D-476B-B826-4714342A6FC2"; diff --git a/sources/Merriweather-Italic.glyphspackage/glyphs/yacute.glyph b/sources/Merriweather-Italic.glyphspackage/glyphs/yacute.glyph index 75a00347d..327dd261f 100644 --- a/sources/Merriweather-Italic.glyphspackage/glyphs/yacute.glyph +++ b/sources/Merriweather-Italic.glyphspackage/glyphs/yacute.glyph @@ -8,7 +8,7 @@ shapes = ( ref = y; }, { -pos = (457,0); +pos = (463,0); ref = acutecomb; } ); @@ -21,7 +21,7 @@ shapes = ( ref = y; }, { -pos = (404,0); +pos = (436,0); ref = acutecomb; } ); @@ -34,7 +34,7 @@ shapes = ( ref = y; }, { -pos = (461,0); +pos = (471,0); ref = acutecomb; } ); @@ -47,7 +47,7 @@ shapes = ( ref = y; }, { -pos = (476,0); +pos = (473,0); ref = acutecomb; } ); @@ -60,7 +60,7 @@ shapes = ( ref = y; }, { -pos = (434,0); +pos = (433,0); ref = acutecomb; } ); @@ -73,7 +73,7 @@ shapes = ( ref = y; }, { -pos = (384,0); +pos = (385,0); ref = acutecomb; } ); @@ -86,7 +86,7 @@ shapes = ( ref = y; }, { -pos = (464,0); +pos = (483,0); ref = acutecomb; } ); @@ -99,7 +99,7 @@ shapes = ( ref = y; }, { -pos = (432,0); +pos = (429,0); ref = acutecomb; } ); @@ -112,7 +112,7 @@ shapes = ( ref = y; }, { -pos = (407,0); +pos = (397,0); ref = acutecomb; } ); @@ -125,7 +125,7 @@ shapes = ( ref = y; }, { -pos = (412,0); +pos = (422,0); ref = acutecomb; } ); @@ -138,7 +138,7 @@ shapes = ( ref = y; }, { -pos = (354,0); +pos = (355,0); ref = acutecomb; } ); @@ -151,7 +151,7 @@ shapes = ( ref = y; }, { -pos = (414,0); +pos = (423,0); ref = acutecomb; } ); diff --git a/sources/Merriweather-Italic.glyphspackage/glyphs/ycircumflex.glyph b/sources/Merriweather-Italic.glyphspackage/glyphs/ycircumflex.glyph index bd3993c8d..d228c67d5 100644 --- a/sources/Merriweather-Italic.glyphspackage/glyphs/ycircumflex.glyph +++ b/sources/Merriweather-Italic.glyphspackage/glyphs/ycircumflex.glyph @@ -8,7 +8,7 @@ shapes = ( ref = y; }, { -pos = (219,0); +pos = (225,0); ref = circumflexcomb; } ); @@ -21,7 +21,7 @@ shapes = ( ref = y; }, { -pos = (129,0); +pos = (161,0); ref = circumflexcomb; } ); @@ -34,7 +34,7 @@ shapes = ( ref = y; }, { -pos = (186,0); +pos = (196,0); ref = circumflexcomb; } ); @@ -47,7 +47,7 @@ shapes = ( ref = y; }, { -pos = (241,0); +pos = (238,0); ref = circumflexcomb; } ); @@ -60,7 +60,7 @@ shapes = ( ref = y; }, { -pos = (121,0); +pos = (120,0); ref = circumflexcomb; } ); @@ -73,7 +73,7 @@ shapes = ( ref = y; }, { -pos = (121,0); +pos = (122,0); ref = circumflexcomb; } ); @@ -86,7 +86,7 @@ shapes = ( ref = y; }, { -pos = (161,0); +pos = (180,0); ref = circumflexcomb; } ); @@ -99,7 +99,7 @@ shapes = ( ref = y; }, { -pos = (180,0); +pos = (177,0); ref = circumflexcomb; } ); @@ -112,7 +112,7 @@ shapes = ( ref = y; }, { -pos = (172,0); +pos = (162,0); ref = circumflexcomb; } ); @@ -125,7 +125,7 @@ shapes = ( ref = y; }, { -pos = (137,0); +pos = (147,0); ref = circumflexcomb; } ); @@ -138,7 +138,7 @@ shapes = ( ref = y; }, { -pos = (128,0); +pos = (129,0); ref = circumflexcomb; } ); @@ -151,7 +151,7 @@ shapes = ( ref = y; }, { -pos = (114,0); +pos = (123,0); ref = circumflexcomb; } ); diff --git a/sources/Merriweather-Italic.glyphspackage/glyphs/ydieresis.glyph b/sources/Merriweather-Italic.glyphspackage/glyphs/ydieresis.glyph index 94408463d..424a8f193 100644 --- a/sources/Merriweather-Italic.glyphspackage/glyphs/ydieresis.glyph +++ b/sources/Merriweather-Italic.glyphspackage/glyphs/ydieresis.glyph @@ -8,7 +8,7 @@ shapes = ( ref = y; }, { -pos = (241,0); +pos = (247,0); ref = dieresiscomb; } ); @@ -21,7 +21,7 @@ shapes = ( ref = y; }, { -pos = (119,0); +pos = (151,0); ref = dieresiscomb; } ); @@ -34,7 +34,7 @@ shapes = ( ref = y; }, { -pos = (176,0); +pos = (186,0); ref = dieresiscomb; } ); @@ -47,7 +47,7 @@ shapes = ( ref = y; }, { -pos = (270,0); +pos = (267,0); ref = dieresiscomb; } ); @@ -60,7 +60,7 @@ shapes = ( ref = y; }, { -pos = (130,0); +pos = (129,0); ref = dieresiscomb; } ); @@ -73,7 +73,7 @@ shapes = ( ref = y; }, { -pos = (136,0); +pos = (137,0); ref = dieresiscomb; } ); @@ -86,7 +86,7 @@ shapes = ( ref = y; }, { -pos = (170,0); +pos = (189,0); ref = dieresiscomb; } ); @@ -99,7 +99,7 @@ shapes = ( ref = y; }, { -pos = (184,0); +pos = (181,0); ref = dieresiscomb; } ); @@ -112,7 +112,7 @@ shapes = ( ref = y; }, { -pos = (207,0); +pos = (197,0); ref = dieresiscomb; } ); @@ -125,7 +125,7 @@ shapes = ( ref = y; }, { -pos = (127,0); +pos = (137,0); ref = dieresiscomb; } ); @@ -138,7 +138,7 @@ shapes = ( ref = y; }, { -pos = (106,0); +pos = (107,0); ref = dieresiscomb; } ); @@ -151,7 +151,7 @@ shapes = ( ref = y; }, { -pos = (120,0); +pos = (129,0); ref = dieresiscomb; } ); diff --git a/sources/Merriweather-Italic.glyphspackage/glyphs/ydotaccent.glyph b/sources/Merriweather-Italic.glyphspackage/glyphs/ydotaccent.glyph index ddf18d949..c871246bf 100644 --- a/sources/Merriweather-Italic.glyphspackage/glyphs/ydotaccent.glyph +++ b/sources/Merriweather-Italic.glyphspackage/glyphs/ydotaccent.glyph @@ -8,7 +8,7 @@ shapes = ( ref = y; }, { -pos = (418,0); +pos = (424,0); ref = dotaccentcomb; } ); @@ -21,7 +21,7 @@ shapes = ( ref = y; }, { -pos = (322,0); +pos = (354,0); ref = dotaccentcomb; } ); @@ -34,7 +34,7 @@ shapes = ( ref = y; }, { -pos = (377,0); +pos = (387,0); ref = dotaccentcomb; } ); @@ -47,7 +47,7 @@ shapes = ( ref = y; }, { -pos = (441,0); +pos = (438,0); ref = dotaccentcomb; } ); @@ -60,7 +60,7 @@ shapes = ( ref = y; }, { -pos = (308,0); +pos = (307,0); ref = dotaccentcomb; } ); @@ -73,7 +73,7 @@ shapes = ( ref = y; }, { -pos = (311,0); +pos = (312,0); ref = dotaccentcomb; } ); @@ -86,7 +86,7 @@ shapes = ( ref = y; }, { -pos = (333,0); +pos = (352,0); ref = dotaccentcomb; } ); @@ -99,7 +99,7 @@ shapes = ( ref = y; }, { -pos = (352,0); +pos = (349,0); ref = dotaccentcomb; } ); @@ -112,7 +112,7 @@ shapes = ( ref = y; }, { -pos = (366,0); +pos = (356,0); ref = dotaccentcomb; } ); @@ -125,7 +125,7 @@ shapes = ( ref = y; }, { -pos = (333,0); +pos = (343,0); ref = dotaccentcomb; } ); @@ -138,7 +138,7 @@ shapes = ( ref = y; }, { -pos = (294,0); +pos = (295,0); ref = dotaccentcomb; } ); @@ -151,7 +151,7 @@ shapes = ( ref = y; }, { -pos = (307,0); +pos = (316,0); ref = dotaccentcomb; } ); diff --git a/sources/Merriweather-Italic.glyphspackage/glyphs/ygrave.glyph b/sources/Merriweather-Italic.glyphspackage/glyphs/ygrave.glyph index d049fd679..646b4e67a 100644 --- a/sources/Merriweather-Italic.glyphspackage/glyphs/ygrave.glyph +++ b/sources/Merriweather-Italic.glyphspackage/glyphs/ygrave.glyph @@ -8,7 +8,7 @@ shapes = ( ref = y; }, { -pos = (157,0); +pos = (163,0); ref = gravecomb; } ); @@ -21,7 +21,7 @@ shapes = ( ref = y; }, { -pos = (34,0); +pos = (66,0); ref = gravecomb; } ); @@ -34,7 +34,7 @@ shapes = ( ref = y; }, { -pos = (91,0); +pos = (101,0); ref = gravecomb; } ); @@ -47,7 +47,7 @@ shapes = ( ref = y; }, { -pos = (176,0); +pos = (173,0); ref = gravecomb; } ); @@ -60,7 +60,6 @@ shapes = ( ref = y; }, { -pos = (1,0); ref = gravecomb; } ); @@ -73,7 +72,7 @@ shapes = ( ref = y; }, { -pos = (-14,0); +pos = (-13,0); ref = gravecomb; } ); @@ -86,7 +85,7 @@ shapes = ( ref = y; }, { -pos = (-9,0); +pos = (10,0); ref = gravecomb; } ); @@ -99,7 +98,7 @@ shapes = ( ref = y; }, { -pos = (34,0); +pos = (31,0); ref = gravecomb; } ); @@ -112,7 +111,7 @@ shapes = ( ref = y; }, { -pos = (107,0); +pos = (97,0); ref = gravecomb; } ); @@ -125,7 +124,7 @@ shapes = ( ref = y; }, { -pos = (42,0); +pos = (52,0); ref = gravecomb; } ); @@ -138,7 +137,7 @@ shapes = ( ref = y; }, { -pos = (-4,0); +pos = (-3,0); ref = gravecomb; } ); @@ -151,7 +150,6 @@ shapes = ( ref = y; }, { -pos = (-9,0); ref = gravecomb; } ); diff --git a/sources/Merriweather-Italic.glyphspackage/glyphs/yhookabove.glyph b/sources/Merriweather-Italic.glyphspackage/glyphs/yhookabove.glyph index 6e864c5d2..31c60241e 100644 --- a/sources/Merriweather-Italic.glyphspackage/glyphs/yhookabove.glyph +++ b/sources/Merriweather-Italic.glyphspackage/glyphs/yhookabove.glyph @@ -8,7 +8,7 @@ shapes = ( ref = y; }, { -pos = (384,0); +pos = (390,0); ref = hookabovecomb; } ); @@ -21,7 +21,7 @@ shapes = ( ref = y; }, { -pos = (331,0); +pos = (363,0); ref = hookabovecomb; } ); @@ -34,7 +34,7 @@ shapes = ( ref = y; }, { -pos = (382,0); +pos = (392,0); ref = hookabovecomb; } ); @@ -47,7 +47,7 @@ shapes = ( ref = y; }, { -pos = (434,0); +pos = (431,0); ref = hookabovecomb; } ); @@ -60,7 +60,7 @@ shapes = ( ref = y; }, { -pos = (300,0); +pos = (299,0); ref = hookabovecomb; } ); @@ -73,7 +73,7 @@ shapes = ( ref = y; }, { -pos = (250,0); +pos = (251,0); ref = hookabovecomb; } ); @@ -86,7 +86,7 @@ shapes = ( ref = y; }, { -pos = (330,0); +pos = (349,0); ref = hookabovecomb; } ); @@ -99,7 +99,7 @@ shapes = ( ref = y; }, { -pos = (288,0); +pos = (285,0); ref = hookabovecomb; } ); @@ -112,7 +112,7 @@ shapes = ( ref = y; }, { -pos = (358,0); +pos = (348,0); ref = hookabovecomb; } ); @@ -125,7 +125,7 @@ shapes = ( ref = y; }, { -pos = (345,0); +pos = (355,0); ref = hookabovecomb; } ); @@ -138,7 +138,7 @@ shapes = ( ref = y; }, { -pos = (240,0); +pos = (241,0); ref = hookabovecomb; } ); @@ -151,7 +151,7 @@ shapes = ( ref = y; }, { -pos = (290,0); +pos = (299,0); ref = hookabovecomb; } ); diff --git a/sources/Merriweather-Italic.glyphspackage/glyphs/ymacron.glyph b/sources/Merriweather-Italic.glyphspackage/glyphs/ymacron.glyph index 6face2a17..03eef1bb5 100644 --- a/sources/Merriweather-Italic.glyphspackage/glyphs/ymacron.glyph +++ b/sources/Merriweather-Italic.glyphspackage/glyphs/ymacron.glyph @@ -8,7 +8,7 @@ shapes = ( ref = y; }, { -pos = (280,0); +pos = (286,0); ref = macroncomb; } ); @@ -21,7 +21,7 @@ shapes = ( ref = y; }, { -pos = (217,0); +pos = (249,0); ref = macroncomb; } ); @@ -34,7 +34,7 @@ shapes = ( ref = y; }, { -pos = (274,0); +pos = (284,0); ref = macroncomb; } ); @@ -47,7 +47,7 @@ shapes = ( ref = y; }, { -pos = (299,0); +pos = (296,0); ref = macroncomb; } ); @@ -60,7 +60,7 @@ shapes = ( ref = y; }, { -pos = (199,0); +pos = (198,0); ref = macroncomb; } ); @@ -73,7 +73,7 @@ shapes = ( ref = y; }, { -pos = (157,0); +pos = (158,0); ref = macroncomb; } ); @@ -86,7 +86,7 @@ shapes = ( ref = y; }, { -pos = (240,0); +pos = (259,0); ref = macroncomb; } ); @@ -99,7 +99,7 @@ shapes = ( ref = y; }, { -pos = (202,0); +pos = (199,0); ref = macroncomb; } ); @@ -112,7 +112,7 @@ shapes = ( ref = y; }, { -pos = (230,0); +pos = (220,0); ref = macroncomb; } ); @@ -125,7 +125,7 @@ shapes = ( ref = y; }, { -pos = (225,0); +pos = (235,0); ref = macroncomb; } ); @@ -138,7 +138,7 @@ shapes = ( ref = y; }, { -pos = (124,0); +pos = (125,0); ref = macroncomb; } ); @@ -151,7 +151,7 @@ shapes = ( ref = y; }, { -pos = (190,0); +pos = (199,0); ref = macroncomb; } ); diff --git a/sources/Merriweather-Italic.glyphspackage/glyphs/yring.glyph b/sources/Merriweather-Italic.glyphspackage/glyphs/yring.glyph index 341477060..41cedad57 100644 --- a/sources/Merriweather-Italic.glyphspackage/glyphs/yring.glyph +++ b/sources/Merriweather-Italic.glyphspackage/glyphs/yring.glyph @@ -8,7 +8,7 @@ shapes = ( ref = y; }, { -pos = (270,0); +pos = (276,0); ref = ringcomb; } ); @@ -21,7 +21,7 @@ shapes = ( ref = y; }, { -pos = (170,0); +pos = (202,0); ref = ringcomb; } ); @@ -34,7 +34,7 @@ shapes = ( ref = y; }, { -pos = (290,0); +pos = (287,0); ref = ringcomb; } ); @@ -47,7 +47,7 @@ shapes = ( ref = y; }, { -pos = (214,0); +pos = (224,0); ref = ringcomb; } ); @@ -60,7 +60,7 @@ shapes = ( ref = y; }, { -pos = (161,0); +pos = (162,0); ref = ringcomb; } ); @@ -73,7 +73,7 @@ shapes = ( ref = y; }, { -pos = (201,0); +pos = (200,0); ref = ringcomb; } ); @@ -86,7 +86,7 @@ shapes = ( ref = y; }, { -pos = (209,0); +pos = (206,0); ref = ringcomb; } ); @@ -99,7 +99,7 @@ shapes = ( ref = y; }, { -pos = (237,0); +pos = (256,0); ref = ringcomb; } ); @@ -112,7 +112,7 @@ shapes = ( ref = y; }, { -pos = (220,0); +pos = (210,0); ref = ringcomb; } ); @@ -125,7 +125,7 @@ shapes = ( ref = y; }, { -pos = (179,0); +pos = (189,0); ref = ringcomb; } ); @@ -138,7 +138,7 @@ shapes = ( ref = y; }, { -pos = (131,0); +pos = (132,0); ref = ringcomb; } ); @@ -151,7 +151,7 @@ shapes = ( ref = y; }, { -pos = (191,0); +pos = (200,0); ref = ringcomb; } ); diff --git a/sources/Merriweather-Italic.glyphspackage/glyphs/ytilde.glyph b/sources/Merriweather-Italic.glyphspackage/glyphs/ytilde.glyph index e4736627f..0e98032ed 100644 --- a/sources/Merriweather-Italic.glyphspackage/glyphs/ytilde.glyph +++ b/sources/Merriweather-Italic.glyphspackage/glyphs/ytilde.glyph @@ -9,7 +9,7 @@ ref = y; }, { anchor = top; -pos = (46,0); +pos = (52,0); ref = tildecomb; } ); @@ -23,7 +23,7 @@ ref = y; }, { anchor = top; -pos = (-31,0); +pos = (1,0); ref = tildecomb; } ); @@ -36,7 +36,7 @@ shapes = ( ref = y; }, { -pos = (60,0); +pos = (70,0); ref = tildecomb; } ); @@ -49,7 +49,7 @@ shapes = ( ref = y; }, { -pos = (84,0); +pos = (81,0); ref = tildecomb; } ); @@ -63,7 +63,7 @@ ref = y; }, { anchor = top; -pos = (26,0); +pos = (25,0); ref = tildecomb; } ); @@ -77,7 +77,7 @@ ref = y; }, { anchor = top; -pos = (20,0); +pos = (21,0); ref = tildecomb; } ); @@ -90,7 +90,7 @@ shapes = ( ref = y; }, { -pos = (53,0); +pos = (72,0); ref = tildecomb; } ); @@ -103,7 +103,7 @@ shapes = ( ref = y; }, { -pos = (64,0); +pos = (61,0); ref = tildecomb; } ); @@ -116,7 +116,7 @@ shapes = ( ref = y; }, { -pos = (41,0); +pos = (31,0); ref = tildecomb; } ); @@ -129,7 +129,7 @@ shapes = ( ref = y; }, { -pos = (5,0); +pos = (15,0); ref = tildecomb; } ); @@ -142,7 +142,7 @@ shapes = ( ref = y; }, { -pos = (-3,0); +pos = (-2,0); ref = tildecomb; } ); @@ -155,7 +155,7 @@ shapes = ( ref = y; }, { -pos = (26,0); +pos = (35,0); ref = tildecomb; } ); diff --git a/sources/Merriweather.glyphspackage/UIState.plist b/sources/Merriweather.glyphspackage/UIState.plist index 83d942397..cfb145428 100644 --- a/sources/Merriweather.glyphspackage/UIState.plist +++ b/sources/Merriweather.glyphspackage/UIState.plist @@ -3,6 +3,7 @@ displayStrings = ( "Λ", "Λ", "+", -"≠/plus.case/minus.case/multiply.case/divide.case/equal.case/notequal.case" +"≠/plus.case/minus.case/multiply.case/divide.case/equal.case/notequal.case", +y ); } diff --git a/sources/Merriweather.glyphspackage/fontinfo.plist b/sources/Merriweather.glyphspackage/fontinfo.plist index 49ba1d9ab..dcfe633e6 100644 --- a/sources/Merriweather.glyphspackage/fontinfo.plist +++ b/sources/Merriweather.glyphspackage/fontinfo.plist @@ -100,7 +100,7 @@ wght = { }; } ); -date = "2024-10-02 08:49:52 +0000"; +date = "2024-10-05 03:46:38 +0000"; familyName = Merriweather; featurePrefixes = ( { diff --git a/sources/Merriweather.glyphspackage/glyphs/D_elta.glyph b/sources/Merriweather.glyphspackage/glyphs/D_elta.glyph index c1eb3d388..9ff28830d 100644 --- a/sources/Merriweather.glyphspackage/glyphs/D_elta.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/D_elta.glyph @@ -7,26 +7,26 @@ shapes = ( { closed = 1; nodes = ( -(1384,0,l), -(1418,40,l), -(822,1500,l), -(758,1500,l), -(180,40,l), -(216,0,l) +(1426,0,l), +(1460,40,l), +(864,1500,l), +(800,1500,l), +(222,40,l), +(258,0,l) ); }, { closed = 1; nodes = ( -(760,1186,l), -(781,1244,l), -(802,1192,l), -(1222,86,l), -(344,86,l) +(802,1186,l), +(823,1244,l), +(844,1192,l), +(1264,86,l), +(386,86,l) ); } ); -width = 1598; +width = 1682; }, { layerId = "DEBB1CE4-A72D-4960-969E-E04A036D2FA1"; @@ -34,26 +34,26 @@ shapes = ( { closed = 1; nodes = ( -(1477,0,l), -(1507,74,l), -(891,1493,l), -(761,1493,l), -(180,74,l), -(214,0,l) +(1505,0,l), +(1535,74,l), +(919,1493,l), +(789,1493,l), +(208,74,l), +(242,0,l) ); }, { closed = 1; nodes = ( -(741,956,l), -(764,1025,l), -(784,957,l), -(1106,132,l), -(409,132,l) +(769,956,l), +(792,1025,l), +(812,957,l), +(1134,132,l), +(437,132,l) ); } ); -width = 1687; +width = 1743; }, { layerId = "184155C8-9F61-4F1C-9784-DDA8EA717636"; @@ -61,26 +61,26 @@ shapes = ( { closed = 1; nodes = ( -(1389,0,l), -(1417,66,l), -(805,1493,l), -(713,1493,l), -(154,63,l), -(186,0,l) +(1443,0,l), +(1471,66,l), +(859,1493,l), +(767,1493,l), +(208,63,l), +(240,0,l) ); }, { closed = 1; nodes = ( -(585,956,l), -(630,1080,l), -(665,972,l), -(968,208,l), -(297,208,l) +(639,956,l), +(684,1080,l), +(719,972,l), +(1022,208,l), +(351,208,l) ); } ); -width = 1571; +width = 1679; }, { layerId = "EA2265BD-E890-48C4-9E90-A53076E780C5"; @@ -88,26 +88,26 @@ shapes = ( { closed = 1; nodes = ( -(1442,0,l), -(1472,74,l), -(876,1493,l), -(746,1493,l), -(185,74,l), -(219,0,l) +(1476,0,l), +(1506,74,l), +(910,1493,l), +(780,1493,l), +(219,74,l), +(253,0,l) ); }, { closed = 1; nodes = ( -(726,956,l), -(749,1025,l), -(769,957,l), -(1074,132,l), -(412,132,l) +(760,956,l), +(783,1025,l), +(803,957,l), +(1108,132,l), +(446,132,l) ); } ); -width = 1657; +width = 1725; }, { layerId = "0E4B6E2E-ECAB-4D06-9686-B0B40AA31834"; @@ -115,26 +115,26 @@ shapes = ( { closed = 1; nodes = ( -(1274,0,l), -(1308,40,l), -(732,1500,l), -(668,1500,l), -(110,40,l), -(146,0,l) +(1386,0,l), +(1420,40,l), +(844,1500,l), +(780,1500,l), +(222,40,l), +(258,0,l) ); }, { closed = 1; nodes = ( -(670,1186,l), -(690,1264,l), -(712,1192,l), -(1113,86,l), -(273,86,l) +(782,1186,l), +(802,1264,l), +(824,1192,l), +(1225,86,l), +(385,86,l) ); } ); -width = 1418; +width = 1642; }, { layerId = "F2B10EEF-9DDC-48CA-970D-6B8C79870881"; @@ -142,26 +142,26 @@ shapes = ( { closed = 1; nodes = ( -(1257,0,l), -(1282,66,l), -(739,1493,l), -(655,1493,l), -(141,63,l), -(170,0,l) +(1325,0,l), +(1350,66,l), +(807,1493,l), +(723,1493,l), +(209,63,l), +(238,0,l) ); }, { closed = 1; nodes = ( -(537,956,l), -(578,1080,l), -(611,972,l), -(872,208,l), -(272,208,l) +(605,956,l), +(646,1080,l), +(679,972,l), +(940,208,l), +(340,208,l) ); } ); -width = 1423; +width = 1559; }, { layerId = "E96AC896-F5DF-475B-BBD9-C7FEC6A86D0E"; @@ -169,26 +169,26 @@ shapes = ( { closed = 1; nodes = ( -(1180,0,l), -(1206,45,l), -(687,1500,l), -(643,1500,l), -(140,40,l), -(164,0,l) +(1274,0,l), +(1300,45,l), +(781,1500,l), +(737,1500,l), +(234,40,l), +(258,0,l) ); }, { closed = 1; nodes = ( -(589,1106,l), -(625,1242,l), -(678,1068,l), -(1021,105,l), -(247,105,l) +(683,1106,l), +(719,1242,l), +(772,1068,l), +(1115,105,l), +(341,105,l) ); } ); -width = 1346; +width = 1534; }, { layerId = "C9B9556E-C2FD-4F62-BB40-44923C452C22"; @@ -196,26 +196,26 @@ shapes = ( { closed = 1; nodes = ( -(1328,0,l), -(1356,45,l), -(770,1500,l), -(722,1500,l), -(154,40,l), -(180,0,l) +(1382,0,l), +(1410,45,l), +(824,1500,l), +(776,1500,l), +(208,40,l), +(234,0,l) ); }, { closed = 1; nodes = ( -(656,1106,l), -(714,1242,l), -(777,1068,l), -(1165,105,l), -(264,105,l) +(710,1106,l), +(768,1242,l), +(831,1068,l), +(1219,105,l), +(318,105,l) ); } ); -width = 1510; +width = 1618; }, { layerId = "AFA1064D-EFC9-4C9F-B9B0-9118E41D87C4"; @@ -223,26 +223,26 @@ shapes = ( { closed = 1; nodes = ( -(1505,0,l), -(1537,66,l), +(1610,0,l), +(1642,66,l), +(948,1493,l), (843,1493,l), -(738,1493,l), -(104,63,l), -(141,0,l) +(209,63,l), +(246,0,l) ); }, { closed = 1; nodes = ( -(593,956,l), -(645,1080,l), -(683,972,l), -(1027,208,l), -(268,208,l) +(698,956,l), +(750,1080,l), +(788,972,l), +(1132,208,l), +(373,208,l) ); } ); -width = 1641; +width = 1851; }, { layerId = "2103F1D3-C390-4F79-A87D-298F85EA6916"; @@ -250,26 +250,26 @@ shapes = ( { closed = 1; nodes = ( -(1477,0,l), -(1508,45,l), -(854,1500,l), -(799,1500,l), -(156,40,l), -(185,0,l) +(1530,0,l), +(1561,45,l), +(907,1500,l), +(852,1500,l), +(209,40,l), +(238,0,l) ); }, { closed = 1; nodes = ( -(717,1106,l), -(786,1280,l), -(878,1068,l), -(1311,105,l), -(275,105,l) +(770,1106,l), +(839,1280,l), +(931,1068,l), +(1364,105,l), +(328,105,l) ); } ); -width = 1664; +width = 1770; }, { layerId = "779F1615-9D1A-4778-9767-9A030AA58B6C"; @@ -277,29 +277,29 @@ shapes = ( { closed = 1; nodes = ( -(1374,0,l), -(1410,40,l), -(784,1500,l), -(717,1500,l), -(110,40,l), -(148,0,l) +(1486,0,l), +(1522,40,l), +(896,1500,l), +(829,1500,l), +(222,40,l), +(260,0,l) ); }, { closed = 1; nodes = ( -(719,1186,l), -(740,1264,l), -(763,1192,l), -(1204,86,l), -(282,86,l) +(831,1186,l), +(852,1264,l), +(875,1192,l), +(1316,86,l), +(394,86,l) ); } ); userData = { com.schriftgestaltung.Glyphs.lastChange = "2019-04-25 21:50:43 +0000"; }; -width = 1520; +width = 1744; }, { layerId = "97BB7961-D669-43AB-8BBF-11FFD0C46A4B"; @@ -307,26 +307,26 @@ shapes = ( { closed = 1; nodes = ( -(1532,0,l), -(1563,74,l), -(916,1493,l), -(780,1493,l), -(170,74,l), -(206,0,l) +(1561,0,l), +(1592,74,l), +(945,1493,l), +(809,1493,l), +(199,74,l), +(235,0,l) ); }, { closed = 1; nodes = ( -(759,956,l), -(783,1025,l), -(804,957,l), -(1142,132,l), -(411,132,l) +(788,956,l), +(812,1025,l), +(833,957,l), +(1171,132,l), +(440,132,l) ); } ); -width = 1733; +width = 1791; } ); metricLeft = plus; diff --git a/sources/Merriweather.glyphspackage/glyphs/K_astroke-cy.glyph b/sources/Merriweather.glyphspackage/glyphs/K_astroke-cy.glyph index 9a53696a5..f9de4fa6b 100644 --- a/sources/Merriweather.glyphspackage/glyphs/K_astroke-cy.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/K_astroke-cy.glyph @@ -118,7 +118,7 @@ width = 1462; anchors = ( { name = top; -pos = (3778,1486); +pos = (3796,1486); } ); layerId = "EA2265BD-E890-48C4-9E90-A53076E780C5"; @@ -137,7 +137,7 @@ width = 1351; anchors = ( { name = top; -pos = (2310,1486); +pos = (2320,1486); } ); layerId = "0E4B6E2E-ECAB-4D06-9686-B0B40AA31834"; diff --git a/sources/Merriweather.glyphspackage/glyphs/L_slash.glyph b/sources/Merriweather.glyphspackage/glyphs/L_slash.glyph index 9275ea33b..ac81db123 100644 --- a/sources/Merriweather.glyphspackage/glyphs/L_slash.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/L_slash.glyph @@ -96,14 +96,14 @@ shapes = ( { closed = 1; nodes = ( -(9740,664,l), -(9850,714,l), -(10343,938,l), -(10343,1108,l), -(9852,879,l), -(9740,831,l), -(9466,707,l), -(9466,547,l) +(9776,664,l), +(9886,714,l), +(10379,938,l), +(10379,1108,l), +(9888,879,l), +(9776,831,l), +(9502,707,l), +(9502,547,l) ); } ); @@ -139,14 +139,14 @@ shapes = ( { closed = 1; nodes = ( -(5985,675,l), -(6016,689,l), -(6605,953,l), -(6605,1032,l), -(6018,768,l), -(5985,754,l), -(5782,666,l), -(5782,589,l) +(6007,675,l), +(6038,689,l), +(6627,953,l), +(6627,1032,l), +(6040,768,l), +(6007,754,l), +(5804,666,l), +(5804,589,l) ); } ); @@ -169,14 +169,14 @@ shapes = ( { closed = 1; nodes = ( -(3355,680,l), -(3382,693,l), -(3831,919,l), -(3831,1005,l), -(3384,777,l), -(3355,762,l), -(3156,669,l), -(3156,589,l) +(3367,680,l), +(3394,693,l), +(3843,919,l), +(3843,1005,l), +(3396,777,l), +(3367,762,l), +(3168,669,l), +(3168,589,l) ); } ); @@ -259,14 +259,14 @@ shapes = ( { closed = 1; nodes = ( -(6985,644,l), -(7012,657,l), -(7524,919,l), -(7524,1005,l), -(7014,741,l), -(6985,726,l), -(6813,639,l), -(6813,559,l) +(7011,644,l), +(7038,657,l), +(7550,919,l), +(7550,1005,l), +(7040,741,l), +(7011,726,l), +(6839,639,l), +(6839,559,l) ); } ); @@ -322,14 +322,14 @@ shapes = ( { closed = 1; nodes = ( -(25922,658,l), -(26032,708,l), -(26565,938,l), -(26565,1108,l), -(26034,873,l), -(25922,825,l), -(25656,707,l), -(25656,547,l) +(26020,658,l), +(26130,708,l), +(26663,938,l), +(26663,1108,l), +(26132,873,l), +(26020,825,l), +(25754,707,l), +(25754,547,l) ); } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/bulletoperator.glyph b/sources/Merriweather.glyphspackage/glyphs/bulletoperator.glyph index 965cdd11f..148502128 100644 --- a/sources/Merriweather.glyphspackage/glyphs/bulletoperator.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/bulletoperator.glyph @@ -5,124 +5,124 @@ layers = ( layerId = UUID0; shapes = ( { -pos = (58,643); +pos = (100,643); ref = period; } ); -width = 598; +width = 682; }, { layerId = "DEBB1CE4-A72D-4960-969E-E04A036D2FA1"; shapes = ( { -pos = (70,584); +pos = (98,584); ref = period; } ); -width = 721; +width = 778; }, { layerId = "184155C8-9F61-4F1C-9784-DDA8EA717636"; shapes = ( { -pos = (78,600); +pos = (132,600); ref = period; } ); -width = 627; +width = 736; }, { layerId = "EA2265BD-E890-48C4-9E90-A53076E780C5"; shapes = ( { -pos = (43,584); +pos = (77,584); ref = period; } ); -width = 707; +width = 774; }, { layerId = "0E4B6E2E-ECAB-4D06-9686-B0B40AA31834"; shapes = ( { -pos = (-18,643); +pos = (94,643); ref = period; } ); -width = 454; +width = 678; }, { layerId = "F2B10EEF-9DDC-48CA-970D-6B8C79870881"; shapes = ( { -pos = (73,600); +pos = (141,600); ref = period; } ); -width = 571; +width = 706; }, { layerId = "E96AC896-F5DF-475B-BBD9-C7FEC6A86D0E"; shapes = ( { -pos = (58,666); +pos = (152,666); ref = period; } ); -width = 446; +width = 633; }, { layerId = "C9B9556E-C2FD-4F62-BB40-44923C452C22"; shapes = ( { -pos = (66,666); +pos = (120,666); ref = period; } ); -width = 496; +width = 605; }, { layerId = "AFA1064D-EFC9-4C9F-B9B0-9118E41D87C4"; shapes = ( { -pos = (22,600); +pos = (127,600); ref = period; } ); -width = 557; +width = 766; }, { layerId = "2103F1D3-C390-4F79-A87D-298F85EA6916"; shapes = ( { -pos = (50,666); +pos = (103,666); ref = period; } ); -width = 492; +width = 597; }, { layerId = "779F1615-9D1A-4778-9767-9A030AA58B6C"; shapes = ( { -pos = (-10,643); +pos = (102,643); ref = period; } ); userData = { com.schriftgestaltung.Glyphs.lastChange = "2019-04-25 21:50:43 +0000"; }; -width = 458; +width = 682; }, { layerId = "97BB7961-D669-43AB-8BBF-11FFD0C46A4B"; shapes = ( { -pos = (48,584); +pos = (77,584); ref = period; } ); -width = 717; +width = 774; } ); metricLeft = "=plus"; diff --git a/sources/Merriweather.glyphspackage/glyphs/chook.glyph b/sources/Merriweather.glyphspackage/glyphs/chook.glyph index a06f5df2a..1f120ccef 100644 --- a/sources/Merriweather.glyphspackage/glyphs/chook.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/chook.glyph @@ -7,70 +7,70 @@ background = { anchors = ( { name = bottom; -pos = (3676,0); +pos = (3846,0); }, { name = center; -pos = (3676,556); +pos = (3846,556); }, { name = top; -pos = (3676,1110); +pos = (3846,1110); } ); shapes = ( { closed = 1; nodes = ( -(4017,844,l), -(4017,1080,l), -(4017,1150,o), -(4102,1220,o), -(4102,1220,cs), +(4187,844,l), +(4187,1080,l), +(4187,1150,o), (4272,1220,o), -(4272,1198,o), -(4357,1184,c), -(4357,1348,l), -(4272,1356,o), +(4272,1220,cs), +(4442,1220,o), +(4442,1198,o), +(4527,1184,c), +(4527,1348,l), +(4442,1356,o), +(4442,1364,o), +(4357,1364,cs), (4272,1364,o), -(4187,1364,cs), -(4102,1364,o), -(4017,1264,o), -(3932,1117,c), -(3932,879,l) +(4187,1264,o), +(4102,1117,c), +(4102,879,l) ); }, { closed = 1; nodes = ( -(3167,226,o), -(3337,-22,o), -(3677,-22,cs), -(3847,-22,o), -(4017,46,o), -(4017,120,c), -(4017,186,l), -(3932,144,o), -(3847,94,o), -(3762,94,cs), -(3507,94,o), -(3337,256,o), -(3337,604,cs), -(3337,878,o), -(3507,1046,o), -(3677,1046,cs), -(3762,1046,o), -(3847,1018,o), -(3847,986,cs), -(3932,794,l), -(4017,794,l), -(4017,1080,l), -(4017,1102,o), -(3847,1140,o), -(3762,1140,cs), -(3422,1140,o), -(3167,858,o), -(3167,542,cs) +(3337,226,o), +(3507,-22,o), +(3847,-22,cs), +(4017,-22,o), +(4187,46,o), +(4187,120,c), +(4187,186,l), +(4102,144,o), +(4017,94,o), +(3932,94,cs), +(3677,94,o), +(3507,256,o), +(3507,604,cs), +(3507,878,o), +(3677,1046,o), +(3847,1046,cs), +(3932,1046,o), +(4017,1018,o), +(4017,986,cs), +(4102,794,l), +(4187,794,l), +(4187,1080,l), +(4187,1102,o), +(4017,1140,o), +(3932,1140,cs), +(3592,1140,o), +(3337,858,o), +(3337,542,cs) ); } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/eopen.sc.glyph b/sources/Merriweather.glyphspackage/glyphs/eopen.sc.glyph index 59e07a910..331c7e0cf 100644 --- a/sources/Merriweather.glyphspackage/glyphs/eopen.sc.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/eopen.sc.glyph @@ -6,11 +6,11 @@ layers = ( anchors = ( { name = bottom; -pos = (-17850,0); +pos = (-17922,0); }, { name = top; -pos = (-17827,1272); +pos = (-17899,1272); } ); layerId = UUID0; @@ -25,11 +25,11 @@ width = 1120; anchors = ( { name = bottom; -pos = (-22953,0); +pos = (-23045,0); }, { name = top; -pos = (-22910,1272); +pos = (-23002,1272); } ); layerId = "DEBB1CE4-A72D-4960-969E-E04A036D2FA1"; @@ -63,11 +63,11 @@ width = 898; anchors = ( { name = bottom; -pos = (-10169,0); +pos = (-10211,0); }, { name = top; -pos = (-10149,1272); +pos = (-10191,1272); } ); layerId = "EA2265BD-E890-48C4-9E90-A53076E780C5"; @@ -82,11 +82,11 @@ width = 1012; anchors = ( { name = bottom; -pos = (-5390,0); +pos = (-5538,0); }, { name = top; -pos = (-5381,1272); +pos = (-5529,1272); } ); layerId = "779F1615-9D1A-4778-9767-9A030AA58B6C"; @@ -101,11 +101,11 @@ width = 1238; anchors = ( { name = bottom; -pos = (-13809,0); +pos = (-13987,0); }, { name = top; -pos = (-13809,1272); +pos = (-13987,1272); } ); layerId = "97BB7961-D669-43AB-8BBF-11FFD0C46A4B"; @@ -120,11 +120,11 @@ width = 1325; anchors = ( { name = bottom; -pos = (-8386,0); +pos = (-8546,0); }, { name = top; -pos = (-8306,1272); +pos = (-8466,1272); } ); layerId = "C9B9556E-C2FD-4F62-BB40-44923C452C22"; @@ -139,11 +139,11 @@ width = 1083; anchors = ( { name = bottom; -pos = (-27240,0); +pos = (-27474,0); }, { name = top; -pos = (-27240,1352); +pos = (-27474,1352); } ); layerId = "184155C8-9F61-4F1C-9784-DDA8EA717636"; @@ -158,11 +158,11 @@ width = 1242; anchors = ( { name = bottom; -pos = (-13479,0); +pos = (-13659,0); }, { name = top; -pos = (-13408,1272); +pos = (-13588,1272); } ); layerId = "E96AC896-F5DF-475B-BBD9-C7FEC6A86D0E"; @@ -177,11 +177,11 @@ width = 931; anchors = ( { name = bottom; -pos = (-21434,0); +pos = (-21520,0); }, { name = top; -pos = (-21414,1272); +pos = (-21500,1272); } ); layerId = "F2B10EEF-9DDC-48CA-970D-6B8C79870881"; @@ -196,11 +196,11 @@ width = 1024; anchors = ( { name = bottom; -pos = (-31376,0); +pos = (-31626,0); }, { name = top; -pos = (-31376,1272); +pos = (-31626,1272); } ); layerId = "2103F1D3-C390-4F79-A87D-298F85EA6916"; @@ -215,11 +215,11 @@ width = 1234; anchors = ( { name = bottom; -pos = (-22614,0); +pos = (-22828,0); }, { name = top; -pos = (-22614,1272); +pos = (-22828,1272); } ); layerId = "AFA1064D-EFC9-4C9F-B9B0-9118E41D87C4"; diff --git a/sources/Merriweather.glyphspackage/glyphs/eth.sc.glyph b/sources/Merriweather.glyphspackage/glyphs/eth.sc.glyph index 5c36f073e..7311fc822 100644 --- a/sources/Merriweather.glyphspackage/glyphs/eth.sc.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/eth.sc.glyph @@ -8,52 +8,52 @@ shapes = ( { closed = 1; nodes = ( -(2400,613,l), -(2400,713,l), -(1732,713,l), -(1732,613,l) +(2404,613,l), +(2404,713,l), +(1736,713,l), +(1736,613,l) ); }, { closed = 1; nodes = ( -(1688,80,l), -(1688,0,l), -(1936,0,ls), -(2046,0,o), -(2152,-12,o), -(2250,-14,cs), -(2654,-22,o), -(2949,266,o), -(2949,686,cs), -(2949,1062,o), -(2722,1306,o), -(2274,1306,cs), -(2160,1306,o), -(2046,1292,o), -(1928,1292,cs), -(1690,1292,l), -(1690,1210,l), -(1846,1192,l), -(1846,98,l) +(1692,80,l), +(1692,0,l), +(1940,0,ls), +(2050,0,o), +(2156,-12,o), +(2254,-14,cs), +(2658,-22,o), +(2953,266,o), +(2953,686,cs), +(2953,1062,o), +(2726,1306,o), +(2278,1306,cs), +(2164,1306,o), +(2050,1292,o), +(1932,1292,cs), +(1694,1292,l), +(1694,1210,l), +(1850,1192,l), +(1850,98,l) ); }, { closed = 1; nodes = ( -(2012,1206,l), -(2064,1208,o), -(2140,1218,o), -(2226,1218,cs), -(2582,1218,o), -(2770,1022,o), -(2770,654,cs), -(2770,292,o), -(2566,82,o), -(2272,78,cs), -(2186,76,o), -(2114,76,o), -(2012,92,c) +(2016,1206,l), +(2068,1208,o), +(2144,1218,o), +(2230,1218,cs), +(2586,1218,o), +(2774,1022,o), +(2774,654,cs), +(2774,292,o), +(2570,82,o), +(2276,78,cs), +(2190,76,o), +(2118,76,o), +(2016,92,c) ); } ); @@ -182,52 +182,52 @@ shapes = ( { closed = 1; nodes = ( -(6441,575,l), -(6441,738,l), -(5752,738,l), -(5752,575,l) +(6455,575,l), +(6455,738,l), +(5766,738,l), +(5766,575,l) ); }, { closed = 1; nodes = ( -(5726,126,l), -(5726,0,l), -(6002,0,ls), -(6084,0,o), -(6174,-9,o), -(6276,-14,cs), -(6649,-32,o), -(6870,296,o), -(6870,694,cs), -(6870,1066,o), -(6702,1304,o), -(6307,1304,cs), -(6201,1304,o), -(6121,1292,o), -(6000,1292,cs), -(5726,1292,l), -(5726,1158,l), -(5858,1134,l), -(5858,146,l) +(5740,126,l), +(5740,0,l), +(6016,0,ls), +(6098,0,o), +(6188,-9,o), +(6290,-14,cs), +(6663,-32,o), +(6884,296,o), +(6884,694,cs), +(6884,1066,o), +(6716,1304,o), +(6321,1304,cs), +(6215,1304,o), +(6135,1292,o), +(6014,1292,cs), +(5740,1292,l), +(5740,1158,l), +(5872,1134,l), +(5872,146,l) ); }, { closed = 1; nodes = ( -(6161,1158,l), -(6175,1160,o), -(6201,1172,o), -(6268,1172,cs), -(6474,1172,o), -(6556,944,o), -(6556,648,cs), -(6556,278,o), -(6446,126,o), -(6286,126,cs), -(6233,126,o), -(6196,130,o), -(6161,142,c) +(6175,1158,l), +(6189,1160,o), +(6215,1172,o), +(6282,1172,cs), +(6488,1172,o), +(6570,944,o), +(6570,648,cs), +(6570,278,o), +(6460,126,o), +(6300,126,cs), +(6247,126,o), +(6210,130,o), +(6175,142,c) ); } ); @@ -761,67 +761,67 @@ background = { anchors = ( { name = bottom; -pos = (16896,0); +pos = (16936,0); }, { name = center; -pos = (16896,648); +pos = (16936,648); }, { name = top; -pos = (16926,1272); +pos = (16966,1272); } ); shapes = ( { closed = 1; nodes = ( -(16968,575,l), -(16968,738,l), -(16239,738,l), -(16239,575,l) +(17008,575,l), +(17008,738,l), +(16279,738,l), +(16279,575,l) ); }, { closed = 1; nodes = ( -(16226,126,l), -(16226,0,l), -(16554,0,ls), -(16646,0,o), -(16780,-12,o), -(16884,-14,cs), -(17352,-22,o), -(17596,296,o), -(17596,694,cs), -(17596,1086,o), -(17386,1304,o), -(16912,1304,cs), -(16754,1304,o), -(16657,1292,o), -(16552,1292,cs), -(16226,1292,l), -(16226,1158,l), -(16361,1134,l), -(16361,145,l) +(16266,126,l), +(16266,0,l), +(16594,0,ls), +(16686,0,o), +(16820,-12,o), +(16924,-14,cs), +(17392,-22,o), +(17636,296,o), +(17636,694,cs), +(17636,1086,o), +(17426,1304,o), +(16952,1304,cs), +(16794,1304,o), +(16697,1292,o), +(16592,1292,cs), +(16266,1292,l), +(16266,1158,l), +(16401,1134,l), +(16401,145,l) ); }, { closed = 1; nodes = ( -(16705,1160,l), -(16723,1162,o), -(16780,1174,o), -(16844,1174,cs), -(17114,1174,o), -(17214,944,o), -(17214,648,cs), -(17214,278,o), -(17082,124,o), -(16866,124,cs), -(16814,124,o), -(16747,128,o), -(16705,140,c) +(16745,1160,l), +(16763,1162,o), +(16820,1174,o), +(16884,1174,cs), +(17154,1174,o), +(17254,944,o), +(17254,648,cs), +(17254,278,o), +(17122,124,o), +(16906,124,cs), +(16854,124,o), +(16787,128,o), +(16745,140,c) ); } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/increment.glyph b/sources/Merriweather.glyphspackage/glyphs/increment.glyph index b28b137e4..54f5196fb 100644 --- a/sources/Merriweather.glyphspackage/glyphs/increment.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/increment.glyph @@ -8,7 +8,7 @@ shapes = ( ref = Delta; } ); -width = 1598; +width = 1682; }, { layerId = "DEBB1CE4-A72D-4960-969E-E04A036D2FA1"; @@ -17,7 +17,7 @@ shapes = ( ref = Delta; } ); -width = 1687; +width = 1743; }, { layerId = "184155C8-9F61-4F1C-9784-DDA8EA717636"; @@ -26,7 +26,7 @@ shapes = ( ref = Delta; } ); -width = 1571; +width = 1679; }, { layerId = "EA2265BD-E890-48C4-9E90-A53076E780C5"; @@ -35,7 +35,7 @@ shapes = ( ref = Delta; } ); -width = 1657; +width = 1725; }, { layerId = "0E4B6E2E-ECAB-4D06-9686-B0B40AA31834"; @@ -44,7 +44,7 @@ shapes = ( ref = Delta; } ); -width = 1418; +width = 1642; }, { layerId = "F2B10EEF-9DDC-48CA-970D-6B8C79870881"; @@ -53,7 +53,7 @@ shapes = ( ref = Delta; } ); -width = 1423; +width = 1559; }, { layerId = "E96AC896-F5DF-475B-BBD9-C7FEC6A86D0E"; @@ -62,7 +62,7 @@ shapes = ( ref = Delta; } ); -width = 1346; +width = 1534; }, { layerId = "C9B9556E-C2FD-4F62-BB40-44923C452C22"; @@ -71,7 +71,7 @@ shapes = ( ref = Delta; } ); -width = 1510; +width = 1618; }, { layerId = "AFA1064D-EFC9-4C9F-B9B0-9118E41D87C4"; @@ -80,7 +80,7 @@ shapes = ( ref = Delta; } ); -width = 1641; +width = 1851; }, { layerId = "2103F1D3-C390-4F79-A87D-298F85EA6916"; @@ -89,7 +89,7 @@ shapes = ( ref = Delta; } ); -width = 1664; +width = 1770; }, { layerId = "779F1615-9D1A-4778-9767-9A030AA58B6C"; @@ -101,7 +101,7 @@ ref = Delta; userData = { com.schriftgestaltung.Glyphs.lastChange = "2019-04-25 21:50:43 +0000"; }; -width = 1520; +width = 1744; }, { layerId = "97BB7961-D669-43AB-8BBF-11FFD0C46A4B"; @@ -110,7 +110,7 @@ shapes = ( ref = Delta; } ); -width = 1733; +width = 1791; } ); unicode = 8710; diff --git a/sources/Merriweather.glyphspackage/glyphs/phook.glyph b/sources/Merriweather.glyphspackage/glyphs/phook.glyph index a6bf4212b..b2dd4f6f6 100644 --- a/sources/Merriweather.glyphspackage/glyphs/phook.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/phook.glyph @@ -6,11 +6,11 @@ layers = ( background = { shapes = ( { -pos = (11255,0); +pos = (11529,0); ref = p; }, { -pos = (11255,0); +pos = (11529,0); ref = bhook; } ); @@ -31,11 +31,11 @@ width = 1196; background = { shapes = ( { -pos = (31186,0); +pos = (31416,0); ref = p; }, { -pos = (31301,0); +pos = (31531,0); ref = bhook; } ); @@ -56,11 +56,11 @@ width = 1301; background = { shapes = ( { -pos = (11255,0); +pos = (11529,0); ref = p; }, { -pos = (11255,0); +pos = (11529,0); ref = bhook; } ); @@ -81,11 +81,11 @@ width = 1066; background = { shapes = ( { -pos = (30175,0); +pos = (30285,0); ref = p; }, { -pos = (30149,0); +pos = (30259,0); ref = bhook; } ); @@ -106,11 +106,11 @@ width = 1093; background = { shapes = ( { -pos = (13557,0); +pos = (13839,0); ref = p; }, { -pos = (13557,0); +pos = (13839,0); ref = bhook; } ); @@ -131,11 +131,11 @@ width = 1258; background = { shapes = ( { -pos = (18130,0); +pos = (18312,0); ref = p; }, { -pos = (18130,0); +pos = (18312,0); ref = bhook; } ); @@ -156,11 +156,11 @@ width = 1354; background = { shapes = ( { -pos = (30079,0); +pos = (30305,0); ref = p; }, { -pos = (30079,0); +pos = (30305,0); ref = bhook; } ); @@ -183,51 +183,51 @@ shapes = ( { closed = 1; nodes = ( -(30486,-22,o), -(30710,179,o), -(30710,574,cs), -(30710,860,o), -(30598,1044,o), -(30262,1044,cs), -(30150,1044,o), -(30038,949,o), -(30038,893,c), -(30038,1345,ls), -(30038,1462,o), -(30038,1497,o), -(30150,1497,cs), +(30710,-22,o), +(30934,179,o), +(30934,574,cs), +(30934,860,o), +(30822,1044,o), +(30486,1044,cs), +(30374,1044,o), +(30262,949,o), +(30262,893,c), +(30262,1345,ls), +(30262,1462,o), (30262,1497,o), -(30374,1468,o), -(30486,1423,c), -(30486,1638,l), -(30374,1653,o), -(30374,1662,o), -(30262,1662,cs), -(29926,1662,o), -(29702,1393,o), -(29702,1065,cs), -(29702,54,l), -(29702,35,o), -(29814,-22,o), -(30150,-22,cs) +(30374,1497,cs), +(30486,1497,o), +(30598,1468,o), +(30710,1423,c), +(30710,1638,l), +(30598,1653,o), +(30598,1662,o), +(30486,1662,cs), +(30150,1662,o), +(29926,1393,o), +(29926,1065,cs), +(29926,54,l), +(29926,35,o), +(30038,-22,o), +(30374,-22,cs) ); }, { closed = 1; nodes = ( -(30150,37,o), -(30038,63,o), -(30038,113,c), -(30038,837,l), -(30038,854,o), -(30038,909,o), -(30150,909,cs), +(30374,37,o), +(30262,63,o), +(30262,113,c), +(30262,837,l), +(30262,854,o), (30262,909,o), -(30262,824,o), -(30262,522,cs), -(30262,200,o), -(30262,37,o), -(30150,37,cs) +(30374,909,cs), +(30486,909,o), +(30486,824,o), +(30486,522,cs), +(30486,200,o), +(30486,37,o), +(30374,37,cs) ); } ); @@ -248,11 +248,11 @@ width = 1155; background = { shapes = ( { -pos = (30687,0); +pos = (30915,0); ref = p; }, { -pos = (30687,0); +pos = (30915,0); ref = bhook; } ); @@ -273,11 +273,11 @@ width = 912; background = { shapes = ( { -pos = (22395,0); +pos = (22593,0); ref = p; }, { -pos = (22395,0); +pos = (22593,0); ref = bhook; } ); @@ -298,11 +298,11 @@ width = 1027; background = { shapes = ( { -pos = (4646,0); +pos = (4896,0); ref = p; }, { -pos = (4771,0); +pos = (5021,0); ref = bhook; } ); @@ -323,11 +323,11 @@ width = 1056; background = { shapes = ( { -pos = (1941,0); +pos = (2181,0); ref = p; }, { -pos = (1941,0); +pos = (2181,0); ref = bhook; } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/udieresis-cy.glyph b/sources/Merriweather.glyphspackage/glyphs/udieresis-cy.glyph index 15aead11d..3a5c04710 100644 --- a/sources/Merriweather.glyphspackage/glyphs/udieresis-cy.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/udieresis-cy.glyph @@ -21,7 +21,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (188,0); +pos = (196,0); ref = dieresiscomb; } ); @@ -34,7 +34,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (140,0); +pos = (150,0); ref = dieresiscomb; } ); @@ -47,7 +47,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (115,0); +pos = (125,0); ref = dieresiscomb; } ); @@ -60,7 +60,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (187,0); +pos = (188,0); ref = dieresiscomb; } ); @@ -73,7 +73,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (-5,0); +pos = (5,0); ref = dieresiscomb; } ); @@ -99,7 +99,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (184,0); +pos = (194,0); ref = dieresiscomb; } ); @@ -112,7 +112,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (130,0); +pos = (140,0); ref = dieresiscomb; } ); @@ -125,7 +125,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (209,0); +pos = (214,0); ref = dieresiscomb; } ); @@ -138,7 +138,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (273,0); +pos = (270,0); ref = dieresiscomb; } ); @@ -154,7 +154,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (176,0); +pos = (188,0); ref = dieresiscomb; } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/uhungarumlaut-cy.glyph b/sources/Merriweather.glyphspackage/glyphs/uhungarumlaut-cy.glyph index 4a8555131..5d5006c14 100644 --- a/sources/Merriweather.glyphspackage/glyphs/uhungarumlaut-cy.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/uhungarumlaut-cy.glyph @@ -21,7 +21,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (89,0); +pos = (97,0); ref = hungarumlautcomb; } ); @@ -34,7 +34,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (138,0); +pos = (148,0); ref = hungarumlautcomb; } ); @@ -47,7 +47,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (27,0); +pos = (37,0); ref = hungarumlautcomb; } ); @@ -60,7 +60,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (148,0); +pos = (149,0); ref = hungarumlautcomb; } ); @@ -73,7 +73,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (48,0); +pos = (58,0); ref = hungarumlautcomb; } ); @@ -99,7 +99,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (77,0); +pos = (87,0); ref = hungarumlautcomb; } ); @@ -112,7 +112,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (178,0); +pos = (188,0); ref = hungarumlautcomb; } ); @@ -125,7 +125,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (109,0); +pos = (114,0); ref = hungarumlautcomb; } ); @@ -138,7 +138,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (269,0); +pos = (266,0); ref = hungarumlautcomb; } ); @@ -154,7 +154,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (95,0); +pos = (107,0); ref = hungarumlautcomb; } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/umacron-cy.glyph b/sources/Merriweather.glyphspackage/glyphs/umacron-cy.glyph index e2408c72c..0730c0133 100644 --- a/sources/Merriweather.glyphspackage/glyphs/umacron-cy.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/umacron-cy.glyph @@ -21,7 +21,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (90,1); +pos = (98,1); ref = macroncomb; } ); @@ -34,7 +34,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (71,0); +pos = (81,0); ref = macroncomb; } ); @@ -47,7 +47,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (45,2); +pos = (55,2); ref = macroncomb; } ); @@ -60,7 +60,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (156,0); +pos = (157,0); ref = macroncomb; } ); @@ -73,7 +73,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (-29,0); +pos = (-19,0); ref = macroncomb; } ); @@ -99,7 +99,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (72,0); +pos = (82,0); ref = macroncomb; } ); @@ -112,7 +112,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (65,0); +pos = (75,0); ref = macroncomb; } ); @@ -125,7 +125,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (77,0); +pos = (82,0); ref = macroncomb; } ); @@ -138,7 +138,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (232,0); +pos = (229,0); ref = macroncomb; } ); @@ -154,7 +154,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (96,0); +pos = (108,0); ref = macroncomb; } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/ushort-cy.glyph b/sources/Merriweather.glyphspackage/glyphs/ushort-cy.glyph index 222001ca4..19971bcd3 100644 --- a/sources/Merriweather.glyphspackage/glyphs/ushort-cy.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/ushort-cy.glyph @@ -21,7 +21,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (167,0); +pos = (175,0); ref = "brevecomb-cy"; } ); @@ -34,7 +34,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (154,0); +pos = (164,0); ref = "brevecomb-cy"; } ); @@ -47,7 +47,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (108,0); +pos = (118,0); ref = "brevecomb-cy"; } ); @@ -60,7 +60,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (176,0); +pos = (177,0); ref = "brevecomb-cy"; } ); @@ -73,7 +73,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (85,0); +pos = (95,0); ref = "brevecomb-cy"; } ); @@ -99,7 +99,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (175,0); +pos = (185,0); ref = "brevecomb-cy"; } ); @@ -112,7 +112,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (114,0); +pos = (124,0); ref = "brevecomb-cy"; } ); @@ -125,7 +125,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (189,0); +pos = (194,0); ref = "brevecomb-cy"; } ); @@ -138,7 +138,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (247,0); +pos = (244,0); ref = "brevecomb-cy"; } ); @@ -154,7 +154,7 @@ shapes = ( ref = "u-cy"; }, { -pos = (144,0); +pos = (156,0); ref = "brevecomb-cy"; } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/y.glyph b/sources/Merriweather.glyphspackage/glyphs/y.glyph index 8496b0935..114236be0 100644 --- a/sources/Merriweather.glyphspackage/glyphs/y.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/y.glyph @@ -71,7 +71,7 @@ pos = (618,565); }, { name = top; -pos = (600,1112); +pos = (608,1112); } ); layerId = "DEBB1CE4-A72D-4960-969E-E04A036D2FA1"; @@ -128,7 +128,7 @@ pos = (535,492); }, { name = top; -pos = (525,1005); +pos = (535,1005); } ); layerId = "184155C8-9F61-4F1C-9784-DDA8EA717636"; @@ -185,7 +185,7 @@ pos = (538,561); }, { name = top; -pos = (510,1112); +pos = (520,1112); } ); layerId = "EA2265BD-E890-48C4-9E90-A53076E780C5"; @@ -242,7 +242,7 @@ pos = (509,564); }, { name = top; -pos = (502,1110); +pos = (503,1110); } ); layerId = "0E4B6E2E-ECAB-4D06-9686-B0B40AA31834"; @@ -299,7 +299,7 @@ pos = (447,492); }, { name = top; -pos = (422,1005); +pos = (432,1005); } ); layerId = "F2B10EEF-9DDC-48CA-970D-6B8C79870881"; @@ -365,9 +365,9 @@ shapes = ( closed = 1; nodes = ( (261,-501,o), -(331,-367,o), -(464,-32,cs), -(499,56,o), +(337,-367,o), +(470,-32,cs), +(505,56,o), (656,575,o), (789,951,c), (879,975,l), @@ -375,18 +375,18 @@ nodes = ( (574,1010,l), (574,975,l), (677,951,l), -(474,190,l), -(422,26,l), -(388,198,l), +(480,190,l), +(428,26,l), +(394,198,l), (182,951,l), (291,974,l), (291,1010,l), (-37,1010,l), (-37,975,l), (36,959,l), -(328,0,l), -(400,0,l), -(354,-163,o), +(334,0,l), +(406,0,l), +(360,-163,o), (261,-387,o), (98,-387,cs), (72,-387,o), @@ -413,7 +413,7 @@ pos = (465,489); }, { name = top; -pos = (456,1005); +pos = (466,1005); } ); layerId = "C9B9556E-C2FD-4F62-BB40-44923C452C22"; @@ -470,7 +470,7 @@ pos = (527,492); }, { name = top; -pos = (515,1005); +pos = (525,1005); } ); layerId = "AFA1064D-EFC9-4C9F-B9B0-9118E41D87C4"; @@ -527,7 +527,7 @@ pos = (504,544); }, { name = top; -pos = (490,1005); +pos = (495,1005); } ); layerId = "2103F1D3-C390-4F79-A87D-298F85EA6916"; @@ -584,7 +584,7 @@ pos = (633,564); }, { name = top; -pos = (623,1110); +pos = (620,1110); } ); layerId = "779F1615-9D1A-4778-9767-9A030AA58B6C"; @@ -644,7 +644,7 @@ pos = (622,558); }, { name = top; -pos = (596,1112); +pos = (608,1112); } ); background = { diff --git a/sources/Merriweather.glyphspackage/glyphs/yacute.glyph b/sources/Merriweather.glyphspackage/glyphs/yacute.glyph index 97272df6c..0e923df44 100644 --- a/sources/Merriweather.glyphspackage/glyphs/yacute.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/yacute.glyph @@ -22,7 +22,7 @@ shapes = ( ref = y; }, { -pos = (274,0); +pos = (282,0); ref = acutecomb; } ); @@ -35,7 +35,7 @@ shapes = ( ref = y; }, { -pos = (270,0); +pos = (280,0); ref = acutecomb; } ); @@ -48,7 +48,7 @@ shapes = ( ref = y; }, { -pos = (185,0); +pos = (195,0); ref = acutecomb; } ); @@ -61,7 +61,7 @@ shapes = ( ref = y; }, { -pos = (307,0); +pos = (308,0); ref = acutecomb; } ); @@ -74,7 +74,7 @@ shapes = ( ref = y; }, { -pos = (200,0); +pos = (210,0); ref = acutecomb; } ); @@ -100,7 +100,7 @@ shapes = ( ref = y; }, { -pos = (222,0); +pos = (232,0); ref = acutecomb; } ); @@ -113,7 +113,7 @@ shapes = ( ref = y; }, { -pos = (329,0); +pos = (339,0); ref = acutecomb; } ); @@ -126,7 +126,7 @@ shapes = ( ref = y; }, { -pos = (238,0); +pos = (243,0); ref = acutecomb; } ); @@ -139,7 +139,7 @@ shapes = ( ref = y; }, { -pos = (378,0); +pos = (375,0); ref = acutecomb; } ); @@ -155,7 +155,7 @@ shapes = ( ref = y; }, { -pos = (275,0); +pos = (287,0); ref = acutecomb; } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/ycircumflex.glyph b/sources/Merriweather.glyphspackage/glyphs/ycircumflex.glyph index bfa0474b5..48533f1a2 100644 --- a/sources/Merriweather.glyphspackage/glyphs/ycircumflex.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/ycircumflex.glyph @@ -22,7 +22,7 @@ shapes = ( ref = y; }, { -pos = (21,0); +pos = (29,0); ref = circumflexcomb; } ); @@ -35,7 +35,7 @@ shapes = ( ref = y; }, { -pos = (16,0); +pos = (26,0); ref = circumflexcomb; } ); @@ -48,7 +48,7 @@ shapes = ( ref = y; }, { -pos = (-64,0); +pos = (-54,0); ref = circumflexcomb; } ); @@ -61,7 +61,7 @@ shapes = ( ref = y; }, { -pos = (76,0); +pos = (77,0); ref = circumflexcomb; } ); @@ -74,7 +74,7 @@ shapes = ( ref = y; }, { -pos = (-34,0); +pos = (-24,0); ref = circumflexcomb; } ); @@ -100,7 +100,7 @@ shapes = ( ref = y; }, { -pos = (23,0); +pos = (33,0); ref = circumflexcomb; } ); @@ -113,7 +113,7 @@ shapes = ( ref = y; }, { -pos = (36,0); +pos = (46,0); ref = circumflexcomb; } ); @@ -126,7 +126,7 @@ shapes = ( ref = y; }, { -pos = (35,0); +pos = (40,0); ref = circumflexcomb; } ); @@ -139,7 +139,7 @@ shapes = ( ref = y; }, { -pos = (177,0); +pos = (174,0); ref = circumflexcomb; } ); @@ -155,7 +155,7 @@ shapes = ( ref = y; }, { -pos = (17,0); +pos = (29,0); ref = circumflexcomb; } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/ydieresis.glyph b/sources/Merriweather.glyphspackage/glyphs/ydieresis.glyph index 71bbe5830..7d8eb4fc4 100644 --- a/sources/Merriweather.glyphspackage/glyphs/ydieresis.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/ydieresis.glyph @@ -22,7 +22,7 @@ shapes = ( ref = y; }, { -pos = (188,0); +pos = (196,0); ref = dieresiscomb; } ); @@ -35,7 +35,7 @@ shapes = ( ref = y; }, { -pos = (140,0); +pos = (150,0); ref = dieresiscomb; } ); @@ -48,7 +48,7 @@ shapes = ( ref = y; }, { -pos = (115,0); +pos = (125,0); ref = dieresiscomb; } ); @@ -61,7 +61,7 @@ shapes = ( ref = y; }, { -pos = (187,0); +pos = (188,0); ref = dieresiscomb; } ); @@ -74,7 +74,7 @@ shapes = ( ref = y; }, { -pos = (-5,0); +pos = (5,0); ref = dieresiscomb; } ); @@ -100,7 +100,7 @@ shapes = ( ref = y; }, { -pos = (184,0); +pos = (194,0); ref = dieresiscomb; } ); @@ -113,7 +113,7 @@ shapes = ( ref = y; }, { -pos = (130,0); +pos = (140,0); ref = dieresiscomb; } ); @@ -126,7 +126,7 @@ shapes = ( ref = y; }, { -pos = (209,0); +pos = (214,0); ref = dieresiscomb; } ); @@ -139,7 +139,7 @@ shapes = ( ref = y; }, { -pos = (273,0); +pos = (270,0); ref = dieresiscomb; } ); @@ -155,7 +155,7 @@ shapes = ( ref = y; }, { -pos = (176,0); +pos = (188,0); ref = dieresiscomb; } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/ydotaccent.glyph b/sources/Merriweather.glyphspackage/glyphs/ydotaccent.glyph index aa78e652f..a9c4e45a7 100644 --- a/sources/Merriweather.glyphspackage/glyphs/ydotaccent.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/ydotaccent.glyph @@ -22,7 +22,7 @@ shapes = ( ref = y; }, { -pos = (238,0); +pos = (246,0); ref = dotaccentcomb; } ); @@ -35,7 +35,7 @@ shapes = ( ref = y; }, { -pos = (193,0); +pos = (203,0); ref = dotaccentcomb; } ); @@ -48,7 +48,7 @@ shapes = ( ref = y; }, { -pos = (143,0); +pos = (153,0); ref = dotaccentcomb; } ); @@ -61,7 +61,7 @@ shapes = ( ref = y; }, { -pos = (273,0); +pos = (274,0); ref = dotaccentcomb; } ); @@ -74,7 +74,7 @@ shapes = ( ref = y; }, { -pos = (108,0); +pos = (118,0); ref = dotaccentcomb; } ); @@ -100,7 +100,7 @@ shapes = ( ref = y; }, { -pos = (203,0); +pos = (213,0); ref = dotaccentcomb; } ); @@ -113,7 +113,7 @@ shapes = ( ref = y; }, { -pos = (234,0); +pos = (244,0); ref = dotaccentcomb; } ); @@ -126,7 +126,7 @@ shapes = ( ref = y; }, { -pos = (235,0); +pos = (240,0); ref = dotaccentcomb; } ); @@ -139,7 +139,7 @@ shapes = ( ref = y; }, { -pos = (394,0); +pos = (391,0); ref = dotaccentcomb; } ); @@ -155,7 +155,7 @@ shapes = ( ref = y; }, { -pos = (241,0); +pos = (253,0); ref = dotaccentcomb; } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/ygrave.glyph b/sources/Merriweather.glyphspackage/glyphs/ygrave.glyph index aac58b37c..3e4f93634 100644 --- a/sources/Merriweather.glyphspackage/glyphs/ygrave.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/ygrave.glyph @@ -22,7 +22,7 @@ shapes = ( ref = y; }, { -pos = (53,0); +pos = (61,0); ref = gravecomb; } ); @@ -35,7 +35,7 @@ shapes = ( ref = y; }, { -pos = (-9,0); +pos = (1,0); ref = gravecomb; } ); @@ -48,7 +48,7 @@ shapes = ( ref = y; }, { -pos = (-11,0); +pos = (-1,0); ref = gravecomb; } ); @@ -61,7 +61,7 @@ shapes = ( ref = y; }, { -pos = (100,0); +pos = (101,0); ref = gravecomb; } ); @@ -74,7 +74,7 @@ shapes = ( ref = y; }, { -pos = (-69,0); +pos = (-59,0); ref = gravecomb; } ); @@ -100,7 +100,7 @@ shapes = ( ref = y; }, { -pos = (6,0); +pos = (16,0); ref = gravecomb; } ); @@ -113,7 +113,7 @@ shapes = ( ref = y; }, { -pos = (6,0); +pos = (16,0); ref = gravecomb; } ); @@ -126,7 +126,7 @@ shapes = ( ref = y; }, { -pos = (9,0); +pos = (14,0); ref = gravecomb; } ); @@ -139,7 +139,7 @@ shapes = ( ref = y; }, { -pos = (156,0); +pos = (153,0); ref = gravecomb; } ); @@ -155,7 +155,7 @@ shapes = ( ref = y; }, { -pos = (35,0); +pos = (47,0); ref = gravecomb; } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/yhookabove.glyph b/sources/Merriweather.glyphspackage/glyphs/yhookabove.glyph index 681b5aaa9..744fc4656 100644 --- a/sources/Merriweather.glyphspackage/glyphs/yhookabove.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/yhookabove.glyph @@ -22,7 +22,7 @@ shapes = ( ref = y; }, { -pos = (344,0); +pos = (352,0); ref = hookabovecomb; } ); @@ -35,7 +35,7 @@ shapes = ( ref = y; }, { -pos = (303,0); +pos = (313,0); ref = hookabovecomb; } ); @@ -48,7 +48,7 @@ shapes = ( ref = y; }, { -pos = (284,0); +pos = (294,0); ref = hookabovecomb; } ); @@ -61,7 +61,7 @@ shapes = ( ref = y; }, { -pos = (322,0); +pos = (323,0); ref = hookabovecomb; } ); @@ -74,7 +74,7 @@ shapes = ( ref = y; }, { -pos = (219,0); +pos = (229,0); ref = hookabovecomb; } ); @@ -100,7 +100,7 @@ shapes = ( ref = y; }, { -pos = (299,0); +pos = (309,0); ref = hookabovecomb; } ); @@ -113,7 +113,7 @@ shapes = ( ref = y; }, { -pos = (278,0); +pos = (288,0); ref = hookabovecomb; } ); @@ -126,7 +126,7 @@ shapes = ( ref = y; }, { -pos = (318,0); +pos = (323,0); ref = hookabovecomb; } ); @@ -139,7 +139,7 @@ shapes = ( ref = y; }, { -pos = (393,0); +pos = (390,0); ref = hookabovecomb; } ); @@ -155,7 +155,7 @@ shapes = ( ref = y; }, { -pos = (320,0); +pos = (332,0); ref = hookabovecomb; } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/ymacron.glyph b/sources/Merriweather.glyphspackage/glyphs/ymacron.glyph index 03ceb03b0..889e32d5e 100644 --- a/sources/Merriweather.glyphspackage/glyphs/ymacron.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/ymacron.glyph @@ -22,7 +22,7 @@ shapes = ( ref = y; }, { -pos = (90,1); +pos = (98,1); ref = macroncomb; } ); @@ -35,7 +35,7 @@ shapes = ( ref = y; }, { -pos = (71,0); +pos = (81,0); ref = macroncomb; } ); @@ -48,7 +48,7 @@ shapes = ( ref = y; }, { -pos = (45,2); +pos = (55,2); ref = macroncomb; } ); @@ -61,7 +61,7 @@ shapes = ( ref = y; }, { -pos = (156,0); +pos = (157,0); ref = macroncomb; } ); @@ -74,7 +74,7 @@ shapes = ( ref = y; }, { -pos = (-29,0); +pos = (-19,0); ref = macroncomb; } ); @@ -100,7 +100,7 @@ shapes = ( ref = y; }, { -pos = (72,0); +pos = (82,0); ref = macroncomb; } ); @@ -113,7 +113,7 @@ shapes = ( ref = y; }, { -pos = (65,0); +pos = (75,0); ref = macroncomb; } ); @@ -126,7 +126,7 @@ shapes = ( ref = y; }, { -pos = (77,0); +pos = (82,0); ref = macroncomb; } ); @@ -139,7 +139,7 @@ shapes = ( ref = y; }, { -pos = (232,0); +pos = (229,0); ref = macroncomb; } ); @@ -155,7 +155,7 @@ shapes = ( ref = y; }, { -pos = (96,0); +pos = (108,0); ref = macroncomb; } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/yring.glyph b/sources/Merriweather.glyphspackage/glyphs/yring.glyph index 3273ced56..ad2c3131c 100644 --- a/sources/Merriweather.glyphspackage/glyphs/yring.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/yring.glyph @@ -22,7 +22,7 @@ shapes = ( ref = y; }, { -pos = (128,-71); +pos = (136,-71); ref = ringcomb; } ); @@ -35,7 +35,7 @@ shapes = ( ref = y; }, { -pos = (152,0); +pos = (153,0); ref = ringcomb; } ); @@ -48,7 +48,7 @@ shapes = ( ref = y; }, { -pos = (39,0); +pos = (49,0); ref = ringcomb; } ); @@ -61,7 +61,7 @@ shapes = ( ref = y; }, { -pos = (268,0); +pos = (265,0); ref = ringcomb; } ); @@ -74,7 +74,7 @@ shapes = ( ref = y; }, { -pos = (131,0); +pos = (143,0); ref = ringcomb; } ); @@ -87,7 +87,7 @@ shapes = ( ref = y; }, { -pos = (100,0); +pos = (110,0); ref = ringcomb; } ); @@ -100,7 +100,7 @@ shapes = ( ref = y; }, { -pos = (163,0); +pos = (173,0); ref = ringcomb; } ); @@ -126,7 +126,7 @@ shapes = ( ref = y; }, { -pos = (75,0); +pos = (85,0); ref = ringcomb; } ); @@ -139,7 +139,7 @@ shapes = ( ref = y; }, { -pos = (131,0); +pos = (136,0); ref = ringcomb; } ); @@ -152,7 +152,7 @@ shapes = ( ref = y; }, { -pos = (200,0); +pos = (210,0); ref = ringcomb; } ); diff --git a/sources/Merriweather.glyphspackage/glyphs/ytilde.glyph b/sources/Merriweather.glyphspackage/glyphs/ytilde.glyph index 25f36c661..5c803ca25 100644 --- a/sources/Merriweather.glyphspackage/glyphs/ytilde.glyph +++ b/sources/Merriweather.glyphspackage/glyphs/ytilde.glyph @@ -22,7 +22,7 @@ shapes = ( ref = y; }, { -pos = (203,0); +pos = (211,0); ref = tildecomb; } ); @@ -35,7 +35,7 @@ shapes = ( ref = y; }, { -pos = (182,0); +pos = (192,0); ref = tildecomb; } ); @@ -48,7 +48,7 @@ shapes = ( ref = y; }, { -pos = (116,0); +pos = (126,0); ref = tildecomb; } ); @@ -61,7 +61,7 @@ shapes = ( ref = y; }, { -pos = (164,0); +pos = (165,0); ref = tildecomb; } ); @@ -74,7 +74,7 @@ shapes = ( ref = y; }, { -pos = (114,0); +pos = (124,0); ref = tildecomb; } ); @@ -100,7 +100,7 @@ shapes = ( ref = y; }, { -pos = (190,0); +pos = (200,0); ref = tildecomb; } ); @@ -113,7 +113,7 @@ shapes = ( ref = y; }, { -pos = (152,0); +pos = (162,0); ref = tildecomb; } ); @@ -126,7 +126,7 @@ shapes = ( ref = y; }, { -pos = (204,0); +pos = (209,0); ref = tildecomb; } ); @@ -139,7 +139,7 @@ shapes = ( ref = y; }, { -pos = (235,0); +pos = (232,0); ref = tildecomb; } ); @@ -155,7 +155,7 @@ shapes = ( ref = y; }, { -pos = (174,0); +pos = (186,0); ref = tildecomb; } ); diff --git a/venv-test/lib/python3.11/site-packages/_distutils_hack/__pycache__/__init__.cpython-311.pyc b/venv-test/lib/python3.11/site-packages/_distutils_hack/__pycache__/__init__.cpython-311.pyc index 96dab2b82..33a9c7a79 100644 Binary files a/venv-test/lib/python3.11/site-packages/_distutils_hack/__pycache__/__init__.cpython-311.pyc and b/venv-test/lib/python3.11/site-packages/_distutils_hack/__pycache__/__init__.cpython-311.pyc differ