Punctuation fix & change default figure to lining

src/ZhuqueFangsong.glyphspackage/fontinfo.plist

@@ -433,82 +433,72 @@ tag = ordn;
 },
 {
 automatic = 1;
-code = "sub zero by zero.lf;
-sub one by one.lf;
-sub two by two.lf;
-sub three by three.lf;
-sub four by four.lf;
-sub five by five.lf;
-sub six by six.lf;
-sub seven by seven.lf;
-sub eight by eight.lf;
-sub nine by nine.lf;
+code = "sub zero.osf by zero;
+sub one.osf by one;
+sub two.osf by two;
+sub three.osf by three;
+sub four.osf by four;
+sub five.osf by five;
+sub six.osf by six;
+sub seven.osf by seven;
+sub eight.osf by eight;
+sub nine.osf by nine;
 ";
 tag = lnum;
 },
 {
 automatic = 1;
-code = "sub zero.tf by zero.lf;
-sub one.tf by one.lf;
-sub two.tf by two.lf;
-sub three.tf by three.lf;
-sub four.tf by four.lf;
-sub five.tf by five.lf;
-sub six.tf by six.lf;
-sub seven.tf by seven.lf;
-sub eight.tf by eight.lf;
-sub nine.tf by nine.lf;
-sub zero.tosf by zero;
-sub one.tosf by one;
-sub two.tosf by two;
-sub three.tosf by three;
-sub four.tosf by four;
-sub five.tosf by five;
-sub six.tosf by six;
-sub seven.tosf by seven;
-sub eight.tosf by eight;
-sub nine.tosf by nine;
+code = "sub zero.tf by zero;
+sub one.tf by one;
+sub two.tf by two;
+sub three.tf by three;
+sub four.tf by four;
+sub five.tf by five;
+sub six.tf by six;
+sub seven.tf by seven;
+sub eight.tf by eight;
+sub nine.tf by nine;
+sub zero.tosf by zero.osf;
+sub one.tosf by one.osf;
+sub two.tosf by two.osf;
+sub three.tosf by three.osf;
+sub four.tosf by four.osf;
+sub five.tosf by five.osf;
+sub six.tosf by six.osf;
+sub seven.tosf by seven.osf;
+sub eight.tosf by eight.osf;
+sub nine.tosf by nine.osf;
 ";
 tag = pnum;
 },
 {
 automatic = 1;
-code = "sub zero.lf by zero.tf;
-sub one.lf by one.tf;
-sub two.lf by two.tf;
-sub three.lf by three.tf;
-sub four.lf by four.tf;
-sub five.lf by five.tf;
-sub six.lf by six.tf;
-sub seven.lf by seven.tf;
-sub eight.lf by eight.tf;
-sub nine.lf by nine.tf;
-sub zero by zero.tosf;
-sub one by one.tosf;
-sub two by two.tosf;
-sub three by three.tosf;
-sub four by four.tosf;
-sub five by five.tosf;
-sub six by six.tosf;
-sub seven by seven.tosf;
-sub eight by eight.tosf;
-sub nine by nine.tosf;
+code = "sub zero by zero.tf;
+sub one by one.tf;
+sub two by two.tf;
+sub three by three.tf;
+sub four by four.tf;
+sub five by five.tf;
+sub six by six.tf;
+sub seven by seven.tf;
+sub eight by eight.tf;
+sub nine by nine.tf;
+sub zero.osf by zero.tosf;
+sub one.osf by one.tosf;
+sub two.osf by two.tosf;
+sub three.osf by three.tosf;
+sub four.osf by four.tosf;
+sub five.osf by five.tosf;
+sub six.osf by six.tosf;
+sub seven.osf by seven.tosf;
+sub eight.osf by eight.tosf;
+sub nine.osf by nine.tosf;
 ";
 tag = tnum;
 },
 {
 automatic = 1;
-code = "sub zero.lf by zero;
-sub one.lf by one;
-sub two.lf by two;
-sub three.lf by three;
-sub four.lf by four;
-sub five.lf by five;
-sub six.lf by six;
-sub seven.lf by seven;
-sub eight.lf by eight;
-sub nine.lf by nine;
-sub zero.tf by zero.tosf;
+code = "sub zero.tf by zero.tosf;
 sub one.tf by one.tosf;
 sub two.tf by two.tosf;
 sub three.tf by three.tosf;
@@ -518,6 +508,16 @@ sub six.tf by six.tosf;
 sub seven.tf by seven.tosf;
 sub eight.tf by eight.tosf;
 sub nine.tf by nine.tosf;
+sub zero by zero.osf;
+sub one by one.osf;
+sub two by two.osf;
+sub three by three.osf;
+sub four by four.osf;
+sub five by five.osf;
+sub six by six.osf;
+sub seven by seven.osf;
+sub eight by eight.osf;
+sub nine by nine.osf;
 ";
 tag = onum;
 },
