From 9cf7abfe00b9128c12d3b6809ba272acadb1a084 Mon Sep 17 00:00:00 2001 From: mozillazg Date: Tue, 10 May 2016 22:27:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E8=AF=8D?= =?UTF-8?q?=E8=AF=AD=E5=AD=98=E5=9C=A8=E6=8B=BC=E9=9F=B3=E7=B2=98=E8=BF=9E?= =?UTF-8?q?=E5=9C=A8=E4=B8=80=E8=B5=B7=E7=9A=84=E6=83=85=E5=86=B5.=20fixed?= =?UTF-8?q?=20#41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.rst | 8 ++++++++ pypinyin/phrases_dict.py | 28 ++++++++++++++-------------- tests/test_pinyin.py | 2 ++ 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8882b579..b7990896 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,12 @@ Changelog --------- +0.12.1 (2016-mm-dd) ++++++++++++++++++++++ + +* **[Bugfixed]** 修复一些词语存在拼音粘连在一起的情况. (`#41`_ thanks `@jolly-tao`_ ) + + 0.12.0 (2016-03-12) +++++++++++++++++++++ @@ -307,3 +313,5 @@ __ https://github.com/mozillazg/python-pinyin/issues/8 .. _pinyin-data: https://github.com/mozillazg/pinyin-data .. _@someus: https://github.com/someus .. _#34: https://github.com/mozillazg/python-pinyin/issues/34 +.. _#41: https://github.com/mozillazg/python-pinyin/issues/41 +.. _@jolly-tao: https://github.com/jolly-tao diff --git a/pypinyin/phrases_dict.py b/pypinyin/phrases_dict.py index 591f3957..e5460b30 100644 --- a/pypinyin/phrases_dict.py +++ b/pypinyin/phrases_dict.py @@ -670,7 +670,7 @@ "表率": [["biǎo"], ["shuài"]], "表亲": [["biǎo"], ["qīn"]], "表头": [["biǎo"], ["tóu"]], - "表徵": [["biǎo "], ["zhǐ"]], + "表徵": [["biǎo"], ["zhǐ"]], "表语": [["biǎo"], ["yǔ"]], "裱糊": [["biǎo"], ["hú"]], "憋闷": [["biē"], ["mèn"]], @@ -4110,7 +4110,7 @@ "仿行": [["fǎng"], ["xíng"]], "访查": [["fǎng"], ["zhā"]], "彷佛": [["páng"], ["fó"]], - "彷徨": [["pánghuáng"]], + "彷徨": [["páng"], ["huáng"]], "纺车": [["fǎng"], ["chē"]], "放榜": [["fàng"], ["bǎng"]], "纺织": [["fǎng"], ["zhī"]], @@ -15499,7 +15499,7 @@ "应召": [["yìng"], ["zhào"]], "应诊": [["yìng"], ["zhěn"]], "应征": [["yìng"], ["zhēng"]], - "应徵": [["yìng "], ["zhǐ"]], + "应徵": [["yìng"], ["zhǐ"]], "应制": [["yìng"], ["zhì"]], "英尺": [["yīng"], ["chǐ"]], "英华": [["yīng"], ["huá"]], @@ -15513,7 +15513,7 @@ "迎头": [["yíng"], ["tóu"]], "茔地": [["yíng"], ["dì"]], "荥阳": [["xíng"], ["yáng"]], - "荧屏": [["yíng"], ["píng,yíng"], ["mù"]], + "荧屏": [["yíng"], ["píng"]], "赢得": [["yíng"], ["de"]], "蝇头": [["yíng"], ["tóu"]], "赢家": [["yíng"], ["jiā"]], @@ -21965,7 +21965,7 @@ "跌打损伤": [["diē"], ["dǎ"], ["sǔn"], ["shāng"]], "跌弹斑鸠": [["diē"], ["dàn"], ["bān"], ["jiū"]], "跌宕不羁": [["dié"], ["dàng"], ["bù"], ["jī"]], - "跌宕风流": [["diē"], ["dàng"], ["fēngliú"]], + "跌宕风流": [["diē"], ["dàng"], ["fēng"], ["liú"]], "跌荡不拘": [["diē"], ["dàng"], ["bù"], ["jū"]], "跌荡不羁": [["diē"], ["dàng"], ["bù"], ["jī"]], "跌荡风流": [["diē"], ["dàng"], ["fēng"], ["liú"]], @@ -23727,7 +23727,7 @@ "改行从善": [["gǎi"], ["xíng"], ["cóng"], ["shàn"]], "改行迁善": [["gǎi"], ["xíng"], ["qiān"], ["shàn"]], "改行为善": [["gǎi"], ["xíng"], ["wéi"], ["shàn"]], - "改行自新": [["gǎi"], ["xíng"], ["zìxīn"]], + "改行自新": [["gǎi"], ["xíng"], ["zì"], ["xīn"]], "改姓更名": [["gǎi"], ["xìng"], ["gēng"], ["míng"]], "改玉改行": [["gǎi"], ["yù"], ["gǎi"], ["xíng"]], "改张易调": [["gǎi"], ["zhāng"], ["yì"], ["diào"]], @@ -27274,7 +27274,7 @@ "惊见骇闻": [["jīng"], ["jiàn"], ["hài"], ["wén"]], "惊蛇入草": [["jīng"], ["shé"], ["rù"], ["cǎo"]], "惊恐万状": [["jīng"], ["kǒng"], ["wàn"], ["zhuàng"]], - "惊天地泣鬼神": [["Jīng"], ["tiā"], ["ndì"], ["qì"], ["guǐ"], ["shén"]], + "惊天地泣鬼神": [["jīng"], ["tiān"], ["dì"], ["qì"], ["guǐ"], ["shén"]], "惊天动地": [["jīng"], ["tiān"], ["dòng"], ["dì"]], "惊喜若狂": [["jīng"], ["xǐ"], ["ruò"], ["kuáng"]], "惊心裂胆": [["jīng"], ["xīn"], ["liè"], ["dǎn"]], @@ -37057,12 +37057,12 @@ "悬肠挂肚": [["xuán"], ["cháng"], ["guà"], ["dù"]], "悬车束马": [["xuán"], ["chē"], ["shù"], ["mǎ"]], "悬车告老": [["xuán"], ["chē"], ["gào"], ["lǎo"]], - "悬车之年": [["xuán"], ["chē　zhī　nián"]], + "悬车之年": [["xuán"], ["chē"], ["zhī"], ["nián"]], "悬车之岁": [["xuán"], ["chē"], ["zhī"], ["suì"]], "悬车致仕": [["xuán"], ["chē"], ["zhì"], ["shì"]], "悬灯结彩": [["xuán"], ["dēng"], ["jié"], ["cǎi"]], "悬鹑百结": [["xuán"], ["chún"], ["bǎi"], ["jié"]], - "悬龟系鱼": [["xuán"], ["guī[uni]58566[/uni]jì"], ["yú"]], + "悬龟系鱼": [["xuán"], ["guī"], ["jì"], ["yú"]], "悬鼓待椎": [["xuán"], ["gǔ"], ["dài"], ["zhuī"]], "悬狟素飡": [["xuán"], ["huán"], ["sù"], ["kòu"]], "悬剑空垄": [["xuán"], ["jiàn"], ["kōng"], ["lǒng"]], @@ -37730,10 +37730,10 @@ "一倡三叹": [["yī"], ["chàng"], ["sān"], ["tàn"]], "一唱一和": [["yī"], ["chàng"], ["yī"], ["hè"]], "一唱百和": [["yī"], ["chàng"], ["bǎi"], ["hé"]], - "一朝千里": [["yī"], ["zhāo　qiān　lǐ"]], + "一朝千里": [["yī"], ["zhāo"], ["qiān"], ["lǐ"]], "一朝天子一朝臣": [["yī"], ["cháo"], ["tiān"], ["zǐ"], ["yī"], ["cháo"], ["chén"]], "一朝之忿": [["yī"], ["zhāo"], ["zhī"], ["fèn"]], - "一朝之患": [["yī"], ["zhāo　zhī　huàn"]], + "一朝之患": [["yī"], ["zhāo"], ["zhī"], ["huàn"]], "一朝一夕": [["yī"], ["zhāo"], ["yī"], ["xī"]], "一彻万融": [["yī"], ["chè"], ["wàn"], ["róng"]], "一尘不到": [["yī"], ["chén"], ["bù"], ["dào"]], @@ -38518,7 +38518,7 @@ "引颈受戮": [["yǐn"], ["jǐng"], ["shòu"], ["lù"]], "引吭高唱": [["yǐn"], ["háng"], ["gāo"], ["chàng"]], "引吭高歌": [["yǐn"], ["háng"], ["gāo"], ["gē"]], - "引吭高声": [["yǐn"], ["háng　gāo　shēng"]], + "引吭高声": [["yǐn"], ["háng"], ["gāo"], ["shēng"]], "引商刻角": [["yǐn"], ["shāng"], ["kè"], ["jiǎo"]], "引绳排根": [["yǐn"], ["shéng"], ["pái"], ["gēn"]], "引蛇出洞": [["yǐn"], ["shé"], ["chū"], ["dòng"]], @@ -39735,7 +39735,7 @@ "折子戏": [["zhé"], ["zǐ"], ["xì"]], "折足覆餗": [["zhé"], ["zú"], ["fù"], ["sù"]], "哲人其萎": [["zhé"], ["rén"], ["qí"], ["wěi"]], - "赭衣塞路": [["zhě"], ["yī"], ["sàī"], ["lù"]], + "赭衣塞路": [["zhě"], ["yī"], ["sài"], ["lù"]], "这会儿": [["zhè"], ["huì"], ["er"]], "这么点儿": [["zhè"], ["me"], ["diǎn"], ["er"]], "这么些": [["zhè"], ["mǒ"], ["xiē"]], @@ -40935,7 +40935,7 @@ "足不窥户": [["zú"], ["bù"], ["kuī"], ["hù"]], "足不履影": [["zú"], ["bù"], ["lǚ"], ["yǐng"]], "足不逾户": [["zú"], ["bù"], ["yú"], ["hù"]], - "足尺加二": [["zú"], ["chǐ"], ["ji?èr"]], + "足尺加二": [["zú"], ["chǐ"], ["jiā"], ["èr"]], "足食丰衣": [["zú"], ["shí"], ["fēng"], ["yī"]], "足高气强": [["zú"], ["gāo"], ["qì"], ["qiáng"]], "足踏实地": [["zú"], ["tà"], ["shí"], ["dì"]], diff --git a/tests/test_pinyin.py b/tests/test_pinyin.py index 506999da..4fdd0fc6 100644 --- a/tests/test_pinyin.py +++ b/tests/test_pinyin.py @@ -284,6 +284,8 @@ def test_simple_seg(): ['呣', {'style': FINALS}, ['m']], ['呣', {'style': FINALS_TONE}, ['ḿ']], ['呣', {'style': FINALS_TONE2}, ['m2']], + # 41 + ['彷徨', {}, ['pang', 'huang']], ]