From 0342433f76c80f3c780248d56da9c3f49d936bbd Mon Sep 17 00:00:00 2001 From: Ace-Who Date: Sat, 6 Mar 2021 09:33:54 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E4=B8=A4?= =?UTF-8?q?=E4=B8=AA=E6=8B=BC=E9=9F=B3=E5=AD=97=E6=AF=8D=20`e=CC=80=20i?= =?UTF-8?q?=CC=81`=20=E4=BD=BF=E7=94=A8=E4=B8=8D=E5=BD=93=EF=BC=8C?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BA=E6=96=87=E4=BB=B6=E4=B8=AD=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=BD=BF=E7=94=A8=E7=9A=84=20`=C3=A8=20=C3=AD`?= =?UTF-8?q?=EF=BC=8C=20(#45)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zdic.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zdic.txt b/zdic.txt index ee497b7..729a9a5 100644 --- a/zdic.txt +++ b/zdic.txt @@ -11284,7 +11284,7 @@ U+5EAF: bū # 庯 U+5EB0: bìng,píng # 庰 U+5EB1: chěng # 庱 U+5EB2: lái # 庲 -U+5EB3: bēi,bì,pí # 庳 +U+5EB3: bēi,bì,pí # 庳 U+5EB4: jī,cuò # 庴 U+5EB5: ān # 庵 U+5EB6: shù # 庶 @@ -24027,7 +24027,7 @@ U+9076: rào # 遶 U+9077: qiān # 遷 U+9078: xuǎn # 選 U+9079: yù # 遹 -U+907A: yí,wèi,suí # 遺 +U+907A: yí,wèi,suí # 遺 U+907B: è # 遻 U+907C: liáo # 遼 U+907D: jù # 遽 From 108e1588cd281edce2f7af2332560dfbbd2ac698 Mon Sep 17 00:00:00 2001 From: mozillazg Date: Sat, 13 Mar 2021 08:52:46 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=B8=A7=20=E7=9A=84?= =?UTF-8?q?=E6=9C=80=E5=B8=B8=E7=94=A8=E8=AF=BB=E9=9F=B3=E4=B8=BA=20zh?= =?UTF-8?q?=C4=93n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kMandarin_8105.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kMandarin_8105.txt b/kMandarin_8105.txt index 3265c71..1860528 100644 --- a/kMandarin_8105.txt +++ b/kMandarin_8105.txt @@ -1804,7 +1804,7 @@ U+5E1C: zhì # 帜 U+5E1D: dì # 帝 U+5E21: píng # 帡 U+5E26: dài # 带 -U+5E27: zhèng # 帧 -> zhēn +U+5E27: zhēn # 帧 U+5E28: shuì # 帨 U+5E2D: xí # 席 U+5E2E: bāng # 帮 From eb4e2c0853de31f8e506832c090a9992a56e1747 Mon Sep 17 00:00:00 2001 From: mozillazg Date: Sat, 13 Mar 2021 08:54:13 +0800 Subject: [PATCH 3/7] =?UTF-8?q?check=20i=CC=81=20and=20e=CC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a72a5af..a18f2d9 100644 --- a/Makefile +++ b/Makefile @@ -14,4 +14,4 @@ pua: .PHONY: check check: - -rg 'ɡ|ɑ' + -rg 'ɡ|ɑ|í|è' From e99fb3ba0ba677430b6787fed8f1f6fb598b6157 Mon Sep 17 00:00:00 2001 From: mozillazg Date: Sat, 13 Mar 2021 09:03:08 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E7=9A=84pinyin.txt=20=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pinyin.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pinyin.txt b/pinyin.txt index 37beca6..6dad35f 100644 --- a/pinyin.txt +++ b/pinyin.txt @@ -9897,7 +9897,7 @@ U+5E23: juǎn,juàn # 帣 U+5E24: rú # 帤 U+5E25: shuài # 帥 U+5E26: dài # 带 -U+5E27: zhèng,zhēn # 帧 +U+5E27: zhēn,zhèng # 帧 U+5E28: shuì # 帨 U+5E29: qiào # 帩 U+5E2A: zhēn # 帪 From 23ce44e06d83f027a3aedef4dfa783b57f4f72f4 Mon Sep 17 00:00:00 2001 From: mozillazg Date: Sat, 13 Mar 2021 09:05:49 +0800 Subject: [PATCH 5/7] v0.10.2 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7920b0..d65d4c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # ChangeLog +## [0.10.2] (2021-03-13) + +* 修改 `帧` 的最常用读音为 `zhēn` +* 修复 `zdic.txt` 中两个拼音字母 `è í` 使用不当的问题. Thanks [@Ace-Who](https://github.com/Ace-Who) + + ## [0.10.1] (2020-11-22) * 调整 `地` 和 `謦` 的拼音顺序 @@ -125,3 +131,4 @@ [0.9.0]: https://github.com/mozillazg/pinyin-data/compare/v0.8.1...v0.9.0 [0.10.0]: https://github.com/mozillazg/pinyin-data/compare/v0.9.0...v0.10.0 [0.10.1]: https://github.com/mozillazg/pinyin-data/compare/v0.10.0...v0.10.1 +[0.10.2]: https://github.com/mozillazg/pinyin-data/compare/v0.10.1...v0.10.2 From d776b3caa702da29354e74990af447b31df57b74 Mon Sep 17 00:00:00 2001 From: Huang Huang Date: Sat, 13 Mar 2021 09:09:29 +0800 Subject: [PATCH 6/7] Setup github action --- .github/workflows/python-app.yml | 40 ++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/python-app.yml diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml new file mode 100644 index 0000000..c8a6fee --- /dev/null +++ b/.github/workflows/python-app.yml @@ -0,0 +1,40 @@ +# This workflow will install Python dependencies, run tests and lint with a single version of Python +# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions + +name: Python application + +on: + push: + branches: [ ] + pull_request: + branches: [ ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.9 + uses: actions/setup-python@v2 + with: + python-version: 3.9 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install flake8 pytest + if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + - name: try merge_unihan + run: | + make merge_unihan + + - name: Lint with flake8 + run: | + # stop the build if there are Python syntax errors or undefined names + flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + - name: Test with pytest + run: | + pytest From f73a893098307d7f45ef44c26e1512639967d60d Mon Sep 17 00:00:00 2001 From: mozillazg Date: Sat, 13 Mar 2021 09:11:41 +0800 Subject: [PATCH 7/7] remove needless jobs --- .github/workflows/python-app.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index c8a6fee..d4ccc64 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -25,16 +25,7 @@ jobs: python -m pip install --upgrade pip pip install flake8 pytest if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - - name: try merge_unihan - run: | - make merge_unihan - - name: Lint with flake8 + - name: try merge_unihan run: | - # stop the build if there are Python syntax errors or undefined names - flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics - # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - - name: Test with pytest - run: | - pytest + make merge_unihan