From 356f45c6b2382d10caae48f352a1b269c8fb4f67 Mon Sep 17 00:00:00 2001 From: Rasmus Andersson Date: Thu, 9 Jun 2022 12:20:21 -0700 Subject: improvements to punctuation --- src/Inter.glyphspackage/glyphs/bullseye.glyph | 2 +- src/Inter.glyphspackage/glyphs/colon.glyph | 124 ++++++-- src/Inter.glyphspackage/glyphs/comma.glyph | 337 +++++++-------------- src/Inter.glyphspackage/glyphs/period.glyph | 320 +++++++++---------- src/Inter.glyphspackage/glyphs/quotedbl.glyph | 3 - src/Inter.glyphspackage/glyphs/quotedblbase.glyph | 3 - src/Inter.glyphspackage/glyphs/quotedblleft.glyph | 15 +- .../glyphs/quotedblreversed.glyph | 119 +++++--- src/Inter.glyphspackage/glyphs/quotedblright.glyph | 19 +- src/Inter.glyphspackage/glyphs/quoteleft.glyph | 3 - src/Inter.glyphspackage/glyphs/quotereversed.glyph | 197 ++++-------- src/Inter.glyphspackage/glyphs/quoteright.glyph | 18 +- .../glyphs/quotesinglbase.glyph | 3 - src/Inter.glyphspackage/glyphs/quotesingle.glyph | 3 - src/Inter.glyphspackage/glyphs/semicolon.glyph | 309 +++++++++++++++++-- 15 files changed, 809 insertions(+), 666 deletions(-) diff --git a/src/Inter.glyphspackage/glyphs/bullseye.glyph b/src/Inter.glyphspackage/glyphs/bullseye.glyph index ce2bd2a97..812272979 100644 --- a/src/Inter.glyphspackage/glyphs/bullseye.glyph +++ b/src/Inter.glyphspackage/glyphs/bullseye.glyph @@ -98,7 +98,7 @@ pos = (1403,0); ref = period; } ); -width = 1528; +width = 1534; }, { layerId = m008; diff --git a/src/Inter.glyphspackage/glyphs/colon.glyph b/src/Inter.glyphspackage/glyphs/colon.glyph index 3aace205a..897b6d815 100644 --- a/src/Inter.glyphspackage/glyphs/colon.glyph +++ b/src/Inter.glyphspackage/glyphs/colon.glyph @@ -4,6 +4,12 @@ kernLeft = colon; kernRight = colon; layers = ( { +guides = ( +{ +name = "Colon1 center"; +pos = (0,928); +} +); layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; shapes = ( { @@ -11,13 +17,19 @@ alignment = -1; ref = period; }, { -pos = (0,830); +pos = (0,809); ref = period; } ); -width = 564; +width = 582; }, { +guides = ( +{ +name = "Colon1 center"; +pos = (0,864); +} +); layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; shapes = ( { @@ -25,21 +37,25 @@ alignment = -1; ref = period; }, { -pos = (0,750); +pos = (0,685); ref = period; } ); -width = 640; +width = 764; }, { guides = ( { angle = -99.4; -pos = (2337,164); +pos = (2350,164); showMeasurement = 1; }, { -pos = (2493,1304); +pos = (2506,1304); +}, +{ +angle = 80.6; +pos = (293,558); } ); layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; @@ -49,13 +65,19 @@ alignment = -1; ref = period; }, { -pos = (138,830); +pos = (134,809); ref = period; } ); -width = 565; +width = 586; }, { +guides = ( +{ +angle = 80.6; +pos = (385,558); +} +); layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; shapes = ( { @@ -63,13 +85,19 @@ alignment = -1; ref = period; }, { -pos = (124,750); +pos = (114,685); ref = period; } ); -width = 640; +width = 771; }, { +guides = ( +{ +name = "Colon1 center"; +pos = (0,1008); +} +); layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; shapes = ( { @@ -77,13 +105,19 @@ ref = period; }, { alignment = -1; -pos = (0,876); +pos = (0,964); ref = period; } ); -width = 518; +width = 554; }, { +guides = ( +{ +angle = 80.6; +pos = (277,558); +} +); layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; shapes = ( { @@ -91,13 +125,19 @@ ref = period; }, { alignment = -1; -pos = (147,876); +pos = (160,964); ref = period; } ); -width = 520; +width = 555; }, { +guides = ( +{ +name = "Colon1 center"; +pos = (0,888); +} +); layerId = m007; shapes = ( { @@ -105,21 +145,25 @@ alignment = -1; ref = period; }, { -pos = (0,774); +pos = (0,784); ref = period; } ); -width = 500; +width = 440; }, { guides = ( { angle = -99.4; -pos = (2337,164); +pos = (2330,164); showMeasurement = 1; }, { -pos = (2493,1304); +pos = (2486,1304); +}, +{ +angle = 80.6; +pos = (221,528); } ); layerId = m008; @@ -129,13 +173,19 @@ alignment = -1; ref = period; }, { -pos = (129,774); +pos = (130,784); ref = period; } ); -width = 501; +width = 443; }, { +guides = ( +{ +name = "Colon1 center"; +pos = (0,816); +} +); layerId = m009; shapes = ( { @@ -143,13 +193,19 @@ alignment = -1; ref = period; }, { -pos = (0,690); +pos = (0,627); ref = period; } ); -width = 608; +width = 544; }, { +guides = ( +{ +angle = 80.6; +pos = (280,558); +} +); layerId = m010; shapes = ( { @@ -157,13 +213,19 @@ alignment = -1; ref = period; }, { -pos = (114,690); +pos = (104,627); ref = period; } ); -width = 608; +width = 550; }, { +guides = ( +{ +name = "Colon1 center"; +pos = (0,952); +} +); layerId = m011; shapes = ( { @@ -171,13 +233,19 @@ ref = period; }, { alignment = -1; -pos = (0,876); +pos = (0,912); ref = period; } ); -width = 390; +width = 400; }, { +guides = ( +{ +angle = 80.6; +pos = (201,528); +} +); layerId = m012; shapes = ( { @@ -185,11 +253,11 @@ ref = period; }, { alignment = -1; -pos = (147,876); +pos = (151,912); ref = period; } ); -width = 392; +width = 402; } ); metricLeft = period; diff --git a/src/Inter.glyphspackage/glyphs/comma.glyph b/src/Inter.glyphspackage/glyphs/comma.glyph index 4011318b0..ae5a5b186 100644 --- a/src/Inter.glyphspackage/glyphs/comma.glyph +++ b/src/Inter.glyphspackage/glyphs/comma.glyph @@ -4,326 +4,219 @@ kernLeft = comma; kernRight = comma; layers = ( { -layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; shapes = ( { -closed = 1; -nodes = ( -(226,204,l), -(218,122,ls), -(197,-75,o), -(156,-271,o), -(136,-364,c), -(268,-364,l), -(303,-265,o), -(377,-41,o), -(402,126,cs), -(414,204,l) -); +pos = (-244,-1282); +ref = quoteright; } ); -width = 574; +width = 610; }, { -background = { -shapes = ( -{ -closed = 1; -nodes = ( -(190,280,l), -(190,8,l), -(189,-166,o), -(116,-244,o), -(72,-322,c), -(250,-424,l), -(384,-332,o), -(489,-143,o), -(486,38,c), -(486,280,l) -); -} -); -}; guides = ( { -pos = (12,1240); +pos = (114,1240); }, { -pos = (12,764); +pos = (-198,764); } ); -layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; shapes = ( { -closed = 1; -nodes = ( -(190,204,l), -(190,122,ls), -(189,-76,o), -(122,-283,o), -(98,-364,c), -(346,-364,l), -(381,-283,o), -(471,-88,o), -(486,122,cs), -(492,204,l) -); +pos = (-265,-1250); +ref = quoteright; } ); -width = 652; +width = 798; }, { -layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; +layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; shapes = ( { -closed = 1; -nodes = ( -(168,204,l), -(146,122,ls), -(93,-76,o), -(17,-271,o), -(-14,-364,c), -(116,-364,l), -(166,-265,o), -(276,-41,o), -(328,126,cs), -(354,204,l) -); +pos = (-20,-1338); +ref = quoteright; } ); -width = 574; +width = 554; }, { -guides = ( +layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; +shapes = ( { -pos = (324,1240); +pos = (-242,-1338); +ref = quoteright; +} +); +width = 553; }, { -pos = (12,764); +layerId = m007; +shapes = ( +{ +pos = (-32,-1282); +ref = quoteright; } ); -layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; +width = 446; +}, +{ +layerId = m008; shapes = ( { -closed = 1; -nodes = ( -(130,204,l), -(116,122,ls), -(85,-76,o), -(-20,-288,o), -(-52,-364,c), -(194,-364,l), -(242,-282,o), -(364,-87,o), -(414,122,cs), -(434,204,l) -); +pos = (-244,-1282); +ref = quoteright; } ); -width = 652; +width = 446; }, { -layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +layerId = m009; shapes = ( { -closed = 1; -nodes = ( -(282,204,l), -(268,122,ls), -(233,-74,o), -(198,-253,o), -(178,-364,c), -(216,-364,l), -(249,-254,o), -(290,-13,o), -(318,128,cs), -(332,204,l) -); +pos = (-24,-1218); +ref = quoteright; } ); -width = 526; +width = 567; }, { -layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; -shapes = ( +guides = ( { -closed = 1; -nodes = ( -(216,204,l), -(186,122,ls), -(116,-74,o), -(55,-253,o), -(18,-364,c), -(56,-364,l), -(108,-253,o), -(181,-13,o), -(236,128,cs), -(264,204,l) +pos = (80,1240); +}, +{ +pos = (-232,764); +} ); +layerId = m010; +shapes = ( +{ +pos = (-225,-1218); +ref = quoteright; } ); -width = 526; +width = 567; }, { -layerId = m007; +layerId = m011; shapes = ( { -closed = 1; -nodes = ( -(194,204,l), -(186,122,ls), -(165,-75,o), -(124,-271,o), -(104,-364,c), -(236,-364,l), -(271,-265,o), -(345,-41,o), -(370,126,cs), -(382,204,l) -); +pos = (-32,-1330); +ref = quoteright; } ); -width = 510; +width = 392; }, { -layerId = m008; +layerId = m012; shapes = ( { -closed = 1; -nodes = ( -(136,204,l), -(114,122,ls), -(61,-76,o), -(-15,-271,o), -(-46,-364,c), -(84,-364,l), -(134,-265,o), -(244,-41,o), -(296,126,cs), -(322,204,l) -); +pos = (-252,-1330); +ref = quoteright; } ); -width = 510; +width = 392; }, { -background = { +associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +layerId = "C3FE8B72-1850-4B16-A430-18FA1B892B86"; +name = "Jun 9, 22, 07:51"; shapes = ( { closed = 1; nodes = ( -(190,280,l), -(190,8,l), -(189,-166,o), -(116,-244,o), -(72,-322,c), -(250,-424,l), -(384,-332,o), -(489,-143,o), -(486,38,c), -(486,280,l) +(226,204,l), +(218,122,ls), +(197,-75,o), +(156,-271,o), +(136,-364,c), +(268,-364,l), +(303,-265,o), +(377,-41,o), +(402,126,cs), +(414,204,l) ); } ); -}; -guides = ( -{ -pos = (-84,1240); +width = 574; }, { -pos = (-84,764); +layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; +name = Regular; +shapes = ( +{ +pos = (-32,-1282); +ref = quoteright; } ); -layerId = m009; +width = 610; +}, +{ +associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; +layerId = "B2550866-E662-4705-BCA9-57CA727EEE3D"; +name = "Jun 9, 22, 07:52"; shapes = ( { closed = 1; nodes = ( -(174,204,l), -(174,122,ls), -(173,-76,o), -(106,-283,o), -(82,-364,c), -(330,-364,l), -(365,-283,o), -(455,-88,o), -(470,122,cs), -(476,204,l) +(282,204,l), +(268,122,ls), +(233,-74,o), +(198,-253,o), +(178,-364,c), +(216,-364,l), +(249,-254,o), +(290,-13,o), +(318,128,cs), +(332,204,l) ); } ); -width = 620; +width = 526; }, { +associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; guides = ( { -pos = (292,1240); +pos = (12,1240); }, { -pos = (-20,764); -} -); -layerId = m010; -shapes = ( -{ -closed = 1; -nodes = ( -(114,204,l), -(100,122,ls), -(69,-76,o), -(-36,-288,o), -(-68,-364,c), -(178,-364,l), -(226,-282,o), -(348,-87,o), -(398,122,cs), -(418,204,l) -); +pos = (12,764); } ); -width = 620; -}, -{ -layerId = m011; +layerId = "10ACA4B8-98C4-49FE-BE29-4767C4BF4B5D"; +name = "Jun 9, 22, 07:56"; shapes = ( { closed = 1; nodes = ( -(218,204,l), -(204,122,ls), -(169,-74,o), -(134,-253,o), -(114,-364,c), -(152,-364,l), -(185,-254,o), -(226,-13,o), -(254,128,cs), -(268,204,l) +(190,204,l), +(190,122,ls), +(189,-76,o), +(122,-283,o), +(98,-364,c), +(346,-364,l), +(381,-283,o), +(471,-88,o), +(486,122,cs), +(492,204,l) ); } ); -width = 398; +width = 652; }, { -layerId = m012; +layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; +name = Black; shapes = ( { -closed = 1; -nodes = ( -(152,204,l), -(122,122,ls), -(52,-74,o), -(-9,-253,o), -(-46,-364,c), -(-8,-364,l), -(44,-253,o), -(117,-13,o), -(172,128,cs), -(200,204,l) -); +pos = (-58,-1250); +ref = quoteright; } ); -width = 398; +width = 798; } ); tags = ( diff --git a/src/Inter.glyphspackage/glyphs/period.glyph b/src/Inter.glyphspackage/glyphs/period.glyph index 16302b538..54128a298 100644 --- a/src/Inter.glyphspackage/glyphs/period.glyph +++ b/src/Inter.glyphspackage/glyphs/period.glyph @@ -9,30 +9,30 @@ shapes = ( { closed = 1; nodes = ( -(354,-12,o), -(413,47,o), -(414,120,cs), -(413,191,o), -(354,250,o), -(282,250,cs), -(210,250,o), -(151,191,o), -(152,120,cs), -(151,47,o), -(210,-12,o), -(282,-12,cs) +(363,-12,o), +(422,47,o), +(422,119,cs), +(422,191,o), +(363,250,o), +(291,250,cs), +(219,250,o), +(160,191,o), +(160,119,cs), +(160,47,o), +(219,-12,o), +(291,-12,cs) ); } ); -width = 564; +width = 582; }, { guides = ( { -pos = (16,1240); +pos = (78,1240); }, { -pos = (16,764); +pos = (78,764); } ); layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; @@ -40,22 +40,22 @@ shapes = ( { closed = 1; nodes = ( -(427,-23,o), -(522,67,o), -(524,180,cs), -(522,291,o), -(427,381,o), -(320,382,cs), -(207,381,o), -(115,291,o), -(116,180,cs), -(115,67,o), -(207,-23,o), -(320,-24,cs) +(499,-24,o), +(588,63,o), +(588,179,cs), +(588,295,o), +(499,382,o), +(382,382,cs), +(265,382,o), +(176,295,o), +(176,179,cs), +(176,63,o), +(265,-24,o), +(382,-24,cs) ); } ); -width = 640; +width = 764; }, { layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; @@ -63,22 +63,22 @@ shapes = ( { closed = 1; nodes = ( -(281,-12,o), -(339,47,o), -(340,120,cs), -(342,189,o), -(281,247,o), -(210,248,cs), -(138,247,o), -(77,192,o), -(78,120,cs), -(80,47,o), -(135,-12,o), -(210,-12,cs) +(276,-12,o), +(338,41,o), +(349,108,cs), +(362,185,o), +(309,250,o), +(231,250,cs), +(165,250,o), +(102,197,o), +(91,130,cs), +(78,53,o), +(132,-12,o), +(209,-12,cs) ); } ); -width = 564; +width = 586; }, { guides = ( @@ -94,22 +94,22 @@ shapes = ( { closed = 1; nodes = ( -(340,-23,o), -(448,67,o), -(460,180,cs), -(471,291,o), -(387,381,o), -(280,382,cs), -(166,381,o), -(64,291,o), -(52,180,cs), -(41,67,o), -(122,-23,o), -(236,-24,cs) +(416,-24,o), +(507,50,o), +(524,153,cs), +(545,282,o), +(462,382,o), +(335,382,cs), +(228,382,o), +(137,308,o), +(120,205,cs), +(99,76,o), +(182,-24,o), +(309,-24,cs) ); } ); -width = 640; +width = 770; }, { layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; @@ -117,22 +117,22 @@ shapes = ( { closed = 1; nodes = ( -(288,-9,o), -(311,15,o), -(312,44,cs), -(311,73,o), -(288,96,o), -(258,96,cs), -(230,96,o), -(207,73,o), -(206,44,cs), -(207,15,o), -(230,-9,o), -(258,-8,cs) +(306,-9,o), +(330,15,o), +(330,44,cs), +(330,73,o), +(306,97,o), +(277,97,cs), +(248,97,o), +(224,73,o), +(224,44,cs), +(224,15,o), +(248,-9,o), +(277,-9,cs) ); } ); -width = 518; +width = 554; }, { layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; @@ -140,22 +140,22 @@ shapes = ( { closed = 1; nodes = ( -(198,-9,o), -(224,15,o), -(226,44,cs), -(230,73,o), -(209,96,o), -(180,96,cs), -(151,96,o), -(125,73,o), -(122,44,cs), -(119,15,o), -(140,-9,o), -(168,-8,cs) +(214,-9,o), +(240,13,o), +(244,41,cs), +(249,71,o), +(228,97,o), +(197,97,cs), +(170,97,o), +(144,75,o), +(139,47,cs), +(134,17,o), +(156,-9,o), +(186,-9,cs) ); } ); -width = 518; +width = 554; }, { layerId = m007; @@ -163,22 +163,22 @@ shapes = ( { closed = 1; nodes = ( -(322,-12,o), -(381,47,o), -(382,120,cs), -(381,191,o), -(322,250,o), -(250,250,cs), -(178,250,o), -(119,191,o), -(120,120,cs), -(119,47,o), -(178,-12,o), -(250,-12,cs) +(284,-12,o), +(336,40,o), +(336,104,cs), +(336,168,o), +(284,220,o), +(220,220,cs), +(156,220,o), +(104,168,o), +(104,104,cs), +(104,40,o), +(156,-12,o), +(220,-12,cs) ); } ); -width = 500; +width = 440; }, { layerId = m008; @@ -186,30 +186,30 @@ shapes = ( { closed = 1; nodes = ( -(249,-12,o), -(307,47,o), -(308,120,cs), -(310,189,o), -(249,247,o), -(178,248,cs), -(106,247,o), -(45,192,o), -(46,120,cs), -(48,47,o), -(103,-12,o), -(178,-12,cs) +(201,-12,o), +(255,34,o), +(265,93,cs), +(276,162,o), +(229,220,o), +(160,220,cs), +(101,220,o), +(46,174,o), +(37,115,cs), +(25,46,o), +(73,-12,o), +(142,-12,cs) ); } ); -width = 500; +width = 442; }, { guides = ( { -pos = (-80,1240); +pos = (-112,1240); }, { -pos = (-80,764); +pos = (-112,764); } ); layerId = m009; @@ -217,22 +217,22 @@ shapes = ( { closed = 1; nodes = ( -(411,-23,o), -(506,67,o), -(508,180,cs), -(506,291,o), -(411,381,o), -(304,382,cs), -(191,381,o), -(99,291,o), -(100,180,cs), -(99,67,o), -(191,-23,o), -(304,-24,cs) +(387,-19,o), +(480,74,o), +(480,189,cs), +(480,304,o), +(387,397,o), +(272,397,cs), +(157,397,o), +(64,304,o), +(64,189,cs), +(64,74,o), +(157,-19,o), +(272,-19,cs) ); } ); -width = 608; +width = 544; }, { guides = ( @@ -248,22 +248,22 @@ shapes = ( { closed = 1; nodes = ( -(324,-23,o), -(432,67,o), -(444,180,cs), -(455,291,o), -(371,381,o), -(264,382,cs), -(150,381,o), -(48,291,o), -(36,180,cs), -(25,67,o), -(106,-23,o), -(220,-24,cs) +(310,-19,o), +(406,61,o), +(423,163,cs), +(444,291,o), +(358,397,o), +(233,397,cs), +(128,397,o), +(32,317,o), +(15,215,cs), +(-6,87,o), +(80,-19,o), +(205,-19,cs) ); } ); -width = 608; +width = 550; }, { layerId = m011; @@ -271,22 +271,22 @@ shapes = ( { closed = 1; nodes = ( -(224,-9,o), -(247,15,o), -(248,44,cs), -(247,73,o), -(224,96,o), -(194,96,cs), -(166,96,o), -(143,73,o), -(142,44,cs), -(143,15,o), -(166,-9,o), -(194,-8,cs) +(227,-8,o), +(248,13,o), +(248,40,cs), +(248,67,o), +(227,88,o), +(200,88,cs), +(173,88,o), +(152,67,o), +(152,40,cs), +(152,13,o), +(173,-8,o), +(200,-8,cs) ); } ); -width = 390; +width = 400; }, { layerId = m012; @@ -294,22 +294,22 @@ shapes = ( { closed = 1; nodes = ( -(134,-9,o), -(160,15,o), -(162,44,cs), -(166,73,o), -(145,96,o), -(116,96,cs), -(87,96,o), -(61,73,o), -(58,44,cs), -(55,15,o), -(76,-9,o), -(104,-8,cs) +(140,-8,o), +(162,11,o), +(167,37,cs), +(171,65,o), +(153,88,o), +(124,88,cs), +(99,88,o), +(76,69,o), +(72,43,cs), +(67,15,o), +(86,-8,o), +(114,-8,cs) ); } ); -width = 390; +width = 400; } ); tags = ( diff --git a/src/Inter.glyphspackage/glyphs/quotedbl.glyph b/src/Inter.glyphspackage/glyphs/quotedbl.glyph index de3749aa3..3ead715b1 100644 --- a/src/Inter.glyphspackage/glyphs/quotedbl.glyph +++ b/src/Inter.glyphspackage/glyphs/quotedbl.glyph @@ -171,9 +171,6 @@ width = 648; metricLeft = quotesingle; metricRight = quotesingle; note = "space in between:\012100 D: 2.5x\012100 T: 3.25x\012400: 1x\012900: 0.5x"; -tags = ( -"TODO-opsz" -); unicode = 34; userData = { interface.gridadjust.original = "{'width': 1152, 'leftMargin': 256, 'rightMargin': 256}"; diff --git a/src/Inter.glyphspackage/glyphs/quotedblbase.glyph b/src/Inter.glyphspackage/glyphs/quotedblbase.glyph index 324809f73..0fb787e82 100644 --- a/src/Inter.glyphspackage/glyphs/quotedblbase.glyph +++ b/src/Inter.glyphspackage/glyphs/quotedblbase.glyph @@ -130,9 +130,6 @@ width = 672; ); metricLeft = quoteright; metricRight = quoteright; -tags = ( -"TODO-opsz" -); unicode = 8222; userData = { interface.gridadjust.original = "{'width': 1005, 'leftMargin': 48, 'rightMargin': 125}"; diff --git a/src/Inter.glyphspackage/glyphs/quotedblleft.glyph b/src/Inter.glyphspackage/glyphs/quotedblleft.glyph index 8740e46c4..2c91d915f 100644 --- a/src/Inter.glyphspackage/glyphs/quotedblleft.glyph +++ b/src/Inter.glyphspackage/glyphs/quotedblleft.glyph @@ -36,11 +36,11 @@ shapes = ( ref = quoteleft; }, { -pos = (408,0); +pos = (368,0); ref = quoteleft; } ); -width = 1014; +width = 974; }, { layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; @@ -105,11 +105,11 @@ shapes = ( ref = quoteleft; }, { -pos = (344,0); +pos = (304,0); ref = quoteleft; } ); -width = 774; +width = 734; }, { layerId = m009; @@ -161,18 +161,15 @@ ref = quoteleft; }, { alignment = -1; -pos = (280,0); +pos = (176,0); ref = quoteleft; } ); -width = 672; +width = 568; } ); metricLeft = quoteleft; metricRight = quoteleft; -tags = ( -"TODO-opsz" -); unicode = 8220; userData = { "interface.width-adjustments" = ( diff --git a/src/Inter.glyphspackage/glyphs/quotedblreversed.glyph b/src/Inter.glyphspackage/glyphs/quotedblreversed.glyph index 1eb476bd9..8d24e4c2f 100644 --- a/src/Inter.glyphspackage/glyphs/quotedblreversed.glyph +++ b/src/Inter.glyphspackage/glyphs/quotedblreversed.glyph @@ -2,185 +2,226 @@ glyphname = quotedblreversed; layers = ( { +background = { +shapes = ( +{ +pos = (974,0); +ref = quotedblright; +scale = (-1,1); +} +); +}; layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; shapes = ( { -pos = (26,0); ref = quotereversed; }, { -pos = (398,0); +pos = (368,0); ref = quotereversed; } ); -width = 920; +width = 974; }, { +background = { +shapes = ( +{ +pos = (1334,0); +ref = quotedblright; +scale = (-1,1); +} +); +}; layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; shapes = ( { -pos = (-2,0); ref = quotereversed; }, { -pos = (370,0); +pos = (526,0); ref = quotereversed; } ); -width = 902; +width = 1334; }, { layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; shapes = ( { -pos = (26,0); ref = quotereversed; }, { -pos = (398,0); +pos = (368,0); ref = quotereversed; } ); -width = 920; +width = 974; }, { layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; shapes = ( { -pos = (-2,0); ref = quotereversed; }, { -pos = (370,0); +pos = (526,0); ref = quotereversed; } ); -width = 902; +width = 1334; }, { +background = { +shapes = ( +{ +pos = (790,0); +ref = quotedblright; +scale = (-1,1); +} +); +}; layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; shapes = ( { alignment = -1; -pos = (44,0); ref = quotereversed; }, { alignment = -1; -pos = (416,0); +pos = (280,0); ref = quotereversed; } ); -width = 930; +width = 790; }, { layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; shapes = ( { alignment = -1; -pos = (44,0); ref = quotereversed; }, { alignment = -1; -pos = (416,0); +pos = (280,0); ref = quotereversed; } ); -width = 930; +width = 790; }, { +background = { +shapes = ( +{ +pos = (736,0); +ref = quotedblright; +scale = (-1,1); +} +); +}; layerId = m007; shapes = ( { -pos = (26,0); ref = quotereversed; }, { -pos = (398,0); +pos = (306,0); ref = quotereversed; } ); -width = 856; +width = 736; }, { layerId = m008; shapes = ( { -pos = (26,0); ref = quotereversed; }, { -pos = (398,0); +pos = (306,0); ref = quotereversed; } ); -width = 856; +width = 736; }, { +background = { +shapes = ( +{ +pos = (1053,0); +ref = quotedblright; +scale = (-1,1); +} +); +}; layerId = m009; shapes = ( { -pos = (-2,0); ref = quotereversed; }, { -pos = (370,0); +pos = (494,0); ref = quotereversed; } ); -width = 870; +width = 1053; }, { layerId = m010; shapes = ( { -pos = (-2,0); ref = quotereversed; }, { -pos = (370,0); +pos = (494,0); ref = quotereversed; } ); -width = 870; +width = 1053; }, { +background = { +shapes = ( +{ +pos = (568,0); +ref = quotedblright; +scale = (-1,1); +} +); +}; layerId = m011; shapes = ( { alignment = -1; -pos = (44,0); ref = quotereversed; }, { alignment = -1; -pos = (416,0); +pos = (176,0); ref = quotereversed; } ); -width = 802; +width = 568; }, { layerId = m012; shapes = ( { alignment = -1; -pos = (44,0); ref = quotereversed; }, { alignment = -1; -pos = (416,0); +pos = (176,0); ref = quotereversed; } ); -width = 802; +width = 568; } ); -tags = ( -"TODO-opsz" -); +metricLeft = "=|quoteleft"; +metricRight = "=|quoteleft"; unicode = 8223; userData = { interface.gridadjust.original = "{'width': 1095, 'leftMargin': 110, 'rightMargin': 110}"; diff --git a/src/Inter.glyphspackage/glyphs/quotedblright.glyph b/src/Inter.glyphspackage/glyphs/quotedblright.glyph index 2ff583235..c492899cb 100644 --- a/src/Inter.glyphspackage/glyphs/quotedblright.glyph +++ b/src/Inter.glyphspackage/glyphs/quotedblright.glyph @@ -36,11 +36,11 @@ shapes = ( ref = quoteright; }, { -pos = (380,0); +pos = (368,0); ref = quoteright; } ); -width = 986; +width = 974; }, { layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; @@ -105,11 +105,11 @@ shapes = ( ref = quoteright; }, { -pos = (316,0); +pos = (306,0); ref = quoteright; } ); -width = 746; +width = 736; }, { layerId = m009; @@ -161,18 +161,15 @@ ref = quoteright; }, { alignment = -1; -pos = (280,0); +pos = (176,0); ref = quoteright; } ); -width = 672; +width = 568; } ); -metricLeft = quoteright; -metricRight = quoteright; -tags = ( -"TODO-opsz" -); +metricLeft = quoteleft; +metricRight = quoteleft; unicode = 8221; userData = { interface.gridadjust.original = "{'width': 1041, 'leftMargin': 142, 'rightMargin': 78}"; diff --git a/src/Inter.glyphspackage/glyphs/quoteleft.glyph b/src/Inter.glyphspackage/glyphs/quoteleft.glyph index 3ec45ab26..19ce5333b 100644 --- a/src/Inter.glyphspackage/glyphs/quoteleft.glyph +++ b/src/Inter.glyphspackage/glyphs/quoteleft.glyph @@ -231,9 +231,6 @@ nodes = ( width = 570; } ); -tags = ( -"TODO-opsz" -); unicode = 8216; userData = { "interface.width-adjustments" = ( diff --git a/src/Inter.glyphspackage/glyphs/quotereversed.glyph b/src/Inter.glyphspackage/glyphs/quotereversed.glyph index fedf5bca8..bb15b9003 100644 --- a/src/Inter.glyphspackage/glyphs/quotereversed.glyph +++ b/src/Inter.glyphspackage/glyphs/quotereversed.glyph @@ -7,20 +7,14 @@ shapes = ( { closed = 1; nodes = ( -(142,1358,ls), -(143,1239,o), -(209,1085,o), -(326,992,c), -(418,1068,l), -(358,1155,o), -(305,1248,o), -(306,1356,cs), -(306,1490,l), -(142,1490,l) +(446,928,l), +(358,1490,l), +(160,1490,l), +(314,928,l) ); } ); -width = 454; +width = 606; }, { layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; @@ -28,20 +22,14 @@ shapes = ( { closed = 1; nodes = ( -(72,1314,ls), -(73,1172,o), -(175,1015,o), -(264,940,c), -(430,1024,l), -(382,1108,o), -(353,1196,o), -(352,1314,cs), -(352,1490,l), -(72,1490,l) +(638,824,l), +(550,1490,l), +(170,1490,l), +(378,824,l) ); } ); -width = 538; +width = 808; }, { layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; @@ -49,20 +37,14 @@ shapes = ( { closed = 1; nodes = ( -(276,1358,ls), -(256,1239,o), -(297,1085,o), -(398,992,c), -(504,1068,l), -(457,1155,o), -(419,1248,o), -(436,1356,cs), -(460,1490,l), -(296,1490,l) +(507,928,l), +(512,1490,l), +(314,1490,l), +(375,928,l) ); } ); -width = 454; +width = 606; }, { layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; @@ -70,20 +52,14 @@ shapes = ( { closed = 1; nodes = ( -(198,1314,ls), -(175,1172,o), -(251,1015,o), -(328,940,c), -(506,1024,l), -(472,1108,o), -(457,1196,o), -(478,1314,cs), -(506,1490,l), -(226,1490,l) +(682,824,l), +(704,1490,l), +(324,1490,l), +(422,824,l) ); } ); -width = 538; +width = 808; }, { layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; @@ -91,20 +67,14 @@ shapes = ( { closed = 1; nodes = ( -(186,1358,ls), -(186,1239,o), -(253,1085,o), -(370,992,c), -(396,1026,l), -(299,1106,o), -(233,1243,o), -(232,1358,cs), -(232,1490,l), -(186,1490,l) +(330,1040,l), +(230,1490,l), +(180,1490,l), +(289,1040,l) ); } ); -width = 402; +width = 510; }, { layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; @@ -112,20 +82,14 @@ shapes = ( { closed = 1; nodes = ( -(318,1358,ls), -(300,1242,o), -(343,1083,o), -(442,992,c), -(474,1026,l), -(390,1106,o), -(346,1243,o), -(366,1358,cs), -(386,1490,l), -(340,1490,l) +(410,1040,l), +(384,1490,l), +(334,1490,l), +(369,1040,l) ); } ); -width = 402; +width = 510; }, { layerId = m007; @@ -133,20 +97,14 @@ shapes = ( { closed = 1; nodes = ( -(110,1358,ls), -(111,1239,o), -(177,1085,o), -(294,992,c), -(386,1068,l), -(326,1155,o), -(273,1248,o), -(274,1356,cs), -(274,1490,l), -(110,1490,l) +(350,1001,l), +(262,1490,l), +(80,1490,l), +(226,1001,l) ); } ); -width = 390; +width = 430; }, { layerId = m008; @@ -154,20 +112,14 @@ shapes = ( { closed = 1; nodes = ( -(244,1358,ls), -(224,1239,o), -(265,1085,o), -(366,992,c), -(472,1068,l), -(425,1155,o), -(387,1248,o), -(404,1356,cs), -(428,1490,l), -(264,1490,l) +(428,1001,l), +(421,1490,l), +(239,1490,l), +(304,1001,l) ); } ); -width = 390; +width = 430; }, { layerId = m009; @@ -175,20 +127,14 @@ shapes = ( { closed = 1; nodes = ( -(56,1314,ls), -(57,1172,o), -(159,1015,o), -(248,940,c), -(414,1024,l), -(366,1108,o), -(337,1196,o), -(336,1314,cs), -(336,1490,l), -(56,1490,l) +(495,880,l), +(434,1490,l), +(64,1490,l), +(220,880,l) ); } ); -width = 506; +width = 559; }, { layerId = m010; @@ -196,20 +142,14 @@ shapes = ( { closed = 1; nodes = ( -(182,1314,ls), -(159,1172,o), -(235,1015,o), -(312,940,c), -(490,1024,l), -(456,1108,o), -(441,1196,o), -(462,1314,cs), -(490,1490,l), -(210,1490,l) +(553,880,l), +(593,1490,l), +(223,1490,l), +(278,880,l) ); } ); -width = 506; +width = 559; }, { layerId = m011; @@ -217,20 +157,14 @@ shapes = ( { closed = 1; nodes = ( -(122,1358,ls), -(122,1239,o), -(189,1085,o), -(306,992,c), -(332,1026,l), -(235,1106,o), -(169,1243,o), -(168,1358,cs), -(168,1490,l), -(122,1490,l) +(264,1056,l), +(178,1490,l), +(128,1490,l), +(224,1056,l) ); } ); -width = 274; +width = 392; }, { layerId = m012; @@ -238,25 +172,18 @@ shapes = ( { closed = 1; nodes = ( -(254,1358,ls), -(236,1242,o), -(279,1083,o), -(378,992,c), -(410,1026,l), -(326,1106,o), -(282,1243,o), -(302,1358,cs), -(322,1490,l), -(276,1490,l) +(346,1056,l), +(332,1490,l), +(282,1490,l), +(306,1056,l) ); } ); -width = 274; +width = 392; } ); -tags = ( -"TODO-opsz" -); +metricLeft = "=|quoteleft"; +metricRight = "=|quoteleft"; unicode = 8219; userData = { interface.gridadjust.original = "{'width': 578, 'leftMargin': 106, 'rightMargin': 66}"; diff --git a/src/Inter.glyphspackage/glyphs/quoteright.glyph b/src/Inter.glyphspackage/glyphs/quoteright.glyph index ec0a49f58..1d5ebbefe 100644 --- a/src/Inter.glyphspackage/glyphs/quoteright.glyph +++ b/src/Inter.glyphspackage/glyphs/quoteright.glyph @@ -19,19 +19,6 @@ nodes = ( width = 606; }, { -background = { -shapes = ( -{ -closed = 1; -nodes = ( -(630,1490,l), -(474,880,l), -(199,880,l), -(260,1490,l) -); -} -); -}; layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; shapes = ( { @@ -299,10 +286,7 @@ width = 494; ); metricLeft = quoteleft; metricRight = quoteleft; -tags = ( -"TODO-opsz" -); -unicode = 8217; +unicode = (8217,700); userData = { "interface.width-adjustments" = ( -16 diff --git a/src/Inter.glyphspackage/glyphs/quotesinglbase.glyph b/src/Inter.glyphspackage/glyphs/quotesinglbase.glyph index bd5dcb32e..566cce5d6 100644 --- a/src/Inter.glyphspackage/glyphs/quotesinglbase.glyph +++ b/src/Inter.glyphspackage/glyphs/quotesinglbase.glyph @@ -138,9 +138,6 @@ width = 392; ); metricLeft = quoteright; metricRight = quoteright; -tags = ( -"TODO-opsz" -); unicode = 8218; userData = { interface.gridadjust.original = "{'width': 578, 'leftMargin': 48, 'rightMargin': 124}"; diff --git a/src/Inter.glyphspackage/glyphs/quotesingle.glyph b/src/Inter.glyphspackage/glyphs/quotesingle.glyph index 41d7699e1..31d76702b 100644 --- a/src/Inter.glyphspackage/glyphs/quotesingle.glyph +++ b/src/Inter.glyphspackage/glyphs/quotesingle.glyph @@ -248,9 +248,6 @@ nodes = ( width = 454; } ); -tags = ( -"TODO-opsz" -); unicode = 39; userData = { "interface.width-adjustments" = ( diff --git a/src/Inter.glyphspackage/glyphs/semicolon.glyph b/src/Inter.glyphspackage/glyphs/semicolon.glyph index 20a7b5187..fb835e731 100644 --- a/src/Inter.glyphspackage/glyphs/semicolon.glyph +++ b/src/Inter.glyphspackage/glyphs/semicolon.glyph @@ -4,6 +4,12 @@ kernLeft = colon; kernRight = colon; layers = ( { +guides = ( +{ +name = "Colon1 center"; +pos = (0,928); +} +); layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265"; shapes = ( { @@ -11,17 +17,21 @@ alignment = -1; ref = comma; }, { -pos = (26,830); +pos = (28,809); ref = period; } ); -width = 574; +width = 610; }, { guides = ( { angle = 90; -pos = (460,700); +pos = (392,1118); +}, +{ +name = "Colon1 center"; +pos = (0,864); } ); layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093"; @@ -31,13 +41,49 @@ alignment = -1; ref = comma; }, { -pos = (26,750); +pos = (10,685); ref = period; } ); -width = 652; +width = 774; }, { +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(109,-354,l), +(356,208,l), +(158,208,l), +(-23,-354,l) +); +}, +{ +closed = 1; +nodes = ( +(430,797,o), +(499,856,o), +(511,928,cs), +(523,1000,o), +(474,1059,o), +(402,1059,cs), +(330,1059,o), +(261,1000,o), +(249,928,cs), +(237,856,o), +(286,797,o), +(358,797,cs) +); +} +); +}; +guides = ( +{ +angle = 80.6; +pos = (274,287); +} +); layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933"; shapes = ( { @@ -45,17 +91,47 @@ alignment = -1; ref = comma; }, { -pos = (142,830); +pos = (160,809); ref = period; } ); -width = 574; +width = 612; }, { +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(209,-426,l), +(527,240,l), +(147,240,l), +(-51,-426,l) +); +}, +{ +closed = 1; +nodes = ( +(526,661,o), +(629,748,o), +(648,864,cs), +(668,980,o), +(593,1067,o), +(476,1067,cs), +(359,1067,o), +(256,980,o), +(236,864,cs), +(217,748,o), +(292,661,o), +(409,661,cs) +); +} +); +}; guides = ( { -angle = 90; -pos = (460,700); +angle = 80.6; +pos = (347,287); } ); layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E"; @@ -65,13 +141,23 @@ alignment = -1; ref = comma; }, { -pos = (128,750); +pos = (121,685); ref = period; } ); -width = 652; +width = 778; }, { +guides = ( +{ +name = "Colon1 center"; +pos = (0,1008); +}, +{ +angle = 90; +pos = (285,287); +} +); layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59"; shapes = ( { @@ -80,13 +166,49 @@ ref = comma; }, { alignment = -1; -pos = (26,876); +pos = (8,964); ref = period; } ); -width = 530; +width = 544; }, { +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(59,-298,l), +(243,152,l), +(193,152,l), +(18,-298,l) +); +}, +{ +closed = 1; +nodes = ( +(380,955,o), +(408,979,o), +(412,1008,cs), +(417,1037,o), +(397,1061,o), +(368,1061,cs), +(339,1061,o), +(311,1037,o), +(306,1008,cs), +(302,979,o), +(322,955,o), +(351,955,cs) +); +} +); +}; +guides = ( +{ +angle = 80.6; +pos = (240,287); +} +); layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F"; shapes = ( { @@ -95,17 +217,21 @@ ref = comma; }, { alignment = -1; -pos = (152,876); +pos = (168,964); ref = period; } ); -width = 530; +width = 563; }, { guides = ( { +name = "Colon1 center"; +pos = (0,888); +}, +{ angle = 90; -pos = (424,600); +pos = (226,287); } ); layerId = m007; @@ -115,13 +241,49 @@ alignment = -1; ref = comma; }, { -pos = (26,830); +pos = (6,784); ref = period; } ); -width = 510; +width = 446; }, { +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(38,-281,l), +(265,208,l), +(83,208,l), +(-86,-281,l) +); +}, +{ +closed = 1; +nodes = ( +(330,772,o), +(391,824,o), +(402,888,cs), +(412,952,o), +(369,1004,o), +(305,1004,cs), +(241,1004,o), +(180,952,o), +(170,888,cs), +(159,824,o), +(202,772,o), +(266,772,cs) +); +} +); +}; +guides = ( +{ +angle = 80.6; +pos = (186,287); +} +); layerId = m008; shapes = ( { @@ -129,17 +291,21 @@ alignment = -1; ref = comma; }, { -pos = (142,830); +pos = (134,784); ref = period; } ); -width = 510; +width = 447; }, { guides = ( { angle = 90; -pos = (460,700); +pos = (275,287); +}, +{ +name = "Colon1 center"; +pos = (0,816); } ); layerId = m009; @@ -149,13 +315,49 @@ alignment = -1; ref = comma; }, { -pos = (26,750); +pos = (3,627); ref = period; } ); -width = 620; +width = 547; +}, +{ +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(172,-338,l), +(429,272,l), +(59,272,l), +(-103,-338,l) +); }, { +closed = 1; +nodes = ( +(403,608,o), +(512,701,o), +(531,816,cs), +(550,931,o), +(472,1024,o), +(357,1024,cs), +(242,1024,o), +(134,931,o), +(115,816,cs), +(96,701,o), +(173,608,o), +(288,608,cs) +); +} +); +}; +guides = ( +{ +angle = 80.6; +pos = (235,287); +} +); layerId = m010; shapes = ( { @@ -163,13 +365,23 @@ alignment = -1; ref = comma; }, { -pos = (128,750); +pos = (104,627); ref = period; } ); -width = 620; +width = 550; +}, +{ +guides = ( +{ +name = "Colon1 center"; +pos = (0,952); }, { +angle = 90; +pos = (196,287); +} +); layerId = m011; shapes = ( { @@ -178,28 +390,67 @@ ref = comma; }, { alignment = -1; -pos = (26,876); +pos = (-4,912); ref = period; } ); -width = 402; +width = 396; +}, +{ +background = { +shapes = ( +{ +closed = 1; +nodes = ( +(3,-274,l), +(171,160,l), +(121,160,l), +(-37,-274,l) +); }, { +closed = 1; +nodes = ( +(285,904,o), +(310,925,o), +(314,952,cs), +(319,979,o), +(301,1000,o), +(274,1000,cs), +(247,1000,o), +(223,979,o), +(218,952,cs), +(214,925,o), +(231,904,o), +(258,904,cs) +); +} +); +}; +guides = ( +{ +angle = 80.6; +pos = (156,287); +} +); layerId = m012; shapes = ( { alignment = -1; +pos = (5,0); ref = comma; }, { alignment = -1; -pos = (152,876); +pos = (146,912); ref = period; } ); -width = 402; +width = 397; } ); +metricLeft = comma; +metricRight = period; tags = ( "TODO-opsz" ); -- cgit v1.2.3