@@ -1574,26 +1574,26 @@ sub macroncomb_gravecomb by macroncomb_gravecomb.case;
 sub macroncomb_acutecomb by macroncomb_acutecomb.case;
 sub dblgravecomb by dblgravecomb.case;
 sub strokeshortcomb by strokeshortcomb.case;
-sub zero by zero.lf;
-sub one by one.lf;
-sub two by two.lf;
-sub three by three.lf;
-sub four by four.lf;
-sub five by five.lf;
-sub six by six.lf;
-sub seven by seven.lf;
-sub eight by eight.lf;
-sub nine by nine.lf;
-sub zero.tosf by zero.lf;
-sub one.tosf by one.lf;
-sub two.tosf by two.lf;
-sub three.tosf by three.lf;
-sub four.tosf by four.lf;
-sub five.tosf by five.lf;
-sub six.tosf by six.lf;
-sub seven.tosf by seven.lf;
-sub eight.tosf by eight.lf;
-sub nine.tosf by nine.lf;
+sub zero.osf by zero;
+sub one.osf by one;
+sub two.osf by two;
+sub three.osf by three;
+sub four.osf by four;
+sub five.osf by five;
+sub six.osf by six;
+sub seven.osf by seven;
+sub eight.osf by eight;
+sub nine.osf by nine;
+sub zero.tosf by zero;
+sub one.tosf by one;
+sub two.tosf by two;
+sub three.tosf by three;
+sub four.tosf by four;
+sub five.tosf by five;
+sub six.tosf by six;
+sub seven.tosf by seven;
+sub eight.tosf by eight;
+sub nine.tosf by nine;
 ";
 tag = case;
 },
@@ -1645,6 +1645,7 @@ sub bracketleft by bracketleft.full;
 sub bracketright by bracketright.full;
 sub parenleft by parenleft.full;
 sub parenright by parenright.full;
+sub asciitilde by asciitilde.full;
 ";
 tag = fwid;
 },
@@ -1669,9 +1670,17 @@ sub yasmall-kata by yasmall-kata.vert;
 sub yusmall-kata by yusmall-kata.vert;
 sub yosmall-kata by yosmall-kata.vert;
 sub wasmall-kata by wasmall-kata.vert;
+sub comma-han by comma-han.vert;
+sub period-han by period-han.vert;
+sub colon by colon.vert;
+sub semicolon by semicolon.vert;
+sub comma.full by comma.full.vert;
 sub underscore.full by underscore.full.vert;
+sub exclam.full by exclam.full.vert;
+sub period.full by period.full.vert;
+sub question.full by question.full.vert;
 sub emdash by emdash.vert;
-sub endash by endash.vert;
+sub wavedash by wavedash.vert;
 sub anglebracketleft by anglebracketleft.vert;
 sub anglebracketright by anglebracketright.vert;
 sub blacklenticularbracketleft by blacklenticularbracketleft.vert;
@@ -1688,6 +1697,7 @@ sub braceleft.full by braceleft.full.vert;
 sub braceright.full by braceright.full.vert;
 sub parenleft.full by parenleft.full.vert;
 sub parenright.full by parenright.full.vert;
+sub asciitilde.full by asciitilde.full.vert;
 sub prolonged-kana by prolonged-kana.vert;
 ";
 tag = vert;
