diff --git a/src/ZhuqueFangsong.glyphspackage/fontinfo.plist b/src/ZhuqueFangsong.glyphspackage/fontinfo.plist index 682d989e..6d973443 100644 --- a/src/ZhuqueFangsong.glyphspackage/fontinfo.plist +++ b/src/ZhuqueFangsong.glyphspackage/fontinfo.plist @@ -131,13 +131,19 @@ tag = aalt; }, { code = "sub @Lowercase emdash' by emdash.lower; -sub @Uppercase emdash' by emdash.case; +sub @Uppercase emdash' by emdash.upper; sub emdash.lower emdash' by emdash.lower; -sub emdash.case emdash' by emdash.case; +sub emdash.upper emdash' by emdash.upper; + sub @Lowercase ellipsis' by ellipsis.lower; sub @Uppercase ellipsis' by ellipsis.lower; sub ellipsis.lower ellipsis' by ellipsis.lower; +sub @Lowercase periodcentered' by periodcentered.lower; +sub @Uppercase periodcentered' by periodcentered.upper; +sub periodcentered.lower periodcentered' by periodcentered.lower; +sub periodcentered.upper periodcentered' by periodcentered.upper; + sub emdash by emdash.unjoined; sub emdash.unjoined emdash.unjoined' by emdash.joined; sub emdash.joined emdash.unjoined' by emdash.joined; @@ -1555,13 +1561,11 @@ tag = smcp; }, { automatic = 1; -code = "sub periodcentered by periodcentered.case; -sub bullet by bullet.case; +code = "sub bullet by bullet.case; sub slash by slash.case; sub backslash by backslash.case; sub hyphen by hyphen.case; sub endash by endash.case; -sub emdash by emdash.case; sub parenleft by parenleft.case; sub parenright by parenright.case; sub braceleft by braceleft.case; @@ -1651,7 +1655,6 @@ sub f l by fl; tag = liga; }, { -automatic = 1; code = "sub ampersand by ampersand.full; sub asterisk by asterisk.full; sub at by at.full; @@ -1676,7 +1679,11 @@ sub bracketright by bracketright.full; sub parenleft by parenleft.full; sub parenright by parenright.full; sub asciitilde by asciitilde.full; -"; + +sub quotedblleft by quotedblleft.uv002; +sub quotedblright by quotedblright.uv002; +sub quoteleft by quoteleft.uv002; +sub quoteright by quoteright.uv002;"; tag = fwid; }, { @@ -1736,9 +1743,17 @@ sub ellipsis by ellipsis.vert; sub ellipsis.lower by ellipsis.vert; sub quoteleft by cornerbracketleft.vert; +sub quoteleft.uv001 by cornerbracketleft.vert; +sub quoteleft.uv002 by cornerbracketleft.vert; sub quoteright by cornerbracketright.vert; +sub quoteright.uv001 by cornerbracketright.vert; +sub quoteright.uv002 by cornerbracketright.vert; sub quotedblleft by whitecornerbracketleft.vert; +sub quotedblleft.uv001 by whitecornerbracketleft.vert; +sub quotedblleft.uv002 by whitecornerbracketleft.vert; sub quotedblright by whitecornerbracketright.vert; +sub quotedblright.uv001 by whitecornerbracketright.vert; +sub quotedblright.uv002 by whitecornerbracketright.vert; "; tag = vert; }, @@ -1823,9 +1838,17 @@ sub ellipsis by ellipsis.vert; sub ellipsis.lower by ellipsis.vert; sub quoteleft by cornerbracketleft.vert; +sub quoteleft.uv001 by cornerbracketleft.vert; +sub quoteleft.uv002 by cornerbracketleft.vert; sub quoteright by cornerbracketright.vert; +sub quoteright.uv001 by cornerbracketright.vert; +sub quoteright.uv002 by cornerbracketright.vert; sub quotedblleft by whitecornerbracketleft.vert; +sub quotedblleft.uv001 by whitecornerbracketleft.vert; +sub quotedblleft.uv002 by whitecornerbracketleft.vert; sub quotedblright by whitecornerbracketright.vert; +sub quotedblright.uv001 by whitecornerbracketright.vert; +sub quotedblright.uv002 by whitecornerbracketright.vert; "; tag = vrt2; }, diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/L_dot.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/L_dot.glyph index de0f45fd..1a52eefc 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/L_dot.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/L_dot.glyph @@ -14,7 +14,7 @@ ref = L; { alignment = -1; pos = (320,215); -ref = periodcentered; +ref = periodcentered.lower; } ); width = 533; diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/anoteleia.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/anoteleia.glyph index 480e47d7..50bc3d72 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/anoteleia.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/anoteleia.glyph @@ -9,14 +9,14 @@ layerId = m01; shapes = ( { pos = (0,96); -ref = periodcentered; +ref = periodcentered.lower; } ); width = 238; } ); locked = 1; -metricLeft = "=periodcentered"; -metricRight = "=periodcentered"; +metricLeft = "=periodcentered.upper"; +metricRight = "=periodcentered.upper"; unicode = 903; } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/bulletoperator.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/bulletoperator.glyph index f4ff0ece..ab7c63a7 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/bulletoperator.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/bulletoperator.glyph @@ -7,7 +7,7 @@ layerId = m01; shapes = ( { alignment = 1; -ref = periodcentered; +ref = periodcentered.lower; } ); width = 238; diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/ellipsis.lower.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/ellipsis.lower.glyph index eb8d28ae..23baf3ac 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/ellipsis.lower.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/ellipsis.lower.glyph @@ -25,4 +25,5 @@ ref = period; width = 658; } ); +locked = 1; } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/emdash.lower.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/emdash.lower.glyph index 82c22b2b..87a2794a 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/emdash.lower.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/emdash.lower.glyph @@ -29,4 +29,5 @@ nodes = ( width = 918; } ); +locked = 1; } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/emdash.unjoined.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/emdash.unjoined.glyph index 2763d9bc..b356d706 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/emdash.unjoined.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/emdash.unjoined.glyph @@ -70,4 +70,5 @@ nodes = ( width = 924.03922; } ); +locked = 1; } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/emdash.case.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/emdash.upper.glyph similarity index 81% rename from src/ZhuqueFangsong.glyphspackage/glyphs/emdash.case.glyph rename to src/ZhuqueFangsong.glyphspackage/glyphs/emdash.upper.glyph index 8f5478db..28f36a7c 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/emdash.case.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/emdash.upper.glyph @@ -1,6 +1,6 @@ { color = 9; -glyphname = emdash.case; +glyphname = emdash.upper; layers = ( { layerId = m01; diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/ldot.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/ldot.glyph index fe0b2a72..11ada152 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/ldot.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/ldot.glyph @@ -14,7 +14,7 @@ ref = l; { alignment = -1; pos = (148,51); -ref = periodcentered; +ref = periodcentered.lower; } ); width = 332; diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/ldot.sc.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/ldot.sc.glyph index 77993e7b..471162a6 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/ldot.sc.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/ldot.sc.glyph @@ -14,7 +14,7 @@ ref = l.sc; { alignment = -1; pos = (255,95); -ref = periodcentered; +ref = periodcentered.lower; } ); width = 490; diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/periodcentered.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/periodcentered.glyph index 804fa613..8002a944 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/periodcentered.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/periodcentered.glyph @@ -1,8 +1,6 @@ { -color = 2; +color = 9; glyphname = periodcentered; -kernLeft = hyphen; -kernRight = hyphen; layers = ( { layerId = m01; @@ -10,24 +8,23 @@ shapes = ( { closed = 1; nodes = ( -(155,168,o), -(179,196,o), -(179,230,cs), -(179,261,o), -(159,287,o), -(122,287,cs), -(84,287,o), -(60,259,o), -(60,225,cs), -(60,196,o), -(78,168,o), -(116,168,cs) +(292,280,o), +(320,313,o), +(320,353,cs), +(320,389,o), +(296,420,o), +(253,420,cs), +(208,420,o), +(180,387,o), +(180,347,cs), +(180,313,o), +(201,280,o), +(246,280,cs) ); } ); -width = 238; +width = 500; } ); -locked = 1; unicode = 183; } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/periodcentered.lower.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/periodcentered.lower.glyph new file mode 100644 index 00000000..d012475d --- /dev/null +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/periodcentered.lower.glyph @@ -0,0 +1,32 @@ +{ +color = 2; +glyphname = periodcentered.lower; +kernLeft = hyphen; +kernRight = hyphen; +layers = ( +{ +layerId = m01; +shapes = ( +{ +closed = 1; +nodes = ( +(155,168,o), +(179,196,o), +(179,230,cs), +(179,261,o), +(159,287,o), +(122,287,cs), +(84,287,o), +(60,259,o), +(60,225,cs), +(60,196,o), +(78,168,o), +(116,168,cs) +); +} +); +width = 238; +} +); +locked = 1; +} diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/periodcentered.case.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/periodcentered.upper.glyph similarity index 62% rename from src/ZhuqueFangsong.glyphspackage/glyphs/periodcentered.case.glyph rename to src/ZhuqueFangsong.glyphspackage/glyphs/periodcentered.upper.glyph index 2161feaf..642158b4 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/periodcentered.case.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/periodcentered.upper.glyph @@ -1,13 +1,13 @@ { color = 2; -glyphname = periodcentered.case; +glyphname = periodcentered.upper; layers = ( { layerId = m01; shapes = ( { pos = (0,80); -ref = periodcentered; +ref = periodcentered.lower; } ); width = 238; diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/quotedblleft.uv001.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/quotedblleft.uv001.glyph new file mode 100644 index 00000000..a40980a9 --- /dev/null +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/quotedblleft.uv001.glyph @@ -0,0 +1,20 @@ +{ +color = 2; +glyphname = quotedblleft.uv001; +kernLeft = asterisk; +kernRight = asterisk; +layers = ( +{ +layerId = m01; +shapes = ( +{ +ref = quotedblleft; +} +); +width = 331; +} +); +locked = 1; +metricLeft = quoteleft; +metricRight = quoteleft; +} diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/quotedblleft.uv002.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/quotedblleft.uv002.glyph new file mode 100644 index 00000000..95afaef3 --- /dev/null +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/quotedblleft.uv002.glyph @@ -0,0 +1,58 @@ +{ +color = 9; +glyphname = quotedblleft.uv002; +layers = ( +{ +layerId = m01; +shapes = ( +{ +closed = 1; +nodes = ( +(868,462,o), +(891,476,o), +(914,504,c), +(913,519,l), +(878,530,o), +(854,559,o), +(854,592,cs), +(854,625,o), +(876,668,o), +(911,700,c), +(908,711,l), +(885,723,l), +(819,667,o), +(781,604,o), +(781,553,cs), +(781,503,o), +(809,462,o), +(845,462,cs) +); +}, +{ +closed = 1; +nodes = ( +(697,462,o), +(720,476,o), +(743,504,c), +(742,519,l), +(707,530,o), +(684,559,o), +(684,592,cs), +(684,625,o), +(706,668,o), +(740,700,c), +(738,711,l), +(715,723,l), +(649,667,o), +(610,604,o), +(610,553,cs), +(610,503,o), +(639,462,o), +(674,462,cs) +); +} +); +width = 1000; +} +); +} diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/quotedblright.uv001.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/quotedblright.uv001.glyph new file mode 100644 index 00000000..b450a914 --- /dev/null +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/quotedblright.uv001.glyph @@ -0,0 +1,20 @@ +{ +color = 2; +glyphname = quotedblright.uv001; +kernLeft = asterisk; +kernRight = asterisk; +layers = ( +{ +layerId = m01; +shapes = ( +{ +ref = quotedblright; +} +); +width = 331; +} +); +locked = 1; +metricLeft = quoteright; +metricRight = quoteright; +} diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/quotedblright.uv002.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/quotedblright.uv002.glyph new file mode 100644 index 00000000..d6e1afad --- /dev/null +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/quotedblright.uv002.glyph @@ -0,0 +1,58 @@ +{ +color = 9; +glyphname = quotedblright.uv002; +layers = ( +{ +layerId = m01; +shapes = ( +{ +closed = 1; +nodes = ( +(351,518,o), +(390,581,o), +(390,632,cs), +(390,682,o), +(361,723,o), +(326,723,cs), +(303,723,o), +(280,709,o), +(257,681,c), +(258,666,l), +(293,655,o), +(316,626,o), +(316,593,cs), +(316,560,o), +(294,517,o), +(260,485,c), +(262,474,l), +(285,462,l) +); +}, +{ +closed = 1; +nodes = ( +(181,518,o), +(219,581,o), +(219,632,cs), +(219,682,o), +(191,723,o), +(156,723,cs), +(132,723,o), +(109,709,o), +(86,681,c), +(87,666,l), +(123,655,o), +(146,626,o), +(146,593,cs), +(146,560,o), +(124,517,o), +(90,485,c), +(92,474,l), +(115,462,l) +); +} +); +width = 1000; +} +); +} diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/quoteleft.uv001.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/quoteleft.uv001.glyph new file mode 100644 index 00000000..139e2a2f --- /dev/null +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/quoteleft.uv001.glyph @@ -0,0 +1,20 @@ +{ +color = 2; +glyphname = quoteleft.uv001; +kernLeft = asterisk; +kernRight = asterisk; +layers = ( +{ +layerId = m01; +shapes = ( +{ +ref = quoteleft; +} +); +width = 176; +} +); +locked = 1; +metricLeft = "=|quoteright"; +metricRight = "=|quoteright"; +} diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/quoteleft.uv002.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/quoteleft.uv002.glyph new file mode 100644 index 00000000..6025e574 --- /dev/null +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/quoteleft.uv002.glyph @@ -0,0 +1,35 @@ +{ +color = 9; +glyphname = quoteleft.uv002; +layers = ( +{ +layerId = m01; +shapes = ( +{ +closed = 1; +nodes = ( +(840,462,o), +(863,476,o), +(886,504,c), +(885,519,l), +(850,530,o), +(827,559,o), +(827,592,cs), +(827,625,o), +(849,668,o), +(883,700,c), +(881,711,l), +(857,723,l), +(791,667,o), +(753,604,o), +(753,553,cs), +(753,503,o), +(782,462,o), +(817,462,cs) +); +} +); +width = 1000; +} +); +} diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/quoteright.uv001.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/quoteright.uv001.glyph new file mode 100644 index 00000000..4a0b6c5f --- /dev/null +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/quoteright.uv001.glyph @@ -0,0 +1,18 @@ +{ +color = 2; +glyphname = quoteright.uv001; +kernLeft = asterisk; +kernRight = asterisk; +layers = ( +{ +layerId = m01; +shapes = ( +{ +ref = quoteright; +} +); +width = 176; +} +); +locked = 1; +} diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/quoteright.uv002.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/quoteright.uv002.glyph new file mode 100644 index 00000000..22e947f1 --- /dev/null +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/quoteright.uv002.glyph @@ -0,0 +1,35 @@ +{ +color = 9; +glyphname = quoteright.uv002; +layers = ( +{ +layerId = m01; +shapes = ( +{ +closed = 1; +nodes = ( +(209,518,o), +(247,581,o), +(247,632,cs), +(247,682,o), +(218,723,o), +(183,723,cs), +(160,723,o), +(137,709,o), +(114,681,c), +(115,666,l), +(150,655,o), +(173,626,o), +(173,593,cs), +(173,560,o), +(151,517,o), +(117,485,c), +(119,474,l), +(143,462,l) +); +} +); +width = 1000; +} +); +} diff --git a/src/ZhuqueFangsong.glyphspackage/order.plist b/src/ZhuqueFangsong.glyphspackage/order.plist index eba1df2b..a6c2072e 100644 --- a/src/ZhuqueFangsong.glyphspackage/order.plist +++ b/src/ZhuqueFangsong.glyphspackage/order.plist @@ -13350,7 +13350,6 @@ ampersand.full, asterisk.full, at.full, backslash.full, -periodcentered.case, bullet.case, slash.case, backslash.case, @@ -13360,6 +13359,7 @@ comma.full, ellipsis.vert, exclam.full, ellipsis.lower, +periodcentered.lower, numbersign.full, percent.full, period.full, @@ -13374,6 +13374,7 @@ semicolon.full, semicolon.vert, slash.full, underscore.full, +periodcentered.upper, comma.full.vert, underscore.full.vert, exclam.full.vert, @@ -13390,12 +13391,12 @@ underscore, wavedash, hyphen.case, endash.case, -emdash.case, emdash.vert, hyphen.full, emdash.joined, emdash.lower, emdash.unjoined, +emdash.upper, wavedash.vert, emdash.joined.vert, emdash.unjoined.vert, @@ -13469,6 +13470,14 @@ quoteleft.sc, quoteright.sc, quotedbl.sc, quotesingle.sc, +quotedblleft.uv001, +quotedblright.uv001, +quoteleft.uv001, +quoteright.uv001, +quotedblleft.uv002, +quotedblright.uv002, +quoteleft.uv002, +quoteright.uv002, florin, "numeral-greek", "lowernumeral-greek",