From 3e00b833cc1a2d40e4b3044e8324a898364a1c7c Mon Sep 17 00:00:00 2001 From: RUBiKLi09 Date: Mon, 23 Dec 2024 18:13:43 +0800 Subject: [PATCH] 124 hanzi manually retraced & Japanese kana fixed --- .../glyphs/da-kata.glyph | 2 +- .../glyphs/esmall-kata.glyph | 2 +- .../glyphs/ga-kata.glyph | 4 +- .../glyphs/ge-kata.glyph | 16 +- .../glyphs/i-hira.glyph | 7 +- .../glyphs/i-kata.glyph | 10 +- .../glyphs/ismall-hira.glyph | 13 +- .../glyphs/ismall-kata.glyph | 10 +- .../glyphs/kasmall-kata.glyph | 4 +- .../glyphs/ke-kata.glyph | 16 +- .../glyphs/kesmall-kata.glyph | 6 +- .../glyphs/ko-kata.glyph | 2 +- .../glyphs/o-kata.glyph | 10 +- .../glyphs/osmall-kata.glyph | 6 +- .../glyphs/ra-hira.glyph | 5 +- .../glyphs/re-hira.glyph | 17 +- .../glyphs/sa-kata.glyph | 8 +- .../glyphs/si-kata.glyph | 2 +- .../glyphs/su-kata.glyph | 6 +- .../glyphs/u-hira.glyph | 13 +- .../glyphs/u-kata.glyph | 24 +- .../glyphs/uni4E_38.glyph | 22 +- .../glyphs/uni4E_66.glyph | 11 +- .../glyphs/uni5077.glyph | 4 +- .../glyphs/uni51A_2.glyph | 55 +- .../glyphs/uni51A_C_.glyph | 20 +- .../glyphs/uni51B_B_.glyph | 14 +- .../glyphs/uni5238.glyph | 15 +- .../glyphs/uni5370.glyph | 23 +- .../glyphs/uni5417.glyph | 21 +- .../glyphs/uni5472.glyph | 23 +- .../glyphs/uni5634.glyph | 60 +- .../glyphs/uni577C_.glyph | 13 +- .../glyphs/uni590F_.glyph | 10 +- .../glyphs/uni5934.glyph | 14 +- .../glyphs/uni5B_A_4.glyph | 19 +- .../glyphs/uni5C_04.glyph | 47 +- .../glyphs/uni5E_93.glyph | 64 +- .../glyphs/uni5F_A_E_.glyph | 87 +-- .../glyphs/uni5F_D_8.glyph | 8 +- .../glyphs/uni6068.glyph | 65 +- .../glyphs/uni60A_0.glyph | 52 +- .../glyphs/uni610F_.glyph | 74 +- .../glyphs/uni6216.glyph | 52 +- .../glyphs/uni6350.glyph | 67 +- .../glyphs/uni6559.glyph | 220 +++--- .../glyphs/uni6593.glyph | 641 +++++++++--------- .../glyphs/uni65B_C_.glyph | 91 ++- .../glyphs/uni65C_B_.glyph | 237 +++---- .../glyphs/uni6603.glyph | 30 +- .../glyphs/uni660F_.glyph | 34 +- .../glyphs/uni662F_.glyph | 99 ++- .../glyphs/uni665A_.glyph | 223 +++--- .../glyphs/uni6717.glyph | 210 +++--- .../glyphs/uni6731.glyph | 101 ++- .../glyphs/uni6839.glyph | 456 +++++++------ .../glyphs/uni6845.glyph | 30 +- .../glyphs/uni6B_3E_.glyph | 242 +++---- .../glyphs/uni6B_65.glyph | 48 +- .../glyphs/uni6B_89.glyph | 161 ++--- .../glyphs/uni6B_E_1.glyph | 54 +- .../glyphs/uni6C_28.glyph | 13 +- .../glyphs/uni6D_3B_.glyph | 186 +++-- .../glyphs/uni6D_45.glyph | 40 +- .../glyphs/uni6E_90.glyph | 188 ++--- .../glyphs/uni706C_.glyph | 12 +- .../glyphs/uni706F_.glyph | 9 +- .../glyphs/uni708E_.glyph | 340 ++-------- .../glyphs/uni7136.glyph | 185 +++-- .../glyphs/uni7231.glyph | 72 +- .../glyphs/uni7315.glyph | 91 +-- .../glyphs/uni732A_.glyph | 129 ++-- .../glyphs/uni73C_8.glyph | 79 ++- .../glyphs/uni73F_E_.glyph | 160 ++--- .../glyphs/uni7487.glyph | 390 +++++------ .../glyphs/uni74E_F_.glyph | 172 ++--- .../glyphs/uni74F_6.glyph | 365 +++++----- .../glyphs/uni7701.glyph | 126 ++-- .../glyphs/uni77F_1.glyph | 383 +++++------ .../glyphs/uni7834.glyph | 56 +- .../glyphs/uni7985.glyph | 12 +- .../glyphs/uni79C_B_.glyph | 14 +- .../glyphs/uni7A_20.glyph | 247 +++---- .../glyphs/uni7A_23.glyph | 195 +++--- .../glyphs/uni7A_96.glyph | 33 +- .../glyphs/uni7A_E_D_.glyph | 184 +++-- .../glyphs/uni7B_54.glyph | 8 +- .../glyphs/uni7C_07.glyph | 12 +- .../glyphs/uni7D_00.glyph | 191 +++--- .../glyphs/uni7E_A_7.glyph | 35 +- .../glyphs/uni7F_3A_.glyph | 273 +++----- .../glyphs/uni7F_C_5.glyph | 54 +- .../glyphs/uni7F_F_B_.glyph | 92 +-- .../glyphs/uni80D_D_.glyph | 245 ++++--- .../glyphs/uni8109.glyph | 232 +++---- .../glyphs/uni810A_.glyph | 41 +- .../glyphs/uni8116.glyph | 108 +-- .../glyphs/uni81E_A_.glyph | 102 ++- .../glyphs/uni822C_.glyph | 231 +++---- .../glyphs/uni82D_F_.glyph | 4 +- .../glyphs/uni8317.glyph | 176 +++-- .../glyphs/uni8499.glyph | 290 ++++---- .../glyphs/uni873B_.glyph | 86 ++- .../glyphs/uni88A_A_.glyph | 102 +-- .../glyphs/uni88A_D_.glyph | 345 +++++----- .../glyphs/uni88C_2.glyph | 88 +-- .../glyphs/uni8B_F_2.glyph | 60 +- .../glyphs/uni8C_2F_.glyph | 38 +- .../glyphs/uni8D_29.glyph | 74 +- .../glyphs/uni8D_73.glyph | 4 +- .../glyphs/uni8D_74.glyph | 16 +- .../glyphs/uni8F_6C_.glyph | 38 +- .../glyphs/uni9020.glyph | 36 +- .../glyphs/uni9042.glyph | 23 +- .../glyphs/uni90E_D_.glyph | 214 +++--- .../glyphs/uni916C_.glyph | 32 +- .../glyphs/uni94B_A_.glyph | 58 +- .../glyphs/uni95F_9.glyph | 98 +-- .../glyphs/uni9669.glyph | 40 +- .../glyphs/uni96C_0.glyph | 36 +- .../glyphs/uni96F_9.glyph | 4 +- .../glyphs/uni9785.glyph | 132 ++-- .../glyphs/uni9879.glyph | 130 ++-- .../glyphs/uni98C_E_.glyph | 44 +- .../glyphs/uni98E_2.glyph | 2 +- .../glyphs/uni996E_.glyph | 29 +- .../glyphs/uni9A_7C_.glyph | 24 +- .../glyphs/uni9E_2F_.glyph | 14 +- .../glyphs/uni9E_64.glyph | 59 +- .../glyphs/uni9E_D_8.glyph | 22 +- .../glyphs/usmall-kata.glyph | 10 +- .../glyphs/vu-hira.glyph | 5 +- .../glyphs/yo-hira.glyph | 5 +- .../glyphs/yu-hira.glyph | 4 +- .../glyphs/yu-kata.glyph | 16 +- .../glyphs/yusmall-hira.glyph | 3 +- .../glyphs/za-kata.glyph | 10 +- .../glyphs/zu-kata.glyph | 14 +- 138 files changed, 5555 insertions(+), 6035 deletions(-) diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/da-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/da-kata.glyph index c12d2986..033f4fa7 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/da-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/da-kata.glyph @@ -23,7 +23,7 @@ nodes = ( (678,525,o), (645,517,cs), (599,507,o), -(531,492,o), +(531,493,o), (442,500,c), (436,484,l), (459,465,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/esmall-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/esmall-kata.glyph index 4f31b091..eba64cc2 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/esmall-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/esmall-kata.glyph @@ -37,7 +37,7 @@ nodes = ( { closed = 1; nodes = ( -(233,62,o), +(233,64,o), (271,70,o), (320,73,cs), (494,84,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/ga-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/ga-kata.glyph index 9c701273..fdca402b 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/ga-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/ga-kata.glyph @@ -42,9 +42,9 @@ nodes = ( (674,423,o), (730,426,c), (709,326,o), -(660,162,o), +(659,162,o), (635,126,cs), -(627,114,o), +(629,117,o), (625,117,o), (613,121,cs), (557,140,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/ge-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/ge-kata.glyph index 7bf0f191..11d53008 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/ge-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/ge-kata.glyph @@ -32,7 +32,7 @@ nodes = ( { closed = 1; nodes = ( -(458,410,o), +(458,408,o), (499,413,o), (559,418,cs), (620,424,o), @@ -72,13 +72,13 @@ nodes = ( (633,347,o), (626,356,cs), (608,376,o), -(583,396,o), -(551,418,c), -(539,411,l), -(547,385,o), -(545,366,o), -(534,345,cs), -(461,210,o), +(582,396,o), +(545,414,c), +(537,406,l), +(546,381,o), +(545,364,o), +(534,343,cs), +(461,208,o), (345,86,o), (152,-33,c), (166,-48,l) diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/i-hira.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/i-hira.glyph index 6b143a47..657b738b 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/i-hira.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/i-hira.glyph @@ -48,9 +48,9 @@ nodes = ( (902,213,o), (906,237,cs), (907,244,o), -(900,250,o), -(892,262,cs), -(836,348,o), +(904,254,o), +(895,266,cs), +(836,347,o), (773,411,o), (637,517,c), (616,500,l), @@ -63,6 +63,5 @@ nodes = ( width = 1000; } ); -locked = 1; unicode = 12356; } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/i-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/i-kata.glyph index 5953d204..0aec4b42 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/i-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/i-kata.glyph @@ -48,13 +48,13 @@ nodes = ( (518,333,cs), (525,283,o), (519,161,o), -(510,91,cs), +(511,95,cs), (507,67,o), -(506,54,o), -(499,29,cs), -(495,17,o), +(504,56,o), +(497,31,cs), +(493,19,o), (492,13,o), -(499,6,cs), +(500,4,cs), (514,-12,o), (548,-36,o), (574,-54,c) diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/ismall-hira.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/ismall-hira.glyph index 57e821f5..93e49427 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/ismall-hira.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/ismall-hira.glyph @@ -11,9 +11,9 @@ nodes = ( (315,-6,o), (396,-6,cs), (411,-6,o), -(407,19,o), -(413,48,cs), -(429,119,o), +(408,19,o), +(414,48,cs), +(430,119,o), (462,220,o), (501,321,c), (486,328,l), @@ -45,9 +45,9 @@ nodes = ( (745,66,o), (761,90,cs), (774,110,o), -(788,137,o), -(791,156,cs), -(792,163,o), +(786,132,o), +(789,151,cs), +(790,158,o), (787,169,o), (780,180,cs), (739,247,o), @@ -63,6 +63,5 @@ nodes = ( width = 1000; } ); -locked = 1; unicode = 12355; } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/ismall-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/ismall-kata.glyph index 01e754e4..2a66ac39 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/ismall-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/ismall-kata.glyph @@ -47,12 +47,12 @@ nodes = ( (489,262,o), (493,235,cs), (499,197,o), -(495,113,o), +(493,113,o), (487,63,cs), -(484,46,o), -(486,36,o), -(483,18,cs), -(481,7,o), +(485,47,o), +(483,32,o), +(480,19,cs), +(478,8,o), (477,3,o), (483,-4,cs), (495,-16,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/kasmall-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/kasmall-kata.glyph index 527fce48..be7e596b 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/kasmall-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/kasmall-kata.glyph @@ -41,8 +41,8 @@ nodes = ( (678,295,c), (661,220,o), (617,97,o), -(599,69,cs), -(592,59,o), +(602,74,cs), +(597,65,o), (595,65,o), (588,67,cs), (543,80,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/ke-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/ke-kata.glyph index 0f0d6898..c103a129 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/ke-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/ke-kata.glyph @@ -69,14 +69,14 @@ nodes = ( (622,325,o), (634,335,cs), (643,342,o), -(638,349,o), -(631,358,cs), -(614,380,o), -(590,400,o), -(557,422,c), -(544,414,l), -(552,389,o), -(550,368,o), +(640,350,o), +(631,359,cs), +(615,377,o), +(587,399,o), +(552,417,c), +(539,409,l), +(554,386,o), +(549,367,o), (539,348,cs), (466,210,o), (348,87,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/kesmall-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/kesmall-kata.glyph index 17c6ed60..25c031ae 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/kesmall-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/kesmall-kata.glyph @@ -33,9 +33,9 @@ nodes = ( closed = 1; nodes = ( (477,291,o), -(506,293,o), -(548,297,cs), -(596,302,o), +(507,294,o), +(548,298,cs), +(596,303,o), (712,310,o), (794,312,cs), (811,312,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/ko-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/ko-kata.glyph index 9174dd37..080f741b 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/ko-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/ko-kata.glyph @@ -56,7 +56,7 @@ nodes = ( (841,187,o), (820,203,o), (782,234,c), -(752,219,o), +(758,218,o), (729,206,o), (683,200,cs), (580,189,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/o-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/o-kata.glyph index 04eb837a..9888f4af 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/o-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/o-kata.glyph @@ -17,7 +17,7 @@ nodes = ( (906,449,o), (893,467,cs), (880,483,o), -(863,497,o), +(865,498,o), (828,521,c), (798,508,o), (762,498,o), @@ -79,9 +79,9 @@ nodes = ( (375,134,o), (523,310,cs), (534,324,o), -(542,328,o), -(557,338,cs), -(565,343,o), +(541,329,o), +(556,339,cs), +(564,344,o), (566,347,o), (558,357,cs), (542,377,o), @@ -92,7 +92,7 @@ nodes = ( (477,379,o), (464,359,cs), (378,228,o), -(251,116,o), +(251,115,o), (49,12,c), (59,-3,l) ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/osmall-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/osmall-kata.glyph index 93833167..6abe6bc2 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/osmall-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/osmall-kata.glyph @@ -23,10 +23,10 @@ nodes = ( (672,347,o), (645,343,cs), (574,333,o), -(422,322,o), +(422,323,o), (339,321,cs), -(300,321,o), -(259,316,o), +(300,320,o), +(259,319,o), (208,331,c), (204,325,l), (252,265,l) diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/ra-hira.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/ra-hira.glyph index 319a549e..69a63bd6 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/ra-hira.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/ra-hira.glyph @@ -82,9 +82,9 @@ nodes = ( (340,704,o), (323,731,c), (310,723,l), -(312,705,o), +(311,705,o), (313,690,o), -(318,677,cs), +(315,677,cs), (319,655,o), (326,645,o), (341,633,cs), @@ -100,6 +100,5 @@ nodes = ( width = 1000; } ); -locked = 1; unicode = 12425; } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/re-hira.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/re-hira.glyph index c64dd7ae..a38793d4 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/re-hira.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/re-hira.glyph @@ -30,14 +30,14 @@ nodes = ( (327,253,o), (320,107,cs), (319,81,o), -(303,82,o), -(291,86,cs), -(275,92,o), -(259,96,o), -(241,103,c), -(230,86,l), -(257,57,o), -(287,16,o), +(303,84,o), +(291,87,cs), +(272,92,o), +(253,97,o), +(231,106,c), +(220,89,l), +(251,59,o), +(286,19,o), (307,-27,cs), (317,-48,o), (327,-54,o), @@ -119,6 +119,5 @@ nodes = ( width = 1000; } ); -locked = 1; unicode = 12428; } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/sa-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/sa-kata.glyph index 8112dc21..3cb44dbc 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/sa-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/sa-kata.glyph @@ -73,11 +73,11 @@ nodes = ( (670,600,o), (677,621,cs), (678,626,o), -(682,634,o), +(681,633,o), (672,640,cs), -(645,656,o), -(613,683,o), -(551,717,c), +(640,664,o), +(607,685,o), +(548,719,c), (538,709,l), (589,651,o), (598,619,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/si-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/si-kata.glyph index 986e0715..76a7b33f 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/si-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/si-kata.glyph @@ -43,7 +43,7 @@ nodes = ( (321,113,cs), (269,94,o), (224,87,o), -(167,87,c), +(169,90,c), (165,76,l), (210,42,o), (235,26,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/su-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/su-kata.glyph index cd86f6af..24340fec 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/su-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/su-kata.glyph @@ -48,9 +48,9 @@ nodes = ( (850,24,o), (864,55,cs), (878,85,o), -(884,117,o), -(884,147,cs), -(884,156,o), +(883,111,o), +(883,141,cs), +(883,150,o), (876,160,o), (862,173,cs), (778,246,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/u-hira.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/u-hira.glyph index 921a2166..71020a17 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/u-hira.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/u-hira.glyph @@ -30,12 +30,12 @@ closed = 1; nodes = ( (197,399,l), (232,380,o), -(270,362,o), -(304,349,cs), -(314,344,o), -(326,342,o), -(328,345,cs), -(341,358,o), +(272,362,o), +(305,348,cs), +(316,344,o), +(328,343,o), +(335,351,cs), +(343,359,o), (348,365,o), (362,379,cs), (396,409,o), @@ -66,6 +66,5 @@ nodes = ( width = 1000; } ); -locked = 1; unicode = 12358; } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/u-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/u-kata.glyph index 6fbf110b..7e022c19 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/u-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/u-kata.glyph @@ -21,13 +21,13 @@ nodes = ( (213,579,c), (204,570,l), (221,551,o), -(234,519,o), +(235,519,o), (239,497,cs), -(249,453,o), -(242,423,o), -(236,383,cs), -(233,363,o), -(228,343,o), +(247,453,o), +(245,423,o), +(238,383,cs), +(235,363,o), +(227,343,o), (212,326,c), (238,307,o), (254,294,o), @@ -76,12 +76,12 @@ nodes = ( (593,494,o), (593,504,cs), (593,554,o), -(593,599,o), -(596,630,cs), -(597,647,o), -(597,666,o), -(600,674,cs), -(604,681,o), +(592,599,o), +(595,630,cs), +(596,647,o), +(598,661,o), +(601,671,cs), +(603,679,o), (605,686,o), (595,689,cs), (561,701,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni4E_38.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni4E_38.glyph index 85444e84..66de290c 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni4E_38.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni4E_38.glyph @@ -21,13 +21,13 @@ nodes = ( (937,152,o), (935,240,c), (909,240,l), -(906,182,o), -(905,146,o), -(895,89,cs), -(889,54,o), -(879,6,o), -(843,-6,cs), -(780,-28,o), +(905,163,o), +(901,119,o), +(890,59,cs), +(884,24,o), +(865,1,o), +(837,-8,cs), +(777,-27,o), (694,-26,o), (644,-10,cs), (609,1,o), @@ -52,7 +52,7 @@ nodes = ( (273,490,o), (121,480,c), (118,464,l), -(139,450,o), +(138,450,o), (160,437,o), (183,425,c), (287,451,o), @@ -76,9 +76,9 @@ nodes = ( (509,132,o), (509,149,cs), (509,173,o), -(504,191,o), -(499,204,cs), -(494,219,o), +(505,190,o), +(500,203,cs), +(495,218,o), (484,227,o), (471,233,cs), (402,267,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni4E_66.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni4E_66.glyph index 73888c6a..15dfad9d 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni4E_66.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni4E_66.glyph @@ -39,10 +39,13 @@ nodes = ( (322,284,o), (630,296,o), (806,303,c), -(801,266,o), -(750,93,o), -(724,61,c), -(664,91,o), +(802,273,o), +(766,154,o), +(741,92,cs), +(735,78,o), +(730,70,o), +(723,62,c), +(662,90,o), (623,112,o), (580,137,c), (570,122,l), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5077.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5077.glyph index 0c8fb7b4..3a651077 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5077.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5077.glyph @@ -57,8 +57,8 @@ nodes = ( (192,7,o), (179,-33,c), (194,-51,o), -(211,-68,o), -(230,-84,c) +(214,-70,o), +(233,-85,c) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni51A_2.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni51A_2.glyph index 41845897..372be4eb 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni51A_2.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni51A_2.glyph @@ -72,13 +72,13 @@ nodes = ( (387,153,o), (389,167,cs), (391,179,o), -(390,196,o), -(388,205,cs), -(386,217,o), -(379,221,o), +(390,194,o), +(387,203,cs), +(383,215,o), +(379,220,o), (360,230,cs), -(330,243,o), -(288,259,o), +(331,245,o), +(288,260,o), (230,278,c), (221,263,l), (282,229,o), @@ -101,19 +101,22 @@ nodes = ( (554,260,o), (548,304,o), (516,334,cs), -(485,363,o), -(462,376,o), -(407,400,c), +(482,366,o), +(457,381,o), +(397,406,c), (379,380,l), (412,364,o), (435,351,o), (459,333,cs), (500,303,o), (506,246,o), -(507,200,cs), -(508,152,o), -(504,23,o), -(487,-15,c), +(507,214,cs), +(508,161,o), +(503,69,o), +(496,19,cs), +(494,3,o), +(490,-8,o), +(485,-15,c), (437,-2,o), (381,16,o), (329,36,c), @@ -137,10 +140,10 @@ nodes = ( (432,408,cs), (452,424,o), (468,435,o), -(482,443,c), -(477,454,o), -(458,478,o), -(448,491,c), +(481,443,c), +(470,467,o), +(453,485,o), +(436,497,c), (422,490,l), (416,475,o), (409,464,o), @@ -158,9 +161,9 @@ fillColor = (0,255); closed = 1; nodes = ( (198,501,o), -(232,594,o), +(235,594,o), (246,631,cs), -(253,652,o), +(252,652,o), (255,666,o), (252,681,cs), (247,703,o), @@ -200,7 +203,9 @@ nodes = ( (358,514,o), (220,510,c), (216,498,l), -(271,463,l) +(231,486,o), +(250,474,o), +(271,463,c) ); }, { @@ -247,16 +252,18 @@ nodes = ( (759,718,o), (726,713,cs), (636,699,o), -(398,684,o), +(398,681,o), (246,675,c), (242,661,l), -(254,649,o), -(269,638,o), +(253,650,o), +(271,637,o), (285,630,c), (350,637,o), (726,666,o), (770,666,c), -(725,596,l), +(758,643,o), +(743,619,o), +(725,596,c), (737,585,l) ); } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni51A_C_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni51A_C_.glyph index 6a3c5ef0..7b3516d4 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni51A_C_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni51A_C_.glyph @@ -130,13 +130,19 @@ nodes = ( (724,290,cs), (590,366,o), (522,424,o), -(407,517,cs), -(392,528,o), -(374,535,o), -(348,537,c), -(334,517,l), -(419,468,o), -(658,250,o), +(412,517,cs), +(398,528,o), +(384,531,o), +(369,531,cs), +(360,531,o), +(345,529,o), +(326,523,c), +(326,511,l), +(340,511,o), +(352,506,o), +(363,498,cs), +(464,427,o), +(665,243,o), (733,182,cs), (749,167,o), (758,166,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni51B_B_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni51B_B_.glyph index f7b52584..2d082a77 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni51B_B_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni51B_B_.glyph @@ -74,10 +74,10 @@ nodes = ( (195,229,o), (144,132,cs), (132,109,o), -(118,104,o), -(104,104,cs), -(96,104,o), -(88,105,o), +(118,103,o), +(104,103,cs), +(96,103,o), +(88,104,o), (80,106,c), (73,94,l), (105,62,o), @@ -105,9 +105,9 @@ nodes = ( (374,58,o), (328,21,c), (330,2,o), -(335,-16,o), -(338,-26,cs), -(345,-45,o), +(334,-16,o), +(339,-29,cs), +(346,-45,o), (360,-45,o), (375,-31,cs) ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5238.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5238.glyph index 2e1189c0..fe27e489 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5238.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5238.glyph @@ -92,10 +92,13 @@ nodes = ( (402,189,o), (534,201,o), (626,206,c), -(608,123,o), -(574,-2,o), -(549,-25,c), -(507,-10,o), +(611,139,o), +(583,43,o), +(565,-2,cs), +(561,-13,o), +(556,-21,o), +(550,-27,c), +(508,-12,o), (466,8,o), (427,28,c), (418,12,l), @@ -196,8 +199,8 @@ nodes = ( (845,205,o), (795,238,cs), (722,285,o), -(698,305,o), -(625,374,c), +(674,321,o), +(601,390,c), (578,372,l), (614,337,o), (766,177,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5370.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5370.glyph index 07a60c5a..6ad05e12 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5370.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5370.glyph @@ -93,8 +93,8 @@ nodes = ( (529,-2,o), (524,-28,o), (515,-54,c), -(526,-68,o), -(564,-106,o), +(529,-72,o), +(557,-101,o), (575,-114,c) ); }, @@ -129,11 +129,11 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(795,140,o), -(811,171,o), -(819,199,cs), -(841,281,o), -(864,433,o), +(792,137,o), +(809,165,o), +(815,189,cs), +(838,275,o), +(864,430,o), (872,496,cs), (874,515,o), (888,529,o), @@ -154,9 +154,12 @@ nodes = ( (661,518,o), (738,526,o), (815,533,c), -(804,393,o), -(775,228,o), -(759,202,c), +(807,426,o), +(790,305,o), +(774,242,cs), +(769,222,o), +(764,211,o), +(758,203,c), (732,210,o), (706,220,o), (634,250,c), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5417.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5417.glyph index 8c5cd211..d1d45307 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5417.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5417.glyph @@ -61,9 +61,12 @@ nodes = ( (613,287,o), (739,296,o), (843,300,c), -(815,157,o), -(769,9,o), -(742,-28,c), +(820,185,o), +(784,67,o), +(760,6,cs), +(754,-9,o), +(749,-18,o), +(740,-28,c), (689,-8,o), (637,15,o), (584,43,c), @@ -84,10 +87,12 @@ closed = 1; nodes = ( (183,140,l), (177,262,o), -(176,390,o), -(177,530,c), -(186,556,l), -(160,583,o), +(177,390,o), +(177,530,cs), +(177,539,o), +(178,544,o), +(183,558,c), +(158,586,o), (135,607,o), (108,628,c), (92,617,l), @@ -178,7 +183,7 @@ nodes = ( (303,595,o), (285,580,o), (263,575,cs), -(230,568,o), +(232,568,o), (197,563,o), (165,560,c), (166,518,l), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5472.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5472.glyph index 02f73354..2e97ee19 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5472.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5472.glyph @@ -64,8 +64,11 @@ nodes = ( (550,70,o), (647,108,c), (638,132,l), -(463,68,o), -(315,22,o), +(510,85,o), +(396,48,o), +(301,26,cs), +(266,18,o), +(233,12,o), (203,9,c), (199,-8,l), (222,-24,o), @@ -130,8 +133,8 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(420,54,l), -(421,140,o), +(420,36,l), +(421,122,o), (426,334,o), (428,382,cs), (429,419,o), @@ -145,8 +148,8 @@ nodes = ( (363,470,o), (367,439,cs), (379,353,o), -(374,115,o), -(374,41,c) +(374,97,o), +(374,23,c) ); }, { @@ -189,8 +192,8 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(537,80,l), -(538,135,o), +(537,79,l), +(538,134,o), (547,530,o), (550,568,cs), (552,602,o), @@ -204,8 +207,8 @@ nodes = ( (486,641,o), (488,606,cs), (498,457,o), -(493,212,o), -(489,65,c) +(493,211,o), +(489,64,c) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5634.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5634.glyph index 7388feae..19db55ab 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5634.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5634.glyph @@ -61,10 +61,10 @@ nodes = ( (481,98,o), (483,267,cs), (483,274,o), -(486,282,o), -(490,289,c), -(471,312,o), -(456,327,o), +(484,282,o), +(488,289,c), +(469,312,o), +(454,326,o), (435,337,c), (426,329,l), (430,314,o), @@ -85,8 +85,10 @@ nodes = ( (149,206,l), (147,267,o), (143,485,o), -(143,532,c), -(149,556,l), +(143,532,cs), +(143,540,o), +(144,549,o), +(149,556,c), (127,581,o), (104,603,o), (81,623,c), @@ -117,11 +119,13 @@ nodes = ( (313,324,o), (316,332,o), (309,341,cs), -(299,353,o), -(282,369,o), -(267,381,c), -(248,362,l), -(208,356,o), +(301,351,o), +(288,364,o), +(276,374,c), +(268,369,o), +(261,365,o), +(248,362,cs), +(212,353,o), (168,351,o), (128,349,c), (129,310,l) @@ -134,7 +138,6 @@ fillColor = (0,255); closed = 1; nodes = ( (287,351,l), -(287,367,ls), (289,412,o), (292,458,o), (299,503,cs), @@ -199,12 +202,12 @@ nodes = ( (540,404,o), (560,419,o), (577,432,c), -(563,456,o), -(546,475,o), -(530,489,c), -(519,480,l), -(519,469,o), -(517,458,o), +(564,454,o), +(548,471,o), +(533,484,c), +(520,477,l), +(520,467,o), +(517,457,o), (498,433,cs), (446,365,o), (353,294,o), @@ -315,11 +318,14 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(601,287,l), -(659,344,o), -(685,368,o), +(604,291,l), +(631,317,o), +(651,335,o), +(665,349,cs), +(682,366,o), +(694,374,o), (704,379,cs), -(720,388,o), +(720,387,o), (723,394,o), (709,406,cs), (703,411,o), @@ -338,9 +344,9 @@ nodes = ( (576,374,o), (608,380,o), (635,384,c), -(619,356,o), -(600,328,o), -(580,300,c) +(620,357,o), +(601,330,o), +(582,303,c) ); }, { @@ -349,7 +355,7 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(540,490,l), +(540,500,l), (540,546,o), (542,603,o), (545,659,cs), @@ -365,7 +371,7 @@ nodes = ( (493,661,cs), (496,596,o), (497,531,o), -(494,467,c) +(494,477,c) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni577C_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni577C_.glyph index 3f742632..4cbfaffd 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni577C_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni577C_.glyph @@ -40,11 +40,14 @@ nodes = ( (333,202,o), (446,267,c), (432,291,l), -(334,237,o), -(121,143,o), -(49,127,c), -(47,111,l), -(70,97,o), +(364,254,o), +(240,194,o), +(147,157,cs), +(105,141,o), +(72,132,o), +(49,130,c), +(47,114,l), +(71,97,o), (97,84,o), (126,72,c) ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni590F_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni590F_.glyph index 6a8f185c..3dbf239b 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni590F_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni590F_.glyph @@ -256,11 +256,11 @@ closed = 1; nodes = ( (417,548,l), (453,570,o), -(485,595,o), -(503,611,cs), -(514,621,o), -(525,631,o), -(534,638,c), +(493,603,o), +(511,619,cs), +(522,628,o), +(525,630,o), +(534,636,c), (527,651,o), (518,662,o), (497,680,c), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5934.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5934.glyph index 6e243774..5d10fe15 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5934.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5934.glyph @@ -37,12 +37,12 @@ fillColor = (0,255); closed = 1; nodes = ( (393,339,o), -(407,343,o), +(406,343,o), (411,360,cs), -(416,380,o), -(416,398,o), +(417,380,o), +(417,398,o), (413,413,cs), -(411,423,o), +(410,423,o), (407,430,o), (397,435,cs), (341,461,o), @@ -112,9 +112,9 @@ fillColor = (0,255); closed = 1; nodes = ( (466,535,o), -(468,558,o), -(465,577,cs), -(463,588,o), +(469,558,o), +(466,577,cs), +(464,588,o), (459,595,o), (447,601,cs), (405,622,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5B_A_4.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5B_A_4.glyph index 8a06dd74..42071c3f 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5B_A_4.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5B_A_4.glyph @@ -11,8 +11,11 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(826,537,o), -(876,549,o), +(806,529,o), +(837,538,o), +(866,544,cs), +(885,548,o), +(904,550,o), (922,550,cs), (941,551,o), (946,562,o), @@ -27,7 +30,9 @@ nodes = ( (309,606,o), (222,606,c), (218,586,l), -(259,558,l), +(231,575,o), +(244,565,o), +(259,558,c), (455,577,o), (588,584,o), (804,596,c), @@ -104,7 +109,9 @@ nodes = ( (531,185,o), (532,203,o), (536,228,c), -(483,260,l), +(519,240,o), +(498,252,o), +(479,262,c), (466,255,l), (470,225,o), (472,196,o), @@ -198,7 +205,9 @@ nodes = ( (294,462,o), (223,464,c), (219,449,l), -(269,415,l) +(235,436,o), +(251,424,o), +(269,415,c) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5C_04.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5C_04.glyph index 5ff96114..54ff86bc 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5C_04.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5C_04.glyph @@ -69,9 +69,12 @@ nodes = ( (341,249,o), (449,278,c), (445,308,l), -(326,278,o), -(181,242,o), -(65,231,c), +(350,283,o), +(239,255,o), +(139,237,cs), +(114,233,o), +(89,231,o), +(66,231,c), (63,217,l), (79,204,o), (98,191,o), @@ -86,12 +89,14 @@ closed = 1; nodes = ( (241,252,l), (243,357,o), -(245,462,o), -(246,561,c), -(250,585,l), -(230,605,o), -(208,623,o), -(182,637,c), +(240,492,o), +(246,557,cs), +(247,568,o), +(248,577,o), +(251,585,c), +(231,605,o), +(207,624,o), +(181,638,c), (170,628,l), (190,582,o), (192,548,o), @@ -165,8 +170,11 @@ nodes = ( (395,392,o), (387,400,o), (376,410,c), -(331,389,o), -(283,382,o), +(363,404,o), +(349,398,o), +(335,395,cs), +(303,387,o), +(269,381,o), (234,377,c), (233,344,l) ); @@ -186,9 +194,12 @@ nodes = ( (393,492,o), (386,499,o), (372,512,c), -(329,489,o), -(282,487,o), -(234,480,c), +(357,504,o), +(341,497,o), +(325,494,cs), +(296,488,o), +(265,483,o), +(234,481,c), (235,446,l) ); }, @@ -253,10 +264,10 @@ nodes = ( (944,453,o), (927,467,o), (899,488,c), -(862,461,o), -(817,457,o), -(771,452,cs), -(733,448,o), +(862,462,o), +(837,460,o), +(791,454,cs), +(753,449,o), (602,435,o), (504,433,c), (501,419,l), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5E_93.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5E_93.glyph index 5a343b73..346fe48b 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5E_93.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5E_93.glyph @@ -23,34 +23,34 @@ nodes = ( (815,264,o), (792,281,o), (774,294,c), -(725,269,o), -(669,264,o), -(618,260,cs), -(560,256,o), -(485,250,o), +(725,272,o), +(692,269,o), +(651,265,cs), +(593,259,o), +(485,252,o), (429,248,c), -(460,311,o), -(492,375,o), -(525,440,cs), -(540,470,o), -(555,501,o), -(577,534,c), -(562,554,o), -(549,571,o), +(464,321,o), +(501,395,o), +(540,470,cs), +(551,491,o), +(563,512,o), +(579,534,c), +(565,555,o), +(550,572,o), (525,599,c), (506,595,l), (510,536,o), -(487,479,o), -(470,437,cs), -(454,397,o), +(499,502,o), +(482,460,cs), +(466,420,o), (422,327,o), (395,279,cs), (386,264,o), (369,250,o), (348,244,c), (342,232,l), -(354,217,o), -(363,206,o), +(353,217,o), +(362,206,o), (374,193,c) ); }, @@ -66,8 +66,8 @@ nodes = ( (290,442,o), (295,498,o), (301,523,c), -(288,537,o), -(264,562,o), +(289,538,o), +(265,563,o), (247,579,c), (222,581,l), (225,561,o), @@ -101,7 +101,9 @@ nodes = ( (367,97,o), (237,97,c), (233,85,l), -(289,43,l) +(250,70,o), +(268,56,o), +(289,43,c) ); }, { @@ -152,7 +154,9 @@ nodes = ( (390,439,o), (304,443,c), (298,426,l), -(352,392,l) +(315,414,o), +(332,403,o), +(352,392,c) ); }, { @@ -161,9 +165,8 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(255,573,l), -(342,581,o), -(690,607,o), +(422,589,o), +(678,607,o), (861,604,cs), (888,604,o), (894,616,o), @@ -174,14 +177,13 @@ nodes = ( (799,670,o), (776,664,o), (755,660,cs), -(653,638,o), -(410,629,o), -(301,625,cs), -(257,624,o), -(211,623,o), +(644,636,o), +(280,620,o), (167,625,c), (163,608,l), -(233,569,l) +(185,593,o), +(209,580,o), +(233,569,c) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5F_A_E_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5F_A_E_.glyph index b336c588..1091d0c9 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5F_A_E_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5F_A_E_.glyph @@ -43,9 +43,11 @@ nodes = ( (242,280,o), (244,310,o), (249,335,c), -(202,370,l), -(188,354,l), -(188,347,o), +(235,349,o), +(220,360,o), +(202,370,c), +(187,361,l), +(188,354,o), (189,339,o), (189,295,cs), (189,225,o), @@ -54,7 +56,9 @@ nodes = ( (174,18,o), (169,-16,o), (160,-41,c), -(214,-89,l) +(173,-57,o), +(191,-73,o), +(214,-89,c) ); }, { @@ -65,10 +69,12 @@ closed = 1; nodes = ( (338,-12,o), (398,70,o), -(412,228,c), -(422,246,l), -(402,264,o), -(382,283,o), +(412,228,cs), +(413,236,o), +(415,243,o), +(418,250,c), +(402,268,o), +(384,285,o), (362,301,c), (350,291,l), (358,266,o), @@ -111,7 +117,7 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(532,36,o), +(532,38,o), (588,87,o), (651,141,c), (640,159,l), @@ -139,13 +145,12 @@ nodes = ( (394,219,l), (490,234,l), (479,79,ls), -(478,64,o), -(470,51,o), -(457,45,cs), -(434,35,l), -(431,23,l), -(444,9,o), -(459,-3,o), +(478,58,o), +(468,49,o), +(436,35,c), +(433,23,l), +(445,9,o), +(458,-3,o), (476,-15,c) ); }, @@ -188,8 +193,8 @@ nodes = ( (292,655,o), (309,673,o), (328,691,c), -(316,713,o), -(286,760,o), +(317,714,o), +(287,761,o), (269,785,c), (253,778,l), (259,740,o), @@ -248,12 +253,14 @@ nodes = ( (560,474,o), (594,475,c), (601,512,l), -(403,491,l), -(404,535,o), +(536,504,o), +(470,499,o), +(403,495,c), +(404,539,o), (407,590,o), (414,619,c), -(393,637,o), -(371,656,o), +(395,638,o), +(373,657,o), (350,674,c), (339,664,l), (346,650,o), @@ -266,7 +273,9 @@ nodes = ( (347,485,o), (338,484,c), (334,470,l), -(362,440,l) +(341,458,o), +(351,448,o), +(362,440,c) ); }, { @@ -287,10 +296,10 @@ nodes = ( (455,791,c), (443,781,l), (460,740,o), -(464,719,o), -(466,675,cs), -(468,619,o), -(469,564,o), +(463,722,o), +(466,678,cs), +(470,622,o), +(470,564,o), (469,488,c) ); }, @@ -301,14 +310,14 @@ fillColor = (0,255); closed = 1; nodes = ( (621,438,l), -(624,473,o), -(627,524,o), +(622,473,o), +(626,524,o), (633,577,cs), -(636,598,o), -(635,609,o), -(643,633,c), -(624,653,o), -(607,669,o), +(636,599,o), +(637,605,o), +(645,629,c), +(627,649,o), +(607,668,o), (584,685,c), (573,677,l), (583,653,o), @@ -337,8 +346,8 @@ nodes = ( (787,637,o), (796,663,o), (808,683,c), -(784,719,o), -(758,752,o), +(784,721,o), +(761,753,o), (730,787,c), (713,778,l), (725,742,o), @@ -363,14 +372,14 @@ nodes = ( (959,468,o), (947,479,cs), (930,494,o), -(913,505,o), +(914,505,o), (895,516,c), (872,498,o), (862,495,o), (839,486,cs), (816,478,o), -(746,463,o), -(702,455,c), +(746,461,o), +(702,456,c), (695,444,l), (706,436,o), (718,428,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5F_D_8.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5F_D_8.glyph index 426c5e9c..2f453914 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni5F_D_8.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni5F_D_8.glyph @@ -20,11 +20,11 @@ nodes = ( (825,-66,o), (808,-50,cs), (762,-3,o), -(704,61,o), -(669,118,c), +(711,61,o), +(671,118,c), (660,114,l), -(675,68,o), -(687,22,o), +(676,68,o), +(688,22,o), (696,-26,c), (510,-25,o), (376,19,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6068.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6068.glyph index c2a64147..351867c1 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6068.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6068.glyph @@ -36,8 +36,8 @@ nodes = ( (438,-19,o), (409,-38,c), (407,-50,l), -(426,-67,o), -(441,-82,o), +(424,-68,o), +(439,-83,o), (463,-99,c) ); }, @@ -81,8 +81,8 @@ nodes = ( (301,652,o), (305,679,o), (316,699,c), -(281,734,o), -(248,762,o), +(282,735,o), +(249,763,o), (216,789,c), (202,776,l), (223,740,o), @@ -94,8 +94,8 @@ nodes = ( (227,32,o), (221,-1,o), (209,-32,c), -(229,-57,o), -(248,-79,o), +(227,-58,o), +(246,-80,o), (268,-99,c) ); }, @@ -106,9 +106,9 @@ fillColor = (0,255); closed = 1; nodes = ( (401,408,o), -(413,415,o), -(413,432,cs), -(413,452,o), +(410,415,o), +(412,432,cs), +(414,450,o), (412,467,o), (408,485,cs), (406,496,o), @@ -129,8 +129,8 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(900,-35,o), -(965,-27,o), +(886,-34,o), +(931,-28,o), (978,-26,c), (978,-3,l), (912,13,o), @@ -153,7 +153,7 @@ nodes = ( (731,64,o), (809,-28,cs), (818,-39,o), -(825,-44,o), +(825,-45,o), (843,-42,cs) ); }, @@ -163,8 +163,11 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(725,181,o), -(797,236,o), +(720,173,o), +(767,209,o), +(802,240,cs), +(816,253,o), +(827,262,o), (840,271,c), (827,295,o), (802,325,o), @@ -189,13 +192,15 @@ nodes = ( (719,360,o), (799,364,cs), (812,365,o), -(815,376,o), +(813,375,o), (806,385,cs), -(796,395,o), -(786,404,o), -(766,423,c), -(746,406,l), -(676,395,o), +(799,395,o), +(792,402,o), +(772,420,c), +(765,414,o), +(748,406,o), +(739,405,cs), +(669,394,o), (580,385,o), (505,380,c), (505,343,l) @@ -217,10 +222,10 @@ nodes = ( (704,555,o), (693,564,c), (663,549,o), -(631,544,o), -(600,539,cs), -(570,535,o), -(540,532,o), +(644,545,o), +(623,542,cs), +(583,536,o), +(540,531,o), (510,528,c), (508,490,l) ); @@ -231,7 +236,7 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(794,486,o), +(793,486,o), (802,565,o), (810,615,cs), (814,641,o), @@ -249,10 +254,12 @@ nodes = ( (655,703,o), (568,692,o), (510,688,c), -(511,645,l), -(752,670,l), -(748,577,o), -(743,487,o), +(511,643,l), +(591,654,o), +(672,662,o), +(752,668,c), +(749,575,o), +(744,487,o), (735,396,c), (786,391,l) ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni60A_0.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni60A_0.glyph index 059c88bf..d4041de5 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni60A_0.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni60A_0.glyph @@ -39,20 +39,20 @@ nodes = ( (186,-33,o), (223,31,o), (241,78,cs), -(245,89,o), -(246,102,o), -(244,120,cs), -(242,138,o), -(236,153,o), +(248,97,o), +(249,106,o), +(245,124,cs), +(241,142,o), +(236,156,o), (224,177,c), (210,175,l), (210,104,o), (150,14,o), (102,-12,c), -(109,-28,o), -(115,-41,o), +(107,-28,o), +(113,-41,o), (121,-52,cs), -(132,-74,o), +(136,-72,o), (152,-67,o), (165,-54,cs) ); @@ -95,8 +95,8 @@ nodes = ( (294,452,o), (296,471,o), (299,484,c), -(283,499,o), -(267,510,o), +(281,499,o), +(266,508,o), (245,520,c), (236,508,l), (240,492,o), @@ -108,7 +108,9 @@ nodes = ( (238,284,o), (236,256,o), (229,226,c), -(277,182,l) +(242,211,o), +(258,197,o), +(277,182,c) ); }, { @@ -121,9 +123,9 @@ nodes = ( (537,49,o), (544,64,cs), (549,75,o), -(552,88,o), +(553,88,o), (555,100,cs), -(559,112,o), +(557,112,o), (555,124,o), (546,132,cs), (521,153,o), @@ -142,14 +144,14 @@ fillColor = (0,255); closed = 1; nodes = ( (430,238,l), -(431,334,o), +(430,334,o), (432,438,o), (436,511,cs), (437,534,o), (440,552,o), (445,570,c), -(426,591,o), -(408,605,o), +(424,590,o), +(406,604,o), (382,621,c), (369,611,l), (378,590,o), @@ -221,9 +223,9 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(859,210,o), -(896,214,o), -(938,218,c), +(861,212,o), +(896,215,o), +(938,217,c), (938,239,l), (890,249,o), (830,265,o), @@ -235,8 +237,8 @@ nodes = ( (578,445,o), (568,445,cs), (558,445,o), -(546,445,o), -(531,442,c), +(546,444,o), +(531,441,c), (531,429,l), (553,421,o), (564,415,o), @@ -245,8 +247,8 @@ nodes = ( (692,302,o), (766,225,cs), (786,205,o), -(790,201,o), -(811,204,cs) +(792,201,o), +(823,206,cs) ); }, { @@ -296,7 +298,9 @@ nodes = ( (678,574,o), (585,563,c), (583,554,l), -(614,530,l) +(592,545,o), +(603,537,o), +(614,530,c) ); } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni610F_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni610F_.glyph index 2a7761b8..34dc623c 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni610F_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni610F_.glyph @@ -34,20 +34,20 @@ nodes = ( (663,432,o), (647,426,o), (624,423,cs), -(569,415,o), -(388,404,o), +(569,417,o), +(390,404,o), (305,398,c), -(317,362,l), +(317,361,l), (426,371,o), (569,380,o), (668,383,c), (668,349,o), (659,254,o), -(649,206,cs), -(646,193,o), +(651,216,cs), +(646,195,o), (633,185,o), (619,186,c), -(631,169,o), +(632,169,o), (642,151,o), (651,132,cs), (656,121,o), @@ -124,8 +124,8 @@ nodes = ( (302,197,o), (302,181,o), (295,161,c), -(306,143,o), -(323,128,o), +(307,145,o), +(324,130,o), (346,115,c) ); }, @@ -153,22 +153,22 @@ nodes = ( { closed = 1; nodes = ( -(413,166,o), -(539,173,o), +(434,166,o), +(548,173,o), (631,174,cs), (646,174,o), -(656,182,o), -(641,196,cs), -(634,204,o), +(652,179,o), +(642,193,cs), +(635,202,o), (628,209,o), (612,220,c), (588,214,o), -(574,211,o), -(545,208,cs), -(505,205,o), -(418,198,o), -(305,192,c), -(308,156,l) +(574,210,o), +(545,207,cs), +(510,204,o), +(434,198,o), +(336,193,c), +(339,157,l) ); }, { @@ -217,8 +217,8 @@ nodes = ( closed = 1; nodes = ( (403,485,o), -(419,486,o), -(427,505,cs), +(417,486,o), +(424,501,cs), (431,516,o), (436,537,o), (437,555,cs), @@ -247,9 +247,9 @@ nodes = ( (890,540,o), (865,555,c), (836,543,o), -(811,538,o), +(811,537,o), (771,533,cs), -(660,520,o), +(660,522,o), (184,493,o), (53,497,c), (48,489,l), @@ -285,14 +285,14 @@ nodes = ( { closed = 1; nodes = ( -(593,508,o), -(621,536,o), -(647,565,cs), -(656,575,o), -(659,578,o), -(670,587,c), -(665,601,o), -(638,632,o), +(594,510,o), +(621,538,o), +(646,567,cs), +(655,578,o), +(658,581,o), +(669,590,c), +(662,607,o), +(636,635,o), (610,658,c), (601,654,l), (606,634,o), @@ -301,19 +301,19 @@ nodes = ( (591,576,o), (570,528,o), (553,496,c), -(571,492,l) +(572,493,l) ); }, { closed = 1; nodes = ( (527,653,o), -(550,665,o), +(549,666,o), (555,683,cs), -(561,702,o), -(566,727,o), -(566,745,cs), -(566,752,o), +(562,702,o), +(567,726,o), +(567,744,cs), +(567,751,o), (562,759,o), (547,765,cs), (513,777,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6216.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6216.glyph index 24ac8af0..c861dc2f 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6216.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6216.glyph @@ -49,11 +49,16 @@ nodes = ( (454,80,o), (542,110,c), (532,136,l), -(405,95,o), -(191,30,o), +(433,104,o), +(282,59,o), +(156,30,cs), +(120,22,o), +(87,19,o), (56,17,c), (56,2,l), -(133,-42,l) +(80,-14,o), +(105,-28,o), +(133,-42,c) ); }, { @@ -62,9 +67,16 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(255,128,l), -(255,379,l), -(182,430,l), +(257,128,l), +(253,203,o), +(249,312,o), +(252,339,cs), +(253,355,o), +(256,366,o), +(260,374,c), +(238,394,o), +(209,416,o), +(182,430,c), (171,420,l), (183,398,o), (190,380,o), @@ -74,7 +86,7 @@ nodes = ( (195,164,c), (208,150,o), (229,132,o), -(242,122,c) +(243,122,c) ); }, { @@ -83,18 +95,20 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(322,185,o), +(322,187,o), (406,193,o), (475,197,cs), (491,198,o), -(493,208,o), +(491,206,o), (483,218,cs), -(476,225,o), -(457,241,o), -(445,251,c), -(428,234,l), -(371,226,o), -(308,219,o), +(477,227,o), +(461,240,o), +(448,248,c), +(442,242,o), +(432,238,o), +(410,234,cs), +(369,226,o), +(308,218,o), (246,214,c), (246,178,l) ); @@ -125,10 +139,12 @@ nodes = ( (286,384,o), (232,379,c), (245,342,l), -(414,364,l), -(411,308,o), +(301,351,o), +(357,359,o), +(413,364,c), +(412,308,o), (410,265,o), -(406,213,c) +(405,213,c) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6350.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6350.glyph index 3797d798..a7f562f4 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6350.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6350.glyph @@ -40,18 +40,17 @@ nodes = ( (725,369,o), (816,376,c), (819,254,o), -(818,132,o), +(820,92,o), (815,10,cs), -(815,-9,o), -(814,-16,o), -(810,-20,c), -(762,-4,o), -(716,17,o), +(814,-5,o), +(813,-11,o), +(809,-19,c), +(761,-3,o), +(716,14,o), (669,34,c), (661,22,l), -(663,21,ls), -(716,-18,o), -(766,-59,o), +(743,-37,o), +(773,-68,o), (809,-110,cs) ); }, @@ -121,10 +120,12 @@ nodes = ( (541,-94,l), (541,61,o), (543,207,o), -(547,362,c), -(550,386,l), -(527,405,o), -(502,424,o), +(547,352,cs), +(547,370,o), +(549,379,o), +(552,388,c), +(530,409,o), +(509,428,o), (478,444,c), (466,434,l), (479,409,o), @@ -136,8 +137,8 @@ nodes = ( (489,26,o), (486,-3,o), (470,-44,c), -(486,-62,o), -(502,-81,o), +(485,-64,o), +(501,-83,o), (525,-103,c) ); }, @@ -223,13 +224,15 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(571,452,l), -(571,469,o), -(569,580,o), -(569,659,c), -(573,683,l), -(546,709,o), -(518,733,o), +(572,452,l), +(569,509,o), +(564,617,o), +(568,659,cs), +(569,667,o), +(571,676,o), +(573,683,c), +(548,710,o), +(520,734,o), (490,755,c), (474,742,l), (499,707,o), @@ -241,8 +244,8 @@ nodes = ( (514,522,o), (510,503,o), (504,487,c), -(520,472,o), -(538,458,o), +(519,470,o), +(537,456,o), (557,443,c) ); }, @@ -259,8 +262,12 @@ nodes = ( (871,523,o), (860,534,cs), (829,562,l), -(794,556,l), -(558,535,l), +(817,560,o), +(806,557,o), +(794,556,cs), +(715,547,o), +(637,540,o), +(558,535,c), (559,495,l) ); }, @@ -289,9 +296,11 @@ nodes = ( (554,690,c), (555,648,l), (630,656,o), -(713,665,o), -(789,671,c), -(779,538,l) +(712,665,o), +(788,671,c), +(788,627,o), +(784,582,o), +(778,538,c) ); } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6559.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6559.glyph index 61123fa4..7fc231d2 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6559.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6559.glyph @@ -19,12 +19,12 @@ nodes = ( (301,553,o), (398,567,o), (496,569,cs), -(503,569,o), -(509,582,o), +(508,569,o), +(512,578,o), (505,588,cs), (495,602,o), -(482,614,o), -(468,624,c), +(483,612,o), +(468,621,c), (442,608,o), (432,605,o), (401,601,cs) @@ -36,25 +36,32 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(683,182,l), -(647,224,o), -(628,253,o), -(603,298,cs), -(600,303,o), -(595,305,o), -(590,304,cs), -(578,301,o), -(564,298,o), -(553,294,cs), -(545,291,o), -(544,288,o), -(548,285,cs), -(562,275,o), -(574,264,o), -(585,251,cs), -(604,225,o), -(622,199,o), -(665,137,c) +(656,157,o), +(717,63,o), +(777,-31,cs), +(791,-53,o), +(798,-57,o), +(816,-55,cs), +(862,-49,o), +(908,-46,o), +(954,-46,c), +(953,-29,l), +(917,-18,o), +(860,9,o), +(842,21,cs), +(755,77,o), +(654,203,o), +(607,287,cs), +(600,300,o), +(589,303,o), +(582,302,cs), +(568,301,o), +(559,298,o), +(544,291,c), +(546,279,l), +(558,281,o), +(569,277,o), +(579,264,cs) ); }, { @@ -64,15 +71,14 @@ fillColor = (0,255); closed = 1; nodes = ( (389,448,l), -(391,598,l), -(390,606,o), -(394,669,o), -(403,708,cs), -(405,717,o), -(405,722,o), -(399,728,cs), -(391,736,o), -(323,791,o), +(390,511,o), +(391,575,o), +(392,638,cs), +(392,670,o), +(398,700,o), +(407,720,c), +(389,741,o), +(339,780,o), (312,796,c), (304,786,l), (325,747,o), @@ -89,23 +95,23 @@ fillColor = (0,255); }; closed = 1; nodes = ( +(216,414,o), (495,441,o), (602,435,cs), -(608,435,o), -(613,446,o), +(610,435,o), +(614,445,o), (609,452,cs), (596,469,o), -(577,486,o), -(556,497,c), -(534,484,o), +(577,485,o), +(556,494,c), +(534,483,o), (510,474,o), (474,470,cs), (313,450,o), (229,443,o), (60,440,c), (58,430,l), -(124,393,l), -(216,414,o) +(124,393,l) ); }, { @@ -114,12 +120,11 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(168,71,ls), -(174,67,o), -(181,66,o), -(192,70,cs), -(315,118,o), -(434,162,o), +(133,94,o), +(153,79,o), +(177,64,c), +(305,114,o), +(429,160,o), (557,204,c), (548,230,l), (469,200,o), @@ -127,8 +132,8 @@ nodes = ( (179,128,cs), (156,124,o), (139,122,o), -(121,124,c), -(115,113,l) +(121,121,c), +(117,109,l) ); }, { @@ -137,9 +142,8 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(642,439,ls), -(669,500,o), -(685,539,o), +(631,397,o), +(678,518,o), (717,635,cs), (722,650,o), (727,665,o), @@ -154,17 +158,10 @@ nodes = ( (653,754,o), (660,720,o), (659,697,cs), -(656,629,o), -(636,549,o), -(603,450,c), -(598,441,l), -(579,396,o), -(557,353,o), +(653,569,o), +(601,420,o), (529,311,c), -(547,301,l), -(583,338,o), -(611,380,o), -(636,425,c) +(547,301,l) ); }, { @@ -173,27 +170,25 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(733,419,l), -(783,424,o), -(903,431,o), +(744,420,o), +(832,429,o), (918,431,cs), -(940,431,o), +(940,432,o), (947,442,o), (929,460,cs), (910,479,o), (891,493,o), (875,505,c), -(853,492,o), -(835,480,o), +(857,490,o), +(835,478,o), (811,473,cs), -(759,459,o), -(687,450,o), -(639,445,c), -(625,422,l), -(652,407,l), -(678,411,o), -(692,415,o), -(722,417,c) +(753,460,o), +(676,446,o), +(619,440,c), +(616,431,l), +(625,422,o), +(638,413,o), +(652,407,c) ); }, { @@ -202,56 +197,23 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(677,117,l), -(711,68,o), -(744,18,o), -(777,-31,cs), -(792,-53,o), -(798,-55,o), -(816,-54,cs), -(851,-52,o), -(927,-48,o), -(954,-46,c), -(953,-29,l), -(917,-18,o), -(860,9,o), -(842,21,cs), -(786,57,o), -(704,145,o), -(707,151,c) -); -}, -{ -attr = { -fillColor = (0,255); -}; -closed = 1; -nodes = ( -(701,138,ls), -(734,199,o), -(757,279,o), +(660,-2,o), +(711,121,o), (772,331,cs), -(774,338,o), -(778,346,o), -(783,355,cs), -(786,361,o), -(787,363,o), -(783,369,cs), -(771,384,o), -(750,405,o), -(734,423,c), +(775,340,o), +(779,351,o), +(787,363,c), +(776,381,o), +(750,409,o), +(729,426,c), (714,419,l), -(725,382,o), -(697,225,o), -(671,186,c), -(659,162,l), -(616,62,o), -(509,-19,o), +(719,402,o), +(722,381,o), +(716,341,cs), +(686,134,o), +(600,30,o), (413,-71,c), -(421,-90,l), -(532,-49,o), -(627,13,o), -(691,118,c) +(421,-90,l) ); }, { @@ -267,17 +229,17 @@ nodes = ( (421,274,o), (394,248,c), (410,229,l), -(435,254,o), -(471,284,o), -(489,299,cs), -(501,309,o), -(512,317,o), +(438,256,o), +(478,291,o), +(497,305,cs), +(507,313,o), +(516,318,o), (530,324,cs), (535,326,o), (540,333,o), (535,339,cs), (519,359,o), -(507,368,o), +(508,369,o), (485,382,c), (471,370,o), (462,365,o), @@ -349,9 +311,7 @@ nodes = ( (583,658,o), (568,682,o), (539,720,c), -(539,720,o), -(527,715,o), -(527,715,c), +(527,715,l), (534,668,o), (515,626,o), (497,587,cs), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6593.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6593.glyph index 9832b038..2bf0b263 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6593.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6593.glyph @@ -11,115 +11,10 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(444,-84,l), -(444,11,l), -(508,49,o), -(563,97,o), -(610,155,c), -(610,147,o), -(608,95,o), -(608,87,cs), -(606,61,o), -(605,36,o), -(597,11,cs), -(595,4,o), -(597,-1,o), -(601,-5,cs), -(632,-34,l), -(642,-40,l), -(651,-33,l), -(649,52,o), -(648,136,o), -(650,221,c), -(707,226,l), -(713,222,o), -(720,214,o), -(726,205,cs), -(733,193,ls), -(737,186,o), -(742,185,o), -(748,190,cs), -(752,194,o), -(755,198,o), -(757,203,cs), -(760,214,o), -(764,226,o), -(765,238,cs), -(779,360,ls), -(781,373,o), -(785,386,o), -(796,395,cs), -(803,402,o), -(803,406,o), -(795,413,cs), -(762,440,l), -(746,451,l), -(732,442,o), -(721,433,o), -(705,430,cs), -(681,427,l), -(652,423,l), -(652,485,l), -(656,486,l), -(750,493,l), -(804,494,ls), -(809,494,o), -(814,495,o), -(816,500,cs), -(818,506,o), -(815,511,o), -(811,515,cs), -(800,529,o), -(787,540,o), -(773,550,c), -(735,531,o), -(695,527,o), -(654,521,c), -(654,546,o), -(656,568,o), -(662,590,c), -(654,601,o), -(619,628,o), -(599,640,c), -(595,636,l), -(591,634,l), -(604,594,o), -(612,536,o), -(607,515,c), -(537,509,l), -(467,505,l), -(463,498,l), -(497,471,ls), -(502,467,o), -(506,467,o), -(512,468,cs), -(582,479,l), -(610,481,l), -(610,418,l), -(527,409,l), -(480,440,l), -(472,432,l), -(482,414,o), -(488,395,o), -(490,375,cs), -(492,354,o), -(495,333,o), -(495,312,cs), -(496,231,l), -(493,207,l), -(532,177,l), -(540,182,l), -(540,211,l), -(597,217,l), -(571,160,o), -(474,50,o), -(442,40,c), -(443,60,l), -(448,425,ls), -(448,457,o), -(450,488,o), -(452,520,cs), -(453,541,o), +(443,110,o), +(445,388,o), +(451,510,cs), +(453,551,o), (454,562,o), (461,582,c), (455,597,o), @@ -127,23 +22,18 @@ nodes = ( (386,661,c), (375,651,l), (388,628,o), -(393,604,o), -(397,579,cs), -(401,546,o), -(402,513,o), -(403,480,cs), -(405,342,o), -(400,205,o), +(395,604,o), +(398,569,cs), +(408,466,o), +(399,180,o), (396,68,cs), -(395,45,o), -(395,21,o), -(389,-1,cs), -(380,-28,ls), -(378,-35,o), -(379,-41,o), -(384,-46,cs), -(412,-76,l), -(431,-94,l) +(395,36,o), +(390,2,o), +(380,-38,c), +(395,-59,o), +(412,-77,o), +(431,-94,c), +(444,-84,l) ); }, { @@ -152,59 +42,22 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(142,36,o), -(211,110,o), -(261,203,c), -(264,200,l), -(320,113,ls), -(322,109,o), -(324,105,o), -(328,102,c), -(333,96,o), -(341,97,o), -(345,103,c), -(348,106,o), -(350,110,o), -(350,113,cs), -(350,177,ls), -(350,183,o), -(347,188,o), -(342,193,cs), -(310,227,l), -(283,254,l), -(284,257,ls), -(299,298,o), -(313,340,o), -(325,383,cs), -(329,398,o), -(334,413,o), -(344,425,cs), -(346,428,l), -(340,442,o), -(311,476,o), -(284,500,c), -(275,495,l), -(276,484,ls), -(276,468,o), -(278,452,o), -(277,435,cs), -(276,405,o), -(270,375,o), -(262,346,cs), -(248,290,l), -(216,323,o), -(183,357,o), +(265,275,o), +(218,324,o), (147,390,c), (128,375,l), -(172,326,o), -(206,283,o), -(231,247,c), -(229,244,l), -(196,167,o), -(147,100,o), -(86,43,cs), -(37,-2,l), -(52,-20,l) +(209,285,o), +(264,210,o), +(320,113,cs), +(329,97,o), +(343,98,o), +(347,113,cs), +(353,134,o), +(354,153,o), +(352,164,cs), +(349,180,o), +(343,191,o), +(338,196,cs) ); }, { @@ -213,29 +66,23 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(137,476,o), -(157,482,o), -(178,486,cs), -(305,508,l), -(370,517,ls), -(377,518,o), -(385,517,o), -(387,526,cs), -(389,533,o), -(384,538,o), +(187,490,o), +(268,505,o), +(370,518,cs), +(383,520,o), +(388,531,o), (379,542,cs), -(353,565,l), -(342,573,l), +(370,554,o), +(357,565,o), +(342,573,c), (319,559,o), -(296,550,o), -(270,544,cs), -(240,537,o), -(209,531,o), -(178,526,cs), -(101,517,l), -(69,516,l), +(306,555,o), +(285,550,cs), +(227,535,o), +(155,521,o), +(69,516,c), (66,506,l), -(115,470,l) +(115,471,l) ); }, { @@ -244,7 +91,7 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(786,34,o), +(785,34,o), (794,44,o), (796,54,cs), (799,74,o), @@ -258,7 +105,7 @@ nodes = ( (660,186,c), (654,172,l), (715,121,o), -(727,107,o), +(729,106,o), (772,51,cs) ); }, @@ -268,29 +115,22 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(259,589,o), -(264,589,o), -(270,594,c), -(276,597,o), -(279,603,o), -(281,609,cs), -(287,628,o), +(254,590,o), +(268,589,o), +(275,602,cs), +(285,620,o), (288,647,o), (287,666,cs), -(287,674,o), -(284,682,o), -(278,687,cs), -(271,692,o), -(265,697,o), +(287,684,o), +(272,693,o), (257,700,cs), -(185,731,l), -(151,744,l), +(223,718,o), +(187,733,o), +(151,744,c), (144,732,l), -(146,730,ls), -(184,692,o), -(218,652,o), -(245,606,c), -(254,594,l) +(204,672,o), +(224,643,o), +(245,606,cs) ); }, { @@ -299,30 +139,22 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(535,377,l), -(611,386,l), -(611,250,l), -(538,242,l) -); -}, -{ -attr = { -fillColor = (0,255); -}; -closed = 1; -nodes = ( -(598,281,o), -(607,307,o), -(601,319,c), -(596,324,ls), +(583,272,o), +(589,273,o), +(592,277,cs), +(597,282,o), +(602,295,o), +(602,307,cs), +(602,314,o), +(601,318,o), +(596,324,cs), (581,337,o), (563,349,o), (544,358,c), -(539,351,l), -(563,312,l), -(572,300,o), -(576,285,o), -(585,273,c) +(539,347,l), +(562,320,o), +(577,290,o), +(581,278,cs) ); }, { @@ -331,28 +163,23 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(705,268,l), -(651,254,l), -(651,275,l), -(717,330,ls), -(725,337,o), -(726,340,o), -(719,349,cs), -(688,385,l), +(646,271,l), +(674,291,o), +(699,314,o), +(709,325,cs), +(716,333,o), +(720,337,o), +(724,340,c), +(717,355,o), +(705,370,o), +(688,385,c), (680,378,l), (684,367,o), -(680,356,o), -(676,346,cs), -(670,331,o), -(661,317,o), -(651,302,c), -(651,389,l), -(679,393,o), -(707,395,o), -(737,396,c), -(736,347,o), -(732,299,o), -(727,250,c) +(683,362,o), +(679,352,cs), +(670,329,o), +(659,308,o), +(638,280,c) ); }, { @@ -361,58 +188,47 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(849,-103,o), -(853,-102,o), -(856,-99,cs), -(872,-83,o), -(885,-65,o), -(891,-43,cs), -(895,-25,o), -(895,-6,o), -(895,12,cs), -(894,202,o), -(894,392,o), +(842,-106,o), +(848,-108,o), +(859,-96,cs), +(883,-69,o), +(895,-49,o), +(895,-8,cs), +(892,189,o), +(894,385,o), (899,582,cs), -(899,602,o), -(901,621,o), -(903,641,cs), -(904,654,o), -(908,667,o), -(917,677,c), -(925,689,l), +(899,620,o), +(905,656,o), +(925,689,c), (903,714,o), -(875,730,o), +(878,734,o), (850,750,c), (835,736,o), (818,725,o), (798,720,cs), (785,716,o), -(773,714,o), -(760,712,cs), -(711,705,o), (661,699,o), -(611,699,cs), -(596,699,l), +(596,699,c), (594,690,l), -(636,658,l), -(641,653,o), -(647,653,o), -(655,654,cs), -(822,676,l), -(846,678,l), -(846,658,l), -(844,55,l), -(840,-4,ls), -(840,-8,o), -(838,-11,o), +(608,676,o), +(625,664,o), +(643,652,c), +(706,663,o), +(775,673,o), +(844,678,c), +(847,449,o), +(847,180,o), +(843,26,cs), +(842,6,o), +(839,-7,o), (836,-16,c), -(725,22,l), +(799,-5,o), +(762,7,o), +(725,22,c), (719,11,l), -(726,5,ls), -(766,-24,o), -(802,-57,o), -(833,-96,c), -(844,-106,l) +(761,-20,o), +(804,-61,o), +(833,-96,cs) ); }, { @@ -421,29 +237,222 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(535,638,o), -(539,643,o), -(541,648,cs), -(546,665,o), +(529,627,o), +(537,644,cs), +(545,661,o), (549,683,o), (549,701,cs), (550,711,o), -(546,720,o), +(546,721,o), (538,726,cs), -(516,740,ls), -(486,758,o), -(453,771,o), -(420,784,cs), -(414,786,l), +(503,749,o), +(470,765,o), +(414,786,c), (406,774,l), -(414,766,ls), -(451,730,o), -(481,690,o), +(450,731,o), +(479,695,o), (506,645,cs), -(511,636,l), -(517,629,o), -(523,627,o), -(530,634,cs) +(518,623,o) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(729,227,o), +(732,230,o), +(728,238,cs), +(721,253,o), +(717,257,o), +(705,268,c), +(694,262,o), +(681,258,o), +(669,256,cs), +(624,249,o), +(576,244,o), +(530,241,c), +(532,209,l), +(593,217,o), +(667,223,o), +(723,227,cs) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(438,7,l), +(515,53,o), +(581,112,o), +(634,192,c), +(608,241,l), +(590,183,o), +(507,84,o), +(439,39,c) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(518,420,o), +(499,431,o), +(480,440,c), +(472,432,l), +(482,414,o), +(488,395,o), +(490,375,cs), +(495,320,o), +(499,284,o), +(496,231,cs), +(496,223,o), +(494,215,o), +(491,207,c), +(505,194,o), +(518,184,o), +(532,177,c), +(540,182,l), +(536,248,o), +(536,314,o), +(535,380,cs), +(535,389,o), +(536,398,o), +(537,407,c) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(517,373,l), +(589,386,o), +(660,393,o), +(737,396,c), +(736,344,o), +(734,302,o), +(726,250,cs), +(725,241,o), +(717,233,o), +(705,229,c), +(715,221,o), +(725,209,o), +(730,198,cs), +(735,186,o), +(745,188,o), +(750,194,cs), +(758,203,o), +(762,215,o), +(764,227,cs), +(771,272,o), +(775,315,o), +(778,360,cs), +(779,373,o), +(785,386,o), +(796,395,cs), +(803,402,o), +(803,405,o), +(795,413,cs), +(781,428,o), +(765,440,o), +(747,450,c), +(735,440,o), +(721,432,o), +(705,430,cs), +(643,421,o), +(580,412,o), +(518,407,c) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(599,482,o), +(700,492,o), +(804,494,cs), +(818,494,o), +(821,505,o), +(811,515,cs), +(800,529,o), +(787,540,o), +(773,550,c), +(736,534,o), +(727,530,o), +(707,527,cs), +(599,514,o), +(540,508,o), +(467,505,c), +(465,497,l), +(477,485,o), +(489,476,o), +(503,467,c) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(652,511,cs), +(652,541,o), +(655,565,o), +(662,590,c), +(654,601,o), +(619,628,o), +(599,640,c), +(591,634,l), +(603,588,o), +(606,572,o), +(608,544,cs), +(619,367,o), +(621,205,o), +(611,81,cs), +(609,52,o), +(605,30,o), +(594,2,c), +(606,-13,o), +(622,-27,o), +(641,-38,c), +(653,-33,l), +(649,316,o), +(652,496,o) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(218,92,o), +(278,205,o), +(325,383,cs), +(329,398,o), +(334,413,o), +(344,425,cs), +(346,428,l), +(340,442,o), +(311,476,o), +(284,500,c), +(271,493,l), +(276,474,o), +(278,454,o), +(277,435,cs), +(265,275,o), +(190,121,o), +(37,-2,c), +(52,-20,l) ); } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni65B_C_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni65B_C_.glyph index 3bac8de9..fa3e26a1 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni65B_C_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni65B_C_.glyph @@ -49,27 +49,27 @@ nodes = ( (433,367,o), (412,383,c), (398,371,o), -(383,363,o), -(366,356,cs), -(341,347,o), -(310,338,o), +(384,363,o), +(367,356,cs), +(345,347,o), +(310,340,o), (277,335,c), (274,327,l), -(292,319,o), -(310,311,o), -(325,305,c), +(289,317,o), +(307,309,o), +(325,303,c), (351,312,o), -(378,318,o), +(378,319,o), (406,324,c), (385,223,o), (342,57,o), -(321,25,cs), -(314,15,o), -(312,17,o), -(304,20,cs), -(279,29,o), -(245,41,o), -(210,54,c), +(328,36,cs), +(323,28,o), +(317,21,o), +(311,16,c), +(280,26,o), +(245,39,o), +(210,55,c), (203,45,l), (246,10,o), (285,-41,o), @@ -86,9 +86,9 @@ nodes = ( (797,-74,o), (797,-56,cs), (798,-38,o), -(793,-8,o), -(789,7,cs), -(786,18,o), +(795,-9,o), +(790,7,cs), +(787,18,o), (783,21,o), (767,28,cs), (678,64,o), @@ -96,18 +96,15 @@ nodes = ( (487,125,c), (477,106,l), (559,69,o), -(714,-22,o), +(703,-11,o), (758,-67,cs) ); }, { closed = 1; nodes = ( -(166,472,o), -(200,480,o), -(243,487,cs), -(334,503,o), -(429,518,o), +(241,492,o), +(426,518,o), (523,523,cs), (533,524,o), (538,534,o), @@ -118,11 +115,8 @@ nodes = ( (459,574,o), (440,567,o), (406,558,cs), -(356,545,o), -(233,526,o), -(181,520,cs), -(140,515,o), -(114,513,o), +(323,536,o), +(159,513,o), (63,513,c), (61,504,l), (86,488,o), @@ -137,9 +131,9 @@ nodes = ( (736,161,o), (739,179,cs), (741,194,o), -(741,224,o), -(739,237,cs), -(737,246,o), +(741,223,o), +(739,236,cs), +(737,245,o), (734,252,o), (720,259,cs), (673,283,o), @@ -178,14 +172,11 @@ nodes = ( (585,382,o), (633,459,o), (698,649,cs), -(704,666,o), -(708,680,o), -(714,690,cs), -(720,698,o), -(720,704,o), -(712,713,cs), -(696,733,o), -(671,759,o), +(706,672,o), +(712,686,o), +(720,700,c), +(708,721,o), +(679,752,o), (639,787,c), (624,775,l), (641,745,o), @@ -201,22 +192,20 @@ nodes = ( closed = 1; nodes = ( (896,299,o), -(929,301,o), +(929,303,o), (968,304,c), (968,320,l), -(899,352,o), -(856,381,o), -(807,427,cs), +(900,352,o), +(871,367,o), +(842,394,cs), (748,481,o), (692,547,o), -(648,602,cs), -(645,605,o), -(616,589,o), -(625,576,cs), -(693,481,o), -(757,388,o), +(648,602,c), +(625,576,l), +(697,482,o), +(762,392,o), (819,304,cs), -(828,293,o), +(827,292,o), (840,292,o), (847,293,cs) ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni65C_B_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni65C_B_.glyph index e5b419c6..647de618 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni65C_B_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni65C_B_.glyph @@ -11,20 +11,17 @@ nodes = ( (191,52,o), (258,177,o), (300,422,cs), -(303,437,o), -(305,449,o), -(311,471,cs), -(312,475,o), -(312,477,o), -(306,484,cs), -(293,499,o), -(278,515,o), +(303,438,o), +(306,451,o), +(315,476,c), +(300,495,o), +(282,512,o), (252,537,c), -(241,531,l), -(252,489,o), -(248,458,o), -(244,424,cs), -(222,217,o), +(240,531,l), +(251,489,o), +(250,472,o), +(246,438,cs), +(214,192,o), (158,89,o), (20,-43,c), (34,-61,l) @@ -33,7 +30,7 @@ nodes = ( { closed = 1; nodes = ( -(323,-27,o), +(322,-27,o), (336,-2,o), (347,25,cs), (370,86,o), @@ -43,39 +40,39 @@ nodes = ( (432,335,o), (442,346,cs), (447,352,o), -(448,355,o), -(440,363,cs), -(429,374,o), -(408,391,o), -(388,406,c), -(374,397,o), -(358,387,o), +(448,356,o), +(442,365,cs), +(433,377,o), +(412,390,o), +(390,404,c), +(375,392,o), +(359,384,o), (339,379,cs), -(317,370,o), -(288,363,o), -(256,359,c), +(317,373,o), +(287,367,o), +(255,363,c), (256,354,l), -(271,345,o), -(292,334,o), +(266,345,o), +(287,334,o), (305,328,c), -(327,333,o), -(353,340,o), +(327,336,o), +(356,343,o), (378,347,c), (360,251,o), -(317,70,o), -(298,40,cs), -(292,31,o), -(291,32,o), -(283,35,cs), -(255,45,o), -(223,58,o), -(187,72,c), +(318,82,o), +(301,51,cs), +(294,38,o), +(291,33,o), +(287,30,c), +(255,40,o), +(223,53,o), +(187,71,c), (179,59,l), (223,26,o), (264,-26,o), (281,-46,cs), (288,-54,o), -(291,-54,o), +(292,-55,o), (300,-47,cs) ); }, @@ -83,16 +80,13 @@ nodes = ( closed = 1; nodes = ( (461,-24,o), -(515,70,o), -(551,173,cs), -(557,189,o), -(561,205,o), -(568,218,cs), -(571,223,o), -(571,226,o), -(567,233,cs), -(550,259,o), -(528,287,o), +(517,69,o), +(550,173,cs), +(556,192,o), +(563,205,o), +(573,219,c), +(557,248,o), +(531,284,o), (504,313,c), (493,305,l), (504,270,o), @@ -107,33 +101,30 @@ nodes = ( { closed = 1; nodes = ( -(883,-74,o), -(915,-64,o), +(883,-70,o), +(913,-61,o), (959,-51,c), (957,-39,l), -(891,-28,o), -(821,-14,o), -(758,11,cs), -(677,44,o), +(891,-31,o), +(829,-17,o), +(789,-1,cs), +(721,26,o), (606,82,o), (521,127,c), -(509,99,l), -(610,37,o), -(713,-28,o), +(508,99,l), +(609,40,o), +(713,-25,o), (807,-88,cs), (815,-93,o), -(820,-94,o), -(827,-92,cs) +(822,-94,o), +(829,-91,cs) ); }, { closed = 1; nodes = ( -(170,497,o), -(207,503,o), -(250,510,cs), -(329,522,o), -(406,531,o), +(207,506,o), +(369,528,o), (485,532,cs), (495,532,o), (500,543,o), @@ -145,13 +136,10 @@ nodes = ( (405,581,o), (367,571,cs), (332,562,o), -(230,548,o), -(190,544,cs), -(149,539,o), -(124,535,o), -(74,537,c), -(72,531,l), -(95,513,o), +(160,538,o), +(75,539,c), +(72,530,l), +(95,512,o), (116,499,o), (135,489,c) ); @@ -162,14 +150,11 @@ nodes = ( (681,119,o), (687,276,o), (689,302,cs), -(690,323,o), -(691,329,o), -(693,338,cs), -(694,341,o), -(693,344,o), -(689,347,cs), -(674,356,o), -(655,366,o), +(690,318,o), +(692,330,o), +(695,343,c), +(679,354,o), +(659,364,o), (625,379,c), (619,374,l), (627,353,o), @@ -177,10 +162,8 @@ nodes = ( (632,297,cs), (634,251,o), (635,140,o), -(632,54,cs), -(631,22,o), -(678,23,o), -(679,40,cs) +(632,54,c), +(679,40,l) ); }, { @@ -190,14 +173,14 @@ nodes = ( (805,200,o), (859,201,cs), (875,201,o), -(876,211,o), +(874,210,o), (866,221,cs), -(859,229,o), +(860,229,o), (842,244,o), (819,259,c), (811,254,o), -(793,249,o), -(778,245,cs), +(793,247,o), +(778,244,cs), (753,239,o), (700,231,o), (661,228,c), @@ -208,16 +191,16 @@ nodes = ( closed = 1; nodes = ( (359,608,o), -(382,621,o), -(388,642,cs), -(393,661,o), +(376,619,o), +(386,640,cs), +(395,659,o), (397,675,o), (397,694,cs), (397,705,o), -(393,713,o), +(393,711,o), (376,719,cs), -(344,731,o), -(284,745,o), +(344,735,o), +(295,748,o), (232,757,c), (227,743,l), (278,709,o), @@ -228,10 +211,13 @@ nodes = ( { closed = 1; nodes = ( -(812,355,o), -(854,364,o), +(796,349,o), +(828,357,o), +(853,362,cs), +(867,365,o), +(876,365,o), (888,365,cs), -(905,366,o), +(905,365,o), (909,377,o), (895,393,cs), (874,416,o), @@ -240,25 +226,19 @@ nodes = ( (785,468,o), (766,460,o), (742,455,cs), -(690,443,o), -(617,434,o), -(564,428,cs), -(533,424,o), -(507,422,o), -(474,422,c), -(471,415,l), -(484,406,o), +(697,445,o), +(555,425,o), +(474,423,c), +(471,413,l), +(484,404,o), (507,389,o), (525,379,c), -(555,384,o), -(579,388,o), -(611,393,cs), -(670,402,o), -(724,409,o), +(609,395,o), +(690,406,o), (793,416,c), (785,392,o), -(774,367,o), -(760,345,c), +(774,370,o), +(760,348,c), (767,339,l) ); }, @@ -268,14 +248,11 @@ nodes = ( (543,501,o), (595,561,o), (654,668,cs), -(663,684,o), -(668,692,o), -(676,702,cs), -(681,708,o), -(681,713,o), -(676,720,cs), -(657,744,o), -(626,771,o), +(665,688,o), +(670,696,o), +(682,710,c), +(665,737,o), +(633,769,o), (593,801,c), (580,789,l), (598,762,o), @@ -290,11 +267,8 @@ nodes = ( { closed = 1; nodes = ( -(634,545,o), -(662,549,o), -(701,554,cs), -(741,560,o), -(823,571,o), +(664,553,o), +(842,572,o), (901,576,cs), (914,577,o), (918,587,o), @@ -302,18 +276,15 @@ nodes = ( (895,611,o), (874,628,o), (851,642,c), -(826,630,o), -(813,624,o), +(829,629,o), +(813,623,o), (787,617,cs), -(745,606,o), -(682,594,o), -(629,588,cs), -(614,586,o), -(588,582,o), +(731,604,o), +(615,583,o), (562,578,c), -(559,574,l), -(574,563,o), -(592,547,o), +(559,571,l), +(573,559,o), +(593,546,o), (607,538,c) ); } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6603.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6603.glyph index bfdc7a58..3318cb07 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6603.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6603.glyph @@ -18,10 +18,10 @@ nodes = ( (574,247,o), (584,264,c), (569,288,o), -(547,311,o), -(527,327,c), -(512,321,l), -(512,304,o), +(543,313,o), +(523,329,c), +(508,321,l), +(508,304,o), (511,288,o), (509,271,cs), (496,123,o), @@ -47,7 +47,7 @@ nodes = ( (279,327,c), (263,321,l), (266,305,o), -(266,297,o), +(264,291,o), (260,268,cs), (240,163,o), (182,33,o), @@ -101,7 +101,7 @@ nodes = ( (552,354,o), (262,337,o), (124,344,c), -(119,329,l), +(119,330,l), (139,314,o), (161,301,o), (185,290,c) @@ -115,10 +115,12 @@ closed = 1; nodes = ( (350,397,l), (347,496,o), -(345,595,o), -(346,694,c), -(354,715,l), -(326,739,o), +(343,595,o), +(346,683,cs), +(347,701,o), +(348,710,o), +(351,717,c), +(323,741,o), (300,758,o), (270,774,c), (255,762,l), @@ -216,9 +218,11 @@ nodes = ( (560,700,o), (678,706,c), (676,649,o), -(670,528,o), -(658,463,c), -(637,456,l), +(671,527,o), +(663,488,cs), +(659,469,o), +(651,459,o), +(637,456,c), (650,442,o), (660,423,o), (667,408,cs), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni660F_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni660F_.glyph index e1a76c2f..c9f67d30 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni660F_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni660F_.glyph @@ -56,11 +56,11 @@ nodes = ( (283,275,o), (257,289,c), (246,281,l), -(259,250,o), -(266,220,o), -(269,187,cs), -(272,153,o), -(274,56,o), +(260,255,o), +(266,227,o), +(269,199,cs), +(272,163,o), +(274,60,o), (269,-7,cs), (267,-26,o), (261,-43,o), @@ -122,7 +122,7 @@ nodes = ( (571,276,o), (545,272,cs), (475,260,o), -(344,250,o), +(345,249,o), (293,248,c), (310,210,l), (411,221,o), @@ -130,7 +130,7 @@ nodes = ( (612,233,c), (612,165,o), (610,47,o), -(607,-4,cs), +(607,-3,cs), (606,-18,o), (595,-19,o), (567,-25,c), @@ -154,7 +154,7 @@ nodes = ( (591,-5,o), (573,10,o), (557,19,c), -(532,10,o), +(533,10,o), (512,4,o), (483,1,cs), (422,-6,o), @@ -221,8 +221,8 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(173,305,l), -(182,288,o), +(173,304,l), +(182,287,o), (195,271,o), (213,254,c), (295,296,o), @@ -234,10 +234,12 @@ nodes = ( (265,338,c), (266,413,o), (272,565,o), -(275,612,c), -(288,630,l), -(261,657,o), -(237,677,o), +(274,598,cs), +(275,612,o), +(279,625,o), +(285,637,c), +(258,664,o), +(234,680,o), (206,698,c), (192,689,l), (209,649,o), @@ -247,8 +249,8 @@ nodes = ( (216,401,o), (210,357,cs), (206,334,o), -(199,321,o), -(176,312,c) +(199,322,o), +(176,313,c) ); } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni662F_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni662F_.glyph index 39bcdf5d..37cb8323 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni662F_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni662F_.glyph @@ -30,8 +30,8 @@ nodes = ( (440,80,o), (303,136,c), (288,110,l), -(446,37,o), -(610,-39,o), +(446,40,o), +(610,-37,o), (760,-110,cs) ); }, @@ -41,15 +41,12 @@ nodes = ( (197,-36,o), (281,48,o), (346,171,cs), -(350,179,o), -(354,188,o), -(359,195,cs), -(364,200,o), -(364,205,o), -(360,211,cs), -(345,229,o), -(325,251,o), -(300,277,c), +(352,183,o), +(358,196,o), +(364,203,c), +(351,222,o), +(329,250,o), +(300,278,c), (288,271,l), (297,251,o), (295,217,o), @@ -63,28 +60,23 @@ nodes = ( { closed = 1; nodes = ( -(536,104,o), +(535,104,o), (539,229,o), (540,249,cs), -(542,270,o), -(542,276,o), -(543,285,cs), -(544,288,o), -(544,292,o), -(540,294,cs), -(524,300,o), -(501,307,o), -(472,315,c), +(542,275,o), +(542,278,o), +(544,292,c), +(523,302,o), +(501,309,o), +(473,316,c), (467,310,l), (476,292,o), -(481,272,o), -(483,242,cs), -(484,212,o), -(485,123,o), -(484,53,cs), -(483,20,o), -(534,22,o), -(535,40,cs) +(481,270,o), +(484,240,cs), +(487,210,o), +(486,123,o), +(484,43,c), +(536,40,l) ); }, { @@ -97,9 +89,9 @@ nodes = ( (783,178,o), (770,191,cs), (760,201,o), -(744,214,o), +(745,214,o), (724,228,c), -(709,221,o), +(709,220,o), (695,215,o), (673,210,cs), (636,202,o), @@ -112,14 +104,14 @@ nodes = ( closed = 1; nodes = ( (388,400,l), -(387,435,o), -(384,676,o), -(384,706,cs), -(384,718,o), -(382,721,o), -(375,725,cs), -(363,731,o), -(338,742,o), +(387,431,o), +(384,646,o), +(384,673,cs), +(384,686,o), +(388,700,o), +(394,711,c), +(375,726,o), +(343,743,o), (310,755,c), (304,748,l), (317,723,o), @@ -128,22 +120,19 @@ nodes = ( (331,625,o), (332,550,o), (332,495,cs), -(332,472,o), -(330,457,o), -(327,442,cs), -(326,435,o), -(327,433,o), -(331,429,cs), -(344,416,o), -(363,402,o), +(332,468,o), +(330,452,o), +(327,435,c), +(339,420,o), +(361,403,o), (376,395,c) ); }, { closed = 1; nodes = ( -(453,429,o), -(540,437,o), +(453,430,o), +(540,438,o), (602,441,cs), (618,442,o), (624,456,o), @@ -213,12 +202,12 @@ nodes = ( (624,535,o), (620,490,cs), (618,466,o), -(606,457,o), -(602,455,c), -(601,454,o), -(619,422,o), -(632,408,cs), -(640,398,o), +(605,457,o), +(601,455,c), +(613,439,o), +(622,424,o), +(629,410,cs), +(636,396,o), (648,397,o), (657,406,cs) ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni665A_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni665A_.glyph index 04603704..a0825a97 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni665A_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni665A_.glyph @@ -11,15 +11,12 @@ nodes = ( (505,0,o), (596,115,o), (632,333,cs), -(637,360,o), -(637,380,o), -(642,404,cs), -(643,409,o), -(644,411,o), -(639,416,cs), -(626,429,o), -(610,441,o), -(583,459,c), +(637,362,o), +(641,382,o), +(647,409,c), +(634,425,o), +(611,445,o), +(585,460,c), (577,454,l), (587,405,o), (584,377,o), @@ -33,19 +30,19 @@ nodes = ( { closed = 1; nodes = ( -(159,152,o), -(197,156,o), -(255,158,cs), +(159,153,o), +(198,157,o), +(245,158,cs), (272,159,o), -(278,171,o), +(279,172,o), (271,181,cs), -(265,188,o), -(255,194,o), +(264,189,o), +(254,198,o), (239,206,c), (228,200,o), -(215,197,o), -(197,194,cs), -(179,190,o), +(216,197,o), +(208,196,cs), +(180,191,o), (148,188,o), (108,186,c), (116,148,l) @@ -55,15 +52,15 @@ nodes = ( closed = 1; nodes = ( (153,93,l), -(153,129,o), -(160,525,o), -(163,587,cs), -(164,600,o), -(163,606,o), -(157,611,cs), -(139,626,o), -(116,643,o), -(90,661,c), +(152,205,o), +(157,448,o), +(161,564,cs), +(162,584,o), +(163,595,o), +(165,605,c), +(146,623,o), +(124,645,o), +(94,664,c), (84,657,l), (97,623,o), (105,583,o), @@ -71,14 +68,11 @@ nodes = ( (111,434,o), (108,249,o), (104,207,cs), -(102,184,o), -(99,167,o), -(92,147,cs), -(90,140,o), -(90,137,o), -(94,133,cs), -(108,119,o), -(128,98,o), +(102,181,o), +(98,162,o), +(90,138,c), +(102,123,o), +(126,100,o), (144,86,c) ); }, @@ -94,11 +88,11 @@ nodes = ( (259,398,o), (250,406,o), (238,415,c), -(223,410,o), -(211,407,o), -(192,404,cs), -(179,402,o), -(153,400,o), +(224,410,o), +(213,407,o), +(204,406,cs), +(181,402,o), +(154,399,o), (122,398,c), (128,361,l) ); @@ -110,21 +104,21 @@ nodes = ( (329,126,o), (329,154,cs), (330,258,o), -(332,467,o), +(335,467,o), (341,533,cs), -(344,560,o), +(343,560,o), (345,573,o), (359,589,cs), (365,597,o), -(366,603,o), +(366,602,o), (359,609,cs), -(344,620,o), -(314,637,o), +(344,624,o), +(318,640,o), (290,651,c), -(275,637,o), -(263,629,o), +(276,637,o), +(263,627,o), (239,623,cs), -(211,616,o), +(211,618,o), (150,612,o), (120,609,c), (128,569,l), @@ -137,10 +131,10 @@ nodes = ( (279,178,o), (277,174,o), (257,167,c), -(263,154,o), -(277,116,o), +(265,152,o), +(280,119,o), (287,98,cs), -(294,85,o), +(291,85,o), (305,87,o), (312,96,cs) ); @@ -149,15 +143,12 @@ nodes = ( closed = 1; nodes = ( (472,209,l), -(471,252,o), -(472,430,o), -(472,459,cs), -(472,468,o), -(470,470,o), -(465,473,cs), -(452,480,o), -(421,495,o), -(395,508,c), +(471,254,o), +(470,416,o), +(472,457,c), +(453,479,o), +(427,499,o), +(401,512,c), (391,502,l), (407,478,o), (416,451,o), @@ -165,14 +156,11 @@ nodes = ( (423,381,o), (424,342,o), (422,293,cs), -(421,272,o), -(417,258,o), -(414,246,cs), -(412,240,o), -(414,238,o), -(418,233,cs), -(429,223,o), -(449,212,o), +(421,268,o), +(418,253,o), +(413,239,c), +(421,228,o), +(446,211,o), (463,204,c) ); }, @@ -198,20 +186,17 @@ nodes = ( (804,-38,o), (726,-38,o), (688,-28,cs), -(665,-22,o), -(665,-12,o), +(667,-23,o), +(665,-15,o), (664,10,cs), (663,44,o), (667,129,o), (670,153,cs), -(671,167,o), -(673,184,o), -(678,198,cs), -(679,202,o), -(681,206,o), -(677,209,cs), -(658,224,o), -(636,241,o), +(671,170,o), +(674,191,o), +(680,206,c), +(664,223,o), +(640,242,o), (617,256,c), (608,250,l), (616,217,o), @@ -232,13 +217,16 @@ nodes = ( (698,272,o), (831,273,cs), (844,273,o), -(847,283,o), -(839,289,cs), -(829,298,o), -(820,303,o), -(801,312,c), -(687,304,o), -(570,298,o), +(846,286,o), +(838,292,cs), +(826,303,o), +(816,310,o), +(793,318,c), +(783,313,o), +(771,310,o), +(760,309,cs), +(659,302,o), +(555,297,o), (447,291,c), (446,256,l) ); @@ -256,40 +244,35 @@ nodes = ( (866,465,o), (860,471,cs), (851,481,o), -(818,502,o), -(790,520,c), -(769,501,o), +(819,504,o), +(791,520,c), +(770,501,o), (758,493,o), (740,490,cs), (670,480,o), -(515,470,o), -(438,464,c), +(515,469,o), +(438,465,c), (448,429,l), (541,438,o), (665,446,o), (772,453,c), (768,420,o), (756,350,o), -(746,301,cs), -(742,278,o), -(798,281,o), -(801,298,cs) +(746,301,c), +(801,298,l) ); }, { closed = 1; nodes = ( -(485,551,o), -(553,616,o), -(617,696,cs), -(629,710,o), -(633,720,o), -(640,728,cs), -(647,735,o), -(648,740,o), -(639,748,cs), -(622,762,o), -(593,782,o), +(479,547,o), +(566,623,o), +(624,710,cs), +(632,722,o), +(637,729,o), +(647,741,c), +(630,761,o), +(592,787,o), (562,801,c), (554,792,l), (570,770,o), @@ -317,28 +300,22 @@ nodes = ( (778,655,o), (755,670,o), (735,683,c), -(712,668,o), -(700,662,o), -(672,656,cs), -(655,652,o), -(635,648,o), -(614,646,cs), -(587,643,o), -(564,643,o), -(545,643,c), -(544,636,l), -(559,627,o), +(714,668,o), +(702,662,o), +(684,658,cs), +(630,647,o), +(594,644,o), +(548,644,c), +(544,635,l), +(556,625,o), (578,612,o), (593,604,c), -(602,606,o), -(611,607,o), -(623,609,cs), -(649,613,o), -(664,615,o), +(611,608,o), +(670,616,o), (688,618,c), (662,579,o), -(623,532,o), -(571,468,c) +(625,532,o), +(570,468,c) ); } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6717.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6717.glyph index 1f694fd6..2fde46eb 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6717.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6717.glyph @@ -35,12 +35,12 @@ nodes = ( (394,647,o), (398,663,cs), (403,680,o), -(405,698,o), +(406,698,o), (404,716,cs), -(403,731,o), +(402,731,o), (394,742,o), -(382,748,cs), -(362,757,o), +(378,750,cs), +(354,762,o), (280,783,o), (251,788,c), (245,775,l), @@ -58,16 +58,19 @@ closed = 1; nodes = ( (634,434,l), (696,442,o), -(736,445,o), +(736,447,o), (798,451,cs), (806,452,o), (811,460,o), (806,467,cs), -(797,479,o), -(791,487,o), -(770,506,c), -(740,487,o), -(687,478,o), +(796,481,o), +(786,492,o), +(770,505,c), +(760,498,o), +(746,493,o), +(728,488,cs), +(701,481,o), +(667,476,o), (634,472,c) ); }, @@ -78,29 +81,28 @@ fillColor = (0,255); closed = 1; nodes = ( (474,332,l), -(474,347,l), -(483,460,l), -(491,530,ls), -(493,549,o), -(500,563,o), -(514,577,cs), -(518,581,o), -(519,586,o), -(514,590,cs), -(495,605,o), -(468,621,o), -(442,637,c), -(435,629,ls), -(425,617,o), -(412,609,o), +(476,398,o), +(480,467,o), +(490,531,cs), +(493,550,o), +(498,561,o), +(512,575,cs), +(516,579,o), +(518,583,o), +(513,588,cs), +(496,607,o), +(468,624,o), +(440,636,c), +(430,619,o), +(416,610,o), (396,606,cs), (360,600,o), (289,589,o), (220,583,c), (226,545,l), (294,554,o), -(365,561,o), -(434,568,c), +(365,562,o), +(434,567,c), (432,482,o), (429,401,o), (424,325,c) @@ -123,10 +125,9 @@ nodes = ( (500,148,o), (495,157,o), (487,163,cs), -(434,203,o), -(391,225,o), -(349,246,cs), -(345,248,l), +(447,193,o), +(425,208,o), +(345,248,c), (334,234,l), (401,170,o) ); @@ -140,39 +141,32 @@ nodes = ( (418,159,l), (358,125,o), (297,93,o), -(225,59,c), -(231,284,l), -(232,303,l), -(232,419,l), -(233,435,l), -(235,556,l), -(238,577,l), -(213,604,o), -(185,622,o), -(160,643,c), -(147,632,l), -(161,608,o), -(173,572,o), +(227,59,c), +(228,225,o), +(230,390,o), +(236,536,cs), +(237,563,o), +(238,568,o), +(239,576,c), +(215,603,o), +(190,624,o), +(158,642,c), +(146,631,l), +(160,607,o), +(174,572,o), (176,536,cs), -(183,429,o), +(182,429,o), (184,218,o), -(172,57,cs), -(171,45,o), -(166,38,o), -(156,32,cs), -(151,29,o), -(137,25,o), +(173,67,cs), +(171,43,o), +(150,29,o), (127,22,c), -(125,9,l), -(164,-33,ls), -(173,-42,o), -(178,-42,o), -(188,-34,cs), -(199,-25,o), -(208,-16,o), -(220,-8,cs), -(297,47,o), -(321,63,o), +(123,6,l), +(138,-10,o), +(155,-26,o), +(176,-42,c), +(273,31,o), +(306,55,o), (431,141,c) ); }, @@ -182,23 +176,24 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(642,629,l), -(827,650,l), -(832,436,o), -(829,148,o), -(825,-5,cs), -(825,-15,o), -(819,-16,o), -(814,-14,cs), -(768,5,o), -(722,26,o), +(642,627,l), +(704,637,o), +(765,644,o), +(827,648,c), +(832,434,o), +(830,188,o), +(826,35,cs), +(826,25,o), +(826,-1,o), +(820,-15,c), +(774,2,o), +(722,24,o), (674,47,c), (664,31,l), -(699,7,ls), -(743,-26,o), -(786,-61,o), +(737,-20,o), +(772,-46,o), (823,-103,cs), -(831,-113,o), +(832,-113,o), (839,-112,o), (847,-102,cs), (870,-75,o), @@ -211,10 +206,10 @@ nodes = ( (892,645,o), (906,660,cs), (911,665,o), -(913,671,o), +(913,670,o), (904,679,cs), -(881,697,o), -(857,713,o), +(883,701,o), +(859,717,o), (831,729,c), (817,708,o), (798,696,o), @@ -230,19 +225,21 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(616,257,l), -(632,258,l), -(671,261,o), -(759,269,o), -(798,273,cs), -(808,274,o), -(812,282,o), +(616,255,l), +(685,264,o), +(730,268,o), +(798,271,cs), +(808,271,o), +(811,282,o), (806,290,cs), -(788,315,o), -(795,306,o), -(773,328,c), -(726,300,o), -(675,301,o), +(798,303,o), +(786,317,o), +(773,326,c), +(761,320,o), +(748,313,o), +(724,308,cs), +(699,303,o), +(660,297,o), (624,294,c) ); }, @@ -252,27 +249,23 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(645,334,o), -(648,406,o), -(650,463,cs), -(652,531,o), -(653,598,o), -(654,666,c), -(575,729,l), +(651,228,o), +(652,584,cs), +(652,603,o), +(656,632,o), +(664,658,c), +(637,683,o), +(609,707,o), +(575,729,c), (561,718,l), (587,680,o), (594,643,o), (595,604,cs), -(597,568,o), -(598,521,o), -(597,485,cs), -(597,265,o), -(588,68,o), +(599,378,o), +(622,97,o), (401,-92,c), (418,-110,l), -(547,-23,o), -(613,99,o), -(636,266,cs) +(628,45,o) ); }, { @@ -281,8 +274,10 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(431,337,l), -(391,329,o), +(453,340,o), +(443,338,o), +(430,336,cs), +(390,330,o), (267,315,o), (230,312,c), (222,274,l), @@ -598,6 +593,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6731.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6731.glyph index b35259ec..9828bfb4 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6731.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6731.glyph @@ -24,17 +24,14 @@ nodes = ( (198,416,o), (281,476,o), (355,577,cs), -(363,588,o), -(369,598,o), -(377,606,cs), -(382,612,o), -(383,615,o), -(379,621,cs), -(364,644,o), -(344,670,o), +(365,591,o), +(375,601,o), +(385,611,c), +(371,639,o), +(346,672,o), (324,694,c), -(316,691,l), -(319,663,o), +(312,687,l), +(315,659,o), (310,636,o), (300,615,cs), (260,533,o), @@ -46,30 +43,24 @@ nodes = ( { closed = 1; nodes = ( -(195,289,o), -(230,294,o), -(285,300,cs), -(469,321,o), -(687,338,o), +(320,311,o), +(745,340,o), (880,344,cs), (892,344,o), -(897,355,o), +(898,355,o), (887,367,cs), -(877,378,o), +(872,383,o), (850,400,o), (822,418,c), (794,404,o), (774,397,o), (736,390,cs), -(637,372,o), -(391,350,o), -(272,342,cs), -(214,338,o), -(151,333,o), +(636,372,o), +(266,337,o), (97,336,c), -(93,328,l), -(114,311,o), -(138,294,o), +(93,325,l), +(114,308,o), +(137,292,o), (159,280,c) ); }, @@ -80,38 +71,32 @@ nodes = ( (542,72,o), (546,521,o), (554,656,cs), -(555,683,o), -(558,704,o), -(564,721,cs), -(566,727,o), -(563,732,o), -(557,738,cs), -(534,757,o), -(497,787,o), +(555,688,o), +(559,711,o), +(567,729,c), +(547,746,o), +(501,784,o), (473,804,c), -(464,795,l), -(476,769,o), +(461,792,l), +(473,766,o), (486,739,o), (489,698,cs), (499,557,o), -(497,106,o), -(489,24,cs), -(486,-6,o), -(483,-24,o), -(478,-47,cs), -(476,-56,o), -(475,-60,o), -(483,-68,cs), -(499,-84,o), -(512,-96,o), -(534,-112,c) +(492,106,o), +(489,55,cs), +(486,7,o), +(483,-19,o), +(475,-60,c), +(492,-80,o), +(507,-93,o), +(532,-112,c) ); }, { closed = 1; nodes = ( (850,11,o), -(894,12,o), +(894,13,o), (950,14,c), (950,36,l), (858,61,o), @@ -119,16 +104,14 @@ nodes = ( (737,137,cs), (659,196,o), (599,252,o), -(533,319,cs), -(527,326,o), -(500,305,o), -(513,292,cs), +(533,319,c), +(513,292,l), (586,214,o), -(675,105,o), -(756,13,cs), -(761,7,o), -(770,7,o), -(776,7,cs) +(679,106,o), +(749,20,cs), +(759,8,o), +(770,6,o), +(786,7,cs) ); }, { @@ -152,9 +135,9 @@ nodes = ( (569,553,o), (396,535,o), (287,530,c), -(279,521,l), -(299,505,o), -(314,491,o), +(280,519,l), +(294,506,o), +(307,494,o), (325,483,c) ); } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6839.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6839.glyph index daf08f77..a2045159 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6839.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6839.glyph @@ -11,95 +11,96 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(338,-96,l), -(335,50,o), -(336,196,o), -(339,344,c), -(345,340,l), -(372,315,o), -(399,289,o), -(423,261,cs), -(430,253,l), -(437,249,o), +(320,356,l), +(371,321,o), +(395,295,o), +(422,261,cs), +(434,245,o), (445,251,o), -(448,258,c), -(449,267,l), -(447,319,ls), +(448,264,cs), +(452,279,o), +(452,295,o), +(448,319,cs), (446,331,o), -(440,338,o), -(428,342,cs), -(361,366,l), -(339,373,l), -(341,482,l), -(420,489,l), -(467,491,ls), -(473,491,o), -(479,493,o), -(481,499,cs), -(484,505,o), -(482,510,o), -(478,514,cs), -(459,534,l), -(439,552,l), -(408,534,o), -(376,527,o), -(342,523,c), -(342,527,l), -(346,623,l), -(351,676,l), -(359,709,l), -(328,740,o), -(295,769,o), -(261,797,c), -(252,789,l), -(254,785,ls), -(270,751,o), -(282,715,o), -(284,677,cs), -(287,627,o), -(287,576,o), -(289,525,c), -(288,515,l), -(217,508,o), -(147,499,o), +(439,337,o), +(427,342,cs), +(395,356,o), +(364,367,o), +(332,375,c) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(727,184,l), +(773,220,o), +(822,255,o), +(864,284,cs), +(877,293,o), +(885,297,o), +(903,306,c), +(889,334,o), +(870,360,o), +(847,385,c), +(836,380,l), +(834,358,o), +(829,344,o), +(817,326,cs), +(785,280,o), +(760,254,o), +(706,205,c) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(545,491,l), +(603,499,o), +(660,506,o), +(718,510,cs), +(728,510,o), +(733,520,o), +(729,528,cs), +(719,545,o), +(712,554,o), +(697,565,c), +(682,557,o), +(667,551,o), +(652,547,cs), +(618,539,o), +(582,535,o), +(546,531,c) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(287,513,o), +(162,500,o), (76,501,c), (74,491,l), -(125,456,ls), -(130,453,o), -(134,453,o), -(139,454,cs), -(168,459,l), -(243,471,l), -(288,477,l), -(289,467,o), -(290,458,o), -(286,449,cs), -(276,424,o), -(267,399,o), -(254,375,cs), -(208,283,o), -(149,200,o), -(79,125,cs), -(59,103,l), -(68,93,l), -(76,83,l), -(161,154,o), -(232,235,o), -(288,329,c), -(289,321,l), -(284,52,ls), -(284,23,o), -(281,-5,o), -(272,-33,cs), -(269,-41,o), -(271,-49,o), -(276,-56,cs), -(289,-73,o), -(303,-88,o), -(320,-102,c), -(321,-104,o), -(324,-105,o), -(326,-106,c) +(129,453,l), +(263,477,o), +(372,487,o), +(464,491,cs), +(489,493,o), +(483,507,o), +(478,514,cs), +(468,528,o), +(455,540,o), +(439,552,c), +(419,540,o), +(399,533,o), +(377,529,cs) ); }, { @@ -108,56 +109,56 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(959,-17,l), -(996,-11,l), -(996,5,l), -(991,8,l), -(937,24,o), -(889,50,o), -(846,84,c), -(773,149,ls), -(759,161,o), -(746,175,o), -(733,189,c), -(739,194,l), -(860,280,ls), -(870,288,o), -(881,295,o), -(893,300,cs), -(897,302,o), -(902,303,o), -(903,311,c), -(885,336,o), -(866,362,o), -(843,385,c), -(839,382,l), -(836,378,l), -(834,356,o), -(825,338,o), -(813,320,cs), -(795,294,o), -(774,271,o), -(752,249,cs), -(712,210,l), -(638,295,ls), -(631,303,o), -(626,304,o), -(617,301,cs), -(585,290,l), -(582,288,l), -(582,280,l), -(598,273,o), -(609,262,o), +(773,433,c), +(750,416,o), +(732,410,o), +(710,407,cs), +(655,400,o), +(597,395,o), +(542,391,c), +(541,350,l), +(618,359,o), +(723,367,o), +(814,371,cs), +(827,372,o), +(831,383,o), +(825,391,cs), +(811,408,o), +(797,419,o) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(641,293,cs), +(634,301,o), +(625,304,o), +(615,302,cs), +(604,300,o), +(592,296,o), +(577,290,c), +(577,280,l), +(596,275,o), +(609,263,o), (620,251,cs), -(648,222,l), -(733,120,ls), -(770,76,o), -(806,30,o), -(842,-15,c), -(850,-23,ls), -(856,-28,o), -(862,-31,o), -(871,-30,cs) +(700,163,o), +(765,84,o), +(850,-23,cs), +(855,-29,o), +(862,-33,o), +(871,-31,cs), +(913,-22,o), +(954,-15,o), +(996,-12,c), +(997,5,l), +(942,21,o), +(903,41,o), +(875,63,cs), +(782,135,o), +(727,190,o) ); }, { @@ -166,75 +167,86 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(516,-98,o), -(518,-98,o), -(519,-96,c), -(589,-28,o), -(665,35,o), -(740,98,c), -(726,115,l), -(666,74,o), -(607,35,o), -(544,-3,c), -(551,351,l), -(559,352,l), -(720,365,ls), -(751,368,o), -(783,369,o), -(814,371,cs), -(821,372,o), -(826,374,o), -(830,381,c), -(825,397,o), -(809,404,o), -(798,416,c), -(798,419,l), -(805,514,l), -(814,603,ls), -(817,630,o), -(819,657,o), -(839,678,c), -(840,680,ls), -(843,687,o), -(843,689,o), +(798,406,l), +(801,472,o), +(807,548,o), +(815,614,cs), +(818,638,o), +(821,657,o), +(837,677,cs), +(845,686,o), +(844,688,o), (837,694,cs), -(816,709,l), -(765,743,l), -(763,742,l), -(761,740,ls), -(746,724,o), +(817,713,o), +(794,730,o), +(764,741,c), +(749,725,o), (730,710,o), (707,706,cs), -(673,700,l), -(593,688,l), -(551,684,l), -(527,711,o), -(500,734,o), +(652,696,o), +(596,689,o), +(541,683,c), +(547,641,l), +(617,651,o), +(686,659,o), +(756,665,c), +(755,578,o), +(749,492,o), +(745,405,c) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(292,464,l), +(227,304,o), +(181,236,o), +(59,103,c), +(76,83,l), +(165,157,o), +(244,248,o), +(313,368,c) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(547,159,o), +(552,481,o), +(556,643,cs), +(556,655,o), +(559,663,o), +(562,674,c), +(536,705,o), +(505,733,o), (472,757,c), -(462,748,l), -(474,721,ls), -(492,681,o), -(498,638,o), +(460,746,l), +(490,679,o), +(497,638,o), (499,595,cs), -(501,550,o), -(502,504,o), -(502,459,cs), -(502,315,o), -(500,171,o), -(493,27,cs), -(493,14,o), -(491,2,o), -(490,-10,cs), -(489,-20,o), -(483,-27,o), -(475,-32,cs), -(468,-37,ls), -(463,-42,o), -(463,-45,o), -(466,-51,c), -(471,-57,l), -(504,-92,l), -(513,-100,l) +(505,451,o), +(501,85,o), +(492,10,cs), +(489,-15,o), +(482,-28,o), +(464,-37,c), +(462,-51,l), +(477,-68,o), +(494,-87,o), +(513,-100,c), +(589,-30,o), +(665,35,o), +(740,98,c), +(726,115,l), +(666,74,o), +(609,35,o), +(546,0,c) ); }, { @@ -243,30 +255,30 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(554,494,l), -(579,498,l), -(708,510,l), -(718,512,ls), -(725,513,o), -(730,516,o), -(732,524,c), -(726,541,o), -(711,552,o), -(697,565,c), -(652,542,o), -(604,538,o), -(555,531,c), -(554,569,o), -(555,606,o), -(557,643,c), -(756,666,l), -(755,583,o), -(750,501,o), -(746,418,c), -(733,411,o), -(720,408,o), -(707,407,cs), -(552,390,l) +(289,201,o), +(284,52,cs), +(283,19,o), +(279,-12,o), +(267,-44,c), +(279,-62,o), +(308,-90,o), +(325,-104,c), +(338,-96,l), +(335,249,o), +(336,408,o), +(346,623,cs), +(347,652,o), +(352,683,o), +(359,709,c), +(328,740,o), +(295,769,o), +(261,797,c), +(252,789,l), +(254,785,ls), +(270,751,o), +(282,715,o), +(284,677,cs), +(292,523,o) ); } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6845.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6845.glyph index 8a6bfe96..2d4042cd 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6845.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6845.glyph @@ -373,11 +373,13 @@ nodes = ( (617,-10,o), (616,8,cs), (612,68,o), -(617,233,o), -(619,295,c), -(626,314,l), -(604,337,o), -(584,356,o), +(616,233,o), +(618,289,cs), +(619,303,o), +(620,310,o), +(624,317,c), +(606,339,o), +(585,358,o), (566,370,c), (553,362,l), (560,342,o), @@ -508,7 +510,7 @@ nodes = ( (255,516,o), (113,499,o), (48,497,c), -(45,484,l), +(45,483,l), (96,451,l) ); }, @@ -528,10 +530,10 @@ nodes = ( (812,298,o), (828,314,cs), (836,322,o), -(836,328,o), +(835,327,o), (825,336,cs), -(809,349,o), -(790,361,o), +(810,350,o), +(791,362,o), (767,373,c), (752,358,o), (743,351,o), @@ -596,7 +598,7 @@ nodes = ( (915,458,o), (899,474,cs), (885,488,o), -(860,505,o), +(862,506,o), (838,520,c), (822,510,o), (806,503,o), @@ -636,9 +638,11 @@ nodes = ( (617,635,o), (583,629,c), (575,612,l), -(606,591,l), -(638,598,o), -(669,604,o), +(583,604,o), +(594,597,o), +(606,591,c), +(638,599,o), +(669,605,o), (703,611,c), (673,556,o), (645,506,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_3E_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_3E_.glyph index aee657eb..16ba163f 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_3E_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_3E_.glyph @@ -25,16 +25,13 @@ shapes = ( closed = 1; nodes = ( (610,-11,o), -(657,88,o), -(686,289,cs), -(688,304,o), -(689,313,o), -(693,334,cs), -(694,340,o), -(695,344,o), -(688,350,cs), -(675,362,o), -(658,377,o), +(656,90,o), +(682,271,cs), +(686,298,o), +(689,315,o), +(696,344,c), +(684,359,o), +(665,375,o), (632,398,c), (623,391,l), (634,357,o), @@ -53,20 +50,14 @@ nodes = ( (209,72,o), (226,111,cs), (231,122,o), -(231,128,o), -(229,139,cs), -(227,152,o), +(232,129,o), +(230,140,cs), +(228,153,o), (220,169,o), (209,187,c), (201,185,l), -(200,167,o), -(195,149,o), -(186,131,cs), -(174,107,o), -(161,80,o), -(143,61,cs), -(132,48,o), -(117,37,o), +(199,140,o), +(151,47,o), (104,33,c), (106,16,o), (110,-5,o), @@ -83,30 +74,27 @@ nodes = ( (356,-41,o), (356,-17,cs), (356,44,o), -(357,138,o), -(358,160,cs), -(359,173,o), -(360,189,o), -(362,203,cs), -(363,207,o), -(363,209,o), -(358,212,cs), -(344,221,o), -(322,229,o), +(355,118,o), +(357,160,cs), +(358,175,o), +(359,193,o), +(362,209,c), +(349,219,o), +(324,228,o), (304,235,c), -(300,231,l), +(299,228,l), (303,214,o), (306,196,o), (306,173,cs), -(306,125,o), -(306,40,o), -(304,-2,cs), -(303,-11,o), -(300,-11,o), -(295,-10,cs), -(264,-3,o), -(230,5,o), -(199,12,c), +(307,125,o), +(306,62,o), +(304,30,cs), +(303,11,o), +(302,3,o), +(299,-10,c), +(264,-4,o), +(230,3,o), +(199,13,c), (193,0,l), (230,-22,o), (275,-54,o), @@ -119,11 +107,8 @@ nodes = ( { closed = 1; nodes = ( -(144,201,o), -(172,205,o), -(211,210,cs), -(307,224,o), -(425,232,o), +(200,214,o), +(394,230,o), (519,237,cs), (530,238,o), (540,245,o), @@ -134,15 +119,12 @@ nodes = ( (461,282,o), (437,276,o), (414,271,cs), -(367,262,o), -(256,250,o), -(200,246,cs), -(161,243,o), -(111,239,o), -(73,239,c), -(68,230,l), -(80,220,o), -(96,207,o), +(341,257,o), +(186,240,o), +(73,241,c), +(68,228,l), +(79,217,o), +(95,206,o), (113,194,c) ); }, @@ -170,11 +152,8 @@ nodes = ( { closed = 1; nodes = ( -(231,319,o), -(253,322,o), -(289,328,cs), -(325,333,o), -(406,342,o), +(273,328,o), +(386,341,o), (461,344,cs), (478,345,o), (483,353,o), @@ -185,80 +164,66 @@ nodes = ( (419,389,o), (407,383,o), (379,377,cs), -(364,374,o), -(291,364,o), -(241,359,cs), -(210,356,o), -(186,355,o), +(349,371,o), +(231,355,o), (163,355,c), -(159,349,l), -(174,338,o), -(191,324,o), +(159,345,l), +(172,333,o), +(189,322,o), (207,314,c) ); }, { closed = 1; nodes = ( -(216,433,o), -(237,436,o), -(275,441,cs), -(320,447,o), -(424,459,o), +(258,442,o), +(426,459,o), (496,462,cs), (512,463,o), (518,472,o), (507,484,cs), (500,493,o), -(494,497,o), -(473,512,c), -(456,504,o), -(441,501,o), -(414,495,cs), -(391,490,o), -(293,476,o), -(226,470,cs), -(194,467,o), -(173,467,o), +(491,501,o), +(473,513,c), +(456,505,o), +(441,498,o), +(414,493,cs), +(346,480,o), +(227,469,o), (149,466,c), -(145,460,l), -(162,448,o), -(178,437,o), +(145,457,l), +(159,445,o), +(175,435,o), (192,428,c) ); }, { closed = 1; nodes = ( -(867,-69,o), -(915,-68,o), -(956,-66,c), +(867,-68,o), +(915,-66,o), +(956,-67,c), (957,-50,l), (897,-20,o), (846,15,o), (796,67,cs), (742,125,o), (693,193,o), -(653,259,cs), -(651,263,o), -(622,241,o), -(633,224,cs), +(653,259,c), +(633,224,l), (690,137,o), -(749,30,o), -(806,-65,cs), -(810,-71,o), -(819,-71,o), -(825,-71,cs) +(751,32,o), +(801,-57,cs), +(808,-70,o), +(816,-73,o), +(825,-72,cs) ); }, { closed = 1; nodes = ( -(169,552,o), -(195,555,o), -(235,560,cs), -(311,569,o), -(438,582,o), +(219,562,o), +(446,582,o), (528,587,cs), (538,588,o), (546,594,o), @@ -269,11 +234,8 @@ nodes = ( (469,629,o), (448,624,o), (423,619,cs), -(379,611,o), -(277,600,o), -(225,596,cs), -(183,593,o), -(136,590,o), +(358,607,o), +(185,589,o), (95,591,c), (90,582,l), (105,571,o), @@ -288,14 +250,11 @@ nodes = ( (375,514,o), (377,588,o), (379,632,cs), -(381,662,o), -(383,684,o), -(387,703,cs), -(388,708,o), -(388,712,o), -(382,717,cs), -(361,737,o), -(320,767,o), +(381,666,o), +(384,690,o), +(389,710,c), +(371,730,o), +(323,765,o), (295,783,c), (284,772,l), (307,740,o), @@ -312,14 +271,11 @@ nodes = ( (593,390,o), (648,485,o), (699,648,cs), -(705,667,o), -(708,676,o), -(716,687,cs), -(720,693,o), -(720,696,o), -(714,702,cs), -(695,721,o), -(654,756,o), +(706,669,o), +(709,678,o), +(720,695,c), +(693,726,o), +(672,744,o), (619,782,c), (608,773,l), (624,746,o), @@ -334,36 +290,30 @@ nodes = ( { closed = 1; nodes = ( -(793,372,o), -(831,402,o), -(856,420,cs), -(873,432,o), -(897,447,o), +(800,377,o), +(846,412,o), +(875,434,cs), +(887,442,o), +(904,450,o), (921,457,cs), (928,460,o), (932,465,o), (926,473,cs), -(916,485,o), -(880,517,o), +(911,492,o), +(882,517,o), (853,537,c), (831,521,o), (812,511,o), (787,504,cs), -(767,498,o), -(707,487,o), -(682,483,cs), -(649,477,o), -(622,474,o), -(596,471,c), -(592,465,l), -(608,450,o), -(617,443,o), -(634,432,c), -(645,434,o), -(663,439,o), -(684,443,cs), -(727,451,o), -(779,461,o), +(749,493,o), +(641,474,o), +(594,471,c), +(591,464,l), +(607,449,o), +(617,442,o), +(634,431,c), +(661,439,o), +(742,455,o), (816,465,c), (801,437,o), (767,389,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_65.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_65.glyph index bba9844e..52074d7b 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_65.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_65.glyph @@ -94,15 +94,15 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(366,412,l), -(367,486,o), -(367,510,o), -(368,535,cs), -(369,560,o), -(370,599,o), -(375,633,c), -(349,657,o), -(324,678,o), +(367,412,l), +(366,511,o), +(367,543,o), +(368,576,cs), +(369,590,o), +(372,612,o), +(377,632,c), +(352,657,o), +(325,679,o), (293,700,c), (279,688,l), (297,659,o), @@ -128,10 +128,10 @@ nodes = ( (925,456,o), (903,471,o), (876,489,c), -(820,459,o), -(741,453,o), -(677,449,cs), -(530,441,o), +(817,463,o), +(771,458,o), +(707,453,cs), +(560,441,o), (243,424,o), (93,428,c), (87,415,l), @@ -146,14 +146,14 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(562,427,l), -(562,520,o), +(563,427,l), +(563,520,o), (565,614,o), -(570,676,cs), -(572,694,o), -(574,722,o), -(581,742,c), -(552,769,o), +(568,676,cs), +(569,694,o), +(573,722,o), +(579,742,c), +(551,769,o), (518,796,o), (488,817,c), (473,804,l), @@ -171,7 +171,7 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(658,581,o), +(655,583,o), (722,587,o), (804,589,cs), (824,590,o), @@ -181,9 +181,9 @@ nodes = ( (780,650,o), (760,662,c), (702,629,o), -(650,625,o), -(563,616,c), -(565,574,l) +(647,625,o), +(560,616,c), +(562,574,l) ); } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_89.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_89.glyph index 88bbe1af..cc7f7470 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_89.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_89.glyph @@ -24,36 +24,33 @@ nodes = ( (932,556,o), (924,564,cs), (906,581,o), -(879,601,o), +(881,602,o), (850,622,c), (828,601,o), (802,592,o), (777,587,cs), -(721,577,o), -(667,571,o), -(637,568,cs), -(607,565,o), -(582,562,o), -(558,560,c), +(704,574,o), +(633,566,o), +(559,563,c), (557,553,l), -(579,540,o), -(597,528,o), +(577,540,o), +(595,528,o), (612,521,c), (679,531,o), (791,543,o), (844,547,c), -(831,383,o), -(789,49,o), -(764,-8,cs), -(759,-19,o), -(756,-18,o), -(746,-15,cs), -(696,3,o), -(664,16,o), -(611,36,c), +(832,393,o), +(788,90,o), +(774,37,cs), +(769,20,o), +(762,-4,o), +(756,-16,c), +(703,0,o), +(670,13,o), +(614,38,c), (605,24,l), -(668,-18,o), -(727,-80,o), +(668,-20,o), +(718,-68,o), (751,-108,cs) ); }, @@ -78,9 +75,9 @@ nodes = ( (303,446,o), (276,438,o), (237,432,c), -(233,427,l), -(246,417,o), -(262,409,o), +(232,419,l), +(245,412,o), +(262,405,o), (279,399,c), (308,409,o), (337,417,o), @@ -98,9 +95,9 @@ nodes = ( (277,228,o), (279,237,cs), (282,251,o), -(281,269,o), -(279,284,cs), -(278,291,o), +(282,269,o), +(280,282,cs), +(279,291,o), (273,297,o), (262,300,cs), (226,311,o), @@ -118,14 +115,11 @@ nodes = ( (183,288,o), (239,375,o), (292,486,cs), -(301,504,o), -(307,513,o), -(316,526,cs), -(320,532,o), -(320,537,o), -(316,542,cs), -(303,560,o), -(283,586,o), +(302,507,o), +(308,516,o), +(321,534,c), +(308,558,o), +(287,586,o), (263,609,c), (254,604,l), (258,577,o), @@ -142,20 +136,20 @@ closed = 1; nodes = ( (529,120,o), (588,123,o), -(631,125,cs), -(641,126,o), +(631,124,cs), +(641,124,o), (649,134,o), (640,143,cs), (632,151,o), (621,161,o), (608,169,c), (597,164,o), -(586,161,o), -(567,159,cs), -(555,157,o), +(586,160,o), +(571,158,cs), +(555,156,o), (520,153,o), (483,151,c), -(489,115,l) +(489,114,l) ); }, { @@ -163,29 +157,26 @@ closed = 1; nodes = ( (507,64,l), (506,95,o), -(507,353,o), -(507,395,cs), -(507,406,o), -(508,411,o), -(503,415,cs), -(489,424,o), -(470,434,o), +(505,313,o), +(506,355,cs), +(507,383,o), +(508,399,o), +(511,412,c), +(496,423,o), +(474,434,o), (451,444,c), (443,437,l), -(454,411,o), -(456,401,o), -(460,373,cs), -(469,314,o), +(455,411,o), +(459,401,o), +(461,373,cs), +(466,314,o), (465,199,o), (463,163,cs), -(462,143,o), -(460,124,o), -(454,107,cs), -(452,102,o), -(452,98,o), -(456,94,cs), -(469,81,o), -(485,67,o), +(462,140,o), +(459,118,o), +(453,99,c), +(465,85,o), +(483,68,o), (499,58,c) ); }, @@ -223,10 +214,10 @@ nodes = ( (707,381,o), (714,392,cs), (718,400,o), -(719,403,o), +(719,402,o), (712,409,cs), -(700,419,o), -(675,435,o), +(701,420,o), +(677,437,o), (655,448,c), (638,435,o), (630,431,o), @@ -235,8 +226,8 @@ nodes = ( (505,412,o), (474,410,c), (479,373,l), -(529,379,o), -(595,386,o), +(529,380,o), +(595,387,o), (648,391,c), (647,321,o), (644,217,o), @@ -244,10 +235,10 @@ nodes = ( (640,150,o), (641,146,o), (620,138,c), -(626,125,o), -(641,91,o), -(648,76,cs), -(651,68,o), +(628,125,o), +(639,98,o), +(646,77,cs), +(650,66,o), (659,64,o), (667,73,cs) ); @@ -255,11 +246,8 @@ nodes = ( { closed = 1; nodes = ( -(200,579,o), -(227,585,o), -(260,592,cs), -(341,609,o), -(406,620,o), +(241,590,o), +(369,616,o), (483,628,cs), (498,630,o), (504,638,o), @@ -270,15 +258,12 @@ nodes = ( (416,677,o), (389,664,o), (360,656,cs), -(313,644,o), -(281,638,o), -(222,627,cs), -(188,621,o), -(146,615,o), +(294,639,o), +(187,618,o), (106,612,c), -(105,606,l), -(124,594,o), -(145,581,o), +(104,602,l), +(123,591,o), +(145,580,o), (169,571,c) ); }, @@ -288,14 +273,11 @@ nodes = ( (539,466,o), (587,546,o), (654,670,cs), -(663,686,o), -(668,695,o), -(675,703,cs), -(680,708,o), -(680,712,o), -(676,718,cs), -(660,738,o), -(622,777,o), +(664,689,o), +(669,696,o), +(680,710,c), +(655,746,o), +(631,772,o), (595,802,c), (585,795,l), (596,768,o), @@ -618,6 +600,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_E_1.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_E_1.glyph index f1c163bb..7d28bbcc 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_E_1.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6B_E_1.glyph @@ -31,12 +31,12 @@ nodes = ( (479,-37,o), (377,-15,cs), (313,-3,o), -(310,12,o), +(309,12,o), (307,77,cs), -(305,122,o), -(308,224,o), -(314,454,cs), -(315,492,o), +(304,192,o), +(308,314,o), +(315,474,cs), +(317,512,o), (318,534,o), (326,563,c), (310,580,o), @@ -88,12 +88,14 @@ fillColor = (0,255); closed = 1; nodes = ( (549,30,l), -(546,115,o), -(545,200,o), -(546,285,c), -(548,309,l), -(531,324,o), -(511,341,o), +(545,115,o), +(543,200,o), +(546,279,cs), +(546,293,o), +(548,300,o), +(551,309,c), +(535,325,o), +(512,342,o), (483,361,c), (472,351,l), (484,323,o), @@ -147,12 +149,14 @@ nodes = ( (709,92,o), (796,93,cs), (811,93,o), -(817,103,o), +(816,102,o), (803,117,cs), -(793,127,o), -(781,137,o), -(768,148,c), -(749,136,l), +(794,128,o), +(786,136,o), +(772,146,c), +(766,142,o), +(756,137,o), +(738,134,cs), (709,129,o), (616,122,o), (539,121,c), @@ -168,10 +172,10 @@ nodes = ( (171,566,o), (333,607,o), (427,646,cs), -(444,653,o), +(446,654,o), (461,660,o), -(479,666,c), -(467,693,o), +(479,665,c), +(467,692,o), (444,722,o), (419,752,c), (403,747,l), @@ -208,11 +212,11 @@ nodes = ( (646,323,o), (590,317,o), (524,313,c), -(533,274,l), +(533,273,l), (612,284,o), (674,289,o), -(743,295,c), -(742,238,o), +(743,294,c), +(742,237,o), (737,183,o), (728,126,c), (780,124,l) @@ -237,9 +241,9 @@ nodes = ( (577,780,l), (599,734,o), (604,687,o), -(605,632,cs), -(607,536,o), -(607,423,o), +(606,632,cs), +(610,536,o), +(610,423,o), (606,302,c) ); }, diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6C_28.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6C_28.glyph index 13d2ae4d..05ee529e 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6C_28.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6C_28.glyph @@ -184,10 +184,13 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(593,270,o), -(617,279,o), -(660,284,cs), -(671,285,o), +(607,271,o), +(621,276,o), +(632,280,cs), +(640,283,o), +(651,284,o), +(660,285,cs), +(671,286,o), (675,295,o), (669,304,cs), (659,321,o), @@ -207,7 +210,7 @@ nodes = ( (560,289,o), (547,270,o), (532,252,c), -(542,244,l) +(542,242,l) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6D_3B_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6D_3B_.glyph index 0e6f3cdf..d7bd898c 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6D_3B_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6D_3B_.glyph @@ -18,8 +18,7 @@ shapes = ( { closed = 1; nodes = ( -(189,-67,o), -(198,-63,o), +(198,-70,o), (199,-47,cs), (204,7,o), (211,54,o), @@ -32,61 +31,56 @@ nodes = ( (213,208,o), (155,89,cs), (145,67,o), -(140,61,o), +(140,63,o), (126,61,cs), -(113,61,o), -(100,61,o), +(113,59,o), +(100,59,o), (89,61,c), (85,50,l), (110,23,o), -(133,-6,o), -(162,-52,cs), -(170,-65,o), -(173,-67,o), -(180,-67,cs) +(134,-8,o), +(163,-54,cs), +(177,-77,o) ); }, { closed = 1; nodes = ( -(479,-105,l), -(478,0,o), -(477,115,o), -(477,198,cs), -(477,207,o), -(476,209,o), -(471,212,cs), -(452,226,o), -(409,253,o), +(480,-105,l), +(477,-7,o), +(475,100,o), +(477,167,cs), +(477,186,o), +(478,197,o), +(480,208,c), +(464,221,o), +(425,248,o), (385,269,c), (376,258,l), (393,238,o), -(408,214,o), -(414,185,cs), -(425,138,o), +(412,204,o), +(417,175,cs), +(423,138,o), (428,37,o), (425,-20,cs), -(424,-35,o), -(423,-45,o), -(420,-56,cs), -(418,-65,o), -(419,-67,o), -(425,-74,cs), -(436,-84,o), -(462,-104,o), +(424,-39,o), +(423,-49,o), +(418,-65,c), +(428,-78,o), +(452,-98,o), (472,-110,c) ); }, { closed = 1; nodes = ( -(199,362,o), -(224,375,o), -(229,394,cs), -(234,415,o), -(236,443,o), +(199,363,o), +(214,371,o), +(223,386,cs), +(235,406,o), +(240,441,o), (236,461,cs), -(236,471,o), +(234,471,o), (231,479,o), (217,484,cs), (172,500,o), @@ -104,15 +98,18 @@ nodes = ( (583,-32,o), (693,-26,o), (806,-27,cs), -(819,-27,o), -(821,-18,o), +(817,-27,o), +(819,-19,o), (811,-9,cs), -(801,0,o), -(790,8,o), -(772,19,c), -(672,12,o), -(574,4,o), -(463,-4,c), +(803,0,o), +(784,14,o), +(765,25,c), +(751,20,o), +(741,18,o), +(726,17,cs), +(642,9,o), +(557,2,o), +(463,-3,c), (465,-45,l) ); }, @@ -126,12 +123,12 @@ nodes = ( (820,205,o), (827,215,cs), (830,220,o), -(829,225,o), +(829,224,o), (822,230,cs), -(801,243,o), -(774,257,o), -(750,270,c), -(730,251,o), +(804,245,o), +(777,259,o), +(750,269,c), +(730,250,o), (714,242,o), (692,239,cs), (639,231,o), @@ -151,58 +148,50 @@ nodes = ( closed = 1; nodes = ( (292,582,o), -(317,592,o), -(321,610,cs), -(326,630,o), -(329,656,o), -(329,674,cs), -(329,683,o), +(314,591,o), +(320,609,cs), +(327,629,o), +(331,655,o), +(330,673,cs), +(329,682,o), (325,691,o), (313,695,cs), (268,711,o), -(226,720,o), -(173,730,c), -(167,720,l), -(216,682,o), +(226,722,o), +(173,729,c), +(167,719,l), +(216,684,o), (250,649,o), -(285,594,cs) +(280,601,cs) ); }, { closed = 1; nodes = ( -(570,185,o), -(623,203,o), -(624,225,cs), -(627,317,o), +(624,225,l), +(626,317,o), (632,422,o), (636,488,cs), -(637,513,o), -(639,532,o), -(647,554,cs), -(649,561,o), -(649,564,o), -(644,568,cs), -(629,580,o), -(595,603,o), +(637,515,o), +(639,536,o), +(649,560,c), +(627,585,o), +(604,599,o), (566,619,c), (556,612,l), (574,575,o), -(574,545,o), -(574,503,cs), -(575,444,o), -(577,321,o), -(572,218,cs) +(574,549,o), +(574,507,cs), +(575,448,o), +(576,321,o), +(571,218,c) ); }, { closed = 1; nodes = ( -(416,377,o), -(451,382,o), -(497,387,cs), -(604,399,o), -(749,410,o), +(513,396,o), +(758,410,o), (915,412,cs), (931,412,o), (935,425,o), @@ -213,15 +202,12 @@ nodes = ( (843,471,o), (826,465,o), (782,456,cs), -(713,442,o), -(571,432,o), -(490,425,cs), -(436,420,o), -(395,418,o), +(699,439,o), +(446,418,o), (327,418,c), -(323,407,l), -(347,391,o), -(358,384,o), +(323,405,l), +(340,393,o), +(361,379,o), (380,370,c) ); }, @@ -229,17 +215,14 @@ nodes = ( closed = 1; nodes = ( (501,595,o), -(650,617,o), -(763,658,cs), -(777,663,o), -(788,668,o), -(807,673,cs), -(816,675,o), -(821,681,o), -(811,693,cs), -(795,713,o), -(770,743,o), -(743,767,c), +(650,618,o), +(754,656,cs), +(779,665,o), +(791,669,o), +(815,677,c), +(800,708,o), +(779,736,o), +(748,767,c), (735,762,l), (741,740,o), (733,731,o), @@ -504,6 +487,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6D_45.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6D_45.glyph index cdbc7794..c738f735 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6D_45.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6D_45.glyph @@ -28,7 +28,7 @@ nodes = ( (586,706,o), (596,730,c), (560,764,o), -(517,795,o), +(521,795,o), (489,814,c), (473,797,l), (493,768,o), @@ -124,10 +124,10 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(322,596,o), -(325,615,o), +(325,602,o), +(328,625,o), (326,647,cs), -(326,660,o), +(325,660,o), (320,668,o), (309,673,cs), (266,692,o), @@ -135,11 +135,11 @@ nodes = ( (172,726,c), (163,712,l), (204,678,o), -(254,633,o), -(280,589,cs), -(293,567,o), -(314,573,o), -(319,587,cs) +(252,632,o), +(282,586,cs), +(294,567,o), +(311,570,o), +(317,584,cs) ); }, { @@ -202,22 +202,22 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(808,601,o), -(810,615,cs), -(813,633,o), -(814,652,o), +(805,601,o), +(809,615,cs), +(814,633,o), +(816,652,o), (811,670,cs), -(809,682,o), +(808,682,o), (803,688,o), -(791,692,cs), -(755,704,o), -(710,715,o), +(791,693,cs), +(755,708,o), +(710,719,o), (657,727,c), (650,711,l), (711,674,o), -(739,648,o), -(776,603,cs), -(789,587,o) +(740,649,o), +(777,604,cs), +(790,588,o) ); } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6E_90.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6E_90.glyph index 34372a2b..05dbdd0f 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni6E_90.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni6E_90.glyph @@ -22,10 +22,10 @@ nodes = ( (431,209,o), (457,532,cs), (458,549,o), -(459,569,o), -(464,593,c), -(449,611,o), -(430,629,o), +(460,569,o), +(465,593,c), +(451,612,o), +(431,630,o), (399,656,c), (389,649,l), (396,622,o), @@ -40,8 +40,7 @@ nodes = ( { closed = 1; nodes = ( -(176,-60,o), -(185,-56,o), +(184,-64,o), (186,-40,cs), (191,12,o), (200,59,o), @@ -57,21 +56,19 @@ nodes = ( (127,65,o), (113,65,cs), (100,65,o), -(89,66,o), +(89,65,o), (77,67,c), (73,55,l), (98,29,o), (120,-1,o), (148,-46,cs), -(156,-58,o), -(159,-60,o), -(167,-60,cs) +(163,-68,o) ); }, { closed = 1; nodes = ( -(466,-16,o), +(466,-17,o), (502,60,o), (518,99,cs), (523,110,o), @@ -84,24 +81,24 @@ nodes = ( (492,141,o), (444,40,o), (401,25,c), -(404,5,o), -(409,-15,o), -(418,-35,cs), -(422,-44,o), -(433,-46,o), -(443,-38,cs) +(403,5,o), +(409,-16,o), +(418,-36,cs), +(422,-45,o), +(433,-47,o), +(443,-39,cs) ); }, { closed = 1; nodes = ( (186,375,o), -(210,387,o), +(208,387,o), (214,406,cs), -(218,426,o), -(221,453,o), +(220,426,o), +(222,453,o), (221,471,cs), -(221,481,o), +(220,481,o), (216,489,o), (204,493,cs), (161,509,o), @@ -110,34 +107,40 @@ nodes = ( (62,521,l), (108,483,o), (144,447,o), -(178,388,cs) +(174,396,cs) ); }, { closed = 1; nodes = ( -(663,-89,o), -(675,-53,o), -(675,-28,cs), -(675,35,o), -(678,156,o), -(678,177,cs), -(678,195,o), -(678,204,o), -(681,214,c), +(656,-96,o), +(666,-75,o), +(671,-52,cs), +(674,-37,o), +(676,-25,o), +(676,-13,cs), +(675,23,o), +(676,148,o), +(677,169,cs), +(678,191,o), +(679,200,o), +(680,213,c), (666,224,o), -(641,235,o), -(625,240,c), -(621,232,l), -(624,211,o), +(639,235,o), +(624,240,c), +(619,231,l), +(624,210,o), (624,195,o), (625,170,cs), -(626,140,o), -(626,12,o), -(624,-22,c), -(589,-15,o), -(553,-7,o), -(521,2,c), +(626,144,o), +(627,44,o), +(626,14,cs), +(625,-4,o), +(625,-14,o), +(622,-26,c), +(589,-19,o), +(555,-8,o), +(523,4,c), (518,-6,l), (553,-33,o), (589,-64,o), @@ -172,26 +175,26 @@ nodes = ( closed = 1; nodes = ( (564,197,l), -(562,232,o), -(554,467,o), -(554,498,cs), -(554,508,o), -(552,510,o), -(548,513,cs), -(536,522,o), -(512,533,o), +(560,251,o), +(554,446,o), +(554,471,cs), +(554,485,o), +(556,497,o), +(559,505,c), +(544,517,o), +(516,534,o), (490,545,c), (484,539,l), (495,513,o), -(501,487,o), -(503,462,cs), +(502,487,o), +(504,462,cs), (508,417,o), (510,345,o), (511,289,cs), (512,266,o), (511,250,o), (507,232,c), -(521,219,o), +(520,217,o), (538,201,o), (554,190,c) ); @@ -200,21 +203,21 @@ nodes = ( closed = 1; nodes = ( (277,585,o), -(301,595,o), -(305,614,cs), -(309,633,o), -(313,660,o), -(313,677,cs), -(313,684,o), -(307,691,o), -(296,695,cs), -(255,712,o), -(215,720,o), +(294,591,o), +(303,610,cs), +(311,627,o), +(314,651,o), +(313,667,cs), +(312,684,o), +(306,692,o), +(295,696,cs), +(254,713,o), +(217,723,o), (168,730,c), (162,721,l), (206,685,o), (238,653,o), -(271,596,cs) +(264,607,cs) ); }, { @@ -222,12 +225,12 @@ closed = 1; nodes = ( (615,229,o), (698,235,o), -(756,237,cs), -(770,237,o), -(774,253,o), -(767,260,cs), -(761,267,o), -(755,272,o), +(766,237,cs), +(777,237,o), +(777,247,o), +(770,257,cs), +(765,265,o), +(756,274,o), (741,283,c), (728,278,o), (720,276,o), @@ -272,22 +275,22 @@ nodes = ( (845,482,o), (859,500,cs), (864,506,o), -(865,513,o), +(864,511,o), (855,520,cs), -(844,529,o), -(820,543,o), -(798,554,c), -(782,542,o), +(845,529,o), +(822,544,o), +(799,553,c), +(783,541,o), (767,535,o), (744,530,cs), (700,520,o), (592,512,o), (542,508,c), -(549,468,l), +(549,467,l), (615,476,o), -(713,485,o), -(790,491,c), -(787,448,o), +(713,486,o), +(790,490,c), +(788,447,o), (777,327,o), (769,269,cs), (768,261,o), @@ -304,14 +307,14 @@ nodes = ( { closed = 1; nodes = ( -(599,505,o), -(634,539,o), -(660,570,cs), -(672,583,o), -(685,597,o), -(693,605,c), -(680,621,o), -(654,653,o), +(600,505,o), +(637,542,o), +(665,576,cs), +(674,586,o), +(684,597,o), +(692,605,c), +(679,625,o), +(654,656,o), (635,673,c), (625,669,l), (627,647,o), @@ -326,7 +329,7 @@ nodes = ( { closed = 1; nodes = ( -(498,660,o), +(499,660,o), (752,670,o), (883,672,cs), (901,672,o), @@ -339,10 +342,12 @@ nodes = ( (787,722,o), (758,718,cs), (665,705,o), -(458,685,o), -(341,693,c), -(338,685,l), -(393,644,l) +(460,688,o), +(343,694,c), +(339,685,l), +(355,669,o), +(373,656,o), +(394,644,c) ); } ); @@ -723,6 +728,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni706C_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni706C_.glyph index c9c16268..dd67d83b 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni706C_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni706C_.glyph @@ -59,12 +59,12 @@ nodes = ( (439,-9,o), (441,-1,o), (435,9,cs), -(417,36,o), -(387,78,o), +(419,37,o), +(389,78,o), (364,107,c), (356,103,l), (366,64,o), -(374,9,o), +(376,10,o), (383,-55,cs), (385,-70,o), (396,-73,o), @@ -75,9 +75,9 @@ nodes = ( closed = 1; nodes = ( (622,-41,o), -(629,-15,o), -(632,1,cs), -(634,9,o), +(630,-16,o), +(633,0,cs), +(635,8,o), (633,13,o), (627,20,cs), (598,56,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni706F_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni706F_.glyph index e44e1f12..88c291a7 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni706F_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni706F_.glyph @@ -106,9 +106,12 @@ nodes = ( (670,554,o), (673,522,o), (674,491,cs), -(677,342,o), -(673,41,o), -(665,2,c), +(676,373,o), +(673,160,o), +(669,57,cs), +(668,37,o), +(665,15,o), +(663,2,c), (623,18,o), (554,50,o), (510,75,c), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni708E_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni708E_.glyph index 977e2dc3..a6b44c60 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni708E_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni708E_.glyph @@ -12,18 +12,15 @@ nodes = ( (405,-27,o), (485,71,o), (521,285,cs), -(525,307,o), -(529,325,o), -(534,347,cs), -(535,353,o), -(535,357,o), -(530,362,cs), -(518,375,o), -(488,397,o), +(525,309,o), +(530,331,o), +(535,355,c), +(516,378,o), +(495,396,o), (459,421,c), -(450,415,l), -(467,361,o), -(465,329,o), +(449,413,l), +(466,360,o), +(465,328,o), (461,282,cs), (446,107,o), (362,4,o), @@ -38,20 +35,14 @@ nodes = ( (323,167,o), (337,209,cs), (341,222,o), -(341,228,o), -(340,240,cs), -(338,253,o), +(342,229,o), +(340,241,cs), +(338,254,o), (331,274,o), (321,293,c), -(312,291,l), -(311,270,o), -(303,250,o), -(294,231,cs), -(282,204,o), -(265,175,o), -(246,153,cs), -(234,139,o), -(216,126,o), +(310,291,l), +(310,245,o), +(258,143,o), (201,120,c), (203,104,o), (211,81,o), @@ -73,10 +64,8 @@ nodes = ( (700,49,cs), (612,111,o), (547,165,o), -(473,236,cs), -(468,241,o), -(443,224,o), -(457,209,cs), +(473,236,c), +(457,209,l), (537,129,o), (638,17,o), (730,-79,cs), @@ -100,35 +89,26 @@ nodes = ( (356,671,o), (346,689,o), (333,709,c), -(323,706,l), -(324,681,o), -(322,654,o), -(316,638,cs), -(305,606,o), -(287,571,o), -(265,546,cs), -(254,533,o), -(239,520,o), +(321,706,l), +(326,621,o), +(278,539,o), (224,513,c), -(235,489,o), -(242,473,o), +(232,489,o), +(241,473,o), (254,458,cs) ); }, { closed = 1; nodes = ( -(612,157,o), -(658,186,o), -(720,230,cs), -(729,237,o), -(745,248,o), -(754,254,cs), -(760,257,o), -(764,263,o), -(756,271,cs), -(743,285,o), -(713,311,o), +(614,156,o), +(658,185,o), +(718,230,cs), +(730,239,o), +(751,255,o), +(760,261,c), +(736,291,o), +(710,316,o), (681,338,c), (674,332,l), (680,310,o), @@ -146,14 +126,11 @@ nodes = ( (448,378,o), (495,469,o), (534,650,cs), -(539,673,o), -(544,692,o), -(552,713,cs), -(555,720,o), -(554,724,o), -(550,729,cs), -(537,742,o), -(508,766,o), +(540,676,o), +(545,698,o), +(556,723,c), +(548,733,o), +(516,760,o), (470,795,c), (461,789,l), (479,736,o), @@ -168,21 +145,21 @@ nodes = ( { closed = 1; nodes = ( -(799,331,o), -(817,341,o), -(818,360,cs), -(818,378,o), -(815,407,o), -(810,422,cs), -(807,431,o), +(801,333,o), +(813,341,o), +(816,360,cs), +(819,378,o), +(816,406,o), +(811,421,cs), +(808,430,o), (802,435,o), (788,441,cs), (694,477,o), -(583,510,o), -(493,538,c), +(583,512,o), +(493,536,c), (481,516,l), (570,485,o), -(736,394,o), +(688,424,o), (782,348,cs) ); }, @@ -192,15 +169,12 @@ nodes = ( (630,528,o), (674,554,o), (730,596,cs), -(746,608,o), -(759,616,o), -(777,624,cs), -(784,627,o), -(786,635,o), -(778,644,cs), -(763,661,o), -(736,686,o), -(703,716,c), +(749,610,o), +(762,618,o), +(784,630,c), +(764,661,o), +(739,688,o), +(704,716,c), (692,710,l), (702,680,o), (695,666,o), @@ -425,219 +399,7 @@ nodes = ( ); } ); -width = 1000; -}, -{ -associatedMasterId = m01; -layerId = "270B14C2-89D9-442E-AB6A-59106B17C003"; -name = "24年12月12日 18:28"; -shapes = ( -{ -closed = 1; -nodes = ( -(405,-27,o), -(485,71,o), -(521,285,cs), -(525,307,o), -(529,325,o), -(534,347,cs), -(535,353,o), -(535,357,o), -(530,362,cs), -(518,375,o), -(488,397,o), -(459,421,c), -(450,415,l), -(467,361,o), -(465,329,o), -(461,282,cs), -(446,107,o), -(362,4,o), -(78,-84,c), -(87,-110,l) -); -}, -{ -closed = 1; -nodes = ( -(283,88,o), -(323,167,o), -(337,209,cs), -(341,222,o), -(341,228,o), -(340,240,cs), -(338,253,o), -(331,274,o), -(321,293,c), -(312,291,l), -(311,270,o), -(303,250,o), -(294,231,cs), -(282,204,o), -(266,173,o), -(246,153,cs), -(233,140,o), -(216,126,o), -(201,120,c), -(203,104,o), -(211,81,o), -(220,64,cs), -(227,51,o), -(241,54,o), -(253,63,cs) -); -}, -{ -closed = 1; -nodes = ( -(829,-81,o), -(883,-80,o), -(946,-78,c), -(946,-56,l), -(842,-30,o), -(771,-1,o), -(700,49,cs), -(612,111,o), -(547,165,o), -(473,236,cs), -(468,241,o), -(443,224,o), -(457,209,cs), -(537,129,o), -(638,17,o), -(730,-79,cs), -(734,-84,o), -(742,-85,o), -(747,-85,cs) -); -}, -{ -closed = 1; -nodes = ( -(265,445,o), -(277,451,o), -(290,464,cs), -(315,491,o), -(341,550,o), -(364,620,cs), -(368,633,o), -(368,641,o), -(364,652,cs), -(356,671,o), -(346,689,o), -(333,709,c), -(323,706,l), -(324,681,o), -(322,654,o), -(316,638,cs), -(305,606,o), -(287,571,o), -(265,546,cs), -(254,533,o), -(239,520,o), -(224,513,c), -(235,489,o), -(242,473,o), -(254,458,cs) -); -}, -{ -closed = 1; -nodes = ( -(612,157,o), -(658,186,o), -(720,230,cs), -(729,237,o), -(745,248,o), -(754,254,cs), -(760,257,o), -(764,263,o), -(756,271,cs), -(743,285,o), -(713,311,o), -(681,338,c), -(674,332,l), -(680,310,o), -(673,289,o), -(662,271,cs), -(634,228,o), -(588,180,o), -(539,141,c), -(560,125,l) -); -}, -{ -closed = 1; -nodes = ( -(448,378,o), -(495,469,o), -(534,650,cs), -(539,673,o), -(544,692,o), -(552,713,cs), -(555,720,o), -(554,724,o), -(550,729,cs), -(537,742,o), -(508,766,o), -(470,795,c), -(461,789,l), -(479,736,o), -(478,703,o), -(473,656,cs), -(456,496,o), -(403,408,o), -(204,326,c), -(215,303,l) -); -}, -{ -closed = 1; -nodes = ( -(799,331,o), -(817,341,o), -(818,360,cs), -(818,378,o), -(815,407,o), -(810,422,cs), -(807,431,o), -(802,435,o), -(788,441,cs), -(694,477,o), -(583,510,o), -(493,538,c), -(481,516,l), -(570,485,o), -(736,394,o), -(782,348,cs) -); -}, -{ -closed = 1; -nodes = ( -(630,528,o), -(674,554,o), -(730,596,cs), -(746,608,o), -(759,616,o), -(777,624,cs), -(784,627,o), -(786,635,o), -(778,644,cs), -(763,661,o), -(736,686,o), -(703,716,c), -(692,710,l), -(702,680,o), -(695,666,o), -(673,634,cs), -(645,595,o), -(600,549,o), -(555,510,c), -(575,498,l) -); -} -); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7136.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7136.glyph index 716efc23..3d03de57 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7136.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7136.glyph @@ -18,14 +18,14 @@ nodes = ( (539,589,o), (532,596,cs), (523,605,o), -(489,624,o), -(467,635,c), -(457,622,o), -(442,612,o), -(421,606,cs), -(389,597,o), -(341,585,o), -(293,584,c), +(490,624,o), +(468,635,c), +(458,622,o), +(443,611,o), +(422,605,cs), +(390,596,o), +(343,588,o), +(295,587,c), (290,578,l), (303,568,o), (318,556,o), @@ -54,19 +54,13 @@ nodes = ( (240,86,o), (234,101,o), (228,116,c), -(219,115,l), -(216,97,o), -(211,79,o), -(203,65,cs), -(189,39,o), -(167,13,o), -(148,-4,cs), -(133,-16,o), -(116,-27,o), +(216,114,l), +(209,50,o), +(148,-20,o), (98,-31,c), -(104,-60,o), -(109,-77,o), -(117,-97,cs) +(103,-60,o), +(108,-77,o), +(116,-94,cs) ); }, { @@ -82,10 +76,10 @@ nodes = ( (390,79,o), (367,108,c), (356,103,l), -(365,64,o), -(373,9,o), -(382,-55,cs), -(384,-70,o), +(366,64,o), +(375,9,o), +(381,-55,cs), +(382,-70,o), (396,-75,o), (407,-65,cs) ); @@ -94,20 +88,20 @@ nodes = ( closed = 1; nodes = ( (261,278,o), -(271,281,o), +(270,281,o), (274,292,cs), -(277,306,o), +(279,305,o), (280,320,o), (278,330,cs), (276,340,o), (270,345,o), (257,351,cs), -(226,364,o), -(193,374,o), -(154,384,c), -(147,377,l), -(185,352,o), -(215,326,o), +(227,364,o), +(196,374,o), +(159,384,c), +(151,373,l), +(188,349,o), +(217,324,o), (252,287,cs) ); }, @@ -115,17 +109,17 @@ nodes = ( closed = 1; nodes = ( (623,-44,o), -(631,-16,o), -(633,-5,cs), -(636,6,o), -(636,11,o), -(629,21,cs), -(602,57,o), +(631,-27,o), +(635,-9,cs), +(637,2,o), +(635,12,o), +(628,22,cs), +(601,58,o), (568,93,o), (539,121,c), (528,114,l), (545,74,o), -(563,14,o), +(564,14,o), (582,-54,cs), (587,-72,o), (598,-73,o), @@ -138,18 +132,18 @@ nodes = ( (341,391,o), (349,395,o), (351,404,cs), -(354,417,o), -(353,444,o), -(351,452,cs), -(349,459,o), +(354,418,o), +(355,434,o), +(351,451,cs), +(349,458,o), (345,461,o), (336,464,cs), -(293,477,o), -(257,486,o), -(221,493,c), -(215,489,l), -(255,461,o), -(292,436,o), +(296,477,o), +(261,485,o), +(227,491,c), +(221,485,l), +(259,458,o), +(294,434,o), (331,401,cs) ); }, @@ -157,16 +151,13 @@ nodes = ( closed = 1; nodes = ( (209,403,o), -(270,489,o), +(270,490,o), (350,633,cs), -(361,653,o), -(368,665,o), -(379,676,cs), -(384,682,o), -(383,687,o), -(379,693,cs), -(364,715,o), -(337,744,o), +(363,657,o), +(370,669,o), +(382,683,c), +(372,706,o), +(345,742,o), (313,771,c), (301,764,l), (308,731,o), @@ -205,14 +196,11 @@ nodes = ( (600,242,o), (638,356,o), (669,607,cs), -(672,634,o), -(677,662,o), -(682,685,cs), -(684,692,o), -(682,695,o), -(676,701,cs), -(658,721,o), -(628,745,o), +(672,637,o), +(676,668,o), +(681,692,c), +(659,720,o), +(629,749,o), (586,779,c), (574,767,l), (602,726,o), @@ -227,54 +215,46 @@ nodes = ( { closed = 1; nodes = ( -(850,160,o), -(900,161,o), +(848,162,o), +(900,165,o), (942,165,c), (943,182,l), -(881,206,o), -(829,232,o), -(776,273,cs), -(721,316,o), -(666,370,o), -(625,419,cs), -(623,422,o), -(595,403,o), -(608,388,cs), +(897,198,o), +(857,219,o), +(819,243,cs), +(748,289,o), +(678,360,o), +(625,419,c), +(608,388,l), (666,321,o), -(727,239,o), +(731,242,o), (786,165,cs), (791,159,o), -(801,159,o), -(807,159,cs) +(799,156,o), +(807,157,cs) ); }, { closed = 1; nodes = ( -(532,425,o), -(572,430,o), -(620,435,cs), -(684,441,o), -(780,450,o), +(589,435,o), +(765,450,o), (870,447,cs), (896,446,o), -(899,462,o), +(898,461,o), (888,472,cs), -(875,486,o), -(858,498,o), +(875,487,o), +(857,500,o), (830,514,c), -(810,503,o), -(780,495,o), -(747,489,cs), -(714,483,o), -(616,470,o), -(572,466,cs), -(524,462,o), -(494,460,o), -(452,459,c), +(810,502,o), +(780,492,o), +(747,487,cs), +(663,474,o), +(554,463,o), +(453,460,c), (450,450,l), -(467,438,o), -(473,432,o), +(463,438,o), +(477,428,o), (494,418,c) ); }, @@ -285,9 +265,9 @@ nodes = ( (839,554,o), (843,568,cs), (848,584,o), -(851,607,o), -(851,621,cs), -(851,630,o), +(852,607,o), +(852,621,cs), +(852,630,o), (847,637,o), (836,642,cs), (809,655,o), @@ -602,6 +582,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7231.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7231.glyph index a046179e..ae52181e 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7231.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7231.glyph @@ -43,9 +43,9 @@ nodes = ( (705,200,o), (717,207,cs), (728,214,o), -(734,218,o), +(732,219,o), (721,229,cs), -(702,244,o), +(703,245,o), (678,263,o), (653,278,c), (635,262,o), @@ -54,9 +54,11 @@ nodes = ( (501,234,o), (429,227,o), (390,227,c), -(379,210,l), -(417,182,l), -(479,193,o), +(381,211,l), +(394,200,o), +(406,190,o), +(419,183,c), +(481,194,o), (570,206,o), (629,209,c), (534,54,o), @@ -133,19 +135,21 @@ nodes = ( (624,329,o), (771,327,cs), (787,327,o), -(791,340,o), +(790,339,o), (779,350,cs), -(761,367,o), -(744,381,o), +(761,369,o), +(744,383,o), (721,398,c), (685,381,o), -(652,371,o), -(595,364,cs), -(517,354,o), -(307,334,o), +(652,372,o), +(605,366,cs), +(517,355,o), +(307,335,o), (193,337,c), (188,324,l), -(239,290,l) +(202,311,o), +(219,299,o), +(239,290,c) ); }, { @@ -164,10 +168,10 @@ nodes = ( (321,624,o), (296,648,c), (279,638,l), -(295,598,o), -(311,555,o), +(297,600,o), +(313,557,o), (328,509,cs), -(335,490,o), +(334,490,o), (351,489,o), (361,506,cs) ); @@ -178,10 +182,13 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(832,413,o), -(847,420,o), -(918,429,cs), -(937,432,o), +(816,404,o), +(857,418,o), +(881,424,cs), +(891,427,o), +(904,429,o), +(918,431,cs), +(937,434,o), (938,444,o), (925,460,cs), (896,495,o), @@ -194,14 +201,16 @@ nodes = ( (301,473,o), (197,474,c), (199,460,l), -(240,434,l), +(211,448,o), +(224,440,o), +(240,434,c), (386,450,o), (650,466,o), (807,473,c), (791,443,o), (775,416,o), (758,392,c), -(773,382,l) +(772,380,l) ); }, { @@ -220,10 +229,10 @@ nodes = ( (487,648,o), (464,670,c), (444,668,l), -(467,612,o), -(475,578,o), +(467,613,o), +(478,578,o), (491,523,cs), -(496,504,o), +(495,504,o), (511,504,o), (522,519,cs) ); @@ -259,11 +268,14 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(613,476,l), -(642,507,o), -(715,590,o), -(745,614,c), -(727,642,o), +(610,476,l), +(635,497,o), +(683,549,o), +(702,573,cs), +(721,596,o), +(733,608,o), +(744,615,c), +(726,643,o), (706,668,o), (686,690,c), (668,685,l), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7315.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7315.glyph index 78c8f707..af352afc 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7315.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7315.glyph @@ -18,9 +18,9 @@ nodes = ( (275,-21,o), (280,15,cs), (291,93,o), -(307,264,o), -(300,393,cs), -(295,481,o), +(309,264,o), +(298,423,cs), +(294,481,o), (282,527,o), (232,572,cs), (191,610,o), @@ -31,12 +31,15 @@ nodes = ( (167,580,o), (192,553,cs), (223,519,o), -(246,499,o), -(251,385,cs), -(255,298,o), -(249,119,o), -(222,2,c), -(184,18,o), +(245,499,o), +(250,415,cs), +(256,307,o), +(247,153,o), +(229,38,cs), +(227,26,o), +(225,17,o), +(219,3,c), +(183,17,o), (140,38,o), (101,60,c), (93,47,l), @@ -71,9 +74,9 @@ nodes = ( (476,-28,o), (480,-12,cs), (496,42,o), -(509,125,o), -(528,229,cs), -(531,243,o), +(514,126,o), +(528,226,cs), +(531,244,o), (535,254,o), (547,265,cs), (551,269,o), @@ -112,10 +115,13 @@ nodes = ( (395,246,o), (443,254,o), (482,259,c), -(475,201,o), -(457,55,o), -(432,8,c), -(394,25,o), +(477,212,o), +(460,107,o), +(448,54,cs), +(442,29,o), +(438,17,o), +(433,8,c), +(395,24,o), (360,42,o), (330,61,c), (320,46,l), @@ -146,7 +152,7 @@ nodes = ( (293,763,o), (292,733,o), (283,703,cs), -(254,584,o), +(248,586,o), (159,467,o), (39,366,c), (52,349,l) @@ -174,7 +180,7 @@ nodes = ( (614,254,o), (583,155,o), (536,113,c), -(542,101,o), +(541,101,o), (550,87,o), (559,75,cs) ); @@ -185,16 +191,16 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(706,-110,o), +(707,-110,o), (712,-113,o), (726,-94,cs), (740,-77,o), (749,-52,o), (749,-26,cs), (748,83,o), -(749,194,o), -(749,302,cs), -(749,326,o), +(748,204,o), +(750,312,cs), +(750,336,o), (751,354,o), (758,386,c), (742,402,o), @@ -204,16 +210,19 @@ nodes = ( (698,399,o), (701,382,o), (703,343,cs), -(705,311,o), -(701,10,o), -(697,-17,c), -(663,-5,o), -(618,13,o), -(583,29,c), +(705,317,o), +(702,118,o), +(699,26,cs), +(699,14,o), +(697,-6,o), +(694,-17,c), +(663,-7,o), +(620,11,o), +(585,28,c), (577,17,l), (621,-19,o), -(664,-55,o), -(699,-99,cs) +(661,-56,o), +(694,-95,cs) ); }, { @@ -253,8 +262,8 @@ nodes = ( (933,161,o), (925,174,o), (907,186,cs), -(861,216,o), -(758,273,o), +(861,217,o), +(794,256,o), (745,281,c), (734,267,l), (803,204,o), @@ -308,7 +317,7 @@ nodes = ( (648,450,o), (676,517,o), (723,636,cs), -(733,660,o), +(732,660,o), (741,681,o), (757,704,c), (736,738,o), @@ -330,17 +339,17 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(827,393,o), -(860,428,o), -(891,456,cs), -(905,468,o), -(920,478,o), +(831,397,o), +(870,435,o), +(905,466,cs), +(915,475,o), +(926,482,o), (937,487,cs), -(949,493,o), +(950,493,o), (949,498,o), (941,508,cs), -(930,521,o), -(886,560,o), +(925,527,o), +(893,555,o), (875,567,c), (852,547,o), (827,534,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni732A_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni732A_.glyph index 9ac8fa75..18ae1233 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni732A_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni732A_.glyph @@ -55,27 +55,30 @@ nodes = ( (286,-54,o), (300,-22,o), (306,11,cs), -(318,77,o), -(329,222,o), -(331,309,cs), -(332,387,o), -(336,490,o), -(279,552,cs), -(229,604,o), +(323,104,o), +(334,303,o), +(331,392,cs), +(328,451,o), +(317,513,o), +(277,553,cs), +(227,602,o), (164,631,o), (100,656,c), (92,633,l), (152,606,o), (192,580,o), (234,540,cs), -(285,491,o), -(284,366,o), -(281,278,cs), -(278,200,o), -(267,57,o), +(265,510,o), +(277,451,o), +(281,389,cs), +(284,334,o), +(278,156,o), +(267,82,cs), +(263,52,o), +(256,34,o), (248,18,c), -(224,28,o), -(139,66,o), +(221,28,o), +(143,62,o), (114,77,c), (107,63,l), (169,15,o), @@ -92,23 +95,27 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(530,-93,l), -(530,-86,o), -(530,190,o), -(530,227,c), -(531,247,l), -(465,300,l), +(531,-94,l), +(529,-27,o), +(529,180,o), +(530,217,cs), +(530,224,o), +(532,240,o), +(534,247,c), +(514,268,o), +(491,285,o), +(465,300,c), (455,292,l), (464,272,o), (470,255,o), (473,238,cs), -(485,174,o), +(483,174,o), (484,80,o), (480,8,cs), (479,-16,o), (474,-35,o), (470,-51,c), -(485,-69,o), +(484,-70,o), (501,-87,o), (519,-102,c) ); @@ -128,8 +135,11 @@ nodes = ( (705,123,o), (695,135,o), (673,153,c), -(644,138,o), -(584,130,o), +(662,147,o), +(647,141,o), +(629,138,cs), +(596,132,o), +(561,128,o), (525,125,c), (525,89,l) ); @@ -140,7 +150,7 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(738,-104,o), +(734,-103,o), (746,-105,o), (755,-93,cs), (770,-75,o), @@ -159,18 +169,24 @@ nodes = ( (759,288,o), (730,302,c), (712,282,o), -(687,275,o), -(660,271,cs), -(522,251,l), +(695,278,o), +(668,273,cs), +(622,264,o), +(568,256,o), +(522,251,c), (526,216,l), -(728,237,l), +(593,225,o), +(661,232,o), +(728,237,c), (729,151,o), -(728,67,o), -(725,-18,c), -(700,-26,l), -(705,-34,o), -(730,-89,o), -(734,-97,cs) +(730,87,o), +(726,20,cs), +(725,-7,o), +(720,-19,o), +(700,-26,c), +(713,-48,o), +(724,-71,o), +(732,-96,cs) ); }, { @@ -179,8 +195,8 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(588,-39,o), -(650,-36,o), +(588,-38,o), +(650,-35,o), (713,-33,cs), (733,-32,o), (731,-22,o), @@ -189,9 +205,11 @@ nodes = ( (702,9,o), (690,18,c), (665,8,o), -(640,3,o), -(599,0,cs), -(522,-6,l), +(650,5,o), +(630,3,cs), +(597,-1,o), +(555,-5,o), +(522,-6,c), (522,-42,l) ); }, @@ -202,19 +220,19 @@ fillColor = (0,255); closed = 1; nodes = ( (178,439,o), -(270,521,o), +(269,522,o), (363,625,cs), -(371,634,o), -(381,642,o), +(373,636,o), +(383,646,o), (403,661,c), (390,694,o), (367,729,o), (342,766,c), (326,759,l), (332,718,o), -(324,689,o), -(310,661,cs), -(262,566,o), +(328,691,o), +(313,663,cs), +(261,568,o), (147,464,o), (61,413,c), (74,390,l) @@ -236,16 +254,15 @@ nodes = ( (903,451,o), (882,466,c), (847,447,o), -(819,440,o), -(777,434,cs), -(733,427,o), -(638,419,o), -(598,416,cs), -(512,411,o), -(438,404,o), +(819,439,o), +(777,433,cs), +(689,421,o), +(444,404,o), (346,405,c), (341,389,l), -(396,358,l) +(355,379,o), +(380,365,o), +(396,358,c) ); }, { @@ -270,7 +287,9 @@ nodes = ( (470,568,o), (395,570,c), (390,558,l), -(447,521,l) +(406,545,o), +(431,528,o), +(447,521,c) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni73C_8.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni73C_8.glyph index d34c4057..29804e07 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni73C_8.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni73C_8.glyph @@ -17,8 +17,8 @@ nodes = ( (528,641,o), (531,656,o), (540,684,c), -(520,707,o), -(473,759,o), +(515,715,o), +(482,752,o), (454,779,c), (437,769,l), (465,701,o), @@ -40,8 +40,11 @@ nodes = ( (294,183,o), (372,223,c), (361,245,l), -(244,194,o), -(129,150,o), +(269,205,o), +(178,169,o), +(96,144,cs), +(74,137,o), +(53,131,o), (32,128,c), (30,110,l), (53,97,o), @@ -70,8 +73,8 @@ nodes = ( (199,561,o), (200,535,cs), (203,482,o), -(205,269,o), -(202,171,c) +(205,268,o), +(202,170,c) ); }, { @@ -93,11 +96,11 @@ nodes = ( (313,440,o), (290,433,cs), (258,424,o), -(121,399,o), +(123,401,o), (68,397,c), (66,384,l), -(81,372,o), -(96,363,o), +(82,373,o), +(97,364,o), (113,355,c) ); }, @@ -108,12 +111,12 @@ fillColor = (0,255); closed = 1; nodes = ( (526,-15,o), -(545,19,o), +(546,19,o), (554,51,cs), -(591,187,o), -(606,294,o), -(629,424,cs), -(633,447,o), +(590,187,o), +(609,294,o), +(627,424,cs), +(630,447,o), (636,468,o), (653,483,cs), (658,488,o), @@ -121,15 +124,12 @@ nodes = ( (652,499,cs), (643,507,o), (616,529,o), -(592,543,c), -(569,518,o), -(545,511,o), -(515,505,cs), -(496,502,o), -(478,500,o), -(438,496,cs), -(403,493,o), -(377,491,o), +(592,544,c), +(570,521,o), +(552,515,o), +(526,510,cs), +(483,503,o), +(394,492,o), (354,490,c), (350,480,l), (364,469,o), @@ -138,10 +138,15 @@ nodes = ( (458,460,o), (519,466,o), (579,473,c), -(573,383,o), -(525,65,o), +(574,398,o), +(537,174,o), +(511,88,cs), +(506,70,o), +(500,58,o), (493,49,c), -(401,85,l), +(462,59,o), +(433,71,o), +(402,85,c), (393,71,l), (430,37,o), (451,14,o), @@ -173,8 +178,8 @@ nodes = ( (134,614,o), (55,612,c), (52,600,l), -(68,588,o), -(86,577,o), +(68,589,o), +(86,578,o), (110,566,c) ); }, @@ -184,7 +189,7 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(790,118,o), +(790,119,o), (844,120,o), (912,118,cs), (927,118,o), @@ -193,9 +198,11 @@ nodes = ( (910,149,o), (896,162,o), (881,176,c), -(855,164,l), +(873,169,o), +(865,165,o), +(855,164,cs), (812,159,o), -(774,156,o), +(774,155,o), (735,154,c), (734,113,l) ); @@ -211,10 +218,10 @@ nodes = ( (740,286,o), (747,460,cs), (747,469,o), -(751,482,o), -(756,492,c), -(732,521,o), -(706,545,o), +(749,484,o), +(754,494,c), +(730,523,o), +(707,547,o), (681,569,c), (666,561,l), (683,521,o), @@ -253,7 +260,7 @@ nodes = ( (841,516,o), (821,511,cs), (797,504,o), -(760,499,o), +(760,497,o), (735,495,c), (740,456,l), (779,464,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni73F_E_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni73F_E_.glyph index b9423302..c93e01c9 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni73F_E_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni73F_E_.glyph @@ -18,29 +18,26 @@ nodes = ( (832,655,o), (839,668,cs), (844,676,o), -(842,679,o), -(834,687,cs), -(817,702,o), +(842,680,o), +(834,688,cs), +(817,703,o), (777,727,o), (752,739,c), (725,723,o), -(712,715,o), -(680,710,cs), -(632,703,o), -(567,692,o), -(482,683,c), +(712,716,o), +(683,711,cs), +(635,702,o), +(567,693,o), +(482,685,c), (491,642,l), (575,653,o), (660,662,o), (756,670,c), (756,544,o), -(753,384,o), -(746,278,cs), -(746,274,o), -(744,272,o), -(742,271,cs), -(733,268,o), -(721,265,o), +(753,383,o), +(748,297,cs), +(746,273,o), +(737,264,o), (707,260,c), (720,242,o), (736,218,o), @@ -53,26 +50,20 @@ nodes = ( { closed = 1; nodes = ( -(105,86,o), -(111,86,o), -(116,89,cs), -(128,95,o), -(134,99,o), -(145,104,cs), -(240,149,o), -(334,193,o), -(426,238,c), +(215,140,o), +(322,191,o), +(426,235,c), (420,255,l), (314,220,o), (180,182,o), (105,162,cs), -(74,153,o), -(62,151,o), -(28,148,c), -(24,139,l), -(45,122,o), -(71,104,o), -(100,89,cs) +(75,153,o), +(63,152,o), +(29,151,c), +(24,138,l), +(47,120,o), +(75,101,o), +(106,83,c) ); }, { @@ -87,8 +78,8 @@ nodes = ( (579,192,o), (562,218,o), (542,241,c), -(530,236,l), -(532,202,o), +(528,236,l), +(530,202,o), (524,165,o), (511,134,cs), (481,64,o), @@ -100,20 +91,15 @@ nodes = ( { closed = 1; nodes = ( -(235,175,o), -(284,176,o), -(284,197,cs), +(284,197,l), (286,295,o), -(291,492,o), -(294,531,cs), -(295,548,o), -(295,556,o), -(297,570,cs), -(298,573,o), -(298,577,o), -(293,580,cs), -(278,589,o), -(263,595,o), +(290,492,o), +(293,531,cs), +(294,550,o), +(296,566,o), +(299,577,c), +(283,587,o), +(265,594,o), (235,607,c), (228,601,l), (232,585,o), @@ -121,7 +107,7 @@ nodes = ( (235,542,cs), (238,483,o), (240,325,o), -(236,194,cs) +(236,194,c) ); }, { @@ -134,7 +120,7 @@ nodes = ( (427,423,o), (416,436,cs), (409,444,o), -(399,450,o), +(398,452,o), (378,465,c), (361,456,o), (348,450,o), @@ -143,8 +129,8 @@ nodes = ( (196,417,o), (89,405,c), (86,395,l), -(100,384,o), -(121,373,o), +(100,385,o), +(123,373,o), (139,366,c) ); }, @@ -180,13 +166,13 @@ nodes = ( (692,188,o), (698,198,c), (680,219,o), -(656,237,o), -(631,251,c), -(624,243,l), -(633,210,o), +(659,238,o), +(634,252,c), +(622,244,l), +(631,211,o), (635,180,o), (634,144,cs), -(633,82,o), +(632,82,o), (631,38,o), (633,0,cs), (635,-44,o), @@ -201,9 +187,9 @@ nodes = ( (661,242,o), (728,246,cs), (745,247,o), -(747,263,o), -(738,271,cs), -(731,279,o), +(747,258,o), +(740,268,cs), +(733,277,o), (717,291,o), (702,301,c), (692,295,o), @@ -218,26 +204,20 @@ nodes = ( { closed = 1; nodes = ( -(177,588,o), -(206,595,o), -(236,601,cs), -(304,614,o), -(358,622,o), -(420,627,cs), -(429,628,o), -(436,636,o), +(237,604,o), +(327,619,o), +(420,628,cs), +(429,629,o), +(435,635,o), (426,647,cs), -(414,660,o), -(403,669,o), +(414,662,o), +(402,673,o), (382,686,c), (357,674,o), -(339,668,o), -(305,659,cs), -(277,652,o), -(222,641,o), -(197,638,cs), -(161,633,o), -(128,629,o), +(340,667,o), +(306,659,cs), +(237,643,o), +(152,630,o), (81,627,c), (79,616,l), (98,605,o), @@ -249,21 +229,21 @@ nodes = ( closed = 1; nodes = ( (512,192,l), -(513,296,o), -(519,589,o), -(520,663,cs), -(520,668,o), -(520,673,o), -(515,677,cs), -(499,689,o), -(472,710,o), -(446,725,c), -(439,717,l), -(456,683,o), -(463,642,o), -(466,598,cs), -(470,540,o), -(467,356,o), +(513,291,o), +(513,572,o), +(516,627,cs), +(517,648,o), +(518,663,o), +(522,679,c), +(506,695,o), +(477,715,o), +(449,732,c), +(438,723,l), +(453,693,o), +(463,661,o), +(466,625,cs), +(470,561,o), +(467,361,o), (463,302,cs), (461,277,o), (457,261,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7487.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7487.glyph index e430a50e..a7bea0bd 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7487.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7487.glyph @@ -11,15 +11,12 @@ nodes = ( (340,37,o), (406,161,o), (440,410,cs), -(442,425,o), -(443,437,o), -(448,456,cs), -(449,460,o), -(447,462,o), -(442,468,cs), -(431,479,o), -(414,496,o), -(393,516,c), +(442,426,o), +(443,438,o), +(449,460,c), +(435,477,o), +(414,498,o), +(393,515,c), (384,511,l), (393,473,o), (391,444,o), @@ -33,45 +30,34 @@ nodes = ( { closed = 1; nodes = ( -(94,101,o), -(97,101,o), -(103,104,cs), -(114,110,o), -(119,112,o), -(129,118,cs), -(201,158,o), -(275,197,o), -(346,239,c), +(176,146,o), +(265,196,o), +(346,238,c), (340,255,l), (263,225,o), -(160,194,o), -(99,176,cs), -(75,169,o), -(63,165,o), -(26,161,c), +(132,183,o), +(99,174,cs), +(75,167,o), +(52,163,o), +(25,162,c), (21,152,l), -(45,133,o), -(69,117,o), -(89,104,cs) +(46,131,o), +(72,112,o), +(96,98,c) ); }, { closed = 1; nodes = ( -(194,162,o), -(241,173,o), -(241,195,cs), +(241,195,l), (243,292,o), -(248,486,o), -(251,525,cs), -(252,543,o), -(253,551,o), -(255,563,cs), -(256,567,o), -(255,571,o), -(250,574,cs), -(235,582,o), -(221,590,o), +(248,479,o), +(251,518,cs), +(252,540,o), +(253,554,o), +(257,571,c), +(238,583,o), +(220,592,o), (194,600,c), (188,596,l), (191,579,o), @@ -79,54 +65,54 @@ nodes = ( (194,534,cs), (196,476,o), (197,312,o), -(194,182,cs) +(194,182,c) ); }, { closed = 1; nodes = ( -(445,-28,o), -(462,0,o), -(470,26,cs), -(490,87,o), -(515,199,o), +(446,-27,o), +(463,4,o), +(472,32,cs), +(492,92,o), +(515,201,o), (533,294,cs), (536,307,o), (541,323,o), (548,334,cs), (554,343,o), -(553,346,o), +(553,345,o), (547,351,cs), -(535,361,o), -(519,375,o), +(537,362,o), +(520,375,o), (499,389,c), (491,382,o), -(481,376,o), -(467,371,cs), -(450,364,o), -(423,356,o), -(397,352,c), -(397,347,l), -(415,338,o), -(437,329,o), +(482,376,o), +(471,372,cs), +(452,365,o), +(426,359,o), +(401,356,c), +(400,345,l), +(417,336,o), +(430,331,o), (447,324,c), -(469,330,o), -(478,333,o), +(468,331,o), +(478,334,o), (491,336,c), -(476,214,o), -(433,64,o), -(417,33,cs), -(413,25,o), -(412,27,o), -(409,28,cs), -(384,40,o), -(363,49,o), +(478,223,o), +(438,85,o), +(427,56,cs), +(420,37,o), +(416,30,o), +(412,27,c), +(385,38,o), +(364,47,o), (335,62,c), (327,53,l), (361,19,o), -(391,-26,o), -(404,-46,cs), -(409,-54,o), +(390,-22,o), +(403,-46,cs), +(407,-54,o), (416,-56,o), (424,-49,cs) ); @@ -134,27 +120,21 @@ nodes = ( { closed = 1; nodes = ( -(148,375,o), -(167,378,o), -(202,386,cs), -(226,391,o), -(284,400,o), +(172,382,o), +(269,399,o), (324,404,cs), (342,406,o), (346,415,o), (335,427,cs), (328,435,o), -(319,441,o), +(316,445,o), (298,457,c), -(280,448,o), -(270,443,o), -(243,436,cs), -(227,431,o), -(187,423,o), -(154,418,cs), -(125,413,o), -(102,411,o), -(78,408,c), +(282,447,o), +(267,441,o), +(240,435,cs), +(201,427,o), +(124,415,o), +(77,410,c), (74,400,l), (90,389,o), (111,378,o), @@ -167,14 +147,11 @@ nodes = ( (556,-32,o), (606,69,o), (634,167,cs), -(638,183,o), -(642,194,o), -(647,207,cs), -(649,211,o), -(650,215,o), -(646,222,cs), -(632,246,o), -(611,272,o), +(639,186,o), +(644,198,o), +(650,215,c), +(636,241,o), +(613,270,o), (593,294,c), (581,289,l), (589,258,o), @@ -193,12 +170,12 @@ nodes = ( (905,-71,o), (942,-62,c), (942,-46,l), -(878,-33,o), -(830,-16,o), -(781,8,cs), -(719,38,o), -(661,74,o), -(596,117,c), +(894,-37,o), +(859,-26,o), +(815,-7,cs), +(747,21,o), +(672,68,o), +(596,118,c), (583,90,l), (659,36,o), (740,-31,o), @@ -211,11 +188,8 @@ nodes = ( { closed = 1; nodes = ( -(158,588,o), -(184,594,o), -(218,600,cs), -(259,607,o), -(298,614,o), +(196,599,o), +(297,614,o), (339,618,cs), (349,619,o), (355,628,o), @@ -224,17 +198,14 @@ nodes = ( (324,658,o), (303,675,c), (278,662,o), -(262,657,o), -(240,651,cs), -(215,644,o), -(191,639,o), -(169,635,cs), -(144,631,o), -(114,628,o), -(68,627,c), -(65,619,l), -(87,604,o), -(112,590,o), +(262,656,o), +(240,650,cs), +(181,635,o), +(124,628,o), +(70,627,c), +(66,617,l), +(88,603,o), +(112,589,o), (131,580,c) ); }, @@ -244,54 +215,43 @@ nodes = ( (733,98,o), (734,255,o), (738,295,cs), -(739,310,o), -(740,318,o), -(741,325,cs), -(742,328,o), -(741,331,o), -(734,335,cs), -(724,342,o), -(706,353,o), -(684,363,c), -(679,359,l), -(682,340,o), +(739,313,o), +(740,321,o), +(742,329,c), +(726,343,o), +(708,354,o), +(686,364,c), +(677,358,l), +(682,339,o), (685,320,o), (685,286,cs), (686,236,o), (687,120,o), -(683,36,cs), -(682,3,o), -(730,4,o), -(731,22,cs) +(683,36,c), +(731,22,l) ); }, { closed = 1; nodes = ( -(366,488,o), -(386,493,o), -(409,497,cs), -(478,511,o), -(520,518,o), +(406,500,o), +(518,518,o), (581,521,cs), (594,522,o), -(597,530,o), -(587,542,cs), -(576,555,o), -(566,565,o), +(596,528,o), +(588,539,cs), +(577,555,o), +(567,566,o), (549,581,c), -(529,570,o), -(508,560,o), -(469,551,cs), -(443,545,o), -(414,539,o), -(389,535,cs), -(354,529,o), -(333,526,o), -(289,523,c), -(286,518,l), -(309,504,o), -(327,492,o), +(531,570,o), +(510,562,o), +(491,557,cs), +(441,544,o), +(368,528,o), +(293,526,c), +(290,516,l), +(308,503,o), +(326,492,o), (346,482,c) ); }, @@ -302,17 +262,17 @@ nodes = ( (818,194,o), (859,196,cs), (879,197,o), -(878,211,o), -(868,221,cs), -(861,228,o), +(878,209,o), +(869,221,cs), +(861,230,o), (848,241,o), (831,253,c), (823,248,o), -(809,243,o), -(792,239,cs), -(776,235,o), -(739,224,o), -(710,220,c), +(809,241,o), +(792,237,cs), +(776,233,o), +(739,227,o), +(710,223,c), (707,183,l) ); }, @@ -320,12 +280,12 @@ nodes = ( closed = 1; nodes = ( (482,601,o), -(504,610,o), -(510,629,cs), -(516,650,o), -(518,664,o), -(518,683,cs), -(518,693,o), +(499,607,o), +(507,626,cs), +(516,647,o), +(519,664,o), +(519,683,cs), +(519,693,o), (514,700,o), (496,707,cs), (468,717,o), @@ -334,44 +294,41 @@ nodes = ( (377,731,l), (419,699,o), (449,664,o), -(475,614,cs) +(471,623,cs) ); }, { closed = 1; nodes = ( -(827,340,o), -(858,351,o), -(889,351,cs), -(910,351,o), -(910,363,o), +(815,335,o), +(840,345,o), +(860,349,cs), +(873,352,o), +(882,353,o), +(891,353,cs), +(905,353,o), +(911,362,o), (899,377,cs), (877,403,o), -(855,422,o), -(811,457,c), +(852,428,o), +(812,456,c), (801,448,o), -(788,442,o), +(788,441,o), (769,436,cs), -(731,425,o), -(688,417,o), -(647,409,cs), -(624,405,o), -(598,401,o), -(572,399,c), -(571,394,l), -(582,387,o), -(602,372,o), +(727,425,o), +(635,407,o), +(577,402,c), +(573,392,l), +(584,384,o), +(603,371,o), (617,363,c), -(639,367,o), -(655,370,o), -(681,376,cs), -(726,385,o), +(666,374,o), (754,391,o), (807,399,c), (801,376,o), -(790,351,o), +(792,351,o), (781,328,c), -(786,324,l) +(789,322,l) ); }, { @@ -380,53 +337,44 @@ nodes = ( (644,488,o), (687,549,o), (730,652,cs), -(736,667,o), -(740,677,o), -(744,683,cs), -(751,691,o), -(751,695,o), -(745,704,cs), -(731,725,o), -(701,754,o), -(676,783,c), -(662,774,l), -(678,746,o), +(740,676,o), +(745,686,o), +(752,696,c), +(733,724,o), +(704,756,o), +(675,781,c), +(661,772,l), +(677,744,o), (674,713,o), (668,679,cs), (653,600,o), -(610,505,o), -(555,418,c), +(609,505,o), +(554,418,c), (570,408,l) ); }, { closed = 1; nodes = ( -(711,528,o), -(733,531,o), -(763,537,cs), -(790,542,o), -(836,549,o), +(742,534,o), +(847,551,o), (894,554,cs), (911,555,o), (919,564,o), (907,577,cs), (898,587,o), -(880,605,o), -(862,618,c), -(839,607,o), -(828,602,o), -(804,594,cs), -(771,583,o), -(744,576,o), -(707,570,cs), -(696,568,o), -(677,565,o), -(657,561,c), -(653,557,l), -(664,546,o), -(679,530,o), -(690,522,c) +(878,605,o), +(860,618,c), +(840,605,o), +(827,598,o), +(803,592,cs), +(776,585,o), +(707,568,o), +(654,565,c), +(653,555,l), +(665,545,o), +(682,530,o), +(694,523,c) ); } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni74E_F_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni74E_F_.glyph index e04e2035..9068122c 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni74E_F_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni74E_F_.glyph @@ -11,54 +11,6 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(165,19,o), -(180,25,o), -(195,28,cs), -(265,44,o), -(399,55,o), -(471,56,cs), -(484,56,o), -(489,68,o), -(481,77,cs), -(467,94,o), -(450,109,o), -(434,126,c), -(422,116,o), -(411,112,o), -(385,105,cs), -(358,97,o), -(281,85,o), -(187,76,c), -(189,266,o), -(191,424,o), -(198,603,cs), -(198,614,o), -(201,628,o), -(206,637,c), -(182,665,o), -(159,688,o), -(132,709,c), -(117,700,l), -(139,637,o), -(140,605,o), -(142,540,cs), -(147,366,o), -(140,181,o), -(134,114,cs), -(132,86,o), -(120,64,o), -(110,56,c), -(122,37,o), -(138,20,o), -(152,10,c) -); -}, -{ -attr = { -fillColor = (0,255); -}; -closed = 1; -nodes = ( (457,208,o), (460,222,o), (461,233,cs), @@ -108,43 +60,6 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(557,-16,o), -(623,31,o), -(696,80,c), -(686,99,l), -(640,71,o), -(592,46,o), -(548,27,c), -(565,154,o), -(601,374,o), -(622,489,cs), -(628,521,o), -(632,545,o), -(644,572,c), -(631,596,o), -(609,626,o), -(592,646,c), -(573,641,l), -(578,615,o), -(577,578,o), -(572,530,cs), -(554,362,o), -(520,130,o), -(496,38,cs), -(490,15,o), -(480,6,o), -(444,-15,c), -(457,-34,o), -(477,-53,o), -(500,-68,c) -); -}, -{ -attr = { -fillColor = (0,255); -}; -closed = 1; -nodes = ( (686,195,o), (700,201,o), (702,217,cs), @@ -272,6 +187,93 @@ nodes = ( (511,615,o), (529,605,c) ); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(453,-25,l), +(465,-40,o), +(482,-56,o), +(500,-68,c), +(557,-16,o), +(623,31,o), +(696,80,c), +(686,99,l), +(640,71,o), +(592,46,o), +(548,27,c), +(565,154,o), +(601,374,o), +(622,489,cs), +(628,521,o), +(632,545,o), +(644,572,c), +(631,596,o), +(609,626,o), +(592,646,c), +(573,641,l), +(578,615,o), +(577,578,o), +(572,530,cs), +(554,362,o), +(520,130,o), +(496,38,cs), +(491,18,o), +(482,8,o), +(456,-8,c) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(112,50,l), +(125,33,o), +(140,19,o), +(152,10,c), +(165,19,o), +(180,25,o), +(195,28,cs), +(265,44,o), +(399,55,o), +(471,56,cs), +(484,56,o), +(489,68,o), +(481,77,cs), +(467,94,o), +(450,109,o), +(434,126,c), +(422,116,o), +(411,112,o), +(385,105,cs), +(358,97,o), +(281,85,o), +(187,76,c), +(189,266,o), +(191,424,o), +(197,583,cs), +(198,614,o), +(201,628,o), +(206,637,c), +(182,665,o), +(159,688,o), +(132,709,c), +(117,700,l), +(139,637,o), +(140,605,o), +(142,540,cs), +(147,366,o), +(140,181,o), +(134,114,cs), +(132,93,o), +(125,75,o), +(113,64,c) +); } ); width = 1000; diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni74F_6.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni74F_6.glyph index cdc98fc1..b2746840 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni74F_6.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni74F_6.glyph @@ -11,99 +11,29 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(171,-21,o), -(246,61,o), -(263,270,c), -(353,277,l), -(350,85,l), -(346,17,ls), -(345,3,o), -(342,-10,o), -(336,-22,cs), -(331,-34,o), -(332,-38,o), -(341,-46,cs), -(366,-71,l), -(383,-86,ls), -(386,-88,o), -(389,-90,o), -(393,-88,cs), -(397,-86,o), -(398,-82,o), -(398,-78,cs), -(399,-69,l), -(402,281,l), -(514,287,ls), -(525,288,o), -(528,289,o), -(531,301,c), -(517,321,o), -(496,333,o), -(478,349,c), -(455,337,o), -(425,328,o), -(403,326,c), -(404,354,o), -(404,381,o), +(340,493,l), +(350,449,o), +(352,428,o), +(353,392,cs), +(356,267,o), +(353,142,o), +(346,17,cs), +(345,-2,o), +(342,-19,o), +(333,-34,c), +(350,-56,o), +(368,-75,o), +(387,-89,c), +(399,-83,l), +(396,36,o), +(397,290,o), (407,409,cs), -(408,421,o), -(409,430,o), -(412,437,cs), -(415,445,o), -(416,448,o), -(410,453,cs), -(394,466,o), -(378,478,o), -(362,489,c), -(423,493,ls), -(450,495,o), -(478,496,o), -(505,497,cs), -(521,498,o), -(523,509,o), -(519,516,cs), -(515,521,ls), -(501,537,o), -(483,549,o), -(466,562,c), -(427,538,o), -(383,535,o), -(339,529,c), -(346,539,l), -(458,690,ls), -(468,705,o), -(469,705,o), -(457,720,cs), -(412,773,l), -(397,791,l), -(387,783,l), -(388,773,ls), -(391,749,o), -(387,727,o), -(381,704,cs), -(366,654,o), -(344,607,o), -(319,562,cs), -(298,525,l), -(224,520,o), -(151,511,o), -(77,513,c), -(73,504,l), -(129,465,l), -(204,476,l), -(217,434,o), -(221,374,o), -(215,306,c), -(59,297,l), -(56,289,l), -(109,250,l), -(143,257,o), -(179,264,o), -(213,266,c), -(204,117,o), -(149,8,o), -(48,-74,c), -(66,-93,l) +(408,426,o), +(410,437,o), +(413,445,c), +(398,466,o), +(375,485,o), +(352,498,c) ); }, { @@ -112,32 +42,9 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(268,330,o), -(271,360,o), -(272,379,cs), -(273,396,o), -(275,411,o), -(278,424,cs), -(280,432,o), -(275,436,o), -(270,440,cs), -(222,477,l), -(341,487,l), -(356,424,o), -(352,382,o), -(354,319,c), -(267,311,l) -); -}, -{ -attr = { -fillColor = (0,255); -}; -closed = 1; -nodes = ( -(264,570,o), -(269,587,cs), -(273,602,o), +(259,568,o), +(267,585,cs), +(274,600,o), (277,619,o), (278,636,cs), (280,647,o), @@ -147,14 +54,10 @@ nodes = ( (200,715,o), (159,742,c), (149,730,l), -(166,707,ls), -(192,668,o), -(214,626,o), -(235,583,cs), -(237,580,o), -(238,576,o), -(241,573,cs), -(252,557,o) +(186,678,o), +(216,624,o), +(233,589,cs), +(246,564,o) ); }, { @@ -163,29 +66,25 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(653,613,o), -(803,623,o), +(805,623,o), (906,626,cs), (929,627,o), -(933,643,o), +(932,641,o), (910,662,cs), -(894,675,o), -(878,687,o), +(895,676,o), +(879,689,o), (862,700,c), (834,683,o), (804,675,o), (773,669,cs), -(685,654,o), -(606,649,o), -(555,647,cs), -(524,646,o), -(493,645,o), -(462,644,c), -(458,635,l), -(512,598,l), -(532,601,o), -(552,604,o), -(572,606,cs) +(655,649,o), +(571,648,o), +(463,645,c), +(458,634,l), +(474,622,o), +(492,610,o), +(512,598,c), +(615,613,o) ); }, { @@ -194,8 +93,10 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(605,432,l), -(647,410,l), +(604,434,l), +(616,425,o), +(631,417,o), +(647,410,c), (674,416,o), (722,424,o), (752,428,c), @@ -211,16 +112,16 @@ nodes = ( (942,-65,o), (952,-58,o), (948,-32,cs), -(935,44,o), +(937,44,o), (933,156,o), (932,211,c), -(914,211,l), -(905,128,o), -(901,83,o), -(890,19,cs), -(886,-5,o), -(877,-12,o), -(864,-18,cs), +(913,211,l), +(907,128,o), +(903,83,o), +(891,19,cs), +(887,-5,o), +(877,-14,o), +(864,-19,cs), (853,-23,o), (833,-27,o), (805,-23,cs), @@ -237,15 +138,14 @@ nodes = ( (842,451,o), (835,458,cs), (821,471,o), -(788,491,o), -(770,503,c), -(750,481,o), -(740,473,o), -(711,466,cs), -(687,460,o), -(671,457,o), -(647,453,c), -(608,449,l) +(793,493,o), +(772,503,c), +(752,481,o), +(740,471,o), +(711,464,cs), +(693,460,o), +(641,452,o), +(608,450,c) ); }, { @@ -278,17 +178,14 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(587,143,o), +(587,144,o), (619,360,o), (638,473,cs), -(643,504,o), -(647,531,o), -(659,555,cs), -(664,565,o), -(661,569,o), -(654,576,cs), -(637,593,o), -(622,607,o), +(644,508,o), +(648,540,o), +(664,566,c), +(644,589,o), +(625,605,o), (605,619,c), (589,613,l), (591,594,o), @@ -298,21 +195,124 @@ nodes = ( (540,118,o), (518,28,cs), (514,12,o), -(505,1,o), +(505,-1,o), (490,-6,cs), -(467,-17,l), -(463,-26,l), -(498,-73,ls), -(504,-81,o), -(509,-82,o), -(518,-75,cs), -(572,-30,o), -(641,18,o), +(469,-13,l), +(463,-27,l), +(475,-48,o), +(490,-67,o), +(508,-82,c), +(563,-36,o), +(636,17,o), (712,68,c), (702,85,l), -(657,60,o), -(616,40,o), -(570,18,c) +(657,59,o), +(616,39,o), +(570,19,c) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(257,145,o), +(272,379,cs), +(273,400,o), +(276,417,o), +(280,432,c), +(258,454,o), +(235,472,o), +(211,485,c), +(203,479,l), +(217,436,o), +(221,403,o), +(220,367,cs), +(213,115,o), +(152,11,o), +(48,-74,c), +(66,-93,l), +(236,24,o) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(514,287,cs), +(528,288,o), +(534,298,o), +(524,309,cs), +(515,321,o), +(496,337,o), +(477,348,c), +(450,334,o), +(415,325,o), +(393,323,cs), +(303,314,o), +(169,302,o), +(59,299,c), +(56,289,l), +(71,275,o), +(88,263,o), +(109,251,c), +(201,271,o), +(313,274,o) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(333,521,l), +(346,539,l), +(458,690,ls), +(468,705,o), +(469,705,o), +(457,720,cs), +(412,773,l), +(397,791,l), +(387,783,l), +(388,773,ls), +(391,749,o), +(387,727,o), +(381,704,cs), +(366,654,o), +(344,607,o), +(319,562,cs), +(293,516,l) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(308,525,o), +(159,512,o), +(77,513,c), +(73,504,l), +(89,491,o), +(107,478,o), +(129,465,c), +(261,483,o), +(364,492,o), +(505,497,cs), +(521,498,o), +(524,509,o), +(519,516,cs), +(508,531,o), +(485,550,o), +(465,562,c), +(429,541,o), +(410,539,o), +(380,535,cs) ); } ); @@ -634,6 +634,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7701.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7701.glyph index 548671d7..f1ab196b 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7701.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7701.glyph @@ -19,14 +19,11 @@ nodes = ( (184,261,o), (463,348,o), (660,514,cs), -(672,524,o), -(684,533,o), -(690,537,cs), -(696,540,o), -(700,545,o), -(695,552,cs), -(681,572,o), -(658,598,o), +(677,528,o), +(693,540,o), +(701,544,c), +(687,565,o), +(662,595,o), (633,621,c), (626,617,l), (629,597,o), @@ -42,14 +39,14 @@ nodes = ( closed = 1; nodes = ( (361,-101,l), -(361,4,o), -(366,298,o), -(368,335,cs), -(368,341,o), -(369,345,o), -(364,349,cs), -(346,364,o), -(309,387,o), +(361,-11,o), +(365,217,o), +(367,308,cs), +(367,320,o), +(368,334,o), +(370,345,c), +(354,360,o), +(312,386,o), (282,403,c), (274,393,l), (301,358,o), @@ -58,14 +55,11 @@ nodes = ( (313,216,o), (309,63,o), (306,9,cs), -(305,-11,o), -(302,-26,o), -(297,-42,cs), -(294,-52,o), -(293,-55,o), -(297,-61,cs), -(306,-75,o), -(327,-95,o), +(305,-16,o), +(302,-35,o), +(296,-55,c), +(311,-75,o), +(328,-94,o), (345,-111,c) ); }, @@ -78,13 +72,13 @@ nodes = ( (687,-51,o), (688,-35,o), (680,-26,cs), -(673,-19,o), +(670,-15,o), (659,-5,o), (640,7,c), -(632,4,o), -(615,0,o), -(601,-3,cs), -(555,-11,o), +(626,1,o), +(614,-2,o), +(590,-5,cs), +(554,-10,o), (401,-19,o), (324,-22,c), (327,-63,l) @@ -97,16 +91,16 @@ nodes = ( (555,91,o), (640,94,cs), (655,95,o), -(665,103,o), -(651,119,cs), -(644,127,o), -(637,133,o), +(663,104,o), +(649,120,cs), +(642,128,o), +(636,134,o), (620,145,c), (594,135,o), -(572,132,o), -(547,129,cs), -(513,124,o), -(447,120,o), +(572,130,o), +(547,128,cs), +(513,125,o), +(447,119,o), (353,114,c), (345,76,l) ); @@ -141,17 +135,14 @@ nodes = ( (700,350,c), (700,224,o), (698,100,o), -(692,-21,cs), +(693,-11,cs), (692,-26,o), -(691,-27,o), -(690,-28,cs), -(680,-33,o), -(671,-36,o), +(681,-34,o), (657,-41,c), (671,-56,o), -(686,-79,o), -(701,-101,cs), -(707,-111,o), +(688,-78,o), +(699,-99,cs), +(705,-111,o), (715,-113,o), (726,-103,cs) ); @@ -161,10 +152,10 @@ closed = 1; nodes = ( (443,205,o), (555,211,o), -(640,214,cs), -(655,214,o), +(647,214,cs), +(660,214,o), (666,225,o), -(651,240,cs), +(655,237,cs), (643,249,o), (637,254,o), (620,265,c), @@ -190,14 +181,8 @@ nodes = ( (340,668,o), (327,691,c), (319,689,l), -(317,668,o), -(308,643,o), -(295,622,cs), -(276,589,o), -(240,541,o), -(211,519,cs), -(195,507,o), -(179,497,o), +(313,622,o), +(221,502,o), (162,495,c), (166,468,o), (169,450,o), @@ -214,14 +199,11 @@ nodes = ( (518,525,o), (521,608,o), (525,652,cs), -(528,682,o), -(529,698,o), -(538,719,cs), -(540,725,o), -(537,732,o), -(530,737,cs), -(506,757,o), -(468,783,o), +(528,686,o), +(529,702,o), +(538,729,c), +(520,747,o), +(473,780,o), (446,797,c), (439,790,l), (453,756,o), @@ -230,14 +212,11 @@ nodes = ( (462,663,o), (462,613,o), (461,582,cs), -(461,556,o), -(462,535,o), -(456,512,cs), -(455,506,o), -(454,504,o), -(459,498,cs), -(475,478,o), -(499,462,o), +(461,553,o), +(462,531,o), +(454,505,c), +(469,482,o), +(498,463,o), (510,454,c) ); }, @@ -254,7 +233,7 @@ nodes = ( (899,603,o), (888,607,cs), (833,629,o), -(745,650,o), +(745,651,o), (660,670,c), (651,654,l), (742,612,o), @@ -528,6 +507,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni77F_1.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni77F_1.glyph index 8d130857..4af7bf1c 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni77F_1.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni77F_1.glyph @@ -16,31 +16,25 @@ nodes = ( (763,114,o), (777,123,cs), (785,129,o), -(787,135,o), +(787,134,o), (777,142,cs), -(766,150,o), -(737,167,o), +(763,153,o), +(734,170,o), (709,182,c), (691,166,o), (672,159,o), (646,154,cs), -(612,148,o), -(555,141,o), -(515,137,cs), -(487,134,o), -(468,132,o), +(608,147,o), +(492,132,o), (443,132,c), (440,125,l), -(459,112,o), -(471,103,o), -(487,94,c), -(500,97,o), -(520,100,o), -(538,103,cs), -(577,109,o), -(622,115,o), -(700,126,c), -(644,45,o), +(456,112,o), +(471,102,o), +(487,93,c), +(524,102,o), +(622,119,o), +(700,125,c), +(644,44,o), (560,-31,o), (312,-70,c), (317,-97,l) @@ -52,18 +46,15 @@ nodes = ( (223,90,o), (268,199,o), (284,390,cs), -(287,424,o), -(290,443,o), -(292,464,cs), -(293,469,o), -(292,472,o), -(286,477,cs), -(269,491,o), -(257,498,o), -(230,517,c), -(224,515,l), -(240,476,o), -(236,437,o), +(287,428,o), +(289,449,o), +(293,471,c), +(273,489,o), +(262,499,o), +(234,517,c), +(225,508,l), +(240,471,o), +(236,434,o), (234,393,cs), (227,232,o), (192,123,o), @@ -78,9 +69,9 @@ nodes = ( (369,46,o), (373,59,cs), (380,84,o), -(381,107,o), -(381,123,cs), -(381,130,o), +(381,103,o), +(381,119,cs), +(381,126,o), (379,133,o), (370,141,cs), (329,174,o), @@ -95,11 +86,8 @@ nodes = ( { closed = 1; nodes = ( -(132,282,o), -(162,289,o), -(194,296,cs), -(263,311,o), -(326,324,o), +(163,292,o), +(316,323,o), (390,330,cs), (404,331,o), (409,339,o), @@ -108,13 +96,10 @@ nodes = ( (371,372,o), (352,384,c), (327,370,o), -(307,363,o), -(272,353,cs), -(243,345,o), -(185,333,o), -(159,328,cs), -(127,322,o), -(91,315,o), +(309,363,o), +(283,356,cs), +(236,343,o), +(118,318,o), (48,311,c), (47,303,l), (69,290,o), @@ -125,37 +110,32 @@ nodes = ( { closed = 1; nodes = ( -(837,-95,o), -(885,-89,o), -(947,-79,c), +(837,-93,o), +(885,-87,o), +(947,-80,c), (945,-58,l), -(864,-49,o), -(784,-33,o), -(719,-1,cs), -(660,27,o), -(621,45,o), -(575,72,cs), -(567,77,o), -(560,82,o), -(553,87,cs), -(549,90,o), -(548,90,o), -(542,89,cs), -(534,88,o), -(516,84,o), -(508,80,cs), -(502,78,o), -(503,72,o), -(509,69,cs), -(520,63,o), -(538,55,o), -(546,51,cs), -(597,22,o), -(700,-51,o), +(875,-51,o), +(810,-39,o), +(759,-17,cs), +(712,2,o), +(615,45,o), +(555,86,cs), +(550,89,o), +(543,90,o), +(536,89,cs), +(528,88,o), +(512,83,o), +(504,79,c), +(506,68,l), +(515,68,o), +(522,66,o), +(530,61,cs), +(584,29,o), +(697,-47,o), (757,-94,cs), (765,-100,o), -(772,-104,o), -(780,-103,cs) +(772,-106,o), +(790,-102,cs) ); }, { @@ -164,14 +144,11 @@ nodes = ( (169,444,o), (208,523,o), (246,626,cs), -(252,644,o), -(258,655,o), -(263,665,cs), -(266,671,o), -(265,674,o), -(261,678,cs), -(248,695,o), -(214,724,o), +(253,647,o), +(259,660,o), +(265,672,c), +(247,698,o), +(226,718,o), (190,744,c), (182,739,l), (193,709,o), @@ -187,41 +164,35 @@ nodes = ( closed = 1; nodes = ( (505,154,l), -(506,229,o), -(508,390,o), -(510,440,cs), -(510,445,o), -(510,447,o), -(505,451,cs), -(495,457,o), -(488,460,o), -(473,468,c), -(463,453,l), -(463,436,o), -(463,422,o), -(464,398,cs), -(466,347,o), +(506,220,o), +(508,359,o), +(509,403,cs), +(509,421,o), +(510,429,o), +(510,445,c), +(496,454,o), +(487,458,o), +(464,464,c), +(456,455,l), +(461,440,o), +(463,433,o), +(464,408,cs), +(466,357,o), (463,277,o), (461,243,cs), -(460,224,o), -(458,214,o), -(456,202,cs), -(454,193,o), -(452,189,o), -(456,184,cs), -(465,172,o), -(479,160,o), +(460,217,o), +(456,208,o), +(454,187,c), +(463,174,o), +(478,161,o), (493,149,c) ); }, { closed = 1; nodes = ( -(237,501,o), -(261,505,o), -(288,511,cs), -(315,517,o), -(342,523,o), +(253,505,o), +(322,520,o), (387,528,cs), (401,530,o), (406,538,o), @@ -232,26 +203,20 @@ nodes = ( (343,572,o), (327,564,o), (310,558,cs), -(288,550,o), -(258,542,o), -(235,537,cs), -(209,532,o), -(200,530,o), +(271,544,o), +(219,533,o), (181,527,c), -(176,522,l), -(189,512,o), -(203,502,o), +(178,519,l), +(189,509,o), +(203,500,o), (215,494,c) ); }, { closed = 1; nodes = ( -(542,198,o), -(572,200,o), -(600,202,cs), -(680,208,o), -(753,212,o), +(588,206,o), +(792,212,o), (867,213,cs), (883,213,o), (888,222,o), @@ -262,11 +227,8 @@ nodes = ( (819,259,o), (805,256,o), (786,253,cs), -(727,243,o), -(629,238,o), -(570,233,cs), -(530,230,o), -(506,230,o), +(732,244,o), +(557,230,o), (479,230,c), (477,223,l), (488,213,o), @@ -280,14 +242,11 @@ nodes = ( (452,391,o), (494,443,o), (531,496,cs), -(537,505,o), -(543,513,o), -(548,520,cs), -(551,524,o), -(551,528,o), -(545,534,cs), -(534,544,o), -(516,557,o), +(539,508,o), +(547,518,o), +(552,526,c), +(544,537,o), +(522,553,o), (495,571,c), (487,564,l), (495,547,o), @@ -302,11 +261,8 @@ nodes = ( { closed = 1; nodes = ( -(572,278,o), -(592,281,o), -(621,284,cs), -(661,289,o), -(770,298,o), +(648,286,o), +(725,296,o), (821,300,cs), (835,300,o), (843,308,o), @@ -317,11 +273,8 @@ nodes = ( (787,337,o), (779,334,o), (755,330,cs), -(735,326,o), -(645,318,o), -(588,313,cs), -(558,311,o), -(538,308,o), +(733,326,o), +(563,308,o), (520,308,c), (518,304,l), (529,293,o), @@ -332,38 +285,30 @@ nodes = ( { closed = 1; nodes = ( -(637,205,o), -(680,205,o), -(680,224,cs), +(680,224,l), (680,280,o), (682,376,o), -(683,401,cs), -(683,420,o), +(683,397,cs), +(683,412,o), (684,427,o), -(685,436,cs), -(685,439,o), -(685,442,o), -(683,443,cs), -(670,449,o), -(659,453,o), -(637,459,c), -(632,457,l), -(633,445,o), -(634,432,o), +(686,438,c), +(672,447,o), +(661,452,o), +(639,461,c), +(631,453,l), +(633,442,o), +(634,430,o), (635,414,cs), (636,373,o), (639,293,o), -(637,221,cs) +(637,221,c) ); }, { closed = 1; nodes = ( -(572,355,o), -(592,358,o), -(621,361,cs), -(661,366,o), -(770,374,o), +(660,366,o), +(716,370,o), (821,376,cs), (835,377,o), (843,388,o), @@ -374,11 +319,8 @@ nodes = ( (788,416,o), (778,413,o), (755,409,cs), -(720,402,o), -(645,396,o), -(588,390,cs), -(558,387,o), -(540,386,o), +(724,403,o), +(564,386,o), (521,386,c), (518,382,l), (529,371,o), @@ -399,17 +341,14 @@ nodes = ( (831,501,o), (811,515,c), (798,506,o), -(786,502,o), -(761,497,cs), -(714,487,o), -(605,478,o), -(521,470,cs), -(509,469,o), -(486,465,o), -(466,465,c), -(464,459,l), -(473,452,o), -(486,442,o), +(786,501,o), +(761,496,cs), +(704,485,o), +(534,469,o), +(474,469,c), +(468,455,l), +(475,449,o), +(486,440,o), (495,435,c) ); }, @@ -441,15 +380,12 @@ nodes = ( (572,615,o), (571,656,o), (571,684,cs), -(571,698,o), -(573,715,o), -(574,725,cs), -(575,730,o), -(575,735,o), -(571,737,cs), -(548,748,o), -(524,756,o), -(493,766,c), +(571,705,o), +(573,723,o), +(575,735,c), +(552,747,o), +(527,757,o), +(495,768,c), (489,759,l), (512,731,o), (517,713,o), @@ -457,25 +393,19 @@ nodes = ( (523,662,o), (523,642,o), (524,618,cs), -(524,610,o), -(524,600,o), -(523,593,cs), -(522,589,o), -(521,585,o), -(525,582,cs), -(538,569,o), -(552,561,o), +(524,607,o), +(524,591,o), +(521,586,c), +(535,571,o), +(551,562,o), (566,554,c) ); }, { closed = 1; nodes = ( -(432,602,o), -(463,605,o), -(508,609,cs), -(626,621,o), -(776,624,o), +(505,613,o), +(702,623,o), (884,626,cs), (902,626,o), (909,639,o), @@ -486,11 +416,8 @@ nodes = ( (824,675,o), (807,670,o), (772,665,cs), -(714,657,o), -(567,648,o), -(498,644,cs), -(449,642,o), -(398,639,o), +(707,656,o), +(442,637,o), (352,641,c), (349,635,l), (368,620,o), @@ -501,28 +428,23 @@ nodes = ( { closed = 1; nodes = ( -(669,551,o), -(704,554,o), -(709,574,cs), -(716,606,o), -(730,661,o), -(742,707,cs), -(744,715,o), -(748,727,o), -(752,737,cs), -(755,746,o), -(755,748,o), -(749,752,cs), -(730,765,o), -(706,778,o), -(673,790,c), -(669,783,l), -(679,763,o), -(683,750,o), -(684,725,cs), -(685,681,o), -(676,611,o), -(672,574,cs) +(702,559,l), +(713,597,o), +(727,656,o), +(736,692,cs), +(742,716,o), +(749,733,o), +(753,742,c), +(734,758,o), +(704,777,o), +(674,792,c), +(667,784,l), +(677,764,o), +(682,751,o), +(683,726,cs), +(685,679,o), +(680,602,o), +(674,562,c) ); } ); @@ -1053,6 +975,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7834.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7834.glyph index 5fbc53d7..b0b8b64e 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7834.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7834.glyph @@ -26,12 +26,12 @@ nodes = ( (747,348,o), (718,341,o), (691,337,cs), -(612,325,o), -(576,321,o), -(518,316,c), -(516,303,l), -(528,292,o), -(542,284,o), +(610,325,o), +(573,319,o), +(513,316,c), +(511,303,l), +(524,292,o), +(540,284,o), (558,277,c), (618,289,o), (680,299,o), @@ -88,8 +88,10 @@ nodes = ( (394,145,o), (389,149,o), (373,165,c), -(360,160,l), -(298,150,o), +(364,163,o), +(354,161,o), +(345,159,cs), +(298,149,o), (259,145,o), (217,141,c), (219,102,l) @@ -107,8 +109,8 @@ nodes = ( (273,452,o), (290,484,o), (314,517,c), -(298,543,o), -(284,565,o), +(299,543,o), +(285,565,o), (264,592,c), (245,587,l), (245,566,o), @@ -139,11 +141,12 @@ nodes = ( (390,382,o), (370,395,o), (349,404,c), -(321,376,o), -(311,373,o), -(294,370,cs), -(240,360,l), -(207,355,l), +(331,386,o), +(316,374,o), +(296,370,cs), +(267,364,o), +(236,359,o), +(207,355,c), (213,316,l), (254,324,o), (293,330,o), @@ -161,11 +164,11 @@ closed = 1; nodes = ( (503,94,o), (526,257,o), -(536,510,cs), +(535,500,cs), (536,518,o), -(538,526,o), -(541,533,c), -(518,564,o), +(537,525,o), +(540,533,c), +(517,564,o), (493,590,o), (466,614,c), (451,603,l), @@ -184,7 +187,9 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(968,-66,l), +(869,-76,o), +(919,-70,o), +(968,-66,c), (968,-44,l), (929,-35,o), (898,-27,o), @@ -268,10 +273,13 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(838,479,o), -(868,500,o), -(917,513,cs), -(930,517,o), +(816,461,o), +(843,481,o), +(873,497,cs), +(886,504,o), +(900,509,o), +(916,511,cs), +(929,513,o), (933,529,o), (923,539,cs), (901,561,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7985.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7985.glyph index a8731cc7..c1319938 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7985.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7985.glyph @@ -117,8 +117,8 @@ nodes = ( (479,133,o), (314,136,c), (309,121,l), -(325,106,o), -(345,93,o), +(326,108,o), +(346,95,o), (367,83,c) ); }, @@ -177,8 +177,8 @@ nodes = ( (453,280,o), (451,262,o), (447,238,c), -(462,221,o), -(476,208,o), +(461,223,o), +(475,210,o), (491,198,c) ); }, @@ -243,8 +243,8 @@ nodes = ( (759,271,c), (773,253,o), (780,240,o), -(786,222,cs), -(791,208,o), +(785,222,cs), +(789,208,o), (804,214,o), (808,219,cs) ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni79C_B_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni79C_B_.glyph index a372e8eb..254e6ca5 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni79C_B_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni79C_B_.glyph @@ -187,13 +187,13 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(173,574,o), -(294,596,o), +(189,572,o), +(311,603,o), (396,640,cs), (426,653,o), -(451,663,o), -(472,669,c), -(461,700,o), +(450,664,o), +(471,670,c), +(460,701,o), (443,728,o), (415,761,c), (402,756,l), @@ -201,9 +201,9 @@ nodes = ( (397,719,o), (383,706,cs), (335,658,o), -(179,605,o), +(188,607,o), (105,587,c), -(112,561,l) +(111,563,l) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_20.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_20.glyph index e2e397c4..adf9f8b8 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_20.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_20.glyph @@ -27,24 +27,24 @@ nodes = ( (836,716,o), (806,729,c), (784,712,o), -(758,706,o), -(734,701,cs), -(674,687,o), +(758,704,o), +(734,700,cs), +(674,689,o), (506,676,o), (438,672,c), (461,631,l), (528,637,o), (701,655,o), (808,662,c), -(810,536,o), -(800,48,o), -(798,-12,cs), -(797,-24,o), -(793,-25,o), -(784,-23,cs), -(754,-15,o), -(710,1,o), -(662,24,c), +(810,541,o), +(801,74,o), +(799,17,cs), +(799,4,o), +(797,-13,o), +(795,-24,c), +(764,-17,o), +(711,3,o), +(663,25,c), (655,11,l), (716,-33,o), (770,-86,o), @@ -71,30 +71,24 @@ nodes = ( (284,155,o), (288,382,o), (295,514,cs), -(297,548,o), -(296,564,o), -(300,581,cs), -(301,586,o), -(300,589,o), -(294,595,cs), -(277,612,o), -(255,628,o), -(239,638,c), -(233,631,l), -(235,617,o), -(239,587,o), +(297,552,o), +(296,567,o), +(302,587,c), +(286,605,o), +(262,623,o), +(246,634,c), +(233,625,l), +(235,612,o), +(239,585,o), (240,559,cs), (243,418,o), (237,133,o), (233,26,cs), -(232,-14,o), -(229,-33,o), -(226,-47,cs), -(225,-55,o), -(224,-57,o), -(229,-63,cs), -(243,-78,o), -(262,-90,o), +(232,-24,o), +(229,-41,o), +(224,-57,c), +(238,-75,o), +(260,-88,o), (280,-102,c) ); }, @@ -125,12 +119,12 @@ nodes = ( (582,50,l), (581,128,o), (580,189,o), -(579,245,cs), -(579,256,o), -(578,259,o), -(573,261,cs), -(557,270,o), -(536,279,o), +(579,235,cs), +(579,244,o), +(579,252,o), +(580,259,c), +(562,269,o), +(539,281,o), (520,288,c), (515,282,l), (522,267,o), @@ -142,68 +136,53 @@ nodes = ( (536,104,o), (535,92,o), (532,76,c), -(544,66,o), -(551,59,o), -(575,46,c) +(543,66,o), +(554,59,o), +(571,47,c) ); }, { closed = 1; nodes = ( -(130,423,o), -(158,428,o), -(201,435,cs), -(274,447,o), -(331,456,o), +(157,431,o), +(297,452,o), (408,460,cs), (425,461,o), -(430,472,o), -(416,487,cs), -(408,497,o), +(428,467,o), +(416,484,cs), +(409,494,o), (400,502,o), (378,516,c), (360,504,o), -(343,499,o), -(319,493,cs), -(283,484,o), -(221,476,o), -(189,471,cs), -(143,464,o), -(92,458,o), +(343,497,o), +(318,492,cs), +(289,486,o), +(129,458,o), (48,458,c), -(44,452,l), -(63,437,o), -(78,426,o), +(44,450,l), +(58,438,o), +(73,428,o), (93,416,c) ); }, { closed = 1; nodes = ( -(427,15,o), -(481,112,o), -(495,401,cs), -(497,451,o), -(500,520,o), -(501,579,cs), -(501,603,o), -(499,627,o), -(502,649,cs), -(503,660,o), -(502,662,o), -(496,668,cs), -(475,689,o), -(453,705,o), +(466,55,o), +(495,195,o), +(500,539,cs), +(501,607,o), +(502,633,o), +(508,658,c), +(484,683,o), +(459,705,o), (425,729,c), (414,717,l), (434,680,o), -(440,645,o), -(443,600,cs), -(447,533,o), -(446,459,o), -(444,404,cs), -(437,154,o), -(395,38,o), +(445,643,o), +(445,548,cs), +(445,273,o), +(445,103,o), (298,-79,c), (317,-98,l) ); @@ -217,11 +196,14 @@ nodes = ( (760,96,o), (763,103,o), (757,110,cs), -(748,119,o), -(736,127,o), -(718,138,c), -(666,133,o), -(617,130,o), +(746,121,o), +(732,129,o), +(709,142,c), +(703,137,o), +(696,136,o), +(688,135,cs), +(649,130,o), +(606,127,o), (563,126,c), (563,90,l) ); @@ -233,22 +215,22 @@ nodes = ( (737,196,o), (744,219,cs), (747,228,o), -(755,238,o), -(761,244,cs), -(769,252,o), -(768,254,o), -(761,259,cs), -(749,269,o), -(725,282,o), +(754,237,o), +(760,243,cs), +(768,251,o), +(766,254,o), +(760,260,cs), +(748,271,o), +(726,284,o), (700,295,c), (683,281,o), -(670,276,o), +(670,277,o), (651,274,cs), -(620,270,o), -(590,265,o), +(620,269,o), +(590,266,o), (556,264,c), (564,229,l), -(606,233,o), +(606,234,o), (648,237,o), (691,239,c), (689,201,o), @@ -261,16 +243,13 @@ nodes = ( closed = 1; nodes = ( (181,596,o), -(287,627,o), -(347,658,cs), -(358,663,o), -(372,670,o), -(384,673,cs), -(393,675,o), -(397,680,o), -(388,693,cs), -(374,712,o), -(353,739,o), +(287,629,o), +(331,650,cs), +(365,666,o), +(381,673,o), +(393,678,c), +(380,707,o), +(360,732,o), (336,759,c), (322,752,l), (331,731,o), @@ -285,8 +264,8 @@ nodes = ( { closed = 1; nodes = ( -(594,353,o), -(699,362,o), +(595,353,o), +(700,362,o), (778,365,cs), (794,365,o), (798,376,o), @@ -297,47 +276,42 @@ nodes = ( (728,408,o), (715,405,o), (684,400,cs), -(640,393,o), -(518,379,o), -(486,379,c), -(483,375,l), -(497,361,o), -(512,349,o), -(525,341,c) +(641,393,o), +(541,381,o), +(490,380,c), +(486,371,l), +(501,359,o), +(514,348,o), +(527,341,c) ); }, { closed = 1; nodes = ( -(617,354,o), -(661,355,o), -(661,373,cs), +(661,373,l), (662,456,o), (665,559,o), (667,593,cs), -(668,607,o), -(668,614,o), -(670,625,cs), -(671,628,o), -(671,630,o), -(667,633,cs), -(652,642,o), -(633,650,o), +(668,609,o), +(668,616,o), +(671,629,c), +(656,641,o), +(634,652,o), (607,662,c), (601,658,l), -(607,642,o), +(609,642,o), (612,626,o), (613,602,cs), (616,551,o), (617,482,o), -(617,370,cs) +(617,370,c) ); }, { closed = 1; nodes = ( -(593,483,o), -(692,494,o), +(596,483,o), +(693,495,o), (761,499,cs), (777,500,o), (780,508,o), @@ -349,12 +323,12 @@ nodes = ( (699,533,o), (670,528,cs), (654,525,o), -(542,511,o), -(515,511,c), -(511,507,l), -(526,493,o), -(536,484,o), -(550,475,c) +(549,513,o), +(511,512,c), +(510,502,l), +(527,491,o), +(538,483,o), +(554,475,c) ); } ); @@ -733,6 +707,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_23.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_23.glyph index 4fa26bf4..a8ebedf3 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_23.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_23.glyph @@ -17,8 +17,8 @@ nodes = ( (323,692,o), (334,704,o), (343,717,c), -(324,746,o), -(300,780,o), +(325,746,o), +(301,780,o), (277,806,c), (264,800,l), (270,769,o), @@ -36,12 +36,15 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(213,-38,o), -(385,22,o), +(182,-46,o), +(399,27,o), (483,52,c), -(472,79,l), -(378,54,o), -(183,3,o), +(476,79,l), +(396,58,o), +(239,20,o), +(118,-2,cs), +(97,-6,o), +(77,-7,o), (59,-7,c), (54,-22,l), (76,-41,o), @@ -56,11 +59,13 @@ fillColor = (0,255); closed = 1; nodes = ( (200,95,l), -(198,183,o), -(196,325,o), -(195,420,c), -(201,433,l), -(182,450,o), +(196,183,o), +(191,325,o), +(195,410,cs), +(196,424,o), +(196,431,o), +(198,435,c), +(179,452,o), (164,462,o), (145,471,c), (133,464,l), @@ -84,16 +89,18 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(256,143,o), -(350,149,o), -(386,149,cs), -(410,149,o), -(414,165,o), +(260,143,o), +(358,149,o), +(396,149,cs), +(411,149,o), +(413,163,o), (402,174,cs), -(369,197,l), -(354,182,o), -(347,184,o), -(320,181,cs), +(392,184,o), +(381,191,o), +(369,197,c), +(354,187,o), +(347,185,o), +(330,183,cs), (280,176,o), (227,170,o), (190,169,c), @@ -107,19 +114,21 @@ fillColor = (0,255); closed = 1; nodes = ( (318,174,l), -(320,221,o), -(321,268,o), -(323,314,cs), -(325,349,o), -(326,378,o), +(321,234,o), +(322,293,o), +(325,351,cs), +(326,372,o), +(327,388,o), (330,402,c), -(289,422,l), -(270,423,l), -(278,382,o), -(278,348,o), -(278,307,cs), -(278,262,o), -(278,213,o), +(313,414,o), +(295,423,o), +(278,430,c), +(267,423,l), +(275,399,o), +(277,379,o), +(278,355,cs), +(281,295,o), +(281,231,o), (277,158,c) ); }, @@ -129,8 +138,8 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(280,285,o), -(336,292,o), +(283,287,o), +(336,293,o), (389,296,cs), (399,297,o), (404,305,o), @@ -138,14 +147,16 @@ nodes = ( (388,322,o), (379,330,o), (369,336,c), -(349,329,o), -(328,324,o), -(308,321,cs), -(274,314,o), -(239,311,o), +(357,331,o), +(346,325,o), +(333,323,cs), +(291,317,o), +(247,312,o), (205,308,c), (202,299,l), -(226,277,l) +(208,292,o), +(216,284,o), +(226,277,c) ); }, { @@ -155,15 +166,15 @@ fillColor = (0,255); closed = 1; nodes = ( (439,129,o), -(444,143,o), +(443,143,o), (445,164,cs), -(450,244,o), -(456,322,o), +(453,244,o), +(459,322,o), (463,394,cs), -(465,410,o), -(468,423,o), -(478,436,cs), -(485,444,o), +(464,410,o), +(469,423,o), +(479,436,cs), +(486,444,o), (488,450,o), (482,455,cs), (463,473,o), @@ -179,16 +190,18 @@ nodes = ( (263,418,o), (337,426,o), (410,434,c), -(412,408,o), -(409,294,o), -(398,171,c), -(376,158,l), -(385,144,o), -(397,130,o), -(409,116,cs), -(415,109,o), +(413,395,o), +(411,281,o), +(398,190,cs), +(395,166,o), +(383,160,o), +(374,158,c), +(388,145,o), +(398,129,o), +(404,117,cs), +(409,106,o), (422,107,o), -(428,114,cs) +(431,118,cs) ); }, { @@ -213,11 +226,11 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(290,449,l), +(291,449,l), (324,490,o), -(359,529,o), -(402,571,cs), -(415,584,o), +(363,533,o), +(406,575,cs), +(419,588,o), (428,595,o), (444,605,cs), (453,610,o), @@ -250,22 +263,22 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(707,-111,l), -(708,10,o), -(707,311,o), -(709,408,cs), -(711,495,o), -(715,535,o), -(724,574,c), -(708,592,o), -(686,611,o), -(666,622,c), -(647,614,l), -(664,556,o), -(660,484,o), -(660,424,cs), -(661,294,o), -(659,137,o), +(708,-111,l), +(704,10,o), +(707,325,o), +(710,462,cs), +(711,509,o), +(714,538,o), +(723,574,c), +(707,592,o), +(685,611,o), +(665,622,c), +(645,614,l), +(656,573,o), +(660,545,o), +(660,504,cs), +(661,361,o), +(659,140,o), (653,35,cs), (651,10,o), (647,-27,o), @@ -310,16 +323,16 @@ nodes = ( (748,404,o), (911,408,cs), (937,409,o), -(933,428,o), +(933,427,o), (924,436,cs), -(906,451,o), -(889,462,o), -(867,477,c), -(828,457,o), -(789,449,o), -(748,443,cs), -(674,435,o), -(562,424,o), +(908,452,o), +(892,464,o), +(871,477,c), +(838,458,o), +(804,451,o), +(769,446,cs), +(689,435,o), +(578,425,o), (486,424,c), (482,410,l), (529,378,l) @@ -332,12 +345,12 @@ fillColor = (0,255); closed = 1; nodes = ( (605,589,o), -(709,617,o), +(709,613,o), (803,650,cs), -(820,656,o), -(846,664,o), -(877,673,c), -(863,700,o), +(824,658,o), +(842,665,o), +(873,673,c), +(861,700,o), (836,740,o), (811,769,c), (796,765,l), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_96.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_96.glyph index 0795fbef..2715810a 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_96.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_96.glyph @@ -11,8 +11,11 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(830,587,o), -(869,594,o), +(804,574,o), +(837,584,o), +(868,591,cs), +(885,595,o), +(900,596,o), (917,597,cs), (935,597,o), (934,613,o), @@ -36,7 +39,7 @@ nodes = ( (781,614,o), (764,589,o), (744,564,c), -(756,553,l) +(756,552,l) ); }, { @@ -45,10 +48,14 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(369,-116,l), -(366,99,l), -(374,119,l), -(355,135,o), +(370,-116,l), +(366,-14,o), +(365,57,o), +(367,99,cs), +(367,107,o), +(368,114,o), +(370,122,c), +(354,136,o), (328,152,o), (302,166,c), (287,158,l), @@ -81,8 +88,10 @@ nodes = ( (713,-25,o), (697,-9,o), (682,2,c), -(667,-10,l), -(549,-18,o), +(665,-7,o), +(653,-12,o), +(627,-14,cs), +(549,-19,o), (464,-22,o), (357,-23,c), (359,-63,l) @@ -257,7 +266,7 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(444,343,o), +(442,342,o), (720,357,o), (770,357,cs), (783,357,o), @@ -274,8 +283,8 @@ nodes = ( (322,366,c), (318,354,l), (332,344,o), -(349,336,o), -(369,328,c) +(347,339,o), +(367,331,c) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_E_D_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_E_D_.glyph index 4907068d..013813e1 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_E_D_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7A_E_D_.glyph @@ -37,20 +37,20 @@ nodes = ( (514,338,o), (489,338,c), (487,331,l), -(509,315,o), -(522,307,o), +(507,314,o), +(520,306,o), (536,297,c), (638,307,o), (742,313,o), (842,318,c), -(827,215,o), -(782,-7,o), -(759,-41,cs), -(751,-52,o), -(749,-51,o), -(738,-47,cs), -(691,-30,o), -(650,-14,o), +(829,222,o), +(786,30,o), +(774,-4,cs), +(764,-33,o), +(759,-42,o), +(749,-51,c), +(692,-32,o), +(650,-17,o), (591,8,c), (585,-3,l), (653,-49,o), @@ -61,26 +61,20 @@ nodes = ( { closed = 1; nodes = ( -(85,71,o), -(90,70,o), -(96,73,cs), -(108,79,o), -(114,82,o), -(131,89,cs), -(214,121,o), -(305,155,o), +(179,109,o), +(288,149,o), (394,187,c), (386,209,l), (291,182,o), (173,154,o), (104,142,cs), (70,136,o), -(48,134,o), -(12,131,c), +(47,134,o), +(11,132,c), (8,121,l), -(34,103,o), -(59,86,o), -(81,73,cs) +(33,101,o), +(61,84,o), +(84,71,c) ); }, { @@ -109,16 +103,13 @@ closed = 1; nodes = ( (247,158,l), (282,219,o), -(307,275,o), -(349,371,cs), -(357,389,o), -(361,395,o), -(366,402,cs), -(370,408,o), -(368,411,o), -(363,417,cs), -(348,435,o), -(322,457,o), +(306,274,o), +(345,362,cs), +(358,392,o), +(362,398,o), +(370,408,c), +(358,427,o), +(323,459,o), (300,477,c), (292,470,l), (299,446,o), @@ -142,19 +133,20 @@ nodes = ( (772,58,o), (765,66,cs), (753,78,o), -(738,91,o), -(724,101,c), -(702,95,o), -(678,89,o), -(651,86,cs), -(479,71,l), -(484,190,l), -(488,234,ls), -(489,242,o), -(488,243,o), -(484,246,cs), -(469,257,o), -(449,270,o), +(738,92,o), +(724,102,c), +(702,96,o), +(686,92,o), +(649,87,cs), +(602,81,o), +(536,75,o), +(479,72,c), +(484,190,ls), +(485,207,o), +(487,225,o), +(490,242,c), +(472,258,o), +(450,272,o), (419,285,c), (413,278,l), (429,251,o), @@ -174,11 +166,8 @@ nodes = ( { closed = 1; nodes = ( -(151,477,o), -(183,483,o), -(217,489,cs), -(289,501,o), -(356,511,o), +(189,487,o), +(335,510,o), (419,514,cs), (433,515,o), (438,523,o), @@ -187,17 +176,14 @@ nodes = ( (401,557,o), (382,570,c), (356,557,o), -(332,550,o), +(332,549,o), (306,544,cs), -(267,535,o), -(231,530,o), -(182,523,cs), -(148,518,o), -(109,514,o), +(266,537,o), +(150,516,o), (66,514,c), -(64,504,l), -(84,492,o), -(101,481,o), +(63,503,l), +(81,492,o), +(99,482,o), (123,470,c) ); }, @@ -207,14 +193,11 @@ nodes = ( (411,255,o), (466,293,o), (529,346,cs), -(542,356,o), -(549,363,o), -(556,367,cs), -(560,370,o), -(562,372,o), -(560,376,cs), -(553,390,o), -(533,422,o), +(545,359,o), +(552,366,o), +(561,369,c), +(552,393,o), +(539,414,o), (517,443,c), (507,440,l), (509,420,o), @@ -232,14 +215,11 @@ nodes = ( (566,152,o), (604,201,o), (628,232,cs), -(636,242,o), -(644,252,o), -(653,261,cs), -(658,266,o), -(657,269,o), -(653,274,cs), -(641,289,o), -(626,304,o), +(638,244,o), +(647,256,o), +(659,266,c), +(646,284,o), +(629,301,o), (606,321,c), (599,317,l), (601,300,o), @@ -276,9 +256,9 @@ nodes = ( closed = 1; nodes = ( (586,431,o), -(665,435,o), +(665,436,o), (721,438,cs), -(731,439,o), +(731,438,o), (734,449,o), (728,455,cs), (722,463,o), @@ -297,31 +277,28 @@ nodes = ( closed = 1; nodes = ( (541,405,l), -(540,438,o), -(544,660,o), -(544,689,cs), -(544,703,o), -(543,706,o), -(536,711,cs), -(515,726,o), -(499,737,o), -(470,755,c), +(536,491,o), +(542,660,o), +(544,679,cs), +(545,687,o), +(546,695,o), +(549,703,c), +(524,722,o), +(504,735,o), +(471,756,c), (459,744,l), (477,713,o), -(483,691,o), -(487,666,cs), +(485,691,o), +(488,666,cs), (495,613,o), (495,553,o), (493,501,cs), -(492,477,o), -(488,462,o), -(485,447,cs), -(484,442,o), -(483,439,o), -(487,434,cs), -(499,422,o), -(519,409,o), -(533,400,c) +(492,472,o), +(490,456,o), +(483,438,c), +(495,425,o), +(517,408,o), +(533,398,c) ); }, { @@ -373,7 +350,7 @@ nodes = ( (590,676,o), (676,684,o), (741,690,c), -(740,646,o), +(742,646,o), (735,529,o), (730,474,cs), (729,460,o), @@ -394,13 +371,13 @@ nodes = ( (306,580,o), (313,597,cs), (321,618,o), -(322,641,o), -(321,662,cs), -(321,670,o), +(323,640,o), +(322,661,cs), +(322,669,o), (318,676,o), (305,682,cs), (271,699,o), -(233,710,o), +(233,711,o), (184,722,c), (177,709,l), (221,673,o), @@ -832,6 +809,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7B_54.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7B_54.glyph index dcfd1b27..bd926f6d 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7B_54.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7B_54.glyph @@ -306,10 +306,10 @@ nodes = ( (892,660,o), (870,677,o), (851,688,c), -(820,669,o), -(801,664,o), -(766,657,cs), -(726,649,o), +(827,672,o), +(801,662,o), +(776,657,cs), +(736,649,o), (656,640,o), (612,637,c), (610,623,l), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7C_07.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7C_07.glyph index 71444c32..7a76773f 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7C_07.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7C_07.glyph @@ -428,7 +428,7 @@ nodes = ( (637,626,c), (628,614,l), (674,571,o), -(703,535,o), +(703,536,o), (730,495,cs) ); }, @@ -451,11 +451,11 @@ nodes = ( (813,673,o), (786,668,cs), (721,656,o), -(637,647,o), -(605,646,c), -(598,639,l), -(601,628,o), -(608,618,o), +(632,647,o), +(600,646,c), +(593,639,l), +(598,627,o), +(608,616,o), (617,609,c) ); } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7D_00.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7D_00.glyph index da17005c..ed293478 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7D_00.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7D_00.glyph @@ -17,11 +17,11 @@ nodes = ( (932,16,o), (925,113,o), (923,215,c), -(907,217,l), +(904,217,l), (896,128,o), -(888,80,o), -(879,49,cs), -(872,27,o), +(888,68,o), +(879,37,cs), +(872,15,o), (864,7,o), (847,-1,cs), (798,-25,o), @@ -30,21 +30,21 @@ nodes = ( (575,-3,o), (570,6,o), (570,37,cs), -(569,69,o), -(572,258,o), -(578,297,cs), -(579,304,o), -(580,307,o), -(577,310,cs), -(565,324,o), -(543,346,o), +(569,66,o), +(571,235,o), +(573,270,cs), +(574,291,o), +(575,299,o), +(577,310,c), +(566,325,o), +(546,345,o), (522,363,c), -(518,360,l), -(521,334,o), -(522,288,o), -(522,254,cs), -(522,197,o), -(522,44,o), +(515,360,l), +(518,344,o), +(521,315,o), +(522,294,cs), +(524,227,o), +(522,47,o), (522,30,cs), (524,-19,o), (534,-51,o), @@ -55,9 +55,9 @@ nodes = ( closed = 1; nodes = ( (109,-71,o), -(114,-70,o), -(124,-62,cs), -(148,-41,o), +(115,-71,o), +(125,-62,cs), +(149,-42,o), (181,32,o), (190,75,cs), (193,87,o), @@ -79,9 +79,9 @@ nodes = ( closed = 1; nodes = ( (303,-16,o), -(314,0,o), -(321,19,cs), -(324,29,o), +(315,-1,o), +(321,16,cs), +(325,28,o), (326,37,o), (321,49,cs), (309,80,o), @@ -89,7 +89,7 @@ nodes = ( (257,158,c), (245,152,l), (257,111,o), -(261,53,o), +(263,53,o), (263,-16,cs), (263,-31,o), (276,-34,o), @@ -100,9 +100,9 @@ nodes = ( closed = 1; nodes = ( (450,17,o), -(458,43,o), -(461,58,cs), -(462,65,o), +(458,41,o), +(461,56,cs), +(462,63,o), (460,71,o), (451,82,cs), (430,108,o), @@ -120,25 +120,24 @@ nodes = ( { closed = 1; nodes = ( -(188,197,o), -(202,201,o), -(229,208,cs), -(433,264,l), +(183,194,o), +(192,198,o), +(218,206,cs), +(292,229,o), +(365,249,o), +(433,264,c), (430,284,l), (360,273,o), -(295,266,o), -(219,257,c), +(295,265,o), +(220,258,c), (290,329,o), -(367,424,o), -(423,501,cs), -(433,514,o), -(441,525,o), -(451,532,cs), -(456,536,o), -(459,543,o), -(454,548,cs), -(439,566,o), -(414,590,o), +(366,424,o), +(422,501,cs), +(435,518,o), +(447,531,o), +(459,542,c), +(441,569,o), +(416,595,o), (387,618,c), (377,612,l), (384,585,o), @@ -150,39 +149,33 @@ nodes = ( (168,253,o), (162,250,o), (126,248,c), -(122,242,l), -(135,224,o), -(153,203,o), -(164,192,cs), -(168,188,o), -(169,188,o), -(176,191,cs) +(121,240,l), +(129,224,o), +(152,198,o), +(169,187,c) ); }, { closed = 1; nodes = ( -(163,403,o), -(169,405,o), +(155,401,o), +(174,406,o), (190,409,cs), (242,419,o), (291,426,o), (355,438,c), (355,463,l), (297,458,o), -(245,456,o), +(245,455,o), (182,454,c), (243,519,o), -(303,603,o), +(304,600,o), (349,669,cs), -(360,685,o), -(371,698,o), -(377,703,cs), -(383,708,o), -(385,711,o), -(381,716,cs), -(366,737,o), -(333,770,o), +(360,686,o), +(370,698,o), +(384,711,c), +(372,730,o), +(336,767,o), (302,797,c), (292,789,l), (302,762,o), @@ -194,26 +187,25 @@ nodes = ( (137,464,o), (129,457,o), (105,456,c), -(102,451,l), -(140,400,l), -(143,397,o), -(144,396,o), -(152,399,cs) +(101,447,l), +(112,427,o), +(126,409,o), +(143,396,c) ); }, { closed = 1; nodes = ( -(424,186,o), -(445,185,o), -(451,198,cs), -(462,224,o), -(464,244,o), -(464,261,cs), -(464,267,o), -(462,270,o), -(454,278,cs), -(422,307,o), +(425,182,o), +(443,182,o), +(449,198,cs), +(459,225,o), +(463,244,o), +(464,258,cs), +(464,266,o), +(461,271,o), +(453,279,cs), +(421,308,o), (384,338,o), (350,360,c), (340,349,l), @@ -229,20 +221,20 @@ nodes = ( (737,344,o), (847,349,cs), (855,349,o), -(861,358,o), +(859,357,o), (854,366,cs), -(845,375,o), -(833,383,o), -(818,396,c), -(723,380,o), -(620,373,o), -(549,366,cs), -(523,363,o), -(507,363,o), +(847,378,o), +(836,388,o), +(818,401,c), +(809,396,o), +(799,393,o), +(778,390,cs), +(708,379,o), +(587,365,o), (488,363,c), -(486,352,l), -(501,343,o), -(522,331,o), +(484,349,l), +(499,339,o), +(521,329,o), (539,322,c) ); }, @@ -265,18 +257,15 @@ nodes = ( (782,660,o), (765,654,o), (745,649,cs), -(700,639,o), -(656,633,o), -(582,626,cs), -(551,623,o), -(524,622,o), +(683,635,o), +(578,622,o), (489,622,c), -(485,613,l), -(508,599,o), -(527,589,o), -(551,578,c), -(629,589,o), -(702,598,o), +(483,613,l), +(499,597,o), +(518,587,o), +(541,576,c), +(623,591,o), +(699,600,o), (788,608,c), (779,519,o), (770,439,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7E_A_7.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7E_A_7.glyph index f918ba67..421c3408 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7E_A_7.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7E_A_7.glyph @@ -18,12 +18,12 @@ nodes = ( (850,377,o), (865,389,cs), (872,394,o), -(871,403,o), +(871,401,o), (861,411,cs), -(840,428,o), -(820,442,o), -(799,455,c), -(786,440,o), +(844,429,o), +(826,442,o), +(801,454,c), +(788,439,o), (782,436,o), (765,431,cs), (745,425,o), @@ -36,10 +36,10 @@ nodes = ( (844,636,o), (860,646,cs), (871,652,o), -(869,660,o), +(869,658,o), (857,670,cs), -(832,691,o), -(813,703,o), +(836,692,o), +(817,704,o), (786,719,c), (759,694,o), (733,684,o), @@ -53,9 +53,9 @@ nodes = ( (685,634,o), (762,642,c), (737,572,o), -(702,503,o), -(677,455,cs), -(667,435,o), +(704,500,o), +(676,452,cs), +(664,432,o), (651,417,o), (627,412,c), (624,397,l), @@ -78,11 +78,14 @@ fillColor = (0,255); closed = 1; nodes = ( (200,26,o), -(313,84,o), +(314,87,o), (416,137,c), (405,160,l), -(328,127,o), -(142,51,o), +(343,133,o), +(212,80,o), +(114,52,cs), +(89,45,o), +(69,42,o), (51,40,c), (49,23,l), (70,7,o), @@ -104,9 +107,9 @@ nodes = ( (296,269,o), (219,254,c), (281,338,o), -(376,455,o), +(376,457,o), (405,491,cs), -(414,502,o), +(415,502,o), (425,510,o), (434,519,c), (416,549,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7F_3A_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7F_3A_.glyph index 68cbea05..3f9472f0 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7F_3A_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7F_3A_.glyph @@ -18,30 +18,21 @@ shapes = ( { closed = 1; nodes = ( -(527,-53,o), -(642,47,o), -(670,317,cs), -(678,389,o), -(685,539,o), +(665,-6,o), +(674,216,o), (690,647,cs), -(691,668,o), -(692,689,o), -(696,706,cs), -(699,716,o), -(699,720,o), -(690,729,cs), -(667,752,o), -(648,769,o), +(691,674,o), +(693,700,o), +(699,719,c), +(672,750,o), +(652,768,o), (617,796,c), (606,787,l), (618,758,o), -(628,716,o), +(630,716,o), (630,667,cs), -(634,580,o), -(627,395,o), -(621,321,cs), -(604,90,o), -(502,-18,o), +(633,274,o), +(633,43,o), (365,-82,c), (372,-101,l) ); @@ -49,37 +40,15 @@ nodes = ( { closed = 1; nodes = ( -(182,-2,o), -(193,2,o), -(217,11,cs), -(275,34,o), -(341,56,o), +(231,20,o), +(313,48,o), (424,82,c), (419,102,l), -(344,88,o), -(276,75,o), -(195,65,c), -(180,64,l), -(163,58,o), -(135,54,o), -(120,53,c), -(114,47,l), -(123,34,o), -(146,5,o), -(155,-5,cs), -(160,-10,o), -(162,-11,o), -(171,-7,cs) -); -}, -{ -closed = 1; -nodes = ( -(123,52,o), -(211,19,o), -(213,55,cs), -(215,104,o), -(217,166,o), +(350,88,o), +(287,76,o), +(213,68,c), +(215,114,o), +(217,170,o), (220,211,cs), (221,237,o), (221,243,o), @@ -90,86 +59,79 @@ nodes = ( (205,275,o), (188,283,o), (159,296,c), -(155,291,l), -(165,275,o), -(171,247,o), +(154,286,l), +(165,271,o), +(171,245,o), (171,227,cs), (171,193,o), -(171,139,o), -(167,83,cs), -(166,69,o), -(167,53,o), -(123,53,c) +(168,139,o), +(168,93,cs), +(168,68,o), +(142,54,o), +(123,53,c), +(118,41,l), +(127,27,o), +(144,8,o), +(159,-8,c) ); }, { closed = 1; nodes = ( -(448,-5,o), -(458,4,o), +(448,-6,o), +(458,0,o), (458,16,cs), -(458,76,o), -(460,172,o), -(461,222,cs), -(462,241,o), -(462,245,o), -(463,258,cs), -(464,264,o), -(461,266,o), -(458,268,cs), -(441,276,o), -(416,288,o), +(457,76,o), +(457,168,o), +(459,218,cs), +(460,240,o), +(461,248,o), +(464,265,c), +(447,275,o), +(418,287,o), (401,293,c), -(397,287,l), -(405,268,o), -(408,252,o), +(396,282,l), +(405,265,o), +(408,251,o), (408,237,cs), (409,189,o), (410,137,o), (407,77,cs), (406,59,o), -(403,39,o), +(405,48,o), (401,31,c), (413,17,o), -(424,11,o), -(436,3,cs) +(424,8,o), +(436,1,cs) ); }, { closed = 1; nodes = ( -(290,36,o), -(336,58,o), -(336,79,cs), +(336,79,l), (337,220,o), (338,343,o), (342,447,cs), -(343,473,o), -(345,482,o), -(347,501,cs), -(348,508,o), -(347,512,o), -(342,515,cs), -(327,525,o), -(310,535,o), -(287,547,c), -(282,544,l), -(288,515,o), -(289,500,o), +(343,477,o), +(344,488,o), +(347,512,c), +(331,524,o), +(315,534,o), +(290,545,c), +(282,540,l), +(288,512,o), +(289,498,o), (290,462,cs), (292,381,o), -(292,224,o), -(290,69,cs) +(292,223,o), +(290,68,c) ); }, { closed = 1; nodes = ( -(148,346,o), -(177,351,o), -(225,356,cs), -(313,366,o), -(408,371,o), +(237,363,o), +(387,370,o), (507,374,cs), (518,374,o), (528,383,o), @@ -177,18 +139,15 @@ nodes = ( (505,408,o), (490,421,o), (469,434,c), -(441,421,o), +(444,421,o), (429,414,o), (401,410,cs), -(363,404,o), -(262,395,o), -(213,392,cs), -(161,388,o), -(102,385,o), +(346,401,o), +(143,382,o), (52,389,c), -(48,380,l), -(69,365,o), -(87,354,o), +(48,378,l), +(67,361,o), +(85,350,o), (112,339,c) ); }, @@ -220,35 +179,30 @@ nodes = ( { closed = 1; nodes = ( -(900,-75,o), -(931,-71,o), -(970,-66,c), -(970,-50,l), -(916,-25,o), +(900,-73,o), +(931,-70,o), +(970,-68,c), +(973,-50,l), +(918,-25,o), (862,8,o), (815,53,cs), (750,115,o), (689,184,o), -(645,253,cs), -(642,257,o), -(612,236,o), -(624,219,cs), -(688,128,o), -(759,21,o), -(832,-74,cs), -(837,-80,o), -(845,-81,o), -(852,-80,cs) +(645,253,c), +(623,219,l), +(692,128,o), +(765,23,o), +(826,-69,cs), +(833,-80,o), +(842,-84,o), +(852,-82,cs) ); }, { closed = 1; nodes = ( -(282,539,o), -(298,540,o), -(319,543,cs), -(363,549,o), -(402,552,o), +(309,543,o), +(441,556,o), (483,558,cs), (497,559,o), (500,569,o), @@ -259,42 +213,36 @@ nodes = ( (434,607,o), (424,601,o), (399,595,cs), -(357,585,o), -(300,578,o), -(252,575,c), +(356,585,o), +(297,578,o), +(247,575,c), (242,567,l), -(250,558,o), -(258,545,o), -(265,535,c) +(248,559,o), +(259,546,o), +(270,535,c) ); }, { closed = 1; nodes = ( -(541,257,o), -(569,262,o), -(612,266,cs), -(715,276,o), -(850,281,o), +(657,273,o), +(777,281,o), (942,277,cs), -(954,276,o), +(954,277,o), (961,286,o), (950,299,cs), (941,310,o), (922,330,o), (903,343,c), -(884,335,o), +(885,332,o), (868,326,o), (837,321,cs), -(787,312,o), -(661,305,o), -(601,302,cs), -(557,300,o), -(506,297,o), +(782,311,o), +(538,295,o), (463,300,c), -(461,293,l), -(475,277,o), -(491,264,o), +(460,288,l), +(474,275,o), +(491,263,o), (506,253,c) ); }, @@ -309,29 +257,23 @@ nodes = ( (852,476,o), (863,492,cs), (867,498,o), -(868,502,o), -(860,510,cs), -(851,519,o), -(826,540,o), +(867,500,o), +(860,509,cs), +(847,525,o), +(827,542,o), (800,559,c), (777,541,o), (760,533,o), (734,529,cs), -(687,523,o), -(614,516,o), -(557,513,cs), -(529,512,o), -(510,511,o), +(659,519,o), +(554,511,o), (487,511,c), -(484,503,l), -(498,488,o), -(512,477,o), -(524,467,c), -(552,470,o), -(589,475,o), -(605,476,cs), -(659,481,o), -(717,487,o), +(481,502,l), +(495,487,o), +(509,475,o), +(526,465,c), +(635,480,o), +(706,487,o), (788,492,c), (781,441,o), (771,365,o), @@ -680,6 +622,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7F_C_5.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7F_C_5.glyph index 1ad90dd2..9cc549d7 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7F_C_5.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7F_C_5.glyph @@ -29,10 +29,10 @@ nodes = ( (120,261,c), (123,244,l), (177,235,o), -(207,216,o), -(276,173,cs), -(391,104,o), -(604,-29,o), +(207,215,o), +(247,191,cs), +(391,105,o), +(604,-27,o), (712,-98,cs), (724,-106,o), (736,-108,o), @@ -109,12 +109,15 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(492,284,o), -(534,318,o), -(582,351,c), +(495,287,o), +(541,325,o), +(594,361,c), (585,383,l), -(541,355,o), -(453,300,o), +(551,360,o), +(498,329,o), +(454,305,cs), +(431,293,o), +(411,286,o), (398,283,c), (399,273,l), (418,264,o), @@ -191,10 +194,10 @@ nodes = ( (566,171,o), (564,164,c), (527,177,o), -(491,192,o), +(491,190,o), (454,209,c), (448,197,l), -(482,169,o), +(485,169,o), (542,118,o), (569,85,cs) ); @@ -206,16 +209,16 @@ fillColor = (0,255); closed = 1; nodes = ( (535,403,o), -(545,404,o), +(544,404,o), (547,420,cs), -(549,434,o), -(549,448,o), +(550,434,o), +(550,448,o), (547,462,cs), -(546,471,o), +(545,471,o), (543,477,o), (536,480,cs), -(515,489,o), -(475,504,o), +(515,490,o), +(476,505,o), (438,516,c), (431,504,l), (466,478,o), @@ -229,12 +232,15 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(730,302,o), -(775,338,o), -(813,366,c), +(734,307,o), +(785,348,o), +(827,380,c), (815,403,l), -(749,359,o), -(687,320,o), +(772,373,o), +(730,348,o), +(692,327,cs), +(672,316,o), +(652,309,o), (633,304,c), (633,293,l), (651,285,o), @@ -301,8 +307,8 @@ fillColor = (0,255); closed = 1; nodes = ( (753,418,o), -(767,426,o), -(769,437,cs), +(765,426,o), +(768,437,cs), (771,449,o), (772,462,o), (771,474,cs), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7F_F_B_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7F_F_B_.glyph index afd83214..8b31caf7 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni7F_F_B_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni7F_F_B_.glyph @@ -61,10 +61,14 @@ fillColor = (0,255); closed = 1; nodes = ( (236,-71,l), -(235,224,l), -(243,239,l), -(219,256,o), -(199,271,o), +(233,27,o), +(231,128,o), +(234,212,cs), +(235,232,o), +(237,242,o), +(240,249,c), +(217,262,o), +(198,274,o), (178,282,c), (168,276,l), (182,234,o), @@ -100,24 +104,26 @@ nodes = ( (530,246,o), (524,252,cs), (514,262,o), -(483,285,o), -(467,296,c), -(451,283,o), +(487,284,o), +(469,296,c), +(453,283,o), (440,274,o), (423,271,cs), (369,262,o), (286,254,o), (217,249,c), (226,215,l), -(458,235,l), +(303,222,o), +(381,228,o), +(458,235,c), (457,155,o), (451,77,o), (445,-4,c), (416,-10,l), -(428,-31,o), -(437,-52,o), -(445,-67,cs), -(450,-76,o), +(427,-30,o), +(437,-50,o), +(444,-66,cs), +(448,-75,o), (457,-77,o), (466,-68,cs) ); @@ -137,11 +143,11 @@ nodes = ( (440,11,o), (431,19,o), (417,29,c), -(391,19,o), -(370,16,o), -(350,14,cs), -(310,9,o), -(269,7,o), +(399,20,o), +(384,17,o), +(369,15,cs), +(323,10,o), +(276,7,o), (229,5,c), (230,-27,l) ); @@ -159,16 +165,16 @@ nodes = ( (365,168,o), (366,185,o), (368,206,c), -(360,218,o), -(348,229,o), -(336,236,c), -(315,231,l), -(321,191,o), -(320,154,o), -(320,114,cs), -(320,77,o), -(320,39,o), -(319,2,c) +(357,218,o), +(339,231,o), +(322,238,c), +(314,232,l), +(318,213,o), +(320,197,o), +(320,178,cs), +(320,121,o), +(319,59,o), +(317,2,c) ); }, { @@ -177,8 +183,8 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(304,106,o), -(384,112,o), +(301,106,o), +(383,112,o), (433,114,cs), (445,114,o), (451,122,o), @@ -186,14 +192,16 @@ nodes = ( (436,139,o), (428,146,o), (416,155,c), -(401,147,o), -(378,142,o), -(352,139,cs), -(319,135,o), -(273,130,o), -(233,129,c), -(232,116,l), -(259,98,l) +(407,149,o), +(392,146,o), +(376,143,cs), +(334,136,o), +(277,130,o), +(226,129,c), +(223,120,l), +(230,113,o), +(242,105,o), +(255,98,c) ); }, { @@ -386,11 +394,11 @@ nodes = ( (467,784,o), (450,797,c), (437,791,l), -(439,762,o), -(389,736,o), -(362,724,cs), -(303,698,o), -(228,677,o), +(437,771,o), +(421,754,o), +(400,743,cs), +(337,710,o), +(248,682,o), (111,654,c), (115,630,l) ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni80D_D_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni80D_D_.glyph index 13ab3707..1a9bde86 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni80D_D_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni80D_D_.glyph @@ -11,35 +11,31 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(219,623,l), -(340,640,l), -(340,618,l), -(338,195,l), -(336,46,l), -(333,23,l), -(321,27,l), -(270,49,l), -(214,74,l), +(219,622,l), +(259,630,o), +(300,635,o), +(340,639,c), +(342,445,o), +(340,253,o), +(336,59,cs), +(336,41,o), +(335,32,o), +(331,24,c), +(292,39,o), +(256,55,o), +(217,74,c), (208,62,l), -(213,57,l), -(290,-19,ls), -(304,-34,o), -(317,-51,o), +(267,8,o), +(289,-16,o), (330,-68,cs), -(336,-75,o), -(341,-77,o), -(348,-73,cs), -(352,-71,o), -(355,-67,o), +(341,-82,o), +(352,-72,o), (357,-63,cs), (376,-34,o), (386,-1,o), (386,34,cs), -(387,192,o), -(384,349,o), -(391,507,cs), -(392,540,o), -(394,573,o), +(387,248,o), +(387,474,o), (397,605,cs), (398,621,o), (401,632,o), @@ -47,15 +43,14 @@ nodes = ( (418,649,o), (419,654,o), (414,659,cs), -(410,663,o), -(367,697,o), -(347,712,c), -(332,697,ls), -(323,689,o), -(314,682,o), -(302,678,cs), -(271,669,o), -(238,665,o), +(400,673,o), +(371,696,o), +(347,710,c), +(330,692,o), +(320,685,o), +(301,679,cs), +(270,670,o), +(238,663,o), (209,659,c) ); }, @@ -66,25 +61,21 @@ fillColor = (0,255); closed = 1; nodes = ( (579,62,l), -(603,34,o), -(649,-27,o), -(672,-65,cs), -(680,-77,ls), -(687,-86,o), -(697,-86,o), -(703,-77,c), -(706,-74,o), -(708,-69,o), -(709,-65,cs), -(712,-52,o), +(610,26,o), +(647,-24,o), +(679,-73,cs), +(690,-90,o), +(703,-81,o), +(707,-67,cs), +(710,-54,o), (713,-38,o), (715,-25,cs), (718,-7,o), -(711,5,o), -(696,13,cs), -(659,34,o), -(626,53,o), -(588,71,c) +(711,3,o), +(698,12,cs), +(662,35,o), +(626,55,o), +(586,72,c) ); }, { @@ -96,15 +87,12 @@ nodes = ( (735,181,o), (708,349,o), (691,511,cs), -(689,532,o), -(689,549,o), -(691,561,cs), -(692,567,o), -(693,570,o), -(687,575,cs), -(674,586,o), -(660,597,o), -(646,608,c), +(688,538,o), +(689,558,o), +(693,570,c), +(677,588,o), +(658,602,o), +(637,614,c), (622,602,l), (669,329,o), (695,118,o), @@ -125,20 +113,20 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(640,358,o), -(733,371,o), -(833,378,cs), -(852,379,o), -(879,379,o), -(898,379,cs), +(632,357,o), +(768,379,o), +(888,380,cs), (909,380,o), (913,390,o), (908,397,cs), (894,416,o), -(879,427,o), -(849,448,c), -(781,405,o), -(581,387,o), +(881,428,o), +(851,449,c), +(831,434,o), +(799,422,o), +(763,415,cs), +(676,398,o), +(561,384,o), (513,378,c), (512,341,l) ); @@ -153,20 +141,17 @@ nodes = ( (638,599,o), (707,621,o), (788,656,cs), -(803,663,o), -(817,668,o), -(834,670,cs), -(847,671,o), -(844,681,o), -(841,687,cs), -(826,713,o), -(803,746,o), +(808,665,o), +(819,670,o), +(839,676,c), +(827,709,o), +(805,747,o), (774,779,c), (759,771,l), -(763,748,o), +(766,748,o), (759,728,o), (742,712,cs), -(695,665,o), +(693,666,o), (595,626,o), (521,598,c) ); @@ -177,42 +162,36 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(514,614,o), -(488,639,o), -(461,662,c), -(453,656,l), +(520,617,o), +(494,642,o), +(465,664,c), (451,653,l), (466,623,o), (474,591,o), (476,559,cs), -(480,515,o), -(482,471,o), -(482,427,cs), -(479,172,ls), -(478,137,o), -(475,103,o), -(473,68,cs), -(472,43,o), -(463,24,o), -(439,12,cs), -(429,7,o), -(428,0,o), -(436,-8,cs), -(466,-42,l), -(476,-51,l), -(484,-44,l), -(503,-23,l), -(573,52,o), -(612,90,o), +(482,455,o), +(484,221,o), +(475,68,cs), +(474,42,o), +(463,21,o), +(430,12,c), +(430,-3,l), +(443,-20,o), +(460,-36,o), +(477,-50,c), +(572,53,o), +(613,94,o), (699,178,c), (683,195,l), (630,149,o), (578,104,o), (522,61,c), -(525,154,o), -(534,451,o), -(536,544,c), -(541,589,l) +(523,154,o), +(532,451,o), +(536,544,cs), +(537,560,o), +(541,575,o), +(547,591,c) ); }, { @@ -225,12 +204,15 @@ nodes = ( (318,435,ls), (328,436,o), (332,443,o), -(327,452,cs), +(326,452,cs), (319,464,o), -(309,474,o), -(297,484,c), -(273,468,o), -(246,463,o), +(311,472,o), +(299,482,c), +(292,476,o), +(281,472,o), +(272,470,cs), +(254,465,o), +(236,462,o), (216,459,c) ); }, @@ -241,14 +223,20 @@ fillColor = (0,255); closed = 1; nodes = ( (200,245,l), -(256,251,l), -(319,256,ls), -(330,257,o), +(240,252,o), +(279,255,o), +(319,256,cs), +(330,256,o), (334,263,o), -(328,273,c), -(302,305,l), -(269,290,o), -(220,277,o), +(328,273,cs), +(322,283,o), +(312,293,o), +(300,303,c), +(291,297,o), +(280,292,o), +(268,289,cs), +(248,284,o), +(229,282,o), (211,281,c) ); }, @@ -258,25 +246,23 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(222,293,o), -(225,452,cs), -(226,518,o), +(208,62,o), +(222,283,o), +(226,492,cs), +(227,548,o), (228,585,o), -(230,651,c), -(147,725,l), +(231,651,c), +(207,679,o), +(180,703,o), +(150,725,c), (135,715,l), -(138,708,l), -(148,691,o), -(155,673,o), -(160,653,cs), -(171,614,o), -(173,574,o), +(163,665,o), +(173,598,o), (174,534,cs), (174,370,o), (187,122,o), (32,-74,c), -(53,-91,l), -(208,62,o) +(53,-91,l) ); } ); @@ -562,6 +548,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8109.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8109.glyph index 6c165df7..b58c460d 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8109.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8109.glyph @@ -11,11 +11,8 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(362,-31,o), -(369,-17,o), -(374,5,cs), -(378,21,o), -(378,36,o), +(379,-4,o), +(378,18,o), (378,78,cs), (377,229,o), (382,535,o), @@ -23,37 +20,38 @@ nodes = ( (390,637,o), (394,654,o), (405,669,cs), -(408,673,o), -(411,677,o), -(403,685,cs), -(385,701,o), -(364,717,o), +(410,675,o), +(411,680,o), +(403,688,cs), +(387,704,o), +(366,719,o), (342,733,c), -(324,713,o), -(301,703,o), -(277,698,cs), -(250,692,o), -(213,685,o), -(182,682,c), +(326,714,o), +(306,704,o), +(285,699,cs), +(256,692,o), +(215,686,o), +(182,683,c), (194,645,l), -(335,663,l), -(331,278,l), -(328,87,l), -(327,49,ls), -(327,45,o), -(324,38,o), -(318,41,cs), -(281,60,o), -(243,79,o), -(206,98,c), +(241,653,o), +(288,659,o), +(335,663,c), +(335,468,o), +(335,274,o), +(331,119,cs), +(330,84,o), +(329,62,o), +(320,40,c), +(282,57,o), +(245,77,o), +(207,99,c), (199,86,l), -(210,75,ls), -(250,36,o), -(292,-7,o), +(241,46,o), +(280,3,o), (323,-50,cs), -(331,-61,o), -(338,-62,o), -(346,-51,cs) +(332,-61,o), +(339,-61,o), +(347,-50,cs) ); }, { @@ -65,10 +63,15 @@ nodes = ( (144,46,o), (180,130,o), (202,256,cs), -(214,328,o), -(225,468,o), -(224,675,c), -(147,740,l), +(212,317,o), +(222,427,o), +(224,584,cs), +(224,613,o), +(224,643,o), +(227,675,c), +(202,698,o), +(177,720,o), +(148,741,c), (136,730,l), (150,705,o), (161,678,o), @@ -91,17 +94,22 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(313,306,ls), -(323,307,o), +(224,298,o), +(269,303,o), +(313,305,cs), +(323,305,o), (326,314,o), (320,323,cs), (312,334,o), -(302,343,o), +(304,343,o), (293,353,c), -(257,336,o), -(222,331,o), +(281,346,o), +(270,342,o), +(253,338,cs), +(235,333,o), +(209,329,o), (185,326,c), -(180,292,l) +(180,291,l) ); }, { @@ -117,28 +125,27 @@ nodes = ( (577,356,o), (590,370,cs), (596,376,o), -(597,383,o), +(596,382,o), (590,388,cs), -(575,401,o), -(558,411,o), +(576,402,o), +(561,413,o), (542,423,c), -(522,408,o), -(512,404,o), +(523,408,o), +(512,403,o), (498,399,cs), -(485,394,o), -(470,391,o), -(457,388,cs), -(436,384,o), -(415,381,o), -(395,379,c), -(393,373,l), -(431,343,l), +(472,391,o), +(425,384,o), +(395,381,c), +(391,371,l), +(403,361,o), +(415,351,o), +(431,343,c), (458,351,o), (499,360,o), (526,364,c), -(498,245,o), -(445,143,o), -(361,58,c), +(496,240,o), +(439,133,o), +(348,44,c), (361,25,l) ); }, @@ -148,15 +155,19 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(311,484,l), -(321,486,o), +(233,476,o), +(272,480,o), +(311,483,cs), +(321,484,o), (325,494,o), (319,501,cs), -(291,532,l), -(260,513,o), +(311,511,o), +(301,522,o), +(290,532,c), +(259,513,o), (228,510,o), (195,506,c), -(194,471,l) +(194,470,l) ); }, { @@ -165,54 +176,50 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(655,-59,o), -(666,-18,o), -(666,18,cs), -(666,207,o), +(658,-46,o), +(663,-16,o), +(663,24,cs), +(660,183,o), (662,419,o), (669,508,cs), (670,522,o), (672,537,o), (683,551,cs), (686,556,o), -(688,558,o), -(683,562,cs), -(668,573,o), -(642,590,o), +(686,560,o), +(681,564,cs), +(667,577,o), +(643,592,o), (627,600,c), (609,583,o), (588,576,o), (566,571,cs), -(543,566,o), -(533,564,o), -(512,561,cs), -(492,558,o), -(471,557,o), +(520,561,o), +(498,558,o), (451,556,c), -(449,547,l), -(464,536,o), -(479,526,o), +(447,543,l), +(460,534,o), +(476,524,o), (498,513,c), -(509,517,o), -(519,520,o), -(537,524,cs), -(564,530,o), -(589,534,o), +(531,523,o), +(586,535,o), (620,541,c), -(620,390,o), -(618,162,o), -(615,35,cs), -(615,23,o), -(610,17,o), -(601,22,cs), -(506,78,l), +(622,396,o), +(619,177,o), +(615,65,cs), +(614,35,o), +(613,27,o), +(609,16,c), +(574,34,o), +(543,54,o), +(507,79,c), (497,67,l), (548,15,o), (581,-23,o), (615,-74,cs), (623,-86,o), -(630,-85,o), -(637,-78,cs) +(631,-84,o), +(637,-76,cs) ); }, { @@ -222,22 +229,20 @@ fillColor = (0,255); closed = 1; nodes = ( (880,77,o), -(943,77,o), +(925,78,o), (972,78,c), (973,97,l), (913,123,o), -(882,143,o), +(881,142,o), (845,177,cs), -(773,243,o), +(776,243,o), (679,371,o), -(648,418,cs), -(643,425,o), -(625,402,o), -(641,378,c), -(695,298,o), -(754,192,o), -(816,88,cs), -(823,78,o), +(648,418,c), +(641,378,l), +(694,297,o), +(756,192,o), +(815,88,cs), +(821,77,o), (830,73,o), (843,74,cs) ); @@ -251,17 +256,14 @@ nodes = ( (747,360,o), (796,398,o), (842,439,cs), -(855,452,o), -(870,463,o), -(893,479,cs), -(903,486,o), -(899,495,o), -(892,505,cs), -(876,528,o), -(861,545,o), -(835,576,c), -(822,571,l), -(828,550,o), +(857,454,o), +(870,466,o), +(899,487,c), +(879,519,o), +(865,541,o), +(834,577,c), +(821,567,l), +(827,546,o), (825,524,o), (815,505,cs), (781,445,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni810A_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni810A_.glyph index c124c46d..f474c7b8 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni810A_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni810A_.glyph @@ -34,19 +34,28 @@ fillColor = (0,255); closed = 1; nodes = ( (364,-99,l), -(365,-5,o), -(369,185,o), -(374,315,c), -(387,331,l), -(335,367,l), +(365,-10,o), +(369,169,o), +(374,282,cs), +(375,306,o), +(383,324,o), +(388,333,c), +(372,349,o), +(355,359,o), +(335,367,c), (317,350,l), -(334,245,o), -(320,68,o), -(315,29,cs), -(312,5,o), -(308,-29,o), +(320,331,o), +(322,309,o), +(323,286,cs), +(329,178,o), +(319,44,o), +(315,10,cs), +(313,-9,o), +(308,-35,o), (299,-57,c), -(349,-108,l) +(314,-75,o), +(330,-92,o), +(349,-108,c) ); }, { @@ -92,10 +101,10 @@ nodes = ( (691,304,o), (701,321,cs), (707,331,o), -(704,336,o), +(704,335,o), (696,343,cs), -(679,357,o), -(653,376,o), +(680,359,o), +(654,378,o), (626,394,c), (612,381,o), (595,372,o), @@ -183,7 +192,7 @@ nodes = ( (210,707,c), (203,689,l), (284,650,o), -(325,621,o), +(325,622,o), (373,586,cs) ); }, @@ -228,7 +237,7 @@ nodes = ( (823,516,o), (805,521,cs), (727,543,o), -(687,551,o), +(683,555,o), (588,572,c), (580,553,l), (639,528,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8116.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8116.glyph index f6960a06..663b5987 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8116.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8116.glyph @@ -36,11 +36,18 @@ nodes = ( (216,663,o), (189,660,c), (198,622,l), -(316,638,l), -(316,621,o), -(315,46,o), -(305,7,c), -(186,59,l), +(237,630,o), +(277,635,o), +(316,638,c), +(316,623,o), +(316,185,o), +(309,49,cs), +(308,28,o), +(306,17,o), +(302,6,c), +(263,20,o), +(225,39,o), +(186,59,c), (179,46,l), (250,-12,o), (265,-28,o), @@ -63,14 +70,11 @@ nodes = ( (162,701,o), (134,722,c), (120,712,l), -(134,688,o), -(144,659,o), -(149,632,cs), -(156,598,o), -(157,563,o), -(158,529,cs), -(165,288,o), -(149,100,o), +(145,669,o), +(153,620,o), +(156,571,cs), +(168,395,o), +(171,130,o), (22,-77,c), (38,-93,l) ); @@ -81,17 +85,17 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(229,273,o), +(229,276,o), (265,279,o), (307,281,cs), (317,281,o), -(323,290,o), +(322,289,o), (313,300,cs), -(303,310,o), -(297,317,o), +(304,312,o), +(298,319,o), (286,327,c), (254,312,o), -(220,307,o), +(220,306,o), (190,302,c), (186,269,l) ); @@ -121,8 +125,11 @@ nodes = ( (614,263,o), (619,233,o), (621,207,cs), -(624,159,o), -(626,6,o), +(623,170,o), +(625,69,o), +(621,13,cs), +(620,-3,o), +(619,-12,o), (615,-22,c), (573,-9,o), (532,5,o), @@ -139,10 +146,10 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(235,443,o), -(277,447,o), -(310,450,cs), -(321,451,o), +(235,444,o), +(278,447,o), +(311,449,cs), +(322,450,o), (326,456,o), (316,467,cs), (306,478,o), @@ -176,7 +183,9 @@ nodes = ( (505,183,o), (380,183,c), (375,171,l), -(428,134,l) +(391,158,o), +(408,145,o), +(428,134,c) ); }, { @@ -185,23 +194,25 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(419,298,o), +(421,297,o), (428,298,o), (440,316,cs), (462,350,o), (483,422,o), (488,448,cs), (490,457,o), -(490,468,o), +(491,468,o), (487,479,cs), -(482,496,o), +(481,496,o), (465,526,o), (458,535,c), (445,531,l), (458,472,o), (431,392,o), (388,355,c), -(409,316,ls) +(393,342,o), +(400,327,o), +(411,311,cs) ); }, { @@ -210,17 +221,17 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(680,270,o), -(704,288,o), -(727,305,cs), -(748,319,o), -(768,333,o), +(684,272,o), +(714,297,o), +(746,319,cs), +(759,328,o), +(775,335,o), (794,340,cs), (803,342,o), (808,347,o), (802,354,cs), -(786,371,o), -(759,393,o), +(787,372,o), +(760,394,o), (734,412,c), (717,399,o), (700,387,o), @@ -229,14 +240,16 @@ nodes = ( (536,366,o), (480,363,c), (475,351,l), -(518,321,l), +(487,340,o), +(502,330,o), +(518,321,c), (580,334,o), -(645,342,o), +(645,344,o), (706,350,c), -(685,322,o), -(665,294,o), -(644,266,c), -(657,253,l) +(689,322,o), +(667,294,o), +(642,266,c), +(658,250,l) ); }, { @@ -245,8 +258,11 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(833,413,o), -(872,425,o), +(821,405,o), +(855,417,o), +(889,425,cs), +(905,429,o), +(911,430,o), (926,431,cs), (936,432,o), (939,440,o), @@ -261,7 +277,9 @@ nodes = ( (612,493,o), (476,487,c), (472,477,l), -(515,448,l), +(483,464,o), +(498,455,o), +(515,448,c), (618,461,o), (735,471,o), (826,475,c), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni81E_A_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni81E_A_.glyph index d718256f..20796ff9 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni81E_A_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni81E_A_.glyph @@ -21,13 +21,13 @@ nodes = ( (802,550,o), (794,558,cs), (778,576,o), -(734,604,o), +(737,605,o), (711,618,c), (689,598,o), (672,590,o), (638,582,cs), (584,569,o), -(452,559,o), +(452,560,o), (307,549,c), (314,505,l), (438,516,o), @@ -35,17 +35,14 @@ nodes = ( (714,537,c), (713,361,o), (711,196,o), -(706,23,cs), -(706,17,o), -(705,15,o), -(701,13,cs), -(693,9,o), -(679,5,o), -(668,3,c), -(681,-14,o), -(698,-64,o), +(707,43,cs), +(706,18,o), +(685,4,o), +(668,1,c), +(683,-22,o), +(701,-60,o), (711,-88,cs), -(716,-98,o), +(715,-98,o), (725,-99,o), (736,-89,cs) ); @@ -56,18 +53,18 @@ nodes = ( (429,-23,o), (574,-19,o), (677,-19,cs), -(694,-19,o), -(696,-1,o), -(688,8,cs), -(681,15,o), -(664,31,o), +(696,-19,o), +(702,-11,o), +(692,3,cs), +(681,17,o), +(664,33,o), (650,43,c), -(643,40,o), -(625,35,o), -(611,32,cs), -(558,21,o), -(376,16,o), -(289,12,c), +(640,39,o), +(618,34,o), +(592,31,cs), +(551,26,o), +(396,15,o), +(289,13,c), (292,-34,l) ); }, @@ -75,15 +72,15 @@ nodes = ( closed = 1; nodes = ( (321,-82,l), -(319,66,o), -(319,507,o), -(321,531,cs), -(322,537,o), -(322,542,o), -(318,545,cs), -(298,560,o), -(272,580,o), -(239,602,c), +(319,33,o), +(319,324,o), +(320,465,cs), +(321,510,o), +(322,527,o), +(324,541,c), +(306,560,o), +(277,582,o), +(242,606,c), (229,596,l), (253,546,o), (257,511,o), @@ -91,21 +88,18 @@ nodes = ( (267,368,o), (269,110,o), (264,37,cs), -(263,15,o), -(260,-4,o), -(256,-21,cs), -(254,-32,o), -(252,-36,o), -(256,-41,cs), -(267,-55,o), -(287,-74,o), +(263,8,o), +(258,-15,o), +(252,-36,c), +(262,-50,o), +(284,-72,o), (308,-92,c) ); }, { closed = 1; nodes = ( -(426,168,o), +(426,169,o), (549,174,o), (650,177,cs), (665,177,o), @@ -126,7 +120,7 @@ nodes = ( { closed = 1; nodes = ( -(420,337,o), +(420,338,o), (541,345,o), (644,348,cs), (659,349,o), @@ -141,24 +135,21 @@ nodes = ( (507,381,o), (421,373,o), (296,368,c), -(296,330,l) +(296,329,l) ); }, { closed = 1; nodes = ( -(380,560,o), -(447,611,o), -(519,686,cs), -(534,701,o), -(540,707,o), -(554,716,cs), -(563,721,o), -(563,729,o), -(555,738,cs), -(538,760,o), -(502,791,o), -(470,818,c), +(379,559,o), +(444,613,o), +(525,690,cs), +(537,702,o), +(549,713,o), +(562,723,c), +(543,753,o), +(511,786,o), +(470,819,c), (457,808,l), (472,778,o), (467,756,o), @@ -342,6 +333,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni822C_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni822C_.glyph index 87daaae3..b1800066 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni822C_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni822C_.glyph @@ -21,10 +21,10 @@ nodes = ( (472,572,o), (480,586,cs), (486,597,o), -(488,598,o), +(484,601,o), (477,607,cs), -(463,618,o), -(436,635,o), +(463,619,o), +(436,636,o), (409,650,c), (388,632,o), (363,626,o), @@ -36,48 +36,39 @@ nodes = ( (289,576,o), (353,586,o), (413,592,c), -(411,466,o), -(408,69,o), -(403,9,cs), -(402,-3,o), -(400,0,o), -(393,3,cs), -(364,13,o), -(319,30,o), +(411,476,o), +(411,111,o), +(406,55,cs), +(404,31,o), +(403,20,o), +(399,0,c), +(368,9,o), +(322,26,o), (272,49,c), (266,36,l), -(324,-3,o), +(324,-5,o), (377,-61,o), -(400,-88,cs) +(395,-82,cs) ); }, { closed = 1; nodes = ( -(197,12,o), -(256,101,o), -(275,370,cs), -(278,418,o), -(278,454,o), +(299,95,o), +(274,292,o), (278,509,cs), -(278,532,o), -(278,555,o), -(279,576,cs), -(280,587,o), -(278,588,o), -(272,594,cs), -(249,613,o), -(229,629,o), +(278,536,o), +(278,564,o), +(280,588,c), +(254,610,o), +(232,627,o), (198,649,c), (188,638,l), (211,605,o), -(220,575,o), +(222,575,o), (223,533,cs), -(228,471,o), -(228,425,o), -(226,373,cs), -(219,143,o), -(166,35,o), +(228,343,o), +(251,118,o), (55,-74,c), (70,-92,l) ); @@ -86,12 +77,12 @@ nodes = ( closed = 1; nodes = ( (349,157,o), -(370,165,o), -(372,179,cs), -(375,193,o), -(377,212,o), -(377,224,cs), -(377,231,o), +(364,163,o), +(370,177,cs), +(376,191,o), +(378,213,o), +(377,225,cs), +(376,232,o), (373,239,o), (364,242,cs), (340,251,o), @@ -100,17 +91,14 @@ nodes = ( (274,257,l), (301,233,o), (323,208,o), -(344,166,cs) +(342,171,cs) ); }, { closed = 1; nodes = ( -(119,283,o), -(130,286,o), -(144,289,cs), -(243,310,o), -(332,328,o), +(214,303,o), +(316,324,o), (429,344,c), (427,380,l), (329,362,o), @@ -120,12 +108,9 @@ nodes = ( (72,334,o), (22,334,c), (19,324,l), -(48,304,o), -(66,292,o), -(89,279,cs), -(93,277,o), -(97,276,o), -(102,278,cs) +(49,302,o), +(68,289,o), +(94,275,c) ); }, { @@ -146,42 +131,36 @@ nodes = ( (735,357,o), (719,348,o), (696,342,cs), -(664,333,o), -(614,324,o), -(578,318,cs), -(553,314,o), -(536,313,o), +(646,329,o), +(575,316,o), (512,311,c), (511,304,l), (527,292,o), (545,280,o), (561,271,c), -(579,275,o), -(595,279,o), -(611,283,cs), -(650,292,o), -(694,300,o), +(623,286,o), +(685,299,o), (747,310,c), (699,147,o), (636,33,o), (441,-66,c), -(456,-87,l) +(455,-87,l) ); }, { closed = 1; nodes = ( (354,411,o), -(372,419,o), -(374,432,cs), -(377,445,o), -(379,463,o), -(379,474,cs), -(379,481,o), -(375,488,o), -(367,491,cs), -(344,500,o), -(317,507,o), +(367,416,o), +(372,429,cs), +(377,442,o), +(380,461,o), +(379,473,cs), +(378,481,o), +(374,489,o), +(362,494,cs), +(343,502,o), +(317,509,o), (286,513,c), (282,505,l), (308,483,o), @@ -192,53 +171,45 @@ nodes = ( { closed = 1; nodes = ( -(870,-69,o), -(902,-65,o), -(957,-61,c), +(870,-67,o), +(902,-64,o), +(957,-62,c), (957,-38,l), (868,-14,o), (821,9,o), (765,55,cs), -(701,107,o), -(656,154,o), -(607,217,cs), -(600,226,o), -(593,235,o), -(586,243,cs), -(583,247,o), -(579,246,o), -(573,245,cs), -(565,244,o), -(544,239,o), -(537,236,cs), -(531,233,o), -(531,229,o), -(537,226,cs), -(549,219,o), -(563,205,o), +(705,104,o), +(665,145,o), +(597,227,cs), +(583,243,o), +(578,245,o), +(566,244,cs), +(555,243,o), +(536,239,o), +(527,236,c), +(527,226,l), +(542,219,o), +(561,207,o), (578,189,cs), (621,142,o), (727,8,o), (786,-66,cs), (793,-75,o), -(800,-76,o), -(806,-75,cs) +(800,-77,o), +(806,-76,cs) ); }, { closed = 1; nodes = ( (291,599,o), -(335,636,o), -(382,693,cs), -(391,704,o), -(400,715,o), -(405,720,cs), -(409,725,o), -(410,730,o), -(403,736,cs), -(384,754,o), -(359,770,o), +(338,635,o), +(379,689,cs), +(392,706,o), +(402,718,o), +(411,727,c), +(391,749,o), +(363,768,o), (335,783,c), (329,778,l), (335,757,o), @@ -254,17 +225,14 @@ nodes = ( closed = 1; nodes = ( (590,415,o), -(622,490,o), -(634,600,cs), -(636,616,o), -(636,636,o), -(639,658,cs), -(640,662,o), -(640,667,o), -(635,671,cs), -(618,686,o), -(596,704,o), -(565,730,c), +(622,486,o), +(635,610,cs), +(637,628,o), +(639,641,o), +(644,666,c), +(627,683,o), +(601,704,o), +(566,730,c), (555,722,l), (572,682,o), (578,662,o), @@ -279,18 +247,18 @@ nodes = ( closed = 1; nodes = ( (838,420,o), -(873,423,o), -(929,428,cs), -(944,429,o), +(873,422,o), +(926,429,cs), +(944,431,o), (946,444,o), (934,458,cs), (919,474,o), -(905,484,o), -(884,501,c), -(870,490,o), -(864,487,o), -(853,481,cs), -(835,472,o), +(905,483,o), +(884,500,c), +(872,490,o), +(865,484,o), +(854,480,cs), +(836,473,o), (805,468,o), (786,469,cs), (773,470,o), @@ -305,18 +273,18 @@ nodes = ( (811,682,o), (811,687,o), (803,694,cs), -(788,707,o), -(762,720,o), -(747,729,c), -(734,715,o), -(725,706,o), +(789,707,o), +(767,721,o), +(749,729,c), +(736,715,o), +(725,705,o), (708,700,cs), -(681,691,o), -(639,686,o), +(681,692,o), +(649,686,o), (607,682,c), (610,642,l), (649,650,o), -(687,655,o), +(687,657,o), (731,661,c), (718,593,o), (713,532,o), @@ -656,6 +624,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni82D_F_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni82D_F_.glyph index cff7f560..028c665a 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni82D_F_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni82D_F_.glyph @@ -97,7 +97,9 @@ nodes = ( (573,106,o), (560,116,o), (545,125,c), -(522,118,l), +(537,121,o), +(529,119,o), +(512,117,cs), (455,111,o), (383,106,o), (320,102,c), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8317.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8317.glyph index a2fa7c47..f4e00650 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8317.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8317.glyph @@ -37,7 +37,7 @@ nodes = ( (444,458,l), (464,446,o), (481,437,o), -(503,427,c), +(503,425,c), (553,436,o), (609,444,o), (651,448,c), @@ -50,15 +50,15 @@ nodes = ( { closed = 1; nodes = ( -(426,-103,l), -(425,-9,o), -(425,79,o), -(425,155,cs), -(425,165,o), -(424,166,o), -(417,169,cs), -(403,175,o), -(373,184,o), +(427,-103,l), +(423,-17,o), +(424,57,o), +(424,126,cs), +(424,145,o), +(426,154,o), +(428,163,c), +(410,172,o), +(378,183,o), (357,188,c), (353,182,l), (360,171,o), @@ -67,31 +67,31 @@ nodes = ( (375,86,o), (375,28,o), (373,-23,cs), -(372,-36,o), -(370,-48,o), -(367,-61,cs), -(365,-68,o), -(363,-74,o), -(368,-78,cs), -(381,-90,o), -(391,-95,o), +(372,-40,o), +(369,-56,o), +(364,-74,c), +(379,-89,o), +(392,-98,o), (418,-111,c) ); }, { closed = 1; nodes = ( -(529,-45,o), -(651,-37,o), -(788,-38,cs), -(803,-38,o), -(801,-28,o), +(529,-43,o), +(646,-37,o), +(783,-38,cs), +(798,-38,o), +(800,-29,o), (795,-21,cs), -(785,-11,o), -(772,-2,o), -(752,10,c), -(630,3,o), -(521,-6,o), +(787,-9,o), +(772,4,o), +(752,20,c), +(738,11,o), +(720,6,o), +(705,5,cs), +(630,-1,o), +(503,-9,o), (387,-14,c), (389,-55,l) ); @@ -102,14 +102,11 @@ nodes = ( (254,292,o), (369,348,o), (493,481,cs), -(502,490,o), -(505,494,o), -(514,504,cs), -(518,508,o), -(521,512,o), -(514,518,cs), -(500,532,o), -(478,545,o), +(504,492,o), +(506,495,o), +(520,511,c), +(507,528,o), +(483,542,o), (449,562,c), (439,556,l), (443,544,o), @@ -128,13 +125,13 @@ nodes = ( (775,95,o), (788,126,cs), (794,141,o), -(807,155,o), -(816,165,cs), -(820,169,o), -(821,174,o), -(815,178,cs), -(792,193,o), -(760,210,o), +(806,155,o), +(815,165,cs), +(819,169,o), +(819,176,o), +(813,180,cs), +(789,198,o), +(762,213,o), (733,224,c), (712,208,o), (694,198,o), @@ -155,10 +152,10 @@ nodes = ( { closed = 1; nodes = ( -(489,243,o), -(496,256,o), -(496,262,cs), -(494,291,o), +(488,244,o), +(496,251,o), +(496,267,cs), +(496,286,o), (491,309,o), (484,324,cs), (481,331,o), @@ -170,28 +167,23 @@ nodes = ( (325,360,l), (377,331,o), (428,295,o), -(477,253,cs) +(472,257,cs) ); }, { closed = 1; nodes = ( -(404,508,o), -(413,512,o), -(413,523,cs), -(413,575,o), -(412,646,o), +(413,519,l), +(413,572,o), +(412,645,o), (413,676,cs), -(414,693,o), -(414,712,o), -(417,721,cs), -(419,727,o), -(418,735,o), -(413,737,cs), -(390,747,o), -(355,754,o), -(324,763,c), -(319,757,l), +(414,699,o), +(416,708,o), +(421,733,c), +(399,745,o), +(362,758,o), +(327,768,c), +(321,757,l), (344,726,o), (349,710,o), (353,683,cs), @@ -201,19 +193,16 @@ nodes = ( (361,569,o), (359,552,o), (358,541,c), -(375,526,o), -(388,516,o), -(397,511,cs) +(374,528,o), +(392,516,o), +(402,511,c) ); }, { closed = 1; nodes = ( -(210,587,o), -(247,592,o), -(301,597,cs), -(488,616,o), -(709,629,o), +(351,609,o), +(717,629,o), (894,631,cs), (915,631,o), (924,645,o), @@ -224,43 +213,35 @@ nodes = ( (824,690,o), (805,684,o), (765,678,cs), -(665,664,o), -(408,645,o), -(287,638,cs), -(228,635,o), -(167,629,o), +(677,666,o), +(213,625,o), (112,634,c), -(107,627,l), -(128,610,o), -(153,592,o), -(172,580,c) +(107,621,l), +(130,606,o), +(157,590,o), +(177,580,c) ); }, { closed = 1; nodes = ( -(586,511,o), -(622,514,o), -(628,534,cs), -(639,575,o), -(657,651,o), -(672,709,cs), -(675,718,o), -(679,731,o), -(683,742,cs), -(686,750,o), -(685,753,o), -(679,757,cs), -(659,768,o), -(625,784,o), +(623,524,l), +(637,567,o), +(658,647,o), +(670,699,cs), +(675,721,o), +(681,740,o), +(686,752,c), +(664,765,o), +(626,784,o), (589,797,c), (584,790,l), (594,769,o), (599,756,o), (600,728,cs), -(602,672,o), -(594,580,o), -(589,534,cs) +(602,669,o), +(597,572,o), +(589,523,c) ); } ); @@ -530,6 +511,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8499.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8499.glyph index e669586d..417fc445 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8499.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8499.glyph @@ -16,11 +16,14 @@ shapes = ( { closed = 1; nodes = ( -(810,444,o), -(859,453,o), -(906,456,cs), -(926,457,o), -(928,473,o), +(805,436,o), +(836,446,o), +(863,452,cs), +(877,455,o), +(895,458,o), +(906,459,cs), +(926,460,o), +(927,474,o), (916,486,cs), (891,514,o), (862,537,o), @@ -31,20 +34,17 @@ nodes = ( (605,538,o), (364,526,o), (214,524,c), -(212,519,l), -(224,507,o), -(243,493,o), +(212,516,l), +(222,505,o), +(240,491,o), (259,482,c), -(292,487,o), -(326,490,o), -(375,493,cs), -(476,499,o), -(661,510,o), +(363,498,o), +(740,514,o), (799,515,c), -(789,487,o), -(779,463,o), +(791,487,o), +(781,463,o), (765,433,c), -(772,427,l) +(775,423,l) ); }, { @@ -77,17 +77,14 @@ nodes = ( closed = 1; nodes = ( (233,159,o), -(327,192,o), -(434,279,cs), -(442,285,o), -(448,290,o), -(456,296,cs), -(461,299,o), -(459,304,o), -(452,310,cs), -(442,318,o), -(428,327,o), -(409,339,c), +(325,191,o), +(423,273,cs), +(440,287,o), +(446,292,o), +(457,301,c), +(442,319,o), +(429,329,o), +(411,341,c), (404,335,l), (404,327,o), (402,320,o), @@ -101,41 +98,41 @@ nodes = ( { closed = 1; nodes = ( -(482,-118,o), -(488,-113,o), -(498,-105,cs), -(515,-90,o), +(481,-117,o), +(488,-114,o), +(498,-106,cs), +(515,-91,o), (529,-61,o), (531,-33,cs), (537,37,o), (535,109,o), (532,171,cs), (531,201,o), -(526,212,o), -(509,224,cs), -(487,240,o), -(439,258,o), +(520,215,o), +(503,227,cs), +(480,243,o), +(440,262,o), (392,273,c), (380,261,l), -(411,245,o), +(412,249,o), (449,223,o), (466,206,cs), (477,196,o), (482,184,o), (483,166,cs), -(487,107,o), -(484,5,o), -(478,-27,cs), -(476,-37,o), -(474,-35,o), -(467,-33,cs), -(434,-24,o), -(394,-12,o), -(357,-1,c), +(487,114,o), +(485,24,o), +(481,-4,cs), +(479,-18,o), +(476,-27,o), +(472,-34,c), +(435,-27,o), +(395,-13,o), +(357,4,c), (350,-9,l), -(389,-37,o), -(441,-75,o), -(475,-111,cs) +(391,-35,o), +(437,-74,o), +(474,-110,cs) ); }, { @@ -145,25 +142,19 @@ nodes = ( (144,295,o), (153,308,cs), (172,334,o), -(202,400,o), -(224,463,cs), -(229,477,o), +(204,400,o), +(226,463,cs), +(231,477,o), (233,490,o), (227,504,cs), (220,522,o), (204,543,o), (186,562,c), -(179,557,l), -(185,536,o), -(178,504,o), -(173,486,cs), -(163,448,o), -(150,424,o), -(132,394,cs), -(122,379,o), -(110,366,o), +(176,557,l), +(189,508,o), +(142,383,o), (94,358,c), -(105,334,o), +(103,333,o), (112,316,o), (122,302,cs) ); @@ -171,8 +162,8 @@ nodes = ( { closed = 1; nodes = ( -(827,-17,o), -(876,-11,o), +(824,-15,o), +(876,-9,o), (936,-4,c), (936,17,l), (812,38,o), @@ -180,26 +171,21 @@ nodes = ( (685,99,cs), (623,133,o), (567,173,o), -(514,213,cs), -(508,217,o), -(505,194,o), -(519,180,cs), -(582,118,o), -(666,46,o), -(738,-18,cs), -(744,-23,o), -(749,-25,o), -(758,-24,cs) +(514,213,c), +(519,176,l), +(592,115,o), +(670,44,o), +(733,-14,cs), +(744,-24,o), +(749,-27,o), +(768,-24,cs) ); }, { closed = 1; nodes = ( -(285,305,o), -(315,308,o), -(349,311,cs), -(490,324,o), -(677,330,o), +(354,317,o), +(639,330,o), (755,330,cs), (773,330,o), (777,343,o), @@ -207,18 +193,15 @@ nodes = ( (754,365,o), (743,373,o), (722,387,c), -(700,380,o), -(687,374,o), -(665,370,cs), -(613,359,o), -(449,347,o), -(294,342,cs), -(275,341,o), -(249,342,o), +(702,378,o), +(687,373,o), +(655,368,cs), +(566,353,o), +(317,342,o), (209,342,c), -(206,335,l), -(224,321,o), -(239,310,o), +(205,332,l), +(222,319,o), +(238,309,o), (257,300,c) ); }, @@ -226,18 +209,15 @@ nodes = ( closed = 1; nodes = ( (606,180,o), -(647,205,o), -(704,239,cs), -(711,243,o), -(730,250,o), -(738,253,cs), -(744,256,o), -(746,261,o), -(739,268,cs), -(727,279,o), -(704,299,o), -(677,317,c), -(669,313,l), +(649,205,o), +(698,236,cs), +(712,245,o), +(724,253,o), +(735,258,c), +(722,277,o), +(699,300,o), +(675,318,c), +(667,312,l), (671,298,o), (667,285,o), (655,270,cs), @@ -250,51 +230,40 @@ nodes = ( { closed = 1; nodes = ( -(345,397,o), -(375,399,o), -(409,402,cs), -(483,408,o), +(404,404,o), (578,415,o), (681,418,cs), (702,419,o), (702,431,o), (693,440,cs), (684,449,o), -(673,457,o), +(673,458,o), (651,471,c), (628,460,o), (610,455,o), (575,450,cs), -(527,443,o), -(429,436,o), -(348,432,cs), -(317,431,o), -(303,431,o), +(519,442,o), +(366,429,o), (271,432,c), -(268,425,l), -(282,415,o), -(302,403,o), +(268,420,l), +(282,410,o), +(300,402,o), (319,394,c) ); }, { closed = 1; nodes = ( -(419,537,o), -(426,541,o), -(426,554,cs), -(426,605,o), -(426,660,o), +(429,550,l), +(426,602,o), +(426,659,o), (429,691,cs), -(430,707,o), -(430,725,o), -(432,735,cs), -(434,741,o), -(434,747,o), -(428,750,cs), -(407,760,o), -(376,771,o), -(345,783,c), +(430,714,o), +(432,730,o), +(435,746,c), +(415,758,o), +(383,773,o), +(347,786,c), (341,776,l), (363,746,o), (368,725,o), @@ -305,19 +274,16 @@ nodes = ( (376,594,o), (376,576,o), (375,567,c), -(391,552,o), -(402,545,o), -(412,540,cs) +(387,556,o), +(399,548,o), +(416,539,c) ); }, { closed = 1; nodes = ( -(219,601,o), -(251,604,o), -(302,608,cs), -(475,621,o), -(682,630,o), +(327,616,o), +(674,630,o), (854,628,cs), (874,628,o), (881,642,o), @@ -328,43 +294,35 @@ nodes = ( (789,686,o), (771,679,o), (735,674,cs), -(640,662,o), -(403,650,o), -(291,647,cs), -(236,645,o), -(179,644,o), +(635,661,o), +(259,639,o), (128,647,c), -(122,641,l), -(143,623,o), -(165,608,o), -(183,596,c) +(120,633,l), +(142,618,o), +(166,606,o), +(185,596,c) ); }, { closed = 1; nodes = ( -(563,542,o), -(603,545,o), -(609,566,cs), -(620,603,o), -(634,666,o), -(645,711,cs), -(649,726,o), -(653,739,o), -(656,749,cs), -(659,758,o), -(660,761,o), -(654,765,cs), -(634,778,o), -(603,791,o), +(603,560,l), +(615,598,o), +(633,665,o), +(642,701,cs), +(650,733,o), +(655,748,o), +(660,761,c), +(640,775,o), +(606,790,o), (568,804,c), -(563,798,l), -(571,781,o), -(577,764,o), -(578,737,cs), -(579,688,o), -(571,607,o), -(566,566,cs) +(562,793,l), +(571,777,o), +(577,759,o), +(578,734,cs), +(579,685,o), +(573,607,o), +(569,564,c) ); } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni873B_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni873B_.glyph index 64b4399c..5aa7bf8c 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni873B_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni873B_.glyph @@ -37,11 +37,14 @@ nodes = ( (514,303,c), (530,267,l), (765,289,l), -(771,136,o), -(773,-11,o), -(768,-37,c), -(734,-27,o), -(692,-14,o), +(770,171,o), +(772,60,o), +(770,2,cs), +(770,-15,o), +(768,-28,o), +(766,-37,c), +(732,-30,o), +(692,-17,o), (646,2,c), (637,-13,l), (699,-54,o), @@ -56,11 +59,14 @@ fillColor = (0,255); closed = 1; nodes = ( (177,54,o), -(303,100,o), +(303,101,o), (380,128,c), (370,153,l), -(272,126,o), -(132,88,o), +(295,131,o), +(196,108,o), +(110,92,cs), +(84,87,o), +(59,84,o), (36,83,c), (34,68,l), (100,24,l) @@ -144,18 +150,24 @@ fillColor = (0,255); closed = 1; nodes = ( (540,-115,l), -(543,16,o), -(548,163,o), -(553,301,c), -(534,315,o), -(514,330,o), +(543,8,o), +(547,146,o), +(552,277,cs), +(552,285,o), +(553,294,o), +(556,301,c), +(537,318,o), +(516,333,o), (492,346,c), (482,336,l), (497,304,o), -(502,271,o), -(503,219,cs), -(504,143,o), -(503,0,o), +(502,285,o), +(503,233,cs), +(504,184,o), +(504,100,o), +(497,28,cs), +(493,-14,o), +(487,-49,o), (479,-71,c), (494,-90,o), (508,-106,o), @@ -199,10 +211,10 @@ nodes = ( (404,477,o), (417,491,cs), (425,499,o), -(424,504,o), +(424,502,o), (417,509,cs), -(405,519,o), -(385,532,o), +(404,522,o), +(384,535,o), (361,547,c), (350,536,o), (337,520,o), @@ -269,14 +281,14 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(590,387,o), -(781,400,o), +(596,387,o), +(784,400,o), (939,401,cs), (959,401,o), -(958,415,o), +(957,414,o), (948,425,cs), -(935,438,o), -(909,457,o), +(935,440,o), +(915,455,o), (893,468,c), (874,459,o), (852,452,o), @@ -284,8 +296,10 @@ nodes = ( (773,435,o), (577,414,o), (408,411,c), -(404,397,l), -(449,366,l) +(404,399,l), +(420,387,o), +(438,376,o), +(458,366,c) ); }, { @@ -304,13 +318,15 @@ nodes = ( (828,554,o), (811,565,c), (786,550,o), -(767,544,o), -(734,539,cs), -(677,529,o), +(770,543,o), +(737,538,cs), +(680,528,o), (529,516,o), (468,516,c), (464,504,l), -(514,474,l) +(479,492,o), +(495,482,o), +(514,474,c) ); }, { @@ -350,8 +366,8 @@ nodes = ( (895,615,o), (899,624,o), (888,637,cs), -(879,646,o), -(859,661,o), +(878,649,o), +(858,664,o), (838,676,c), (823,668,o), (805,659,o), @@ -360,7 +376,9 @@ nodes = ( (551,621,o), (431,621,c), (427,609,l), -(477,575,l) +(442,596,o), +(459,585,o), +(477,575,c) ); } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni88A_A_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni88A_A_.glyph index 54d7a877..24137f4d 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni88A_A_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni88A_A_.glyph @@ -27,7 +27,7 @@ nodes = ( (315,547,o), (291,541,cs), (247,529,o), -(153,506,o), +(153,507,o), (68,505,c), (63,489,l), (125,456,l), @@ -47,20 +47,28 @@ fillColor = (0,255); closed = 1; nodes = ( (286,-91,l), -(286,49,o), -(290,269,o), -(297,331,c), -(287,340,o), -(275,352,o), +(286,31,o), +(289,214,o), +(294,300,cs), +(295,312,o), +(297,322,o), +(301,329,c), +(288,345,o), +(273,356,o), (255,366,c), -(244,336,l), -(248,206,o), -(239,62,o), +(241,361,l), +(244,339,o), +(244,317,o), +(245,296,cs), +(246,178,o), +(239,58,o), (235,26,cs), (233,4,o), (228,-15,o), (218,-43,c), -(276,-99,l) +(235,-63,o), +(254,-81,o), +(274,-97,c) ); }, { @@ -93,22 +101,22 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(500,-28,o), -(671,5,o), +(510,-27,o), +(671,8,o), (786,29,c), (766,59,l), -(680,46,o), -(596,35,o), -(510,25,c), -(531,51,o), -(557,86,o), -(593,135,cs), -(609,157,o), -(633,191,o), +(680,45,o), +(596,34,o), +(513,26,c), +(536,63,o), +(568,107,o), +(617,170,cs), +(627,183,o), +(642,201,o), (659,215,c), (647,232,o), -(632,251,o), -(613,271,c), +(632,255,o), +(613,275,c), (592,271,l), (588,239,o), (583,223,o), @@ -120,7 +128,9 @@ nodes = ( (440,18,o), (405,16,c), (397,4,l), -(438,-51,l) +(409,-15,o), +(422,-34,o), +(438,-51,c) ); }, { @@ -129,11 +139,14 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(368,320,o), -(406,353,o), -(443,386,c), -(433,404,o), -(413,428,o), +(362,312,o), +(390,337,o), +(419,366,cs), +(426,373,o), +(433,379,o), +(440,384,c), +(431,403,o), +(414,427,o), (396,445,c), (385,441,l), (383,414,o), @@ -151,7 +164,7 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(842,-76,o), +(841,-77,o), (858,-64,o), (862,-48,cs), (866,-28,o), @@ -160,12 +173,12 @@ nodes = ( (864,28,o), (857,41,o), (844,52,cs), -(796,93,o), -(745,130,o), +(796,94,o), +(745,131,o), (685,170,c), (674,157,l), (744,83,o), -(769,40,o), +(770,43,o), (825,-50,cs) ); }, @@ -185,16 +198,15 @@ nodes = ( (887,329,o), (866,345,c), (837,327,o), -(782,315,o), -(737,309,cs), -(693,303,o), -(558,291,o), -(480,287,cs), -(458,286,o), -(421,286,o), +(794,317,o), +(747,311,cs), +(659,299,o), +(507,286,o), (415,286,c), (412,273,l), -(468,239,l) +(429,262,o), +(447,250,o), +(468,239,c) ); }, { @@ -237,13 +249,15 @@ nodes = ( (842,525,o), (822,539,c), (797,522,o), -(740,507,o), -(707,502,cs), -(625,489,o), +(757,509,o), +(724,504,cs), +(642,491,o), (522,482,o), (445,482,c), (441,467,l), -(491,435,l) +(456,456,o), +(472,446,o), +(491,435,c) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni88A_D_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni88A_D_.glyph index 5b137d07..f9544f2a 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni88A_D_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni88A_D_.glyph @@ -11,20 +11,22 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(522,249,l), -(530,268,o), -(532,287,o), -(533,306,cs), -(533,315,o), -(529,321,o), +(507,242,o), +(516,241,o), +(522,252,cs), +(530,267,o), +(534,284,o), +(534,303,cs), +(534,312,o), +(530,321,o), (521,325,cs), -(512,329,l), -(455,346,l), -(416,357,l), +(486,340,o), +(451,351,o), +(416,357,c), (411,343,l), (448,318,o), -(479,287,o), -(503,248,c) +(475,291,o), +(499,254,cs) ); }, { @@ -35,23 +37,21 @@ closed = 1; nodes = ( (611,89,l), (661,118,o), -(686,135,o), -(711,154,c), -(726,162,ls), -(738,168,o), -(740,171,o), -(732,181,cs), -(717,198,o), -(704,212,o), +(683,135,o), +(711,154,cs), +(721,161,o), +(730,166,o), +(740,171,c), +(723,195,o), +(708,209,o), (683,228,c), (675,225,l), -(673,213,o), -(671,202,o), -(664,192,cs), -(647,166,o), -(625,142,o), -(602,123,cs), -(585,109,l) +(676,213,o), +(672,201,o), +(663,188,cs), +(641,155,o), +(603,123,o), +(585,109,c) ); }, { @@ -61,14 +61,16 @@ fillColor = (0,255); closed = 1; nodes = ( (655,649,o), -(677,654,o), +(673,655,o), (680,673,cs), -(685,713,ls), -(687,733,o), -(681,737,o), +(685,686,o), +(688,700,o), +(687,713,cs), +(685,733,o), +(681,738,o), (663,744,cs), -(632,754,o), -(595,764,o), +(632,755,o), +(595,765,o), (547,776,c), (542,761,l), (593,729,o), @@ -82,16 +84,12 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(364,619,o), -(252,609,o), +(237,610,o), (144,613,c), (141,604,l), (202,564,l), -(236,568,o), -(267,571,o), -(298,574,cs), -(488,591,o), -(639,595,o), +(402,588,o), +(620,595,o), (829,599,cs), (847,600,o), (851,612,o), @@ -101,10 +99,8 @@ nodes = ( (778,667,c), (757,658,o), (735,649,o), -(713,646,cs), -(644,635,o), -(579,629,o), -(472,624,cs) +(693,643,cs), +(572,625,o) ); }, { @@ -115,14 +111,13 @@ closed = 1; nodes = ( (486,407,o), (621,446,o), -(696,487,cs), -(707,493,o), -(726,502,o), -(731,504,cs), -(745,509,o), -(747,516,o), -(737,528,cs), -(699,574,l), +(688,483,cs), +(706,493,o), +(723,502,o), +(745,513,c), +(731,533,o), +(716,554,o), +(702,574,c), (690,571,l), (687,557,o), (681,548,o), @@ -139,10 +134,10 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(528,395,o), -(531,363,o), -(577,348,cs), -(669,321,o), +(527,395,o), +(539,357,o), +(595,343,cs), +(669,326,o), (787,338,o), (838,362,cs), (851,369,o), @@ -152,13 +147,13 @@ nodes = ( (836,470,o), (836,524,c), (819,524,l), -(816,505,o), -(812,476,o), -(807,455,cs), -(799,418,o), -(778,394,o), -(739,387,cs), -(686,376,o), +(818,501,o), +(811,467,o), +(803,437,cs), +(795,409,o), +(778,396,o), +(749,390,cs), +(715,383,o), (647,378,o), (602,386,cs), (573,391,o), @@ -167,17 +162,16 @@ nodes = ( (576,479,o), (577,506,o), (581,530,cs), -(582,536,o), -(584,544,o), -(587,553,cs), -(591,566,o), -(590,568,o), -(579,576,cs), -(551,595,l), +(582,539,o), +(584,552,o), +(588,567,c), +(569,583,o), +(549,595,o), +(530,605,c), (520,600,l), (532,550,o), -(526,530,o), -(528,445,cs) +(530,530,o), +(528,426,cs) ); }, { @@ -186,26 +180,23 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(479,645,o), -(489,675,o), -(498,696,cs), -(503,708,o), -(507,715,o), -(505,721,cs), -(500,732,o), -(446,785,o), +(484,657,o), +(497,699,o), +(507,717,c), +(490,741,o), +(447,784,o), (431,794,c), (420,786,l), (440,734,o), -(429,682,o), -(419,637,cs), -(384,488,o), +(431,682,o), +(423,649,cs), +(382,479,o), (302,393,o), (118,307,c), (129,285,l), (337,356,o), -(428,469,o), -(471,616,cs) +(427,461,o), +(475,626,cs) ); }, { @@ -214,59 +205,36 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(425,229,l), -(410,204,o), -(389,187,o), -(368,169,c), -(331,190,l), -(324,184,l), -(333,169,l), -(341,151,l), -(253,88,o), -(153,44,o), -(50,5,c), -(62,-19,l), -(190,21,o), -(263,56,o), -(350,107,c), -(352,83,l), -(352,20,l), -(350,-18,ls), -(349,-28,o), -(345,-40,o), -(334,-43,cs), -(323,-46,ls), -(320,-47,o), -(316,-50,o), -(315,-57,c), -(331,-73,o), -(346,-91,o), +(336,167,o), +(348,134,o), +(349,110,cs), +(352,57,o), +(354,36,o), +(350,-18,cs), +(348,-38,o), +(341,-41,o), +(319,-46,c), +(315,-59,l), +(329,-76,o), +(346,-92,o), (367,-107,c), -(382,-97,o), -(394,-85,o), -(408,-75,cs), -(451,-43,l), -(540,12,l), -(587,41,l), +(423,-62,o), +(512,-4,o), +(587,41,c), (571,61,l), -(514,32,o), +(514,29,o), (460,3,o), -(402,-22,c), -(403,33,o), -(402,87,o), -(402,136,c), -(425,151,o), -(440,166,o), -(455,177,cs), -(460,181,o), -(468,186,o), -(473,188,cs), -(479,190,o), -(480,195,o), -(477,200,cs), -(469,210,o), -(458,219,o), -(440,233,c) +(403,-22,c), +(402,24,o), +(401,69,o), +(402,109,cs), +(402,122,o), +(403,136,o), +(404,149,c), +(382,167,o), +(357,180,o), +(329,192,c), +(322,186,l) ); }, { @@ -275,37 +243,25 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(440,225,o), -(649,236,o), -(829,231,cs), -(869,230,ls), -(875,230,o), -(881,232,o), -(885,237,c), -(889,240,o), -(890,245,o), -(887,249,cs), -(881,257,l), -(853,280,l), -(819,302,l), -(805,297,o), -(794,291,o), -(764,285,cs), -(694,270,o), -(575,265,o), -(428,258,cs), -(369,255,o), -(164,246,o), -(105,246,cs), -(77,246,l), -(75,235,l), -(134,203,ls), -(140,200,o), -(144,199,o), -(149,200,cs), -(193,206,o), -(237,208,o), -(281,212,cs) +(639,236,o), +(869,230,cs), +(890,229,o), +(893,242,o), +(880,255,cs), +(865,271,o), +(845,287,o), +(819,302,c), +(805,295,o), +(793,290,o), +(733,280,cs), +(648,266,o), +(146,246,o), +(77,246,c), +(74,232,l), +(94,220,o), +(116,209,o), +(141,199,c), +(275,219,o) ); }, { @@ -314,33 +270,57 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(597,108,l), -(535,163,ls), -(530,168,o), +(537,163,cs), +(532,167,o), (523,171,o), (516,170,cs), -(502,169,o), -(491,166,o), -(479,162,cs), -(472,160,o), -(470,151,o), -(479,148,cs), -(491,144,o), -(503,137,o), +(500,169,o), +(487,167,o), +(473,162,c), +(473,148,l), +(487,146,o), +(502,138,o), (515,128,cs), (576,84,o), -(675,-3,o), -(735,-51,cs), -(740,-55,o), +(675,2,o), +(732,-51,cs), +(737,-55,o), (745,-57,o), (760,-55,cs), (822,-48,o), (869,-42,o), (937,-33,c), (934,-13,l), -(815,-3,o), -(707,32,o), -(611,99,c) +(863,-7,o), +(797,7,o), +(733,32,cs), +(674,55,o), +(621,89,o) +); +}, +{ +attr = { +fillColor = (0,255); +}; +closed = 1; +nodes = ( +(348,96,o), +(435,162,cs), +(452,175,o), +(468,187,o), +(478,193,c), +(466,213,o), +(453,227,o), +(432,241,c), +(420,236,l), +(419,209,o), +(400,194,o), +(377,176,cs), +(271,93,o), +(137,38,o), +(50,5,c), +(60,-19,l), +(202,23,o) ); } ); @@ -690,6 +670,7 @@ nodes = ( ); } ); +visible = 1; width = 1000; } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni88C_2.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni88C_2.glyph index 6ec39b11..68be99cc 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni88C_2.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni88C_2.glyph @@ -22,10 +22,10 @@ nodes = ( (602,109,o), (529,175,cs), (523,180,o), -(515,184,o), +(515,183,o), (505,183,cs), -(492,182,o), -(480,180,o), +(499,183,o), +(475,181,o), (467,178,c), (467,162,l), (485,159,o), @@ -93,8 +93,8 @@ nodes = ( (333,-43,cs), (306,-56,l), (305,-68,l), -(314,-77,o), -(348,-106,o), +(312,-79,o), +(346,-108,o), (357,-113,c) ); }, @@ -104,15 +104,15 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(218,433,o), -(272,472,o), -(344,549,cs), -(364,570,o), -(386,600,o), -(410,629,c), -(395,645,o), -(380,658,o), -(364,673,c), +(232,443,o), +(291,491,o), +(371,580,cs), +(382,593,o), +(398,609,o), +(412,623,c), +(398,643,o), +(381,663,o), +(362,676,c), (347,672,l), (347,650,o), (338,628,o), @@ -169,7 +169,9 @@ nodes = ( (211,246,o), (84,252,c), (82,237,l), -(150,200,l) +(103,224,o), +(125,211,o), +(150,200,c) ); }, { @@ -197,7 +199,9 @@ nodes = ( (369,556,o), (333,554,c), (320,539,l), -(350,515,l), +(329,530,o), +(339,522,o), +(350,515,c), (459,534,l), (412,439,o), (284,336,o), @@ -235,23 +239,23 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(688,116,o), -(704,127,o), -(732,147,cs), -(741,153,o), -(750,159,o), -(761,165,c), -(749,181,o), -(733,199,o), -(709,225,c), +(678,108,o), +(709,129,o), +(730,147,cs), +(736,152,o), +(748,161,o), +(758,167,c), +(745,188,o), +(724,211,o), +(705,228,c), (694,224,l), -(691,206,o), -(688,198,o), -(680,183,cs), -(664,155,o), -(644,131,o), +(694,206,o), +(691,196,o), +(681,181,cs), +(663,154,o), +(645,131,o), (612,96,c), -(635,79,l) +(632,79,l) ); }, { @@ -266,17 +270,19 @@ nodes = ( (574,671,o), (580,682,o), (568,696,cs), -(556,708,o), -(535,724,o), -(520,734,c), -(498,724,o), +(557,708,o), +(539,723,o), +(523,733,c), +(501,723,o), (477,715,o), (454,711,cs), -(366,695,o), +(366,696,o), (193,688,o), (122,688,c), (118,676,l), -(172,638,l) +(134,662,o), +(152,650,o), +(172,638,c) ); }, { @@ -302,7 +308,9 @@ nodes = ( (614,587,o), (619,501,o), (607,455,c), -(646,422,l) +(618,443,o), +(631,432,o), +(646,422,c) ); }, { @@ -333,7 +341,9 @@ nodes = ( (757,547,o), (756,416,o), (751,383,c), -(669,404,l), +(722,389,o), +(694,396,o), +(669,404,c), (664,392,l), (709,358,o), (728,341,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8B_F_2.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8B_F_2.glyph index 6b97ebf1..d35f7192 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8B_F_2.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8B_F_2.glyph @@ -24,15 +24,17 @@ nodes = ( (871,116,o), (850,133,c), (818,118,o), -(778,111,o), -(741,109,cs), -(708,107,o), -(522,103,o), +(780,111,o), +(743,109,cs), +(710,107,o), +(522,102,o), (443,103,c), (460,156,o), (522,382,o), (541,454,c), -(490,512,l), +(524,473,o), +(507,493,o), +(490,512,c), (475,507,l), (479,475,o), (479,453,o), @@ -44,8 +46,8 @@ nodes = ( (391,109,o), (368,96,c), (363,84,l), -(375,72,o), -(388,60,o), +(372,73,o), +(391,55,o), (406,45,c) ); }, @@ -81,7 +83,9 @@ nodes = ( (90,412,o), (31,405,c), (28,391,l), -(80,358,l), +(41,381,o), +(64,366,o), +(80,358,c), (119,373,o), (162,387,o), (207,401,c), @@ -93,7 +97,9 @@ nodes = ( (163,45,cs), (145,31,l), (142,18,l), -(197,-29,l) +(157,0,o), +(175,-15,o), +(197,-29,c) ); }, { @@ -139,20 +145,22 @@ nodes = ( (807,429,o), (819,439,cs), (829,448,o), -(830,455,o), +(829,453,o), (818,466,cs), -(801,482,o), -(784,495,o), +(802,484,o), +(785,497,o), (760,513,c), (738,494,o), -(724,483,o), -(700,480,cs), -(636,471,o), -(572,465,o), +(726,483,o), +(702,480,cs), +(638,471,o), +(572,464,o), (508,460,c), -(505,423,l), -(745,443,l), -(740,395,o), +(505,422,l), +(585,432,o), +(667,438,o), +(745,442,c), +(740,394,o), (689,-5,o), (657,-26,c), (610,-9,o), @@ -204,9 +212,9 @@ nodes = ( (916,303,o), (890,323,c), (873,314,o), -(853,307,o), -(814,301,cs), -(738,288,o), +(848,298,o), +(809,295,cs), +(733,290,o), (459,281,o), (313,283,c), (309,271,l), @@ -249,8 +257,8 @@ nodes = ( (573,688,o), (583,702,o), (598,720,c), -(575,750,o), -(541,793,o), +(577,752,o), +(543,795,o), (520,819,c), (504,811,l), (512,784,o), @@ -284,7 +292,9 @@ nodes = ( (581,610,o), (502,603,c), (493,590,l), -(528,560,l) +(503,579,o), +(518,566,o), +(528,560,c) ); } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8C_2F_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8C_2F_.glyph index c63c5847..f9ffa2e6 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8C_2F_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8C_2F_.glyph @@ -12,14 +12,14 @@ fillColor = (0,255); closed = 1; nodes = ( (275,36,o), -(366,144,o), +(366,145,o), (419,207,c), (403,223,l), -(357,178,o), -(314,137,o), -(265,94,c), -(271,211,o), -(275,305,o), +(357,177,o), +(315,138,o), +(266,95,c), +(270,212,o), +(274,305,o), (280,362,cs), (282,382,o), (287,396,o), @@ -47,8 +47,10 @@ nodes = ( (210,80,o), (202,58,o), (175,37,c), -(174,19,l), -(228,-24,l) +(171,22,l), +(187,5,o), +(206,-10,o), +(228,-24,c) ); }, { @@ -115,7 +117,7 @@ nodes = ( (726,6,o), (719,18,cs), (696,58,o), -(679,79,o), +(681,80,o), (644,124,c), (631,116,l), (648,66,o), @@ -162,7 +164,7 @@ nodes = ( (908,2,o), (894,16,cs), (858,53,o), -(814,86,o), +(814,88,o), (749,137,c), (737,125,l), (786,60,o), @@ -213,10 +215,12 @@ nodes = ( (819,220,o), (784,214,cs), (749,208,o), -(568,193,o), +(568,192,o), (502,190,c), -(502,172,l), -(538,149,l) +(500,175,l), +(510,166,o), +(525,156,o), +(538,149,c) ); }, { @@ -241,7 +245,9 @@ nodes = ( (602,319,o), (525,314,c), (522,301,l), -(566,276,l) +(535,292,o), +(550,283,o), +(566,276,c) ); }, { @@ -314,7 +320,9 @@ nodes = ( (590,431,o), (526,428,c), (523,415,l), -(566,391,l) +(536,406,o), +(551,398,o), +(566,391,c) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8D_29.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8D_29.glyph index 8c17f798..9670ea36 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8D_29.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8D_29.glyph @@ -71,22 +71,22 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(396,12,o), -(412,29,o), -(414,44,cs), -(416,61,o), -(416,70,o), -(416,87,cs), -(416,99,o), -(411,107,o), -(401,112,cs), -(365,132,o), +(395,16,o), +(405,25,o), +(410,40,cs), +(416,57,o), +(418,71,o), +(415,88,cs), +(413,100,o), +(410,106,o), +(400,112,cs), +(364,134,o), (331,150,o), (291,166,c), (283,146,l), (328,107,o), -(354,73,o), -(385,28,cs) +(353,77,o), +(384,32,cs) ); }, { @@ -95,16 +95,18 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(204,170,l), -(216,612,ls), -(217,624,o), +(207,170,l), +(208,317,o), +(210,465,o), +(216,612,cs), +(216,624,o), (219,639,o), (222,645,c), -(198,666,o), -(174,686,o), +(200,668,o), +(176,688,o), (150,707,c), (135,697,l), -(154,658,o), +(154,655,o), (158,613,o), (159,578,cs), (162,469,o), @@ -113,9 +115,9 @@ nodes = ( (156,265,o), (153,240,o), (143,203,c), -(157,190,o), -(177,171,o), -(190,160,c) +(156,188,o), +(177,170,o), +(193,160,c) ); }, { @@ -153,8 +155,8 @@ nodes = ( (385,245,o), (379,232,o), (369,216,c), -(380,201,o), -(393,186,o), +(379,200,o), +(392,185,o), (404,171,cs), (410,164,o), (415,163,o), @@ -168,13 +170,13 @@ fillColor = (0,255); closed = 1; nodes = ( (572,110,o), -(591,330,o), -(595,565,cs), -(595,576,o), -(598,587,o), -(607,596,c), -(581,623,o), -(555,646,o), +(586,330,o), +(593,545,cs), +(594,576,o), +(596,587,o), +(600,596,c), +(577,623,o), +(553,646,o), (529,666,c), (513,656,l), (531,613,o), @@ -203,12 +205,12 @@ nodes = ( (679,240,o), (636,303,cs), (632,309,o), -(621,314,o), -(612,317,cs), -(601,321,o), -(587,321,o), -(572,319,c), -(568,310,l), +(624,315,o), +(615,317,cs), +(604,319,o), +(586,320,o), +(571,319,c), +(568,304,l), (592,294,o), (607,277,o), (623,254,cs), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8D_73.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8D_73.glyph index de9ff142..76cb40d9 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8D_73.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8D_73.glyph @@ -203,8 +203,8 @@ nodes = ( (581,599,o), (594,563,o), (596,499,cs), -(599,392,o), -(599,359,o), +(600,392,o), +(600,359,o), (596,290,cs), (595,269,o), (589,263,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8D_74.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8D_74.glyph index e3ecd934..8cb4ed10 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8D_74.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8D_74.glyph @@ -26,7 +26,7 @@ nodes = ( (248,173,c), (233,142,l), (402,64,o), -(571,-20,o), +(571,-18,o), (724,-96,cs) ); }, @@ -67,8 +67,8 @@ nodes = ( (423,282,o), (424,305,o), (432,340,c), -(417,355,o), -(398,373,o), +(417,357,o), +(398,375,o), (381,388,c), (363,379,l), (374,291,o), @@ -183,8 +183,8 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(701,49,l), -(702,212,o), +(702,47,l), +(701,213,o), (705,452,o), (716,594,cs), (719,632,o), @@ -226,9 +226,9 @@ nodes = ( (843,401,o), (788,430,o), (703,473,c), -(704,443,l), -(795,373,o), -(836,329,o), +(694,453,l), +(790,379,o), +(833,333,o), (890,265,cs) ); } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8F_6C_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8F_6C_.glyph index 72af645d..6e6a77df 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni8F_6C_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni8F_6C_.glyph @@ -48,11 +48,11 @@ nodes = ( (557,241,o), (550,228,o), (528,218,c), -(524,210,l), -(536,197,o), -(551,182,o), +(523,205,l), +(534,192,o), +(550,182,o), (564,171,c), -(626,196,o), +(626,194,o), (708,205,o), (765,210,c), (730,148,o), @@ -71,8 +71,11 @@ nodes = ( (364,154,o), (487,197,c), (476,224,l), -(384,193,o), -(153,126,o), +(398,198,o), +(236,151,o), +(125,128,cs), +(95,122,o), +(71,119,o), (51,118,c), (48,102,l), (68,86,o), @@ -88,9 +91,9 @@ closed = 1; nodes = ( (348,-92,l), (346,-31,o), -(350,264,o), -(356,361,cs), -(358,391,o), +(350,265,o), +(356,362,cs), +(358,392,o), (361,420,o), (364,439,c), (346,456,o), @@ -141,11 +144,8 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(181,271,o), -(198,276,o), -(233,282,cs), -(285,291,o), -(346,298,o), +(241,290,o), +(353,299,o), (447,305,cs), (460,306,o), (467,315,o), @@ -153,10 +153,10 @@ nodes = ( (448,340,o), (432,354,o), (420,362,c), -(394,345,o), -(374,342,o), -(351,337,cs), -(315,330,o), +(395,346,o), +(378,340,o), +(351,335,cs), +(319,330,o), (271,324,o), (199,316,c), (234,387,o), @@ -181,7 +181,7 @@ nodes = ( (111,298,l), (121,284,o), (132,271,o), -(146,259,c) +(146,260,c) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9020.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9020.glyph index 5bcea3b8..27236f4b 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9020.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9020.glyph @@ -209,14 +209,11 @@ nodes = ( (414,468,o), (459,524,o), (493,589,cs), -(500,603,o), -(506,616,o), -(517,628,cs), -(520,632,o), -(520,636,o), -(514,644,cs), -(491,671,o), -(472,691,o), +(501,605,o), +(508,620,o), +(523,634,c), +(496,666,o), +(475,688,o), (448,714,c), (437,707,l), (451,673,o), @@ -259,14 +256,11 @@ nodes = ( (643,529,o), (647,611,o), (650,665,cs), -(651,692,o), -(653,710,o), -(658,726,cs), -(660,733,o), -(658,738,o), -(652,743,cs), -(631,762,o), -(598,788,o), +(651,697,o), +(654,716,o), +(661,735,c), +(642,754,o), +(602,785,o), (572,805,c), (561,796,l), (577,767,o), @@ -281,9 +275,6 @@ nodes = ( closed = 1; nodes = ( (521,534,o), -(548,536,o), -(585,541,cs), -(633,547,o), (727,558,o), (823,560,cs), (841,560,o), @@ -295,11 +286,8 @@ nodes = ( (770,620,o), (750,613,o), (726,607,cs), -(673,594,o), -(589,581,o), -(519,573,cs), -(505,571,o), -(479,570,o), +(639,586,o), +(562,577,o), (455,568,c), (450,562,l), (464,551,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9042.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9042.glyph index 3bdb522e..ccfb410c 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9042.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9042.glyph @@ -87,7 +87,7 @@ nodes = ( (146,390,o), (193,405,o), (243,420,c), -(235,404,o), +(229,394,o), (182,305,o), (182,289,cs), (182,267,o), @@ -144,15 +144,15 @@ nodes = ( (667,85,o), (669,136,cs), (671,179,o), -(672,221,o), -(671,264,cs), -(670,370,o), -(650,419,o), +(675,225,o), +(669,295,cs), +(662,374,o), +(648,419,o), (551,458,c), (538,440,l), (610,405,o), (619,364,o), -(624,279,cs), +(623,297,cs), (626,256,o), (626,180,o), (623,143,cs), @@ -324,11 +324,14 @@ fillColor = (0,255); closed = 1; nodes = ( (674,583,l), -(719,634,o), -(767,683,o), +(712,621,o), +(747,657,o), +(775,690,cs), +(787,704,o), +(796,713,o), (809,725,c), -(792,749,o), -(764,785,o), +(793,750,o), +(765,786,o), (745,808,c), (731,803,l), (732,773,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni90E_D_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni90E_D_.glyph index c26fa6cc..85d53f4f 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni90E_D_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni90E_D_.glyph @@ -24,30 +24,30 @@ nodes = ( (911,290,o), (879,345,o), (771,435,c), -(801,480,o), -(845,530,o), -(877,562,cs), -(901,585,o), -(913,594,o), -(925,602,cs), -(931,606,o), -(930,613,o), +(803,482,o), +(849,534,o), +(883,568,cs), +(904,588,o), +(913,596,o), +(924,602,cs), +(930,605,o), +(929,612,o), (924,618,cs), -(900,640,o), -(876,658,o), +(902,643,o), +(878,661,o), (855,672,c), (841,659,o), -(823,649,o), -(803,641,cs), -(771,629,o), +(823,647,o), +(800,640,cs), +(771,631,o), (708,620,o), (656,613,c), (667,572,l), (719,581,o), (763,589,o), (824,597,c), -(796,536,o), -(761,472,o), +(797,536,o), +(760,472,o), (727,432,c), (819,349,o), (848,284,o), @@ -56,8 +56,8 @@ nodes = ( (844,212,o), (836,213,cs), (796,217,o), -(743,226,o), -(700,234,c), +(743,225,o), +(700,235,c), (695,219,l), (759,193,o), (814,157,o), @@ -70,11 +70,8 @@ nodes = ( { closed = 1; nodes = ( -(375,-90,o), -(385,-77,o), -(392,-63,cs), -(398,-50,o), -(398,-38,o), +(389,-78,o), +(398,-57,o), (398,-25,cs), (400,38,o), (399,161,o), @@ -93,10 +90,10 @@ nodes = ( (348,190,o), (349,177,cs), (351,146,o), -(351,60,o), -(348,20,cs), -(347,1,o), -(346,-9,o), +(351,59,o), +(350,19,cs), +(350,0,o), +(348,-8,o), (345,-15,c), (306,-4,o), (266,11,o), @@ -113,22 +110,19 @@ nodes = ( { closed = 1; nodes = ( -(144,57,o), -(155,60,o), -(176,66,cs), -(293,100,o), -(439,136,o), +(260,94,o), +(433,139,o), (578,173,c), (570,197,l), -(431,165,o), -(255,136,o), -(147,121,cs), -(115,117,o), -(95,115,o), +(481,177,o), +(270,137,o), +(137,120,cs), +(105,116,o), +(76,114,o), (54,115,c), -(51,107,l), -(79,84,o), -(104,65,o), +(51,103,l), +(62,91,o), +(107,60,o), (127,49,c) ); }, @@ -142,29 +136,23 @@ nodes = ( (510,291,o), (531,300,cs), (539,303,o), -(544,310,o), -(538,317,cs), -(527,329,o), -(502,344,o), +(541,310,o), +(535,317,cs), +(524,329,o), +(503,347,o), (477,361,c), (457,346,o), (444,339,o), (422,334,cs), -(386,325,o), -(308,314,o), -(212,304,cs), -(181,301,o), -(156,299,o), +(377,323,o), +(201,298,o), (123,301,c), -(120,295,l), -(142,278,o), -(151,271,o), +(120,292,l), +(127,284,o), +(162,260,o), (175,254,c), -(185,257,o), -(203,261,o), -(227,265,cs), -(295,278,o), -(379,289,o), +(216,266,o), +(402,294,o), (444,300,c), (419,271,o), (392,242,o), @@ -176,41 +164,47 @@ nodes = ( closed = 1; nodes = ( (272,356,l), -(270,426,o), -(268,481,o), -(268,529,c), -(251,538,o), -(225,549,o), -(209,555,c), -(206,551,l), -(212,535,o), -(217,516,o), -(219,498,cs), -(221,479,o), -(223,451,o), -(224,430,cs), -(225,411,o), +(270,411,o), +(269,457,o), +(268,497,cs), +(268,508,o), +(269,516,o), +(273,527,c), +(256,540,o), +(229,555,o), +(213,562,c), +(206,555,l), +(212,536,o), +(216,525,o), +(219,503,cs), +(222,484,o), +(224,448,o), +(224,427,cs), +(224,408,o), (223,394,o), (220,382,c), (229,371,o), -(241,367,o), -(266,353,c) +(243,362,o), +(265,352,c) ); }, { closed = 1; nodes = ( -(339,387,o), +(339,388,o), (416,395,o), -(501,400,cs), +(497,399,cs), (508,400,o), -(512,408,o), +(511,407,o), (505,416,cs), -(495,426,o), -(488,431,o), -(475,439,c), -(405,429,o), -(334,421,o), +(497,428,o), +(488,435,o), +(474,444,c), +(464,439,o), +(454,436,o), +(443,434,cs), +(384,426,o), +(323,419,o), (260,414,c), (260,378,l) ); @@ -218,7 +212,7 @@ nodes = ( { closed = 1; nodes = ( -(483,437,o), +(482,437,o), (492,468,o), (501,490,cs), (506,503,o), @@ -240,10 +234,10 @@ nodes = ( (309,499,o), (379,507,o), (449,515,c), -(442,479,o), -(434,441,o), +(444,479,o), +(436,441,o), (425,408,c), -(474,406,l) +(475,406,l) ); }, { @@ -254,20 +248,20 @@ nodes = ( (680,394,o), (683,528,cs), (684,560,o), -(685,585,o), -(689,606,c), -(668,627,o), -(636,651,o), -(615,667,c), -(609,662,l), -(618,633,o), -(625,607,o), +(687,584,o), +(691,605,c), +(672,626,o), +(649,647,o), +(619,666,c), +(608,658,l), +(618,630,o), +(625,605,o), (627,572,cs), (634,454,o), (630,121,o), (623,10,cs), (622,-15,o), -(614,-35,o), +(617,-36,o), (608,-56,c), (620,-75,o), (642,-100,o), @@ -277,30 +271,24 @@ nodes = ( { closed = 1; nodes = ( -(160,589,o), -(189,592,o), -(234,597,cs), -(339,608,o), -(468,617,o), +(214,600,o), +(481,617,o), (571,620,cs), (581,620,o), (591,628,o), (580,642,cs), (569,655,o), -(552,668,o), +(553,669,o), (533,683,c), (503,668,o), -(477,662,o), -(450,657,cs), -(400,648,o), -(281,638,o), -(222,634,cs), -(174,631,o), -(122,629,o), +(484,661,o), +(457,657,cs), +(397,648,o), +(178,625,o), (77,632,c), -(73,625,l), -(90,612,o), -(107,597,o), +(72,621,l), +(87,606,o), +(107,593,o), (127,581,c) ); }, @@ -308,9 +296,9 @@ nodes = ( closed = 1; nodes = ( (384,657,o), -(406,668,o), -(411,687,cs), -(416,706,o), +(403,667,o), +(410,686,cs), +(417,705,o), (420,728,o), (420,745,cs), (420,754,o), @@ -322,7 +310,7 @@ nodes = ( (272,788,l), (317,754,o), (346,728,o), -(376,671,cs) +(372,679,cs) ); } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni916C_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni916C_.glyph index cd5a5c31..2f04909b 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni916C_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni916C_.glyph @@ -275,22 +275,22 @@ nodes = ( { closed = 1; nodes = ( -(705,292,o), -(717,297,o), -(720,309,cs), -(723,321,o), -(724,338,o), -(722,351,cs), -(721,357,o), -(717,361,o), -(707,366,cs), -(676,381,o), -(636,397,o), -(603,410,c), -(596,396,l), -(626,375,o), -(669,338,o), -(696,303,cs) +(706,292,o), +(718,297,o), +(721,309,cs), +(724,321,o), +(725,338,o), +(723,351,cs), +(722,357,o), +(718,361,o), +(708,366,cs), +(677,381,o), +(637,399,o), +(604,410,c), +(597,396,l), +(627,375,o), +(670,338,o), +(697,303,cs) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni94B_A_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni94B_A_.glyph index e216187a..36ab46b9 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni94B_A_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni94B_A_.glyph @@ -49,16 +49,18 @@ nodes = ( (360,79,o), (411,133,c), (399,146,l), -(263,41,l), -(266,89,o), -(274,275,o), -(277,319,cs), -(278,335,o), -(280,346,o), +(355,108,o), +(310,75,o), +(264,44,c), +(263,92,o), +(273,274,o), +(276,318,cs), +(277,334,o), +(279,346,o), (282,357,c), -(272,366,o), -(264,372,o), -(233,394,c), +(262,376,o), +(254,381,o), +(231,394,c), (221,385,l), (232,315,o), (219,111,o), @@ -67,7 +69,9 @@ nodes = ( (191,0,o), (171,-11,c), (168,-23,l), -(218,-72,l) +(183,-41,o), +(199,-58,o), +(218,-72,c) ); }, { @@ -92,7 +96,9 @@ nodes = ( (129,248,o), (73,244,c), (71,231,l), -(119,203,l) +(85,220,o), +(101,210,o), +(119,203,c) ); }, { @@ -117,7 +123,9 @@ nodes = ( (159,405,o), (113,404,c), (111,393,l), -(154,363,l) +(123,381,o), +(138,371,o), +(154,363,c) ); }, { @@ -126,12 +134,12 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(465,-16,o), -(633,160,o), +(502,27,o), +(599,131,o), (649,177,c), (636,193,l), -(585,148,o), -(541,112,o), +(587,147,o), +(543,111,o), (490,73,c), (492,123,o), (501,302,o), @@ -153,7 +161,9 @@ nodes = ( (422,33,o), (404,21,c), (400,10,l), -(452,-31,l) +(415,-6,o), +(433,-19,o), +(452,-31,c) ); }, { @@ -224,11 +234,13 @@ nodes = ( (389,596,o), (370,590,o), (347,583,cs), -(313,573,o), -(261,565,o), -(226,559,c), +(311,572,o), +(255,564,o), +(218,558,c), (210,544,l), -(243,519,l) +(219,534,o), +(230,525,o), +(243,519,c) ); }, { @@ -253,7 +265,9 @@ nodes = ( (498,463,o), (397,461,c), (394,449,l), -(446,418,l) +(409,437,o), +(427,426,o), +(446,418,c) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni95F_9.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni95F_9.glyph index 8117c57e..0d27123c 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni95F_9.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni95F_9.glyph @@ -24,10 +24,10 @@ nodes = ( (857,653,o), (869,665,cs), (877,674,o), -(877,684,o), +(876,682,o), (867,691,cs), -(841,711,o), -(814,728,o), +(845,714,o), +(818,731,o), (787,746,c), (761,717,o), (750,714,o), @@ -36,18 +36,21 @@ nodes = ( (536,685,o), (414,684,c), (410,669,l), -(424,658,o), -(445,644,o), +(424,657,o), +(445,643,o), (466,632,c), (549,646,o), (667,656,o), (785,665,c), -(787,244,o), -(784,7,o), -(777,-7,c), -(740,4,o), -(684,24,o), -(646,40,c), +(787,343,o), +(785,134,o), +(781,57,cs), +(780,26,o), +(777,10,o), +(773,-7,c), +(738,2,o), +(685,24,o), +(647,41,c), (638,25,l), (706,-22,o), (744,-53,o), @@ -92,9 +95,15 @@ fillColor = (0,255); closed = 1; nodes = ( (363,73,l), -(361,286,l), -(365,309,l), -(303,355,l), +(360,144,o), +(358,215,o), +(361,286,cs), +(361,294,o), +(362,301,o), +(367,309,c), +(345,327,o), +(327,343,o), +(303,355,c), (291,347,l), (302,323,o), (307,303,o), @@ -105,8 +114,8 @@ nodes = ( (314,152,o), (313,127,o), (306,105,c), -(322,89,o), -(337,78,o), +(320,90,o), +(335,79,o), (352,66,c) ); }, @@ -117,19 +126,19 @@ fillColor = (0,255); closed = 1; nodes = ( (504,-54,l), -(504,120,o), -(505,187,o), -(509,327,cs), -(510,348,o), -(511,383,o), +(504,125,o), +(505,193,o), +(509,337,cs), +(510,355,o), +(511,386,o), (517,407,c), -(472,438,l), +(464,445,l), (451,435,l), -(457,401,o), -(458,358,o), -(459,323,cs), -(461,240,o), -(459,157,o), +(457,407,o), +(458,372,o), +(459,343,cs), +(461,253,o), +(459,164,o), (455,74,cs), (454,50,o), (453,25,o), @@ -149,32 +158,35 @@ nodes = ( (656,116,o), (661,142,cs), (667,173,o), -(672,215,o), +(674,215,o), (677,254,cs), -(679,270,o), +(678,270,o), (684,284,o), (694,295,cs), (702,304,o), (704,308,o), (696,316,cs), -(684,327,o), -(661,343,o), +(681,331,o), +(658,347,o), (632,362,c), (610,343,o), (604,339,o), (575,334,cs), (535,327,o), -(415,319,o), +(415,318,o), (334,313,c), (340,275,l), -(429,284,o), +(429,286,o), (524,293,o), (626,298,c), -(625,256,o), -(617,156,o), +(625,267,o), +(621,203,o), +(615,165,cs), +(613,152,o), +(610,142,o), (607,137,c), -(581,147,o), -(555,157,o), +(581,146,o), +(555,156,o), (530,167,c), (523,156,l), (564,122,o), @@ -192,12 +204,12 @@ fillColor = (0,255); closed = 1; nodes = ( (306,586,o), -(324,595,o), +(322,595,o), (329,611,cs), -(335,629,o), -(339,648,o), +(337,629,o), +(341,648,o), (340,667,cs), -(341,681,o), +(339,681,o), (335,689,o), (322,697,cs), (285,719,o), @@ -231,7 +243,9 @@ nodes = ( (337,454,o), (231,456,c), (228,442,l), -(273,409,l) +(243,431,o), +(258,420,o), +(273,409,c) ); }, { diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9669.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9669.glyph index 36089a71..f6233ad3 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9669.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9669.glyph @@ -54,8 +54,8 @@ nodes = ( (126,27,o), (125,-2,o), (110,-44,c), -(128,-65,o), -(146,-86,o), +(126,-67,o), +(145,-87,o), (169,-107,c) ); }, @@ -65,8 +65,8 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(433,-39,o), -(713,-29,o), +(435,-39,o), +(715,-29,o), (892,-37,cs), (907,-38,o), (912,-24,o), @@ -81,7 +81,9 @@ nodes = ( (393,-6,o), (283,-2,c), (279,-18,l), -(338,-59,l) +(298,-33,o), +(317,-46,o), +(338,-59,c) ); }, { @@ -143,7 +145,9 @@ nodes = ( (280,455,o), (315,360,o), (298,308,c), -(208,331,l), +(267,313,o), +(237,320,o), +(208,331,c), (203,319,l), (242,289,o), (276,257,o), @@ -184,11 +188,11 @@ fillColor = (0,255); closed = 1; nodes = ( (650,1,l), -(683,48,o), -(714,94,o), -(744,141,cs), -(765,174,o), -(799,221,o), +(697,67,o), +(740,131,o), +(781,196,cs), +(791,212,o), +(810,234,o), (821,246,c), (806,275,o), (781,316,o), @@ -219,13 +223,13 @@ nodes = ( (692,440,c), (667,425,o), (657,421,o), -(619,413,cs), -(560,402,o), -(476,393,o), +(629,415,cs), +(571,404,o), +(483,393,o), (433,391,c), (430,381,l), -(445,369,o), -(457,360,o), +(444,368,o), +(456,359,o), (473,349,c) ); }, @@ -235,8 +239,8 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(878,380,o), -(922,383,o), +(878,381,o), +(922,384,o), (965,387,c), (965,408,l), (912,424,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni96C_0.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni96C_0.glyph index d8361284..554f0860 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni96C_0.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni96C_0.glyph @@ -16,23 +16,23 @@ shapes = ( { closed = 1; nodes = ( -(284,286,o), -(482,410,o), -(648,545,cs), -(662,557,o), -(675,566,o), -(687,572,c), -(676,594,o), -(654,623,o), -(627,646,c), -(617,642,l), -(619,624,o), -(611,600,o), -(602,590,cs), -(495,464,o), -(226,304,o), -(8,224,c), -(17,200,l) +(283,286,o), +(481,410,o), +(647,545,cs), +(661,557,o), +(674,566,o), +(686,572,c), +(675,594,o), +(653,623,o), +(626,646,c), +(616,642,l), +(618,624,o), +(610,600,o), +(601,590,cs), +(494,464,o), +(225,304,o), +(7,224,c), +(16,200,l) ); }, { @@ -129,7 +129,7 @@ nodes = ( (559,310,o), (561,286,cs), (564,236,o), -(564,111,o), +(565,111,o), (564,0,c) ); }, diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni96F_9.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni96F_9.glyph index cf890418..805c33a9 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni96F_9.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni96F_9.glyph @@ -176,8 +176,8 @@ nodes = ( (233,443,o), (200,445,c), (196,437,l), -(202,429,o), -(214,415,o), +(202,428,o), +(213,415,o), (220,409,c) ); }, diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9785.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9785.glyph index 9ba21535..a13470cb 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9785.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9785.glyph @@ -52,7 +52,9 @@ nodes = ( (155,152,o), (46,157,c), (42,143,l), -(94,106,l) +(56,128,o), +(74,115,o), +(94,106,c) ); }, { @@ -78,7 +80,9 @@ nodes = ( (268,-2,o), (262,-24,o), (254,-47,c), -(308,-104,l) +(269,-69,o), +(287,-88,o), +(308,-104,c) ); }, { @@ -100,7 +104,7 @@ nodes = ( (157,358,o), (160,283,o), (151,256,c), -(163,244,o), +(162,244,o), (178,231,o), (191,222,c) ); @@ -168,9 +172,9 @@ fillColor = (0,255); closed = 1; nodes = ( (295,488,o), -(332,491,o), +(332,494,o), (367,494,cs), -(378,495,o), +(379,494,o), (384,499,o), (377,508,cs), (369,519,o), @@ -189,11 +193,11 @@ fillColor = (0,255); closed = 1; nodes = ( (260,466,l), -(261,522,o), -(262,578,o), -(263,634,cs), -(264,653,o), -(264,673,o), +(261,528,o), +(262,588,o), +(263,651,cs), +(263,666,o), +(264,681,o), (270,706,c), (261,717,o), (238,737,o), @@ -202,10 +206,15 @@ nodes = ( (197,740,o), (205,716,o), (210,693,cs), -(216,659,o), -(223,527,o), -(211,490,c), -(251,461,l) +(215,666,o), +(220,578,o), +(217,534,cs), +(215,509,o), +(214,501,o), +(210,490,c), +(220,479,o), +(234,470,o), +(251,461,c) ); }, { @@ -214,9 +223,9 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(884,-69,o), -(926,-69,o), -(969,-65,c), +(884,-70,o), +(926,-66,o), +(969,-66,c), (969,-43,l), (915,-24,o), (881,-13,o), @@ -229,8 +238,8 @@ nodes = ( (783,-14,o), (812,-61,cs), (819,-73,o), -(828,-77,o), -(841,-75,cs) +(828,-78,o), +(841,-76,cs) ); }, { @@ -239,26 +248,25 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(247,590,o), +(247,589,o), (407,600,o), (539,603,cs), (559,603,o), -(557,617,o), +(556,616,o), (549,625,cs), -(534,638,o), -(518,651,o), +(536,640,o), +(520,653,o), (503,664,c), (485,652,o), (459,644,o), (421,638,cs), -(367,630,o), -(276,622,o), -(184,615,cs), -(143,612,o), -(119,611,o), +(348,627,o), +(182,611,o), (58,611,c), (55,597,l), -(105,566,l) +(69,584,o), +(85,573,o), +(105,566,c) ); }, { @@ -267,10 +275,16 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(563,255,l), -(563,469,l), -(567,492,l), -(495,542,l), +(564,255,l), +(562,326,o), +(560,398,o), +(563,464,cs), +(563,477,o), +(564,482,o), +(567,492,c), +(546,510,o), +(522,526,o), +(495,542,c), (486,534,l), (499,506,o), (509,474,o), @@ -295,11 +309,11 @@ nodes = ( (924,283,o), (907,295,o), (895,304,c), -(869,289,o), -(842,282,o), -(808,279,cs), -(729,272,o), -(619,266,o), +(872,289,o), +(848,282,o), +(818,279,cs), +(736,272,o), +(622,266,o), (525,261,cs), (488,259,o), (450,258,o), @@ -314,15 +328,15 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(392,461,o), -(405,475,o), -(409,486,cs), -(411,491,o), -(414,501,o), -(414,506,cs), -(417,546,o), -(420,607,o), -(423,647,cs), +(385,469,o), +(391,471,o), +(399,479,cs), +(406,486,o), +(416,499,o), +(416,516,cs), +(416,546,o), +(419,607,o), +(424,659,cs), (426,681,o), (429,706,o), (441,733,c), @@ -333,13 +347,15 @@ nodes = ( (368,769,o), (372,747,o), (374,724,cs), -(379,677,o), -(374,552,o), -(370,512,c), -(356,511,l), -(362,504,o), -(378,481,o), -(386,470,cs) +(379,679,o), +(374,565,o), +(370,540,cs), +(367,521,o), +(362,515,o), +(356,511,c), +(363,506,o), +(372,495,o), +(379,481,cs) ); }, { @@ -356,16 +372,16 @@ nodes = ( (856,474,o), (869,486,cs), (879,495,o), -(878,500,o), +(877,499,o), (868,508,cs), -(854,520,o), -(828,539,o), +(855,522,o), +(829,541,o), (805,554,c), (786,535,o), (773,523,o), (749,519,cs), (695,509,o), -(593,500,o), +(593,498,o), (539,495,c), (544,460,l), (650,470,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9879.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9879.glyph index 5661d814..8512fd68 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9879.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9879.glyph @@ -27,7 +27,7 @@ nodes = ( (611,113,o), (507,2,o), (291,-80,c), -(307,-104,l) +(306,-104,l) ); }, { @@ -36,17 +36,20 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(207,155,o), -(318,217,o), -(428,281,c), +(207,157,o), +(318,219,o), +(428,279,c), (417,300,l), -(323,256,o), -(140,169,o), +(343,265,o), +(213,205,o), +(108,170,cs), +(80,161,o), +(55,156,o), (32,153,c), -(26,140,l), -(49,123,o), -(74,109,o), -(97,92,c) +(26,139,l), +(46,121,o), +(70,105,o), +(97,90,c) ); }, { @@ -61,16 +64,16 @@ nodes = ( (288,470,cs), (289,491,o), (291,512,o), -(293,532,c), -(273,548,o), -(252,563,o), -(232,574,c), -(220,571,l), -(228,523,o), -(228,460,o), -(228,389,cs), -(228,324,o), -(228,259,o), +(294,532,c), +(271,554,o), +(247,571,o), +(224,579,c), +(215,571,l), +(222,550,o), +(226,523,o), +(227,492,cs), +(230,393,o), +(230,293,o), (227,195,c) ); }, @@ -89,12 +92,12 @@ nodes = ( (874,7,o), (868,13,o), (848,24,cs), -(763,71,o), -(736,82,o), +(763,73,o), +(729,88,o), (636,127,c), (627,110,l), -(704,51,o), -(776,-3,o), +(705,55,o), +(776,-1,o), (845,-80,cs) ); }, @@ -106,22 +109,26 @@ closed = 1; nodes = ( (503,128,l), (503,242,o), -(505,313,o), -(510,466,c), -(513,491,l), -(442,548,l), +(501,336,o), +(508,460,cs), +(509,481,o), +(511,487,o), +(513,496,c), +(490,516,o), +(470,531,o), +(442,548,c), (429,538,l), (437,524,o), -(441,513,o), -(448,481,cs), -(462,421,o), +(444,509,o), +(449,477,cs), +(458,417,o), (457,313,o), (455,244,cs), (454,227,o), (452,191,o), (442,167,c), -(458,149,o), -(470,136,o), +(455,149,o), +(468,135,o), (489,119,c) ); }, @@ -140,14 +147,16 @@ nodes = ( (400,618,o), (377,635,o), (356,650,c), -(331,634,o), -(311,626,o), -(282,620,cs), -(243,611,o), -(138,597,o), +(336,636,o), +(319,628,o), +(295,624,cs), +(254,614,o), +(143,597,o), (61,594,c), (57,581,l), -(115,544,l) +(75,567,o), +(95,554,o), +(115,544,c) ); }, { @@ -156,7 +165,7 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(791,114,o), +(792,114,o), (796,120,o), (802,126,cs), (809,134,o), @@ -169,10 +178,10 @@ nodes = ( (829,476,o), (840,487,cs), (849,495,o), -(852,501,o), +(853,499,o), (843,507,cs), -(827,518,o), -(783,545,o), +(827,521,o), +(791,545,o), (769,554,c), (752,537,o), (742,528,o), @@ -182,16 +191,16 @@ nodes = ( (494,496,c), (500,459,l), (589,468,o), -(674,475,o), +(674,476,o), (763,481,c), (764,363,o), -(761,263,o), -(759,230,cs), -(758,210,o), +(761,261,o), +(759,228,cs), +(758,208,o), (755,185,o), (739,169,c), -(744,162,o), -(778,126,o), +(751,151,o), +(764,136,o), (784,120,cs) ); }, @@ -202,13 +211,14 @@ fillColor = (0,255); closed = 1; nodes = ( (567,480,l), -(603,520,l), -(646,574,ls), -(652,581,o), -(667,599,o), +(601,517,o), +(633,555,o), +(660,592,cs), +(663,596,o), +(672,605,o), (679,613,c), -(663,634,o), -(648,653,o), +(665,636,o), +(649,654,o), (631,670,c), (608,670,l), (611,655,o), @@ -230,10 +240,10 @@ nodes = ( (727,673,o), (903,673,cs), (921,673,o), -(935,683,o), +(934,682,o), (915,703,cs), -(898,719,o), -(877,736,o), +(900,720,o), +(879,737,o), (859,750,c), (836,739,o), (806,729,o), @@ -242,8 +252,8 @@ nodes = ( (499,693,o), (364,691,c), (361,678,l), -(386,665,o), -(409,652,o), +(384,664,o), +(407,652,o), (433,640,c) ); } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni98C_E_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni98C_E_.glyph index 43cd8e25..a6a99dbc 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni98C_E_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni98C_E_.glyph @@ -17,10 +17,10 @@ nodes = ( (933,46,o), (935,107,o), (934,212,c), -(914,213,l), -(906,146,o), -(900,98,o), -(882,-5,c), +(913,213,l), +(907,146,o), +(901,98,o), +(881,-5,c), (731,104,o), (707,429,o), (770,619,cs), @@ -28,10 +28,10 @@ nodes = ( (791,660,o), (810,671,cs), (823,679,o), -(819,688,o), +(819,687,o), (810,694,cs), -(787,710,o), -(762,726,o), +(787,713,o), +(762,729,o), (733,743,c), (706,719,o), (690,704,o), @@ -40,7 +40,7 @@ nodes = ( (409,663,o), (262,651,c), (274,606,l), -(418,624,o), +(418,625,o), (560,640,o), (704,654,c), (661,381,o), @@ -55,11 +55,13 @@ fillColor = (0,255); closed = 1; nodes = ( (260,96,o), -(285,262,o), -(286,611,c), -(296,635,l), -(253,675,o), -(225,700,o), +(286,262,o), +(286,611,cs), +(286,623,o), +(290,637,o), +(296,646,c), +(255,683,o), +(227,705,o), (186,731,c), (169,716,l), (213,651,o), @@ -83,8 +85,8 @@ nodes = ( (590,431,o), (600,460,o), (632,506,c), -(607,541,o), -(585,570,o), +(610,542,o), +(588,571,o), (558,601,c), (542,592,l), (553,562,o), @@ -102,10 +104,10 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(662,67,o), -(664,98,o), -(663,120,cs), -(662,129,o), +(660,65,o), +(665,96,o), +(664,119,cs), +(663,128,o), (660,137,o), (652,146,cs), (572,249,o), @@ -116,8 +118,8 @@ nodes = ( (551,179,o), (618,52,cs), (629,30,o), -(646,38,o), -(652,49,cs) +(644,34,o), +(650,46,cs) ); } ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni98E_2.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni98E_2.glyph index 39fb6ff8..49293fd5 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni98E_2.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni98E_2.glyph @@ -68,7 +68,7 @@ nodes = ( (416,95,c), (403,112,l), (350,86,o), -(295,64,o), +(295,62,o), (242,44,c), (245,142,o), (249,300,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni996E_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni996E_.glyph index d344ef9d..5e3b1f86 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni996E_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni996E_.glyph @@ -61,7 +61,7 @@ nodes = ( (188,-4,c), (186,-19,l), (201,-35,o), -(220,-49,o), +(219,-49,o), (239,-61,c) ); }, @@ -111,13 +111,15 @@ nodes = ( (397,560,o), (379,548,o), (350,542,cs), -(309,533,o), -(284,529,o), -(242,521,c), -(228,501,l), -(253,482,l), -(297,492,o), -(340,501,o), +(304,532,o), +(273,527,o), +(226,521,c), +(222,512,l), +(231,502,o), +(242,491,o), +(253,482,c), +(297,493,o), +(340,502,o), (386,510,c), (368,471,o), (343,428,o), @@ -181,8 +183,11 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(792,409,o), -(852,450,o), +(780,399,o), +(820,425,o), +(858,446,cs), +(878,456,o), +(889,461,o), (908,466,cs), (929,472,o), (927,485,o), @@ -197,7 +202,9 @@ nodes = ( (640,510,o), (580,504,c), (572,486,l), -(612,464,l), +(586,478,o), +(600,470,o), +(612,464,c), (670,477,o), (750,488,o), (807,496,c), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9A_7C_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9A_7C_.glyph index a5610a72..2268710f 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9A_7C_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9A_7C_.glyph @@ -84,8 +84,11 @@ nodes = ( (264,162,o), (358,201,c), (348,223,l), -(248,189,o), -(129,154,o), +(269,196,o), +(178,169,o), +(97,151,cs), +(76,147,o), +(55,143,o), (35,140,c), (33,128,l), (47,116,o), @@ -251,8 +254,11 @@ fillColor = (0,255); }; closed = 1; nodes = ( -(827,485,o), -(876,511,o), +(814,476,o), +(846,494,o), +(877,507,cs), +(892,513,o), +(906,518,o), (920,521,cs), (937,525,o), (936,539,o), @@ -267,7 +273,9 @@ nodes = ( (627,569,o), (517,558,c), (517,540,l), -(561,521,l), +(531,533,o), +(545,526,o), +(561,521,c), (653,533,o), (723,541,o), (820,549,c), @@ -298,6 +306,12 @@ nodes = ( (647,693,o), (685,634,cs) ); +}, +{ +closed = 0; +nodes = ( +(657,1200,l) +); } ); width = 1000; diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9E_2F_.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9E_2F_.glyph index ad11686c..df98c86f 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9E_2F_.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9E_2F_.glyph @@ -139,8 +139,8 @@ nodes = ( (679,355,o), (684,361,o), (680,366,cs), -(674,374,o), -(641,399,o), +(669,380,o), +(642,399,o), (621,413,c), (603,399,o), (587,392,o), @@ -155,7 +155,9 @@ nodes = ( (607,344,o), (597,277,o), (584,251,c), -(520,265,l), +(563,255,o), +(541,259,o), +(520,265,c), (517,256,l), (544,236,o), (564,220,o), @@ -177,8 +179,8 @@ nodes = ( (539,696,o), (547,718,o), (564,747,c), -(544,769,o), -(518,796,o), +(545,771,o), +(519,798,o), (494,821,c), (479,814,l), (493,766,o), @@ -254,7 +256,7 @@ nodes = ( (852,595,c), (810,575,o), (771,567,o), -(696,562,cs), +(722,563,cs), (593,554,o), (235,529,o), (94,535,c), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9E_64.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9E_64.glyph index 8263bcdf..6d67bd40 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9E_64.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9E_64.glyph @@ -28,8 +28,8 @@ nodes = ( (175,1,o), (171,-20,o), (162,-44,c), -(178,-61,o), -(196,-80,o), +(176,-61,o), +(194,-80,o), (213,-96,c) ); }, @@ -235,8 +235,8 @@ nodes = ( (571,151,o), (498,151,c), (493,142,l), -(505,129,o), -(518,117,o), +(504,128,o), +(517,116,o), (533,104,c) ); }, @@ -336,10 +336,10 @@ nodes = ( (842,577,o), (856,590,cs), (867,600,o), -(862,605,o), -(850,614,cs), -(833,627,o), -(815,639,o), +(863,603,o), +(852,614,cs), +(837,628,o), +(817,642,o), (799,651,c), (777,632,o), (766,623,o), @@ -351,11 +351,14 @@ nodes = ( (660,572,o), (722,579,o), (782,583,c), -(774,483,o), -(763,394,o), +(777,515,o), +(770,452,o), +(763,418,cs), +(759,398,o), +(757,388,o), (752,377,c), -(734,382,o), -(715,388,o), +(734,380,o), +(715,386,o), (673,403,c), (667,389,l), (703,363,o), @@ -373,11 +376,11 @@ fillColor = (0,255); closed = 1; nodes = ( (645,601,l), -(681,647,o), -(664,626,o), -(699,670,cs), -(715,690,o), -(728,705,o), +(672,632,o), +(696,661,o), +(713,686,cs), +(723,700,o), +(731,710,o), (740,718,c), (734,733,o), (699,782,o), @@ -407,8 +410,11 @@ nodes = ( (706,246,o), (794,254,o), (871,258,c), -(854,144,o), -(828,10,o), +(858,171,o), +(840,72,o), +(820,12,cs), +(814,-7,o), +(807,-22,o), (801,-32,c), (752,-16,o), (703,4,o), @@ -441,10 +447,15 @@ nodes = ( (747,288,o), (679,281,o), (610,276,c), -(610,363,o), -(613,542,o), -(621,590,c), -(559,651,l), +(610,354,o), +(612,502,o), +(618,570,cs), +(619,579,o), +(620,588,o), +(623,597,c), +(605,615,o), +(584,633,o), +(559,651,c), (546,643,l), (560,600,o), (563,580,o), @@ -453,7 +464,7 @@ nodes = ( (566,392,o), (562,319,cs), (561,302,o), -(558,276,o), +(558,277,o), (545,269,c) ); } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9E_D_8.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9E_D_8.glyph index d0c00fb1..9e92da02 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/uni9E_D_8.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/uni9E_D_8.glyph @@ -239,10 +239,10 @@ nodes = ( (368,421,o), (450,426,cs), (463,427,o), -(469,437,o), +(468,436,o), (460,446,cs), -(451,455,o), -(443,462,o), +(452,456,o), +(444,463,o), (431,473,c), (416,463,o), (388,458,o), @@ -308,14 +308,16 @@ nodes = ( (291,653,o), (382,660,o), (474,665,c), -(471,590,o), -(468,516,o), -(457,442,c), -(437,432,l), -(449,420,o), -(457,408,o), +(471,594,o), +(469,524,o), +(460,454,cs), +(459,443,o), +(453,437,o), +(442,432,c), +(452,420,o), +(458,408,o), (465,393,cs), -(471,382,o), +(470,382,o), (482,385,o), (487,391,cs) ); diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/usmall-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/usmall-kata.glyph index 46820b1e..4a690c80 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/usmall-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/usmall-kata.glyph @@ -21,12 +21,12 @@ nodes = ( (262,437,c), (255,428,l), (265,411,o), -(273,383,o), +(274,383,o), (277,365,cs), -(286,328,o), -(282,303,o), -(275,269,cs), -(271,252,o), +(283,328,o), +(281,306,o), +(277,272,cs), +(275,255,o), (268,235,o), (256,218,c), (278,202,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/vu-hira.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/vu-hira.glyph index 5f2dc25c..98109b57 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/vu-hira.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/vu-hira.glyph @@ -31,10 +31,10 @@ nodes = ( (190,399,l), (225,380,o), (263,362,o), -(297,349,cs), +(297,348,cs), (307,344,o), (319,342,o), -(321,345,cs), +(326,349,cs), (334,358,o), (341,365,o), (355,379,cs), @@ -108,6 +108,5 @@ nodes = ( width = 1000; } ); -locked = 1; unicode = 12436; } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/yo-hira.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/yo-hira.glyph index 1a8025c5..496579e9 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/yo-hira.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/yo-hira.glyph @@ -22,7 +22,7 @@ nodes = ( (515,509,l), (527,493,o), (533,481,o), -(542,469,cs), +(541,469,cs), (553,451,o), (562,444,o), (576,441,cs), @@ -48,7 +48,7 @@ nodes = ( (535,647,cs), (538,654,o), (533,662,o), -(526,666,cs), +(527,667,cs), (477,705,o), (424,743,o), (381,767,c), @@ -95,6 +95,5 @@ nodes = ( width = 1000; } ); -locked = 1; unicode = 12424; } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/yu-hira.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/yu-hira.glyph index 2f0d1027..41cef2cd 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/yu-hira.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/yu-hira.glyph @@ -57,9 +57,9 @@ nodes = ( (681,172,o), (661,618,cs), (660,635,o), -(669,650,o), +(668,650,o), (676,677,cs), -(679,681,o), +(678,682,o), (679,689,o), (670,696,cs), (640,720,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/yu-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/yu-kata.glyph index 588e9bdb..00453b6e 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/yu-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/yu-kata.glyph @@ -26,11 +26,11 @@ nodes = ( (397,507,o), (283,504,cs), (248,502,o), -(218,500,o), +(217,504,o), (177,515,c), -(173,504,l), -(202,474,o), -(227,454,o), +(170,503,l), +(200,473,o), +(225,452,o), (256,430,c), (372,452,o), (535,460,o), @@ -63,11 +63,11 @@ nodes = ( (376,213,o), (244,207,cs), (178,204,o), -(103,195,o), -(38,219,c), +(107,205,o), +(42,222,c), (33,208,l), -(63,176,o), -(87,151,o), +(61,176,o), +(85,151,o), (119,121,c) ); } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/yusmall-hira.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/yusmall-hira.glyph index 6c263133..3c60c82c 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/yusmall-hira.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/yusmall-hira.glyph @@ -58,7 +58,7 @@ nodes = ( (595,433,cs), (594,445,o), (595,454,o), -(602,471,cs), +(602,469,cs), (604,473,o), (602,481,o), (594,488,cs), @@ -79,6 +79,5 @@ nodes = ( width = 1000; } ); -locked = 1; unicode = 12421; } diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/za-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/za-kata.glyph index 65801ccb..f7cf23aa 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/za-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/za-kata.glyph @@ -28,9 +28,9 @@ nodes = ( (200,452,o), (135,449,o), (79,455,c), -(75,449,l), -(97,427,o), -(120,405,o), +(74,446,l), +(95,425,o), +(120,404,o), (142,390,c) ); }, @@ -78,8 +78,8 @@ nodes = ( (673,649,o), (663,655,cs), (636,671,o), -(604,698,o), -(542,732,c), +(603,699,o), +(541,733,c), (529,724,l), (580,665,o), (589,633,o), diff --git a/src/ZhuqueFangsong.glyphspackage/glyphs/zu-kata.glyph b/src/ZhuqueFangsong.glyphspackage/glyphs/zu-kata.glyph index 1c194c23..ff8f1cd6 100644 --- a/src/ZhuqueFangsong.glyphspackage/glyphs/zu-kata.glyph +++ b/src/ZhuqueFangsong.glyphspackage/glyphs/zu-kata.glyph @@ -14,10 +14,10 @@ nodes = ( (715,508,o), (749,528,cs), (758,533,o), -(766,541,o), -(754,551,cs), -(737,566,o), -(698,591,o), +(764,542,o), +(752,552,cs), +(735,567,o), +(698,594,o), (658,616,c), (631,596,o), (606,587,o), @@ -26,10 +26,10 @@ nodes = ( (298,552,o), (192,563,c), (189,553,l), -(227,529,o), -(255,513,o), +(224,529,o), +(252,513,o), (295,491,c), -(318,498,o), +(318,499,o), (340,505,o), (365,508,cs), (415,515,o),