@@ -1737,9 +1747,17 @@ sub yasmall-kata by yasmall-kata.vert;
 sub yusmall-kata by yusmall-kata.vert;
 sub yosmall-kata by yosmall-kata.vert;
 sub wasmall-kata by wasmall-kata.vert;
+sub comma-han by comma-han.vert;
+sub period-han by period-han.vert;
+sub colon by colon.vert;
+sub semicolon by semicolon.vert;
+sub comma.full by comma.full.vert;
 sub underscore.full by underscore.full.vert;
+sub exclam.full by exclam.full.vert;
+sub period.full by period.full.vert;
+sub question.full by question.full.vert;
 sub emdash by emdash.vert;
-sub endash by endash.vert;
+sub wavedash by wavedash.vert;
 sub anglebracketleft by anglebracketleft.vert;
 sub anglebracketright by anglebracketright.vert;
 sub blacklenticularbracketleft by blacklenticularbracketleft.vert;
@@ -1756,6 +1774,7 @@ sub braceleft.full by braceleft.full.vert;
 sub braceright.full by braceright.full.vert;
 sub parenleft.full by parenleft.full.vert;
 sub parenright.full by parenright.full.vert;
+sub asciitilde.full by asciitilde.full.vert;
 sub prolonged-kana by prolonged-kana.vert;
 ";
 tag = vrt2;

src/ZhuqueFangsong.glyphspackage/glyphs/ampersand.full.glyph

@@ -1,5 +1,5 @@
 {
-color = 7;
+color = 9;
 glyphname = ampersand.full;
 layers = (
 {

src/ZhuqueFangsong.glyphspackage/glyphs/anglebracketleft.glyph

@@ -1,5 +1,5 @@
 {
-color = 3;
+color = 9;
 glyphname = anglebracketleft;
 layers = (
 {

src/ZhuqueFangsong.glyphspackage/glyphs/anglebracketright.glyph

@@ -1,5 +1,5 @@
 {
-color = 3;
+color = 9;
 glyphname = anglebracketright;
 layers = (
 {

src/ZhuqueFangsong.glyphspackage/glyphs/asciitilde.full.glyph

@@ -0,0 +1,16 @@
+{
+color = 9;
+glyphname = asciitilde.full;
+layers = (
+{
+layerId = m01;
+shapes = (
+{
+ref = wavedash;
+}
+);
+width = 1000;
+}
+);
+unicode = 65374;
+}

src/ZhuqueFangsong.glyphspackage/glyphs/asciitilde.full.vert.glyph

@@ -0,0 +1,15 @@
+{
+color = 9;
+glyphname = asciitilde.full.vert;
+layers = (
+{
+layerId = m01;
+shapes = (
+{
+ref = wavedash.vert;
+}
+);
+width = 1000;
+}
+);
+}

src/ZhuqueFangsong.glyphspackage/glyphs/asterisk.full.glyph

@@ -1,5 +1,5 @@
 {
-color = 7;
+color = 9;
 glyphname = asterisk.full;
 layers = (
 {

src/ZhuqueFangsong.glyphspackage/glyphs/at.full.glyph

@@ -1,5 +1,5 @@
 {
-color = 7;
+color = 9;
 glyphname = at.full;
 layers = (
 {

src/ZhuqueFangsong.glyphspackage/glyphs/backslash.full.glyph

@@ -1,5 +1,5 @@
 {
-color = 7;
+color = 9;
 glyphname = backslash.full;
 layers = (
 {

src/ZhuqueFangsong.glyphspackage/glyphs/blacklenticularbracketleft.glyph

@@ -1,5 +1,5 @@
 {
-color = 3;
+color = 9;
 glyphname = blacklenticularbracketleft;
 layers = (
 {

src/ZhuqueFangsong.glyphspackage/glyphs/blacklenticularbracketleft.vert.glyph

@@ -14,6 +14,5 @@ ref = blacklenticularbracketleft;
 width = 1000;
 }
 );
-locked = 1;
 unicode = 65083;
 }