From 3214eeca7c87326c9b9104670235f7b39a65eb1a Mon Sep 17 00:00:00 2001 From: mozillazg Date: Mon, 10 Jun 2019 08:43:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 主要是增加如何发布新版本的文档。 --- DEVELOP.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 DEVELOP.md diff --git a/DEVELOP.md b/DEVELOP.md new file mode 100644 index 0000000..1b10cd6 --- /dev/null +++ b/DEVELOP.md @@ -0,0 +1,20 @@ +开发文档 +========== + + +发布新版本 +---------- + +发布新版本步骤如下： + +1. 首先确保 master 分支是最新的准备发布的代码。 +2. 确保 master 分支的单元测试和 examples 正常通过（可以通过把 master 代码推送到远程然后触发 CI 服务确认也可以在本地跑测试确认）。 +3. 通过 [bumpversion](https://pypi.org/project/bumpversion/) 更新本地版本号以及增加 git tag（三选一）（如果不想使用 bumpversion 命令的话，需要手动编辑 `Cargo.toml` 文件更新版本号以及通过 git tag 命令增加一个新 tag）: + * 如果是大版本（1.x.y -> 2.0.0）更新，执行 `bumpversion --verbose major` 命令。 + * 如果是不兼容/新功能版本（1.2.y -> 1.3.0），执行 `bumpversion --verbose minor` 命令。 + * 如果是 bugfix 之类的小版本（1.2.3 -> 1.2.4），执行 `bumpversion --verbose patch` 命令。 +4. 准备发布新版本: + * `cargo publish` +5. 检查发布结果是否符合预期： + * https://crates.io/crates/pinyin + * https://docs.rs/pinyin/ From 640f439aa22a66d8e87c37e784320673bbd63601 Mon Sep 17 00:00:00 2001 From: mozillazg Date: Mon, 10 Jun 2019 08:57:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=89=8D=E9=9C=80=E8=A6=81=E6=9B=B4=E6=96=B0=20CHANGE?= =?UTF-8?q?LOG.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DEVELOP.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/DEVELOP.md b/DEVELOP.md index 1b10cd6..2742077 100644 --- a/DEVELOP.md +++ b/DEVELOP.md @@ -9,12 +9,13 @@ 1. 首先确保 master 分支是最新的准备发布的代码。 2. 确保 master 分支的单元测试和 examples 正常通过（可以通过把 master 代码推送到远程然后触发 CI 服务确认也可以在本地跑测试确认）。 -3. 通过 [bumpversion](https://pypi.org/project/bumpversion/) 更新本地版本号以及增加 git tag（三选一）（如果不想使用 bumpversion 命令的话，需要手动编辑 `Cargo.toml` 文件更新版本号以及通过 git tag 命令增加一个新 tag）: +3. 更新 `CHANGELOG.md`：增加变更记录、更新版本发布日期。 +4. 通过 [bumpversion](https://pypi.org/project/bumpversion/) 更新本地版本号以及增加 git tag（三选一）（如果不想使用 bumpversion 命令的话，需要手动编辑 `Cargo.toml` 文件更新版本号以及通过 git tag 命令增加一个新 tag）: * 如果是大版本（1.x.y -> 2.0.0）更新，执行 `bumpversion --verbose major` 命令。 * 如果是不兼容/新功能版本（1.2.y -> 1.3.0），执行 `bumpversion --verbose minor` 命令。 * 如果是 bugfix 之类的小版本（1.2.3 -> 1.2.4），执行 `bumpversion --verbose patch` 命令。 -4. 准备发布新版本: +5. 准备发布新版本: * `cargo publish` -5. 检查发布结果是否符合预期： +6. 检查发布结果是否符合预期： * https://crates.io/crates/pinyin * https://docs.rs/pinyin/ From 3c65e9e0834ada65a614500a91abfca8419db8f0 Mon Sep 17 00:00:00 2001 From: luozijun Date: Mon, 10 Jun 2019 12:43:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BD=93=E9=9F=B3=E8=8A=82=E4=BB=A5?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=A3=B0=E8=B0=83=E6=A0=87=E8=AE=B0=E6=B3=95?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=97=B6=EF=BC=8C=E5=AD=97=E6=AF=8D`=C3=BC`?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E8=A2=AB=E6=94=B9=E5=86=99=E4=B8=BA=E5=AD=97?= =?UTF-8?q?=E6=AF=8D`v`=20-=20#49?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.rs | 8 ++++---- tests/pinyin/a.txt-plain | 2 +- tests/pinyin/a.txt-with_tone_num | 2 +- tests/pinyin/a.txt-with_tone_num_end | 2 +- tests/pinyin/b.txt-plain | 14 +++++++------- tests/pinyin/b.txt-with_tone_num | 14 +++++++------- tests/pinyin/b.txt-with_tone_num_end | 14 +++++++------- tests/pinyin/c.txt-plain | 6 +++--- tests/pinyin/c.txt-with_tone_num | 6 +++--- tests/pinyin/c.txt-with_tone_num_end | 6 +++--- 10 files changed, 37 insertions(+), 37 deletions(-) diff --git a/build.rs b/build.rs index 2822fe1..7d61f0b 100644 --- a/build.rs +++ b/build.rs @@ -36,10 +36,10 @@ const PHONETIC_SYMBOL_MAP: &[(char, char, u8)] = &[ ('ú', 'u', 2), ('ǔ', 'u', 3), ('ù', 'u', 4), - ('ü', 'v', 0), - ('ǘ', 'v', 2), - ('ǚ', 'v', 3), - ('ǜ', 'v', 4), + ('ü', 'ü', 0), + ('ǘ', 'ü', 2), + ('ǚ', 'ü', 3), + ('ǜ', 'ü', 4), ('ń', 'n', 2), ('ň', 'n', 3), ('ǹ', 'n', 4), diff --git a/tests/pinyin/a.txt-plain b/tests/pinyin/a.txt-plain index 07f853e..86289c5 100644 --- a/tests/pinyin/a.txt-plain +++ b/tests/pinyin/a.txt-plain @@ -1,4 +1,4 @@ -dai,bao,hong,shen,-,yue,lve,lv,huan,yun,ni,- +dai,bao,hong,shen,-,yue,lüe,lü,huan,yun,ni,- xiao,yuan,yang,-,jin,fei,cui,-,cheng,ren,xin,- jin,lin,wu,chu,chuan,you,yi,-,hai,yan,lan,tang,chun,you,qu,- ge,nian,shu,-,qian,dian,lei,-,hen,nan,ren,- diff --git a/tests/pinyin/a.txt-with_tone_num b/tests/pinyin/a.txt-with_tone_num index 6a17e57..a755901 100644 --- a/tests/pinyin/a.txt-with_tone_num +++ b/tests/pinyin/a.txt-with_tone_num @@ -1,4 +1,4 @@ -da4i,ba2o,ho2ng,she1n,-,yue1,lve4,lv4,hua2n,yu2n,ni4,- +da4i,ba2o,ho2ng,she1n,-,yue1,lüe4,lü4,hua2n,yu2n,ni4,- xia3o,yua1n,ya1ng,-,ji1n,fe3i,cui4,-,che1ng,re2n,xi1n,- ji3n,li2n,wu2,chu4,chua2n,yo1u,yi4,-,ha3i,ya4n,la2n,ta2ng,chu1n,yo4u,qu4,- ge2,nia2n,shu1,-,qia1n,dia3n,le4i,-,he4n,na2n,re4n,- diff --git a/tests/pinyin/a.txt-with_tone_num_end b/tests/pinyin/a.txt-with_tone_num_end index 8752666..d85df18 100644 --- a/tests/pinyin/a.txt-with_tone_num_end +++ b/tests/pinyin/a.txt-with_tone_num_end @@ -1,4 +1,4 @@ -dai4,bao2,hong2,shen1,-,yue1,lve4,lv4,huan2,yun2,ni4,- +dai4,bao2,hong2,shen1,-,yue1,lüe4,lü4,huan2,yun2,ni4,- xiao3,yuan1,yang1,-,jin1,fei3,cui4,-,cheng1,ren2,xin1,- jin3,lin2,wu2,chu4,chuan2,you1,yi4,-,hai3,yan4,lan2,tang2,chun1,you4,qu4,- ge2,nian2,shu1,-,qian1,dian3,lei4,-,hen4,nan2,ren4,- diff --git a/tests/pinyin/b.txt-plain b/tests/pinyin/b.txt-plain index 8f42cf9..15d9759 100644 --- a/tests/pinyin/b.txt-plain +++ b/tests/pinyin/b.txt-plain @@ -1,7 +1,7 @@ ji,ji,fu,ji,ji,-,mu,lan,dang,hu,zhi,- -bu,wen,ji,zhu,sheng,-,wei,wen,nv,tan,xi,- -wen,nv,he,suo,si,-,wen,nv,he,suo,yi,- -nv,yi,wu,suo,si,-,nv,yi,wu,suo,yi,- +bu,wen,ji,zhu,sheng,-,wei,wen,nü,tan,xi,- +wen,nü,he,suo,si,-,wen,nü,he,suo,yi,- +nü,yi,wu,suo,si,-,nü,yi,wu,suo,yi,- zuo,ye,jian,jun,tie,-,ke,han,da,dian,bing,- jun,shu,shi,er,juan,-,juan,juan,you,ye,ming,- a,ye,wu,da,er,-,mu,lan,wu,zhang,xiong,- @@ -10,9 +10,9 @@ yuan,wei,shi,an,ma,-,cong,ci,ti,ye,zheng,- dong,shi,mai,jun,ma,-,xi,shi,mai,an,jian,- nan,shi,mai,pei,tou,-,bei,shi,mai,zhang,bian,- chao,ci,ye,niang,qu,-,mu,su,huang,he,bian,- -bu,wen,ye,niang,huan,nv,sheng,-,dan,wen,huang,he,liu,shui,ming,jian,jian,- +bu,wen,ye,niang,huan,nü,sheng,-,dan,wen,huang,he,liu,shui,ming,jian,jian,- dan,ci,huang,he,qu,-,mu,zhi,hei,shan,tou,- -bu,wen,ye,niang,huan,nv,sheng,-,dan,wen,yan,shan,hu,qi,sheng,jiu,jiu,- +bu,wen,ye,niang,huan,nü,sheng,-,dan,wen,yan,shan,hu,qi,sheng,jiu,jiu,- wan,li,fu,rong,ji,-,guan,shan,du,ruo,fei,- shuo,qi,chuan,jin,tuo,-,han,guang,zhao,tie,yi,- @@ -23,14 +23,14 @@ ce,xun,shi,er,zhuan,-,shang,ci,bai,qian,qiang,- ke,han,wen,suo,yu,-,-,mu,lan,bu,yong,shang,shu,lang,- yuan,jie,ming,tuo,qian,li,zu,-,song,er,hai,gu,xiang,-,- -ye,niang,wen,nv,lai,-,chu,guo,xiang,fu,jiang,- +ye,niang,wen,nü,lai,-,chu,guo,xiang,fu,jiang,- a,zi,wen,mei,lai,-,dang,hu,li,hong,zhuang,- xiao,di,wen,zi,lai,-,mo,dao,huo,huo,xiang,zhu,yang,- kai,wo,dong,ge,men,-,zuo,wo,xi,jian,chuang,- tuo,wo,zhan,shi,pao,-,zhe,wo,jiu,shi,shang,- dang,chuang,li,yun,bin,-,dui,jing,tie,hua,huang,- chu,men,kan,huo,ban,-,huo,ban,jie,jing,huang,- --,tong,xing,shi,er,nian,-,bu,zhi,mu,lan,shi,nv,lang,-,- +-,tong,xing,shi,er,nian,-,bu,zhi,mu,lan,shi,nü,lang,-,- xiong,tu,jiao,pu,shuo,-,ci,tu,yan,mi,li,- liang,tu,bang,de,zou,-,an,neng,bian,wo,shi,xiong,ci,- diff --git a/tests/pinyin/b.txt-with_tone_num b/tests/pinyin/b.txt-with_tone_num index 8dc18c9..7fcbfef 100644 --- a/tests/pinyin/b.txt-with_tone_num +++ b/tests/pinyin/b.txt-with_tone_num @@ -1,7 +1,7 @@ ji1,ji1,fu4,ji1,ji1,-,mu4,la2n,da1ng,hu4,zhi1,- -bu4,we2n,ji1,zhu4,she1ng,-,we2i,we2n,nv3,ta4n,xi1,- -we4n,nv3,he2,suo3,si1,-,we4n,nv3,he2,suo3,yi4,- -nv3,yi4,wu2,suo3,si1,-,nv3,yi4,wu2,suo3,yi4,- +bu4,we2n,ji1,zhu4,she1ng,-,we2i,we2n,nü3,ta4n,xi1,- +we4n,nü3,he2,suo3,si1,-,we4n,nü3,he2,suo3,yi4,- +nü3,yi4,wu2,suo3,si1,-,nü3,yi4,wu2,suo3,yi4,- zuo2,ye4,jia4n,ju1n,tie1,-,ke3,ha4n,da4,dia3n,bi1ng,- ju1n,shu1,shi2,e4r,jua3n,-,jua3n,jua3n,yo3u,ye2,mi2ng,- a1,ye2,wu2,da4,e2r,-,mu4,la2n,wu2,zha3ng,xio1ng,- @@ -10,9 +10,9 @@ yua4n,we4i,shi4,a1n,ma3,-,co2ng,ci3,ti4,ye2,zhe1ng,- do1ng,shi4,ma3i,ju4n,ma3,-,xi1,shi4,ma3i,a1n,jia1n,- na2n,shi4,ma3i,pe4i,to2u,-,be3i,shi4,ma3i,zha3ng,bia1n,- cha2o,ci2,ye2,nia2ng,qu4,-,mu4,su4,hua2ng,he2,bia1n,- -bu4,we2n,ye2,nia2ng,hua4n,nv3,she1ng,-,da4n,we2n,hua2ng,he2,liu2,shui3,mi2ng,jia4n,jia4n,- +bu4,we2n,ye2,nia2ng,hua4n,nü3,she1ng,-,da4n,we2n,hua2ng,he2,liu2,shui3,mi2ng,jia4n,jia4n,- da4n,ci2,hua2ng,he2,qu4,-,mu4,zhi4,he1i,sha1n,to2u,- -bu4,we2n,ye2,nia2ng,hua4n,nv3,she1ng,-,da4n,we2n,ya4n,sha1n,hu2,qi2,she1ng,jiu1,jiu1,- +bu4,we2n,ye2,nia2ng,hua4n,nü3,she1ng,-,da4n,we2n,ya4n,sha1n,hu2,qi2,she1ng,jiu1,jiu1,- wa4n,li3,fu4,ro2ng,ji1,-,gua1n,sha1n,du4,ruo4,fe1i,- shuo4,qi4,chua2n,ji1n,tuo4,-,ha2n,gua1ng,zha4o,tie3,yi1,- @@ -23,14 +23,14 @@ ce4,xu1n,shi2,e4r,zhua3n,-,sha3ng,ci4,ba3i,qia1n,qia2ng,- ke3,ha4n,we4n,suo3,yu4,-,-,mu4,la2n,bu4,yo4ng,sha4ng,shu1,la2ng,- yua4n,jie4,mi2ng,tuo2,qia1n,li3,zu2,-,so4ng,e2r,ha2i,gu4,xia1ng,-,- -ye2,nia2ng,we2n,nv3,la2i,-,chu1,guo1,xia1ng,fu2,jia1ng,- +ye2,nia2ng,we2n,nü3,la2i,-,chu1,guo1,xia1ng,fu2,jia1ng,- a1,zi3,we2n,me4i,la2i,-,da1ng,hu4,li3,ho2ng,zhua1ng,- xia3o,di4,we2n,zi3,la2i,-,mo2,da1o,huo4,huo4,xia4ng,zhu1,ya2ng,- ka1i,wo3,do1ng,ge2,me2n,-,zuo4,wo3,xi1,jia1n,chua2ng,- tuo1,wo3,zha4n,shi2,pa2o,-,zhe,wo3,jiu4,shi2,shang,- da1ng,chua1ng,li3,yu2n,bi4n,-,dui4,ji4ng,tie1,hua1,hua2ng,- chu1,me2n,ka4n,huo3,ba4n,-,huo3,ba4n,jie1,ji1ng,hua2ng,- --,to2ng,xi2ng,shi2,e4r,nia2n,-,bu4,zhi1,mu4,la2n,shi4,nv3,la2ng,-,- +-,to2ng,xi2ng,shi2,e4r,nia2n,-,bu4,zhi1,mu4,la2n,shi4,nü3,la2ng,-,- xio2ng,tu4,jia3o,pu1,shuo4,-,ci2,tu4,ya3n,mi2,li2,- lia3ng,tu4,ba4ng,de,zo3u,-,a1n,ne2ng,bia4n,wo3,shi4,xio2ng,ci2,- diff --git a/tests/pinyin/b.txt-with_tone_num_end b/tests/pinyin/b.txt-with_tone_num_end index a4bbe66..044f94e 100644 --- a/tests/pinyin/b.txt-with_tone_num_end +++ b/tests/pinyin/b.txt-with_tone_num_end @@ -1,7 +1,7 @@ ji1,ji1,fu4,ji1,ji1,-,mu4,lan2,dang1,hu4,zhi1,- -bu4,wen2,ji1,zhu4,sheng1,-,wei2,wen2,nv3,tan4,xi1,- -wen4,nv3,he2,suo3,si1,-,wen4,nv3,he2,suo3,yi4,- -nv3,yi4,wu2,suo3,si1,-,nv3,yi4,wu2,suo3,yi4,- +bu4,wen2,ji1,zhu4,sheng1,-,wei2,wen2,nü3,tan4,xi1,- +wen4,nü3,he2,suo3,si1,-,wen4,nü3,he2,suo3,yi4,- +nü3,yi4,wu2,suo3,si1,-,nü3,yi4,wu2,suo3,yi4,- zuo2,ye4,jian4,jun1,tie1,-,ke3,han4,da4,dian3,bing1,- jun1,shu1,shi2,er4,juan3,-,juan3,juan3,you3,ye2,ming2,- a1,ye2,wu2,da4,er2,-,mu4,lan2,wu2,zhang3,xiong1,- @@ -10,9 +10,9 @@ yuan4,wei4,shi4,an1,ma3,-,cong2,ci3,ti4,ye2,zheng1,- dong1,shi4,mai3,jun4,ma3,-,xi1,shi4,mai3,an1,jian1,- nan2,shi4,mai3,pei4,tou2,-,bei3,shi4,mai3,zhang3,bian1,- chao2,ci2,ye2,niang2,qu4,-,mu4,su4,huang2,he2,bian1,- -bu4,wen2,ye2,niang2,huan4,nv3,sheng1,-,dan4,wen2,huang2,he2,liu2,shui3,ming2,jian4,jian4,- +bu4,wen2,ye2,niang2,huan4,nü3,sheng1,-,dan4,wen2,huang2,he2,liu2,shui3,ming2,jian4,jian4,- dan4,ci2,huang2,he2,qu4,-,mu4,zhi4,hei1,shan1,tou2,- -bu4,wen2,ye2,niang2,huan4,nv3,sheng1,-,dan4,wen2,yan4,shan1,hu2,qi2,sheng1,jiu1,jiu1,- +bu4,wen2,ye2,niang2,huan4,nü3,sheng1,-,dan4,wen2,yan4,shan1,hu2,qi2,sheng1,jiu1,jiu1,- wan4,li3,fu4,rong2,ji1,-,guan1,shan1,du4,ruo4,fei1,- shuo4,qi4,chuan2,jin1,tuo4,-,han2,guang1,zhao4,tie3,yi1,- @@ -23,14 +23,14 @@ ce4,xun1,shi2,er4,zhuan3,-,shang3,ci4,bai3,qian1,qiang2,- ke3,han4,wen4,suo3,yu4,-,-,mu4,lan2,bu4,yong4,shang4,shu1,lang2,- yuan4,jie4,ming2,tuo2,qian1,li3,zu2,-,song4,er2,hai2,gu4,xiang1,-,- -ye2,niang2,wen2,nv3,lai2,-,chu1,guo1,xiang1,fu2,jiang1,- +ye2,niang2,wen2,nü3,lai2,-,chu1,guo1,xiang1,fu2,jiang1,- a1,zi3,wen2,mei4,lai2,-,dang1,hu4,li3,hong2,zhuang1,- xiao3,di4,wen2,zi3,lai2,-,mo2,dao1,huo4,huo4,xiang4,zhu1,yang2,- kai1,wo3,dong1,ge2,men2,-,zuo4,wo3,xi1,jian1,chuang2,- tuo1,wo3,zhan4,shi2,pao2,-,zhe,wo3,jiu4,shi2,shang,- dang1,chuang1,li3,yun2,bin4,-,dui4,jing4,tie1,hua1,huang2,- chu1,men2,kan4,huo3,ban4,-,huo3,ban4,jie1,jing1,huang2,- --,tong2,xing2,shi2,er4,nian2,-,bu4,zhi1,mu4,lan2,shi4,nv3,lang2,-,- +-,tong2,xing2,shi2,er4,nian2,-,bu4,zhi1,mu4,lan2,shi4,nü3,lang2,-,- xiong2,tu4,jiao3,pu1,shuo4,-,ci2,tu4,yan3,mi2,li2,- liang3,tu4,bang4,de,zou3,-,an1,neng2,bian4,wo3,shi4,xiong2,ci2,- diff --git a/tests/pinyin/c.txt-plain b/tests/pinyin/c.txt-plain index 2dbc236..f6729f9 100644 --- a/tests/pinyin/c.txt-plain +++ b/tests/pinyin/c.txt-plain @@ -1,10 +1,10 @@ -qian,wu,lv,-,you,hao,shi,zhe,-,chuan,zai,yi,ru,-,zhi,ze,wu,ke,yong,-,fang,zhi,shan,xia,- +qian,wu,lü,-,you,hao,shi,zhe,-,chuan,zai,yi,ru,-,zhi,ze,wu,ke,yong,-,fang,zhi,shan,xia,- hu,jian,zhi,-,pang,ran,da,wu,ye,-,yi,wei,shen,- bi,lin,jian,kui,zhi,-,shao,chu,jin,zhi,-,yin,yin,ran,mo,xiang,zhi,- -ta,ri,-,lv,yi,ming,-,hu,da,hai,yuan,dun,-,yi,wei,qie,shi,yi,ye,-,shen,kong,- +ta,ri,-,lü,yi,ming,-,hu,da,hai,yuan,dun,-,yi,wei,qie,shi,yi,ye,-,shen,kong,- ran,wang,lai,shi,zhi,-,jue,wu,yi,neng,zhe,-,yi,xi,qi,sheng,-,you,jin,chu,qian,hou,-,zhong,bu,gan,bo,- shao,jin,yi,xia,-,dang,yi,chong,mao,- -lv,bu,sheng,nu,-,ti,zhi,- +lü,bu,sheng,nu,-,ti,zhi,- hu,yin,xi,-,ji,zhi,yue,-,-,ji,zhi,ci,er,-,- yin,tiao,liang,da,han,-,duan,qi,hou,-,jin,qi,rou,-,nai,qu,- diff --git a/tests/pinyin/c.txt-with_tone_num b/tests/pinyin/c.txt-with_tone_num index 0455491..f48dbe4 100644 --- a/tests/pinyin/c.txt-with_tone_num +++ b/tests/pinyin/c.txt-with_tone_num @@ -1,10 +1,10 @@ -qia2n,wu2,lv2,-,yo3u,ha3o,shi4,zhe3,-,chua2n,za4i,yi3,ru4,-,zhi4,ze2,wu2,ke3,yo4ng,-,fa4ng,zhi1,sha1n,xia4,- +qia2n,wu2,lü2,-,yo3u,ha3o,shi4,zhe3,-,chua2n,za4i,yi3,ru4,-,zhi4,ze2,wu2,ke3,yo4ng,-,fa4ng,zhi1,sha1n,xia4,- hu3,jia4n,zhi1,-,pa2ng,ra2n,da4,wu4,ye3,-,yi3,we4i,she2n,- bi4,li2n,jia1n,kui1,zhi1,-,sha1o,chu1,ji4n,zhi1,-,yi4n,yi4n,ra2n,mo4,xia1ng,zhi1,- -ta1,ri4,-,lv2,yi1,mi2ng,-,hu3,da4,ha4i,yua3n,du4n,-,yi3,we4i,qie3,shi4,yi3,ye3,-,she2n,ko3ng,- +ta1,ri4,-,lü2,yi1,mi2ng,-,hu3,da4,ha4i,yua3n,du4n,-,yi3,we4i,qie3,shi4,yi3,ye3,-,she2n,ko3ng,- ra2n,wa3ng,la2i,shi4,zhi1,-,jue2,wu2,yi4,ne2ng,zhe3,-,yi4,xi2,qi2,she1ng,-,yo4u,ji4n,chu1,qia2n,ho4u,-,zho1ng,bu4,ga3n,bo2,- sha1o,ji4n,yi4,xia2,-,da4ng,yi3,cho1ng,ma4o,- -lv2,bu4,she4ng,nu4,-,ti2,zhi1,- +lü2,bu4,she4ng,nu4,-,ti2,zhi1,- hu3,yi1n,xi3,-,ji4,zhi1,yue1,-,-,ji4,zhi3,ci3,e3r,-,- yi1n,tia4o,lia2ng,da4,ha3n,-,dua4n,qi2,ho2u,-,ji3n,qi2,ro4u,-,na3i,qu4,- diff --git a/tests/pinyin/c.txt-with_tone_num_end b/tests/pinyin/c.txt-with_tone_num_end index 5857040..a2f3f92 100644 --- a/tests/pinyin/c.txt-with_tone_num_end +++ b/tests/pinyin/c.txt-with_tone_num_end @@ -1,10 +1,10 @@ -qian2,wu2,lv2,-,you3,hao3,shi4,zhe3,-,chuan2,zai4,yi3,ru4,-,zhi4,ze2,wu2,ke3,yong4,-,fang4,zhi1,shan1,xia4,- +qian2,wu2,lü2,-,you3,hao3,shi4,zhe3,-,chuan2,zai4,yi3,ru4,-,zhi4,ze2,wu2,ke3,yong4,-,fang4,zhi1,shan1,xia4,- hu3,jian4,zhi1,-,pang2,ran2,da4,wu4,ye3,-,yi3,wei4,shen2,- bi4,lin2,jian1,kui1,zhi1,-,shao1,chu1,jin4,zhi1,-,yin4,yin4,ran2,mo4,xiang1,zhi1,- -ta1,ri4,-,lv2,yi1,ming2,-,hu3,da4,hai4,yuan3,dun4,-,yi3,wei4,qie3,shi4,yi3,ye3,-,shen2,kong3,- +ta1,ri4,-,lü2,yi1,ming2,-,hu3,da4,hai4,yuan3,dun4,-,yi3,wei4,qie3,shi4,yi3,ye3,-,shen2,kong3,- ran2,wang3,lai2,shi4,zhi1,-,jue2,wu2,yi4,neng2,zhe3,-,yi4,xi2,qi2,sheng1,-,you4,jin4,chu1,qian2,hou4,-,zhong1,bu4,gan3,bo2,- shao1,jin4,yi4,xia2,-,dang4,yi3,chong1,mao4,- -lv2,bu4,sheng4,nu4,-,ti2,zhi1,- +lü2,bu4,sheng4,nu4,-,ti2,zhi1,- hu3,yin1,xi3,-,ji4,zhi1,yue1,-,-,ji4,zhi3,ci3,er3,-,- yin1,tiao4,liang2,da4,han3,-,duan4,qi2,hou2,-,jin3,qi2,rou4,-,nai3,qu4,-