[elpa] externals/pyim 6dfe546 08/36: New pyim-punctuation.el file.

[ELPA Syncer]

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

    New pyim-punctuation.el file.
---
 pyim-punctuation.el | 237 ++++++++++++++++++++++++++++++++++++++++++++++
 pyim.el             | 267 +++++++---------------------------------------------
 2 files changed, 271 insertions(+), 233 deletions(-)

diff --git a/pyim-punctuation.el b/pyim-punctuation.el
new file mode 100644
index 0000000..3aee6b8
--- /dev/null
+++ b/pyim-punctuation.el
@@ -0,0 +1,237 @@
+;;; pyim-punctuation.el --- punctuation 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)
+
+(defcustom pyim-punctuation-dict
+  '(("'" "‘" "’")
+    ("\"" "“" "”")
+    ("_" "——")
+    ("^" "…")
+    ("]" "】")
+    ("[" "【")
+    ("@" "◎")
+    ("?" "？")
+    (">" "》")
+    ("=" "＝")
+    ("<" "《")
+    (";" "；")
+    (":" "：")
+    ("/" "、")
+    ("." "。")
+    ("-" "－")
+    ("," "，")
+    ("+" "＋")
+    ("*" "×")
+    (")" "）")
+    ("(" "（")
+    ("&" "※")
+    ("%" "％")
+    ("$" "￥")
+    ("#" "＃")
+    ("!" "！")
+    ("`" "・")
+    ("~" "～")
+    ("}" "』")
+    ("|" "÷")
+    ("{" "『"))
+  "标点符号表."
+  :type 'list)
+
+(defcustom pyim-punctuation-half-width-functions nil
+  "让 pyim 输入半角标点.
+
+取值为一个函数列表，这个函数列表中的任意一个函数的运行结果为 t 时，
+pyim 输入半角标点，函数列表中每个函数都有一个参数：char ，表示
+最后输入的一个字符，具体见: `pyim-translate' 。"
+  :type '(choice (const nil)
+                 (repeat function)))
+
+(defvar pyim-punctuation-translate-p '(auto yes no)
+  "这个变量的第一个元素的取值用于控制标点符号全角半角模式切换.
+
+1. 当第一个元素为 'yes 时，输入全角标点。
+2. 当第一个元素为 'no 时，输入半角标点。
+3. 当第一个元素为 'auto 时，根据中英文环境，自动切换。")
+
+(defvar pyim-punctuation-pair-status
+  '(("\"" nil) ("'" nil))
+  "成对标点符号切换状态.")
+
+(defvar pyim-punctuation-escape-list (number-sequence ?0 ?9)
+  "Punctuation will not insert after this characters.
+
+If you don't like this function, set the variable to nil")
+
+;; ** 切换中英文标点符号
+(defun pyim-punctuation-full-width-p ()
+  "判断是否需要切换到全角标点输入模式
+
+输入标点的样式的改变（全角或者半角）受三个方面影响：
+
+1. 用户是否手动切换了标点样式？
+2  用户是否手动切换到英文输入模式？
+3. pyim 是否根据环境自动切换到英文输入模式？
+
+三方面的综合结果为： 只要当前的输入模式是英文输入模式，那么输入的
+标点符号 *必定* 是半角标点，如果当前输入模式是中文输入模式，那么，
+输入标点的样式用户可以使用 `pyim-punctuation-toggle'手动控制，具
+体请参考 `pyim-punctuation-full-width-p'。"
+  (cl-case (car pyim-punctuation-translate-p)
+    (yes t)
+    (no nil)
+    (auto
+     ;; 如果用户手动或者根据环境自动切换为英文输入模式，
+     ;; 那么标点符号也要切换为半角模式。
+     (and (not pyim-input-ascii)
+          (not (pyim-auto-switch-english-input-p))))))
+
+(defun pyim-punctuation-toggle ()
+  "Pyim 标点符号全角半角模式切换命令.
+
+每次运行 `pyim-punctuation-toggle' 命令，都会调整变量
+`pyim-punctuation-translate-p' 的取值，`pyim-translate' 根据
+`pyim-punctuation-full-width-p' 函数的返回值，来决定是否转换标点
+符号：
+
+1. 当返回值为 'yes 时，`pyim-translate' 转换标点符号，从而输入全角标点。
+2. 当返回值为 'no 时，`pyim-translate' 忽略转换，从而输入半角标点。
+3. 当返回值为 'auto 时，根据中英文环境，自动切换。"
+  (interactive)
+  (setq pyim-punctuation-translate-p
+        `(,@(cdr pyim-punctuation-translate-p)
+          ,(car pyim-punctuation-translate-p)))
+  (message
+   (cl-case (car pyim-punctuation-translate-p)
+     (yes "开启全角标点输入模式。")
+     (no "开启半角标点输入模式。")
+     (auto "开启全半角标点自动转换模式。"))))
+
+(defun pyim-punctuation-translate-at-point ()
+  "切换光标处标点的样式(全角 or 半角).
+
+用户也可以使用命令 `pyim-punctuation-translate-at-point' 来切换
+ *光标前* 标点符号的样式。"
+  (interactive)
+  (let* ((current-char (char-to-string (preceding-char)))
+         (punc-list
+          (cl-some (lambda (x)
+                     (when (member current-char x) x))
+                   pyim-punctuation-dict)))
+    (when punc-list
+      (delete-char -1)
+      (if (equal current-char (car punc-list))
+          (insert (pyim-punctuation-return-proper-punct punc-list))
+        (insert (car punc-list))))))
+
+(defun pyim-punctuation-translate (&optional punct-style)
+  "将光标前1个或前后连续成对的n个标点符号进行全角/半角转换.
+
+当 PUNCT-STYLE 设置为 'full-width 时，所有的标点符号转换为全角符
+号，设置为 'half-width 时，转换为半角符号。"
+  (interactive)
+  (let ((punc-list (pyim-flatten-list pyim-punctuation-dict))
+        (punct-style
+         (or punct-style
+             (intern (completing-read
+                      "将光标处的标点转换为" '("full-width" "half-width")))))
+        ;; lnum : puncts on the left (before point)
+        (lnum 0)
+        ;; rnum : puncts on the right (after point)
+        (rnum 0)
+        (point (point))
+        last-puncts result)
+    (catch 'break
+      (while t
+        (let ((str (pyim-char-after-to-string rnum)))
+          (if (member str punc-list)
+              (cl-incf rnum)
+            (throw 'break nil)))))
+    (catch 'break
+      (while (<= lnum rnum)
+        (let ((str (pyim-char-before-to-string lnum)))
+          (if (member str punc-list)
+              (cl-incf lnum)
+            (throw 'break nil)))))
+    ;; 右侧与左侧成对匹配
+    (setq rnum (min lnum rnum))
+    (setq last-puncts (buffer-substring (- point lnum) (+ point rnum)))
+    ;; 删除旧的标点符号
+    (delete-char rnum)
+    (delete-char (- 0 lnum))
+    (dolist (punct (split-string last-puncts ""))
+      (dolist (puncts pyim-punctuation-dict)
+        (let ((position (cl-position punct puncts :test #'equal)))
+          (when position
+            (cond
+             ((eq punct-style 'full-width)
+              (if (= position 0)
+                  (push (pyim-punctuation-return-proper-punct puncts) result)
+                (push punct result)))
+             ((eq punct-style 'half-width)
+              (if (= position 0)
+                  (push punct result)
+                (push (car puncts) result))))))))
+    (insert (mapconcat #'identity (reverse result) ""))
+    (backward-char rnum)))
+
+(defun pyim-punctuation-return-proper-punct (punc-list &optional before)
+  "返回合适的标点符号，PUNCT-LIST 为标点符号列表.
+
+这个函数用于处理成对的全角标点符号，简单来说：如果第一次输入的标
+点是：（‘）时，那么下一次输入的标点就是（’）。
+
+PUNCT-LIST 格式类似：
+
+   `(\",\" \"，\") 或者：`(\"'\" \"‘\" \"’\")
+
+当 BEFORE 为 t 时，只返回切换之前的结果，这个用来获取切换之前的
+标点符号。
+
+函数 `pyim-punctuation-return-proper-punct' 内部，我们使用变量
+`pyim-punctuation-pair-status' 来记录 “成对” 中文标点符号的状态。"
+  (let* ((str (car punc-list))
+         (punc (cdr punc-list))
+         (switch-p (cdr (assoc str pyim-punctuation-pair-status))))
+    (if (= (safe-length punc) 1)
+        (car punc)
+      (if before
+          (setq switch-p (not switch-p))
+        (setf (cdr (assoc str pyim-punctuation-pair-status))
+              (not switch-p)))
+      (if switch-p
+          (car punc)
+        (nth 1 punc)))))
+
+
+;; * Footer
+(provide 'pyim-punctuation)
+
+;;; pyim-punctuation.el ends here
diff --git a/pyim.el b/pyim.el
index 8c2c167..280a177 100644
--- a/pyim.el
+++ b/pyim.el
@@ -581,6 +581,7 @@
 (require 'pyim-pymap)
 (require 'pyim-common)
 (require 'pyim-pinyin)
+(require 'pyim-punctuation)
 
 (defgroup pyim nil
   "Pyim is a Chinese input method support quanpin, shuangpin, wubi and 
cangjie."
@@ -606,41 +607,6 @@ plist 来表示，比如：
   "启用输入联想词功能."
   :type 'boolean)
 
-(defcustom pyim-punctuation-dict
-  '(("'" "‘" "’")
-    ("\"" "“" "”")
-    ("_" "——")
-    ("^" "…")
-    ("]" "】")
-    ("[" "【")
-    ("@" "◎")
-    ("?" "？")
-    (">" "》")
-    ("=" "＝")
-    ("<" "《")
-    (";" "；")
-    (":" "：")
-    ("/" "、")
-    ("." "。")
-    ("-" "－")
-    ("," "，")
-    ("+" "＋")
-    ("*" "×")
-    (")" "）")
-    ("(" "（")
-    ("&" "※")
-    ("%" "％")
-    ("$" "￥")
-    ("#" "＃")
-    ("!" "！")
-    ("`" "・")
-    ("~" "～")
-    ("}" "』")
-    ("|" "÷")
-    ("{" "『"))
-  "标点符号表."
-  :type 'list)
-
 (defcustom pyim-default-scheme 'quanpin
   "设置 pyim 使用哪一种输入法方案，默认使用全拼输入."
   :type 'symbol)
@@ -724,15 +690,6 @@ pyim 使用函数 `pyim-translate' 来处理特殊功能触发字符。当待输
 运行结果为 t 时，pyim 开启英文输入功能。"
   :type 'symbol)
 
-(defcustom pyim-punctuation-half-width-functions nil
-  "让 pyim 输入半角标点.
-
-取值为一个函数列表，这个函数列表中的任意一个函数的运行结果为 t 时，
-pyim 输入半角标点，函数列表中每个函数都有一个参数：char ，表示
-最后输入的一个字符，具体见: `pyim-translate' 。"
-  :type '(choice (const nil)
-                 (repeat function)))
-
 (defcustom pyim-wash-function 'pyim-wash-current-line-function
   "清洗光标前面的文字内容.
 这个函数与『单字快捷键配合使用』，当光标前面的字符为汉字字符时，
@@ -967,22 +924,6 @@ imobj 组合构成在一起，构成了 imobjs 这个概念。比如：
 (defvar pyim-active-hook nil)
 (defvar pyim-inactive-hook nil)
 
-(defvar pyim-punctuation-translate-p '(auto yes no)
-  "这个变量的第一个元素的取值用于控制标点符号全角半角模式切换.
-
-1. 当第一个元素为 'yes 时，输入全角标点。
-2. 当第一个元素为 'no 时，输入半角标点。
-3. 当第一个元素为 'auto 时，根据中英文环境，自动切换。")
-
-(defvar pyim-punctuation-pair-status
-  '(("\"" nil) ("'" nil))
-  "成对标点符号切换状态.")
-
-(defvar pyim-punctuation-escape-list (number-sequence ?0 ?9)
-  "Punctuation will not insert after this characters.
-
-If you don't like this function, set the variable to nil")
-
 (defvar pyim-dcache-auto-update t
   "是否自动创建和更新词库对应的 dcache 文件.
 
@@ -1143,6 +1084,39 @@ TYPE 取值为 point-after, 返回 entered buffer 中 point 之后的字符
     (beginning-of-line))
   (pyim-entered-refresh t))
 
+(defun pyim-entered-next-imelem-position (num &optional search-forward start)
+  "从 `pyim-entered-buffer' 的当前位置，找到下一个或者下 NUM 个 imelem 对应的位置
+
+如果 SEARCH-FORWARD 为 t, 则向前搜索，反之，向后搜索。"
+  (pyim-with-entered-buffer
+    (let* ((scheme-name (pyim-scheme-name))
+           (start (or start (point)))
+           (end-position start)
+           (string (buffer-substring-no-properties (point-min) start))
+           (orig-imobj-len (length (car (pyim-imobjs-create string 
scheme-name))))
+           imobj pos)
+      (if search-forward
+          ;; "ni|haoshijie" -> "nihao|shijie"
+          (progn
+            (setq pos (point-max))
+            (while (and (> pos start) (= end-position start))
+              (setq string (buffer-substring-no-properties (point-min) pos)
+                    imobj (car (pyim-imobjs-create string scheme-name)))
+              (if (>= (+ orig-imobj-len num) (length imobj))
+                  (setq end-position pos)
+                (cl-decf pos))))
+        ;; "nihao|shijie" -> "ni|haoshijie"
+        (if (<= orig-imobj-len num)
+            (setq end-position (point-min))
+          (setq pos start)
+          (while (and (>= pos (point-min)) (= end-position start))
+            (setq string (buffer-substring-no-properties (point-min) pos)
+                  imobj (car (pyim-imobjs-create string scheme-name)))
+            (if (= (- orig-imobj-len num) (length imobj))
+                (setq end-position pos)
+              (cl-decf pos)))))
+      end-position)))
+
 ;; ** 注册 Pyim 输入法
 ;;;###autoload
 (register-input-method "pyim" "euc-cn" 'pyim-start (nth 0 pyim-titles))
@@ -2267,39 +2241,6 @@ Return the input string.
           (push `(,a ,b ,@(nthcdr 2 imelem)) result)))
       (reverse result))))
 
-(defun pyim-entered-next-imelem-position (num &optional search-forward start)
-  "从 `pyim-entered-buffer' 的当前位置，找到下一个或者下 NUM 个 imelem 对应的位置
-
-如果 SEARCH-FORWARD 为 t, 则向前搜索，反之，向后搜索。"
-  (pyim-with-entered-buffer
-    (let* ((scheme-name (pyim-scheme-name))
-           (start (or start (point)))
-           (end-position start)
-           (string (buffer-substring-no-properties (point-min) start))
-           (orig-imobj-len (length (car (pyim-imobjs-create string 
scheme-name))))
-           imobj pos)
-      (if search-forward
-          ;; "ni|haoshijie" -> "nihao|shijie"
-          (progn
-            (setq pos (point-max))
-            (while (and (> pos start) (= end-position start))
-              (setq string (buffer-substring-no-properties (point-min) pos)
-                    imobj (car (pyim-imobjs-create string scheme-name)))
-              (if (>= (+ orig-imobj-len num) (length imobj))
-                  (setq end-position pos)
-                (cl-decf pos))))
-        ;; "nihao|shijie" -> "ni|haoshijie"
-        (if (<= orig-imobj-len num)
-            (setq end-position (point-min))
-          (setq pos start)
-          (while (and (>= pos (point-min)) (= end-position start))
-            (setq string (buffer-substring-no-properties (point-min) pos)
-                  imobj (car (pyim-imobjs-create string scheme-name)))
-            (if (= (- orig-imobj-len num) (length imobj))
-                (setq end-position pos)
-              (cl-decf pos)))))
-      end-position)))
-
 (defun pyim-codes-create (imobj scheme-name &optional first-n)
   "按照 SCHEME-NAME 对应的输入法方案，从一个 IMOBJ 创建一个列表 codes, 这个列表
 包含一个或者多个 code 字符串，这些 code 字符串用于从词库中搜索词条."
@@ -3306,146 +3247,6 @@ alist 列表。"
               (buffer-string)))
       (insert new-string))))
 
-;; ** 切换中英文标点符号
-(defun pyim-punctuation-full-width-p ()
-  "判断是否需要切换到全角标点输入模式
-
-输入标点的样式的改变（全角或者半角）受三个方面影响：
-
-1. 用户是否手动切换了标点样式？
-2  用户是否手动切换到英文输入模式？
-3. pyim 是否根据环境自动切换到英文输入模式？
-
-三方面的综合结果为： 只要当前的输入模式是英文输入模式，那么输入的
-标点符号 *必定* 是半角标点，如果当前输入模式是中文输入模式，那么，
-输入标点的样式用户可以使用 `pyim-punctuation-toggle'手动控制，具
-体请参考 `pyim-punctuation-full-width-p'。"
-  (cl-case (car pyim-punctuation-translate-p)
-    (yes t)
-    (no nil)
-    (auto
-     ;; 如果用户手动或者根据环境自动切换为英文输入模式，
-     ;; 那么标点符号也要切换为半角模式。
-     (and (not pyim-input-ascii)
-          (not (pyim-auto-switch-english-input-p))))))
-
-(defun pyim-punctuation-toggle ()
-  "Pyim 标点符号全角半角模式切换命令.
-
-每次运行 `pyim-punctuation-toggle' 命令，都会调整变量
-`pyim-punctuation-translate-p' 的取值，`pyim-translate' 根据
-`pyim-punctuation-full-width-p' 函数的返回值，来决定是否转换标点
-符号：
-
-1. 当返回值为 'yes 时，`pyim-translate' 转换标点符号，从而输入全角标点。
-2. 当返回值为 'no 时，`pyim-translate' 忽略转换，从而输入半角标点。
-3. 当返回值为 'auto 时，根据中英文环境，自动切换。"
-  (interactive)
-  (setq pyim-punctuation-translate-p
-        `(,@(cdr pyim-punctuation-translate-p)
-          ,(car pyim-punctuation-translate-p)))
-  (message
-   (cl-case (car pyim-punctuation-translate-p)
-     (yes "开启全角标点输入模式。")
-     (no "开启半角标点输入模式。")
-     (auto "开启全半角标点自动转换模式。"))))
-
-(defun pyim-punctuation-translate-at-point ()
-  "切换光标处标点的样式(全角 or 半角).
-
-用户也可以使用命令 `pyim-punctuation-translate-at-point' 来切换
- *光标前* 标点符号的样式。"
-  (interactive)
-  (let* ((current-char (char-to-string (preceding-char)))
-         (punc-list
-          (cl-some (lambda (x)
-                     (when (member current-char x) x))
-                   pyim-punctuation-dict)))
-    (when punc-list
-      (delete-char -1)
-      (if (equal current-char (car punc-list))
-          (insert (pyim-punctuation-return-proper-punct punc-list))
-        (insert (car punc-list))))))
-
-(defun pyim-punctuation-translate (&optional punct-style)
-  "将光标前1个或前后连续成对的n个标点符号进行全角/半角转换.
-
-当 PUNCT-STYLE 设置为 'full-width 时，所有的标点符号转换为全角符
-号，设置为 'half-width 时，转换为半角符号。"
-  (interactive)
-  (let ((punc-list (pyim-flatten-list pyim-punctuation-dict))
-        (punct-style
-         (or punct-style
-             (intern (completing-read
-                      "将光标处的标点转换为" '("full-width" "half-width")))))
-        ;; lnum : puncts on the left (before point)
-        (lnum 0)
-        ;; rnum : puncts on the right (after point)
-        (rnum 0)
-        (point (point))
-        last-puncts result)
-    (catch 'break
-      (while t
-        (let ((str (pyim-char-after-to-string rnum)))
-          (if (member str punc-list)
-              (cl-incf rnum)
-            (throw 'break nil)))))
-    (catch 'break
-      (while (<= lnum rnum)
-        (let ((str (pyim-char-before-to-string lnum)))
-          (if (member str punc-list)
-              (cl-incf lnum)
-            (throw 'break nil)))))
-    ;; 右侧与左侧成对匹配
-    (setq rnum (min lnum rnum))
-    (setq last-puncts (buffer-substring (- point lnum) (+ point rnum)))
-    ;; 删除旧的标点符号
-    (delete-char rnum)
-    (delete-char (- 0 lnum))
-    (dolist (punct (split-string last-puncts ""))
-      (dolist (puncts pyim-punctuation-dict)
-        (let ((position (cl-position punct puncts :test #'equal)))
-          (when position
-            (cond
-             ((eq punct-style 'full-width)
-              (if (= position 0)
-                  (push (pyim-punctuation-return-proper-punct puncts) result)
-                (push punct result)))
-             ((eq punct-style 'half-width)
-              (if (= position 0)
-                  (push punct result)
-                (push (car puncts) result))))))))
-    (insert (mapconcat #'identity (reverse result) ""))
-    (backward-char rnum)))
-
-(defun pyim-punctuation-return-proper-punct (punc-list &optional before)
-  "返回合适的标点符号，PUNCT-LIST 为标点符号列表.
-
-这个函数用于处理成对的全角标点符号，简单来说：如果第一次输入的标
-点是：（‘）时，那么下一次输入的标点就是（’）。
-
-PUNCT-LIST 格式类似：
-
-   `(\",\" \"，\") 或者：`(\"'\" \"‘\" \"’\")
-
-当 BEFORE 为 t 时，只返回切换之前的结果，这个用来获取切换之前的
-标点符号。
-
-函数 `pyim-punctuation-return-proper-punct' 内部，我们使用变量
-`pyim-punctuation-pair-status' 来记录 “成对” 中文标点符号的状态。"
-  (let* ((str (car punc-list))
-         (punc (cdr punc-list))
-         (switch-p (cdr (assoc str pyim-punctuation-pair-status))))
-    (if (= (safe-length punc) 1)
-        (car punc)
-      (if before
-          (setq switch-p (not switch-p))
-        (setf (cdr (assoc str pyim-punctuation-pair-status))
-              (not switch-p)))
-      (if switch-p
-          (car punc)
-        (nth 1 punc)))))
-
 ;; ** 与拼音输入相关的用户命令
 (defun pyim-entered-delete-backward-char (&optional n)
   "在pyim-entered-buffer中向后删除1个字符"