Merge remote-tracking branch 'origin/develop'

mozillazg · Dec 11, 2023 · a70b095 · a70b095
2 parents f000cd5 + de9a03a
commit a70b095
Show file tree

Hide file tree

Showing 10 changed files with 191 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2022, ubuntu-22.04]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.9"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy3.9"]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 Changelog
 ---------
 
+`0.50.0`_ (2023-12-11)
++++++++++++++++++++++++++
+
+* **[Improved]** 使用 `phrase-pinyin-data`_ v0.16.0 的词语拼音数据。
+* **[Improved]** 使用 `pinyin-data`_ v0.14.0 的拼音数据。
+
 
 `0.49.0`_ (2023-05-14)
 +++++++++++++++++++++++++
@@ -1067,3 +1073,4 @@ __ https://github.com/mozillazg/python-pinyin/issues/8
 .. _0.47.1: https://github.com/mozillazg/python-pinyin/compare/v0.47.0...v0.47.1
 .. _0.48.0: https://github.com/mozillazg/python-pinyin/compare/v0.47.1...v0.48.0
 .. _0.49.0: https://github.com/mozillazg/python-pinyin/compare/v0.48.0...v0.49.0
+.. _0.50.0: https://github.com/mozillazg/python-pinyin/compare/v0.49.0...v0.50.0
diff --git a/README.rst b/README.rst
@@ -12,7 +12,7 @@
 * GitHub: https://github.com/mozillazg/python-pinyin
 * License: MIT license
 * PyPI: https://pypi.org/project/pypinyin
-* Python version: 2.7, pypy, pypy3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11
+* Python version: 2.7, pypy, pypy3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12
 
 .. contents::
 

diff --git a/phrase-pinyin-data b/phrase-pinyin-data
diff --git a/pinyin-data b/pinyin-data
diff --git a/pypinyin/constants.py b/pypinyin/constants.py
@@ -45,7 +45,9 @@
         r'\U0002B825-\U0002BF6E'
         r'\U0002C029-\U0002CE93'
         r'\U0002D016'
+        r'\U0002D11B-\U0002EBD9'
         r'\U0002F80A-\U0002FA1F'   # CJK兼容扩展:[2F800-2FA1F]
+        r'\U000300F7-\U00031288'
         r'\U00030EDD'
         r'\U00030EDE'
         r'])+$'

diff --git a/pypinyin/phrases_dict.py b/pypinyin/phrases_dict.py
@@ -2993,7 +2993,7 @@
     '乐池': [['yuè'], ['chí']],
     '乐清': [['yuè'], ['qīng']],
     '乐滋滋': [['lè'], ['zī'], ['zī']],
-    '乐理': [['lè'], ['lǐ']],
+    '乐理': [['yuè'], ['lǐ']],
     '乐祸幸灾': [['lè'], ['huò'], ['xìng'], ['zāi']],
     '乐章': [['yuè'], ['zhāng']],
     '乐而不厌': [['lè'], ['ér'], ['bù'], ['yàn']],
@@ -13428,8 +13428,8 @@
     '大块文章': [['dà'], ['kuài'], ['wén'], ['zhāng']],
     '大坝': [['dà'], ['bà']],
     '大型': [['dà'], ['xíng']],
-    '大城': [['dài'], ['chéng']],
-    '大城市': [['dài'], ['chéng'], ['shì']],
+    '大城': [['dà'], ['chéng']],
+    '大城市': [['dà'], ['chéng'], ['shì']],
     '大埔': [['dà'], ['bù']],
     '大堂': [['dà'], ['táng']],
     '大堡礁': [['dà'], ['pù'], ['jiāo']],
@@ -18555,7 +18555,7 @@
     '忆苦思甜': [['yì'], ['kǔ'], ['sī'], ['tián']],
     '忌食': [['jì'], ['shí']],
     '忍俊不住': [['rěn'], ['jùn'], ['bù'], ['zhù']],
-    '忍俊不禁': [['rěn'], ['jùn'], ['bù'], ['jìn']],
+    '忍俊不禁': [['rěn'], ['jùn'], ['bù'], ['jīn']],
     '忍无可忍': [['rěn'], ['wú'], ['kě'], ['rěn']],
     '忍辱': [['rěn'], ['rǔ']],
     '忍辱负重': [['rěn'], ['rǔ'], ['fù'], ['zhòng']],
@@ -41461,7 +41461,7 @@
     '重珪叠组': [['chóng'], ['guī'], ['dié'], ['zǔ']],
     '重珪迭组': [['chóng'], ['guī'], ['dié'], ['zǔ']],
     '重理旧业': [['chóng'], ['lǐ'], ['jiù'], ['yè']],
-    '重生': [['zhòng'], ['shēng']],
+    '重生': [['chóng'], ['shēng']],
     '重生父母': [['chóng'], ['shēng'], ['fù'], ['mǔ']],
     '重生爷娘': [['chóng'], ['shēng'], ['yé'], ['niáng']],
     '重申': [['chóng'], ['shēn']],
+1 −1		.bumpversion.cfg
+7 −1		CHANGELOG.md
+7 −7		large_pinyin.txt
+2 −0		overwrite.txt
+6 −6		pinyin.txt
+1 −1		tools/merge.py
+3 −3		zdic_cibs.txt
+1 −1		zdic_cybs.txt
+1 −1		.bumpversion.cfg
+0 −1		.python-version
+7 −0		CHANGELOG.md
+3 −2		README.md
+286 −232		kXHC1983.txt
+1 −1		merge_unihan.py
+167 −13		pinyin.txt
+1 −1		tools/phrase-pinyin-data