[elpa] externals/pyim 900071a 02/36: Add pyim-pinyin.el

[ELPA Syncer]

branch: externals/pyim
commit 900071a21d94a52818ab91f4e0fc54e44c659c1d
Author: Feng Shu <tumashu@163.com>
Commit: Feng Shu <tumashu@163.com>

    Add pyim-pinyin.el
    
        * pyim.el (pyim-shuangpin-invalid-pinyin-regexp): Rename to 
pyim-pinyin-shuangpin-invalid-pinyin-regexp
    
        * pyim.el (pyim-pinyin-shenmu, pyim-pinyin-yunmu)
        (pyim-pinyin-valid-yunmu, pyim-pinyin-build-regexp)
        (pyim-pinyin-get-shenmu, pyim-pinyin-get-charpy)
        (pyim-pinyin-split): Move to pyim-pinyin.el.
---
 pyim-pinyin.el | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pyim.el        | 136 +---------------------------------------------
 2 files changed, 171 insertions(+), 134 deletions(-)

diff --git a/pyim-pinyin.el b/pyim-pinyin.el
new file mode 100644
index 0000000..d9a4e67
--- /dev/null
+++ b/pyim-pinyin.el
@@ -0,0 +1,169 @@
+;;; pyim-pinyin.el --- pinyin tools for pyim.        -*- lexical-binding: t; 
-*-
+
+;; * Header
+;; Copyright (C) 2021 Free Software Foundation, Inc.
+
+;; Author: Feng Shu <tumashu@163.com>
+;; Maintainer: Feng Shu <tumashu@163.com>
+;; URL: https://github.com/tumashu/pyim
+;; Keywords: convenience, Chinese, pinyin, input-method
+;; Package-Requires: ((emacs "24.4") (async "1.6") (xr "1.13"))
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+;; * 代码                                                           :code:
+(require 'cl-lib)
+
+(defvar pyim-pinyin-shenmu
+  '("b" "p" "m" "f" "d" "t" "n" "l" "g" "k" "h"
+    "j" "q" "x" "z" "c" "s" "zh" "ch" "sh" "r" "y" "w"))
+
+(defvar pyim-pinyin-yunmu
+  '("a" "o" "e" "i" "u" "v" "ai" "ei" "ui" "ao" "ou" "iu"
+    "ie" "ia" "ua" "ve" "er" "an" "en" "in" "un" "vn" "ang" "iong"
+    "eng" "ing" "ong" "uan" "uang" "ian" "iang" "iao" "ue"
+    "uai" "uo"))
+
+(defvar pyim-pinyin-valid-yunmu
+  '("a" "o" "e" "ai" "ei" "ui" "ao" "ou" "er" "an" "en"
+    "ang" "eng"))
+
+(defconst pyim-pinyin-shuangpin-invalid-pinyin-regexp
+  (format "^\\(%s\\)$"
+          (mapconcat #'identity
+                     '("[qtghkzcsdn]o"
+                       "[ypfbmw]uo"
+                       "[qj]ong"
+                       "[rtysdghklzcn]iong"
+                       "[qtypdjlxbnm]uai"
+                       "[ghk]ing?"
+                       "[qjlxn]uang"
+                       "[dgh]iang"
+                       "[qjlx]ua"
+                       "[hkg]ia"
+                       "[rtsdghkzc]v"
+                       "[jl]ui")
+                     "\\|"))
+  "双拼可能自动产生的无效拼音. 例如输入 kk 得到有效拼音 kuai .
+但同时产生了无效拼音 king .  用户手动输入的无效拼音无需考虑.
+因为用户有即时界面反馈,不可能连续输入无效拼音.")
+
+(defun pyim-pinyin-build-regexp (pinyin &optional match-beginning first-equal 
all-equal)
+  "从 PINYIN 构建一个 regexp，用于搜索联想词，
+比如：ni-hao-si-j --> ^ni-hao[a-z]*-si[a-z]*-j[a-z]* , when FIRST-EQUAL set to `t'
+                  --> ^ni[a-z]*-hao[a-z]*-si[a-z]*-j[a-z]* , when FIRST-EQUAL 
set to `nil'"
+  (when (and pinyin (stringp pinyin))
+    (let ((pinyin-list (split-string pinyin "-"))
+          (count 0))
+      (concat (if match-beginning "^" "")
+              (mapconcat
+               #'(lambda (x)
+                   (setq count (+ count 1))
+                   (if (or (not first-equal) (> count 1))
+                       (if all-equal
+                           x
+                         (concat x "[a-z]*"))
+                     x))
+               pinyin-list "-")))))
+
+;; 分解拼音的相关函数
+(defun pyim-pinyin-get-shenmu (pinyin)
+  "从一个拼音字符串 PINYIN 中提出第一个声母。"
+  (let ((i (min (length pinyin) 2))
+        shenmu)
+    (while (> i 0)
+      (setq shenmu (substring pinyin 0 i))
+      (if (member shenmu pyim-pinyin-shenmu)
+          (setq i 0)
+        (setq i (1- i))
+        (setq shenmu "")))
+    (cons shenmu
+          (substring pinyin (length shenmu)))))
+
+(defun pyim-pinyin-get-charpy (pinyin)
+  "将拼音字符串 PINYIN 分解成声母，韵母和剩余部分."
+  (let* ((x (pyim-pinyin-get-shenmu pinyin))
+         (shenmu (car x))
+         (yunmu-and-rest (cdr x))
+         (i (min (length yunmu-and-rest) 5))
+         yunmu rest)
+    (cl-flet ((pinyin-valid-p
+               (shenmu yunmu)
+               (cl-some
+                #'(lambda (char-pinyin)
+                    (pyim-pinyin2cchar-get char-pinyin t))
+                (mapcar #'(lambda (x)
+                            (concat (nth 0 x) (nth 1 x)))
+                        (pyim-imobjs-find-fuzzy:quanpin-1
+                         (list shenmu yunmu shenmu yunmu))))))
+      (while (> i 0)
+        (setq yunmu (substring yunmu-and-rest 0 i))
+        (setq rest (substring yunmu-and-rest i))
+        (if (member yunmu pyim-pinyin-yunmu)
+            (cond (;; 如果声母和韵母组成的拼音不是一个有效的拼音，
+                   ;; 就继续缩短，如果是，就进一步检测。
+                   (not (pinyin-valid-p shenmu yunmu))
+                   (setq i (1- i))
+                   (setq yunmu ""))
+                  ((and (string< "" rest)
+                        ;; 截取后剩余的字符串 rest 找不出声母
+                        (equal (car (pyim-pinyin-get-shenmu rest)) "")
+                        ;; 截取后的韵母最后一个字符是一个有效声母
+                        (member (substring yunmu -1) pyim-pinyin-shenmu)
+                        ;; 截取得到的韵母如果去掉最后一个字符，还是有效的韵母
+                        (member (substring yunmu 0 -1) pyim-pinyin-yunmu))
+                   (if (not (pinyin-valid-p shenmu (substring yunmu 0 -1)))
+                       ;; 如果去掉韵母最后一个字符后，无法组成一个有效的拼音。
+                       ;; 就不要缩短了。
+                       (setq i 0)
+                     (setq i (1- i))
+                     (setq yunmu "")))
+                  (t (setq i 0)))
+          (setq i (1- i))
+          (setq yunmu ""))))
+    (cons (list shenmu yunmu shenmu yunmu)
+          (substring yunmu-and-rest (length yunmu)))))
+
+(defun pyim-pinyin-split (pinyin)
+  "将一个代表拼音的字符串 PINYIN, 分解为声母韵母对组成的列表.
+
+这个过程通过循环的调用 `pyim-pinyin-get-charpy' 来实现，整个过程
+类似用菜刀切黄瓜片，将一个拼音字符串逐渐切开。"
+  (let ((py pinyin)
+        charpy spinyin)
+    (while (when (string< "" pinyin)
+             (setq charpy (pyim-pinyin-get-charpy pinyin))
+             (if (and (equal (nth 0 (car charpy)) "")
+                      (equal (nth 1 (car charpy)) ""))
+                 (progn
+                   (setq spinyin nil)
+                   (setq pinyin ""))
+               (setq spinyin (append spinyin (list (car charpy))))
+               (setq pinyin (cdr charpy)))))
+    (or spinyin
+        ;; 如果无法按照拼音的规则来分解字符串，
+        ;; 就将字符串简单的包装一下，然后返回。
+        ;; 目前这个功能用于： 以u或者i开头的词库 #226
+        ;; https://github.com/tumashu/pyim/issues/226
+        (list (list "" py "" py)))))
+
+;; * Footer
+(provide 'pyim-pinyin)
+
+;;; pyim-pinyin.el ends here
diff --git a/pyim.el b/pyim.el
index 5b43dfa..8226d92 100644
--- a/pyim.el
+++ b/pyim.el
@@ -580,6 +580,7 @@
 (require 'posframe nil t)
 (require 'pyim-pymap)
 (require 'pyim-common)
+(require 'pyim-pinyin)
 (require 'xr) ;Used by pyim-cregexp-build
 (require 'rx) ;Used by pyim-cregexp-build
 
@@ -850,20 +851,6 @@ Only useful when use posframe.")
 (defvar pyim-schemes nil
   "Pyim 支持的所有拼音方案.")
 
-(defvar pyim-pinyin-shenmu
-  '("b" "p" "m" "f" "d" "t" "n" "l" "g" "k" "h"
-    "j" "q" "x" "z" "c" "s" "zh" "ch" "sh" "r" "y" "w"))
-
-(defvar pyim-pinyin-yunmu
-  '("a" "o" "e" "i" "u" "v" "ai" "ei" "ui" "ao" "ou" "iu"
-    "ie" "ia" "ua" "ve" "er" "an" "en" "in" "un" "vn" "ang" "iong"
-    "eng" "ing" "ong" "uan" "uang" "ian" "iang" "iao" "ue"
-    "uai" "uo"))
-
-(defvar pyim-pinyin-valid-yunmu
-  '("a" "o" "e" "ai" "ei" "ui" "ao" "ou" "er" "an" "en"
-    "ang" "eng"))
-
 (defvar pyim-entered-buffer " *pyim-entered-buffer*"
   "一个 buffer，用来处理用户已经输入的字符串： entered。
 
@@ -1021,26 +1008,6 @@ dcache 文件的方法让 pyim 正常工作。")
 (defvar pyim-page-tooltip-posframe-buffer " 
*pyim-page-tooltip-posframe-buffer*"
   "这个变量用来保存做为 page tooltip 的 posframe 的 buffer.")
 
-(defconst pyim-shuangpin-invalid-pinyin-regexp
-  (format "^\\(%s\\)$"
-          (mapconcat #'identity
-                     '("[qtghkzcsdn]o"
-                       "[ypfbmw]uo"
-                       "[qj]ong"
-                       "[rtysdghklzcn]iong"
-                       "[qtypdjlxbnm]uai"
-                       "[ghk]ing?"
-                       "[qjlxn]uang"
-                       "[dgh]iang"
-                       "[qjlx]ua"
-                       "[hkg]ia"
-                       "[rtsdghkzc]v"
-                       "[jl]ui")
-                     "\\|"))
-  "双拼可能自动产生的无效拼音. 例如输入 kk 得到有效拼音 kuai .
-但同时产生了无效拼音 king .  用户手动输入的无效拼音无需考虑.
-因为用户有即时界面反馈,不可能连续输入无效拼音.")
-
 (defvar pyim-mode-map
   (let ((map (make-sparse-keymap))
         (i ?\ ))
@@ -1396,24 +1363,6 @@ MERGE-METHOD 是一个函数，这个函数需要两个数字参数，代表
 code 对应的中文词条了."
   (pyim-dcache-call-api 'get code from))
 
-(defun pyim-pinyin-build-regexp (pinyin &optional match-beginning first-equal 
all-equal)
-  "从 PINYIN 构建一个 regexp，用于搜索联想词，
-比如：ni-hao-si-j --> ^ni-hao[a-z]*-si[a-z]*-j[a-z]* , when FIRST-EQUAL set to `t'
-                  --> ^ni[a-z]*-hao[a-z]*-si[a-z]*-j[a-z]* , when FIRST-EQUAL 
set to `nil'"
-  (when (and pinyin (stringp pinyin))
-    (let ((pinyin-list (split-string pinyin "-"))
-          (count 0))
-      (concat (if match-beginning "^" "")
-              (mapconcat
-               #'(lambda (x)
-                   (setq count (+ count 1))
-                   (if (or (not first-equal) (> count 1))
-                       (if all-equal
-                           x
-                         (concat x "[a-z]*"))
-                     x))
-               pinyin-list "-")))))
-
 (defun pyim-insert-word-into-icode2word (word pinyin prepend)
   (pyim-dcache-call-api 'insert-word-into-icode2word word pinyin prepend))
 
@@ -1933,87 +1882,6 @@ Return the input string.
     (when (and class (functionp func))
       (funcall func))))
 
-;; 分解拼音的相关函数
-(defun pyim-pinyin-get-shenmu (pinyin)
-  "从一个拼音字符串 PINYIN 中提出第一个声母。"
-  (let ((i (min (length pinyin) 2))
-        shenmu)
-    (while (> i 0)
-      (setq shenmu (substring pinyin 0 i))
-      (if (member shenmu pyim-pinyin-shenmu)
-          (setq i 0)
-        (setq i (1- i))
-        (setq shenmu "")))
-    (cons shenmu
-          (substring pinyin (length shenmu)))))
-
-(defun pyim-pinyin-get-charpy (pinyin)
-  "将拼音字符串 PINYIN 分解成声母，韵母和剩余部分."
-  (let* ((x (pyim-pinyin-get-shenmu pinyin))
-         (shenmu (car x))
-         (yunmu-and-rest (cdr x))
-         (i (min (length yunmu-and-rest) 5))
-         yunmu rest)
-    (cl-flet ((pinyin-valid-p
-               (shenmu yunmu)
-               (cl-some
-                #'(lambda (char-pinyin)
-                    (pyim-pinyin2cchar-get char-pinyin t))
-                (mapcar #'(lambda (x)
-                            (concat (nth 0 x) (nth 1 x)))
-                        (pyim-imobjs-find-fuzzy:quanpin-1
-                         (list shenmu yunmu shenmu yunmu))))))
-      (while (> i 0)
-        (setq yunmu (substring yunmu-and-rest 0 i))
-        (setq rest (substring yunmu-and-rest i))
-        (if (member yunmu pyim-pinyin-yunmu)
-            (cond (;; 如果声母和韵母组成的拼音不是一个有效的拼音，
-                   ;; 就继续缩短，如果是，就进一步检测。
-                   (not (pinyin-valid-p shenmu yunmu))
-                   (setq i (1- i))
-                   (setq yunmu ""))
-                  ((and (string< "" rest)
-                        ;; 截取后剩余的字符串 rest 找不出声母
-                        (equal (car (pyim-pinyin-get-shenmu rest)) "")
-                        ;; 截取后的韵母最后一个字符是一个有效声母
-                        (member (substring yunmu -1) pyim-pinyin-shenmu)
-                        ;; 截取得到的韵母如果去掉最后一个字符，还是有效的韵母
-                        (member (substring yunmu 0 -1) pyim-pinyin-yunmu))
-                   (if (not (pinyin-valid-p shenmu (substring yunmu 0 -1)))
-                       ;; 如果去掉韵母最后一个字符后，无法组成一个有效的拼音。
-                       ;; 就不要缩短了。
-                       (setq i 0)
-                     (setq i (1- i))
-                     (setq yunmu "")))
-                  (t (setq i 0)))
-          (setq i (1- i))
-          (setq yunmu ""))))
-    (cons (list shenmu yunmu shenmu yunmu)
-          (substring yunmu-and-rest (length yunmu)))))
-
-(defun pyim-pinyin-split (pinyin)
-  "将一个代表拼音的字符串 PINYIN, 分解为声母韵母对组成的列表.
-
-这个过程通过循环的调用 `pyim-pinyin-get-charpy' 来实现，整个过程
-类似用菜刀切黄瓜片，将一个拼音字符串逐渐切开。"
-  (let ((py pinyin)
-        charpy spinyin)
-    (while (when (string< "" pinyin)
-             (setq charpy (pyim-pinyin-get-charpy pinyin))
-             (if (and (equal (nth 0 (car charpy)) "")
-                      (equal (nth 1 (car charpy)) ""))
-                 (progn
-                   (setq spinyin nil)
-                   (setq pinyin ""))
-               (setq spinyin (append spinyin (list (car charpy))))
-               (setq pinyin (cdr charpy)))))
-    (or spinyin
-        ;; 如果无法按照拼音的规则来分解字符串，
-        ;; 就将字符串简单的包装一下，然后返回。
-        ;; 目前这个功能用于： 以u或者i开头的词库 #226
-        ;; https://github.com/tumashu/pyim/issues/226
-        (list (list "" py "" py)))))
-
 (defun pyim-scheme-add (scheme)
   "Add SCHEME to `pyim-schemes'"
   (if (listp scheme)
@@ -2363,7 +2231,7 @@ Return the input string.
           (let* ((y (concat sp-sm (or sp-ym " ")))
                  (z (cadr (assoc y keymaps)))
                  (py (if z (list "" z sp-sm sp-ym) (list sm x sp-sm sp-ym))))
-            (unless (string-match-p pyim-shuangpin-invalid-pinyin-regexp
+            (unless (string-match-p pyim-pinyin-shuangpin-invalid-pinyin-regexp
                                     (concat (nth 0 py) (nth 1 py)))
               (push py one-word-pinyins))))