branch: externals/pyim commit 0b5910156f724868c639666b126d9be6b04aa7f6 Author: Feng Shu <tuma...@163.com> Commit: Feng Shu <tuma...@163.com>
pyim-pymap-py2duoyinzi-get -> pyim-pymap--py2duoyinzi-get --- pyim-pymap-utils.el | 2 +- pyim-pymap.el | 4 ++-- tests/pyim-tests.el | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyim-pymap-utils.el b/pyim-pymap-utils.el index 9235dbe97b..581451e626 100644 --- a/pyim-pymap-utils.el +++ b/pyim-pymap-utils.el @@ -408,7 +408,7 @@ ;; 剔除已经设置为 fallback 拼音 (char-pinyins (cl-remove-if (lambda (py) - (member char (pyim-pymap-py2duoyinzi-get py t))) + (member char (pyim-pymap--py2duoyinzi-get py t))) char-pinyins)) ;; 找到 code2word 词库中,这个字对应得拼音 (pinyin (nth i (car x))) diff --git a/pyim-pymap.el b/pyim-pymap.el index 5ae1fb1cd4..c9448ca6d5 100644 --- a/pyim-pymap.el +++ b/pyim-pymap.el @@ -1142,7 +1142,7 @@ pyim 在特定的时候需要读取一个汉字的拼音,这个工作由此完 (cl-find-if (lambda (pinyin) (when-let ((x (string-join - (pyim-pymap-py2duoyinzi-get + (pyim-pymap--py2duoyinzi-get pinyin search-char) "-"))) (cl-some @@ -1151,7 +1151,7 @@ pyim 在特定的时候需要读取一个汉字的拼音,这个工作由此完 cchar-words))) cchar-pinyins)) -(defun pyim-pymap-py2duoyinzi-get (pinyin &optional return-chars) +(defun pyim-pymap--py2duoyinzi-get (pinyin &optional return-chars) "获取与 PINYIN 想匹配的多音字(词)。" (pyim-pymap--py2duoyinzi-cache-create) (when (and pinyin (stringp pinyin)) diff --git a/tests/pyim-tests.el b/tests/pyim-tests.el index 131da00785..1a2d1c759b 100644 --- a/tests/pyim-tests.el +++ b/tests/pyim-tests.el @@ -291,11 +291,11 @@ '("阿" "啊" "呵" "腌" "|" "嗄" "吖" "锕" "|" "|" "錒"))) (should (equal (pyim-pymap-py2cchar-get "zhua" t) '("抓挝爪||髽|膼撾檛簻"))) - (should (equal (pyim-pymap-py2duoyinzi-get "a") + (should (equal (pyim-pymap--py2duoyinzi-get "a") '("吖啶" "腌臜"))) (should (pyim-pymap-duoyinzi-include-p "银行")) (should-not (pyim-pymap-duoyinzi-include-p "银子")) - (should (equal (pyim-pymap-py2duoyinzi-get "ai" t) + (should (equal (pyim-pymap--py2duoyinzi-get "ai" t) '("艾"))) (should (equal (pyim-pymap-cchars2pys-get '("hello" "你" "好" "ma"))