Merge remote-tracking branch 'origin/develop'

mozillazg · Mar 13, 2021 · ee6081f · ee6081f
2 parents d7d22a6 + f9e8dd0
commit ee6081f
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 5 deletions.
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -0,0 +1,31 @@
+# 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
diff --git 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
diff --git a/Makefile b/Makefile
@@ -14,4 +14,4 @@ pua:
 
 .PHONY: check
 check:
-	-rg 'ɡ|ɑ'
+	-rg 'ɡ|ɑ|í|è'
diff --git 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  # 帮

diff --git 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  # 帪

diff --git 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ì,pí  # 庳
+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: yí,wèi,suí  # 遺
+U+907A: yí,wèi,suí  # 遺
 U+907B: è  # 遻
 U+907C: liáo  # 遼
 U+907D: jù  # 遽