From be43fc5837a22e4254404b1e42c2efe0c8007739 Mon Sep 17 00:00:00 2001
From: Dvel <me@dvel.me>
Date: Sun, 30 Jul 2023 17:54:46 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E6=96=B9=E6=A1=88=20algebra=20=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E6=96=B9=E4=BE=BF=E6=89=93=E8=A1=A5?=
 =?UTF-8?q?=E4=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 melt_eng.schema.yaml | 385 ++++++++++++++++++++++---------------------
 1 file changed, 201 insertions(+), 184 deletions(-)

diff --git a/melt_eng.schema.yaml b/melt_eng.schema.yaml
index d025644..fde2fcb 100644
--- a/melt_eng.schema.yaml
+++ b/melt_eng.schema.yaml
@@ -8,7 +8,7 @@
 schema:
   schema_id: melt_eng
   name: Easy English Nano
-  version: "0.2.2"
+  version: "2023-07-30"
   author:
     - Patrick <ipatrickmac@gmail.com>
     - tumuyan <tumuyan@21cn.com>
@@ -45,74 +45,14 @@ speller:
   alphabet: zyxwvutsrqponmlkjihgfedcbaZYXWVUTSRQPONMLKJIHGFEDCBA
   delimiter: " '"
   algebra:
-    # 根据当前所用中文方案修改 __include 的值
-    # algebra_rime_ice | algebra_double | algebra_flypy | algebra_mspy | algebra_abc | algebra_ziguang
-    __include: algebra_rime_ice
-    __append:
-      # 数字派生
-      - derive/1([4-7|9])/$1teen/
-      - derive/11/eleven/
-      - derive/12/twelve/
-      - derive/13/thirteen/
-      - derive/15/fifteen/
-      - derive/18/eighteen/
-      - derive/0/o/ # 如 1000 -> oneOOO
-      - derive/0/O/
-      - derive/0/zero/
-      - derive/1/one/
-      - derive/10/ten/
-      - derive/2/to/
-      - derive/2/two/
-      - derive/3/three/
-      - derive/4/for/
-      - derive/4/four/
-      - derive/5/five/
-      - derive/6/six/
-      - derive/7/seven/
-      - derive/8/eight/
-      - derive/9/nine/
-      # 符号派生
-      - derive/\+/plus/
-      - derive/\./dot/
-      - derive/@/at/
-      - derive/-/hyphen/
-      - derive/#/hash/
-      - derive/#/number/
-      - derive / slash
-      - derive/&/and/
-      - derive/%/percent/
-      # 派生无单个特殊字符的拼写
-      - derive/[.]//
-      - derive/[+]//
-      - derive/[@]//
-      - derive/[-]//
-      - derive/[_]//
-
-      # 下面带 ⓘ 的，是为了中英混输词库不派生出纯大写
-
-      # 派生无任何非字母数字字符的拼写
-      - derive/[^a-zA-Z0-9ⓘ]//
-      # 禁用非英文、数字开头的编码
-      - erase/^[^a-zA-Z0-9ⓘ].+$/
-      # 全小写
-      - derive/^.+$/\L$0/
-      # 全大写
-      - derive/^(?!ⓘ).+$/\U$0/
-      # 首字母大写
-      - derive/^(?!ⓘ)./\U$0/
-      # 前 2~10 个字母大写
-      - derive/^([a-z]{2})/\U$1/
-      - derive/^([a-z]{3})/\U$1/
-      - derive/^([a-z]{4})/\U$1/
-      - derive/^([a-z]{5})/\U$1/
-      - derive/^([a-z]{6})/\U$1/
-      - derive/^([a-z]{7})/\U$1/
-      - derive/^([a-z]{8})/\U$1/
-      - derive/^([a-z]{9})/\U$1/
-      - derive/^([a-z]{10})/\U$1/
-      # 派生中英混输词库（词库编码以ⓘ开头）
-      - derive/^ⓘ(.+)$/$1/
-      - derive/^ⓘ(.+)$/\L$1/
+    # 根据当前所用拼音方案选择 __include 的值
+    # 如果要在补丁中修改 algebra 以适配双拼，请参考 [常见问题](https://github.com/iDvel/rime-ice/issues/133)
+    __include: algebra_rime_ice    # 全拼
+    # __include: algebra_double    # 自然码双拼
+    # __include: algebra_flypy     # 小鹤双拼
+    # __include: algebra_mspy      # 微软双拼
+    # __include: algebra_abc       # 智能ABC双拼
+    # __include: algebra_ziguang   # 紫光双拼
 
 translator:
   dictionary: melt_eng
@@ -127,130 +67,207 @@ punctuator:
 recognizer:
   import_preset: default
 
-# 不通用的规则：
+
+# 通用的派生规则
+algebra_common:
+  # 数字派生
+  - derive/1([4-7|9])/$1teen/
+  - derive/11/eleven/
+  - derive/12/twelve/
+  - derive/13/thirteen/
+  - derive/15/fifteen/
+  - derive/18/eighteen/
+  - derive/0/o/ # 如 1000 -> oneOOO
+  - derive/0/O/
+  - derive/0/zero/
+  - derive/1/one/
+  - derive/10/ten/
+  - derive/2/to/
+  - derive/2/two/
+  - derive/3/three/
+  - derive/4/for/
+  - derive/4/four/
+  - derive/5/five/
+  - derive/6/six/
+  - derive/7/seven/
+  - derive/8/eight/
+  - derive/9/nine/
+  # 符号派生
+  - derive/\+/plus/
+  - derive/\./dot/
+  - derive/@/at/
+  - derive/-/hyphen/
+  - derive/#/hash/
+  - derive/#/number/
+  - derive / slash
+  - derive/&/and/
+  - derive/%/percent/
+  # 派生无单个特殊字符的拼写
+  - derive/[.]//
+  - derive/[+]//
+  - derive/[@]//
+  - derive/[-]//
+  - derive/[_]//
+  # 下面带 ⓘ 的，是为了中英混输词库不派生出纯大写
+  # 派生无任何非字母数字字符的拼写
+  - derive/[^a-zA-Z0-9ⓘ]//
+  # 禁用非英文、数字开头的编码
+  - erase/^[^a-zA-Z0-9ⓘ].+$/
+  # 全小写
+  - derive/^.+$/\L$0/
+  # 全大写
+  - derive/^(?!ⓘ).+$/\U$0/
+  # 首字母大写
+  - derive/^(?!ⓘ)./\U$0/
+  # 前 2~10 个字母大写
+  - derive/^([a-z]{2})/\U$1/
+  - derive/^([a-z]{3})/\U$1/
+  - derive/^([a-z]{4})/\U$1/
+  - derive/^([a-z]{5})/\U$1/
+  - derive/^([a-z]{6})/\U$1/
+  - derive/^([a-z]{7})/\U$1/
+  - derive/^([a-z]{8})/\U$1/
+  - derive/^([a-z]{9})/\U$1/
+  - derive/^([a-z]{10})/\U$1/
+  # 派生中英混输词库（词库编码以ⓘ开头）
+  - derive/^ⓘ(.+)$/$1/
+  - derive/^ⓘ(.+)$/\L$1/
+
 # 全拼
 algebra_rime_ice:
-  - derive/(?<!\d)1([1-9])(?!\d)/shi$1/
-  - derive/([1-9])0000(?!0)/$1wan/
-  - derive/([1-9])000(?!0)/$1qian/
-  - derive/([1-9])00(?!0)/$1bai/
-  - derive/([2-9])0(?!0)/$1shi/
-  - derive/(?<!\d)([2-9])([1-9])(?!\d)/$1shi$2/
-  - derive/\./dian/
-  - derive/10/shi/
-  - derive/0/ling/
-  - derive/1/yi/
-  - derive/2/er/
-  - derive/2/liang/
-  - derive/3/san/
-  - derive/4/si/
-  - derive/5/wu/
-  - derive/6/liu/
-  - derive/7/qi/
-  - derive/8/ba/
-  - derive/9/jiu/
+  __include: algebra_common
+  __append:
+    - derive/(?<!\d)1([1-9])(?!\d)/shi$1/
+    - derive/([1-9])0000(?!0)/$1wan/
+    - derive/([1-9])000(?!0)/$1qian/
+    - derive/([1-9])00(?!0)/$1bai/
+    - derive/([2-9])0(?!0)/$1shi/
+    - derive/(?<!\d)([2-9])([1-9])(?!\d)/$1shi$2/
+    - derive/\./dian/
+    - derive/10/shi/
+    - derive/0/ling/
+    - derive/1/yi/
+    - derive/2/er/
+    - derive/2/liang/
+    - derive/3/san/
+    - derive/4/si/
+    - derive/5/wu/
+    - derive/6/liu/
+    - derive/7/qi/
+    - derive/8/ba/
+    - derive/9/jiu/
 # 自然码双拼
 algebra_double_pinyin:
-  - derive/(?<!\d)1([1-9])(?!\d)/ui$1/
-  - derive/([1-9])0000(?!0)/$1wj/
-  - derive/([1-9])000(?!0)/$1qm/
-  - derive/([1-9])00(?!0)/$1bl/
-  - derive/([2-9])0(?!0)/$1ui/
-  - derive/(?<!\d)([2-9])([1-9])(?!\d)/$1ui$2/
-  - derive/\./dm/
-  - derive/10/ui/
-  - derive/0/ly/
-  - derive/1/yi/
-  - derive/2/er/
-  - derive/2/ld/
-  - derive/3/sj/
-  - derive/4/si/
-  - derive/5/wu/
-  - derive/6/lq/
-  - derive/7/qi/
-  - derive/8/ba/
-  - derive/9/jq/
+  __include: algebra_common
+  __append:
+    - derive/(?<!\d)1([1-9])(?!\d)/ui$1/
+    - derive/([1-9])0000(?!0)/$1wj/
+    - derive/([1-9])000(?!0)/$1qm/
+    - derive/([1-9])00(?!0)/$1bl/
+    - derive/([2-9])0(?!0)/$1ui/
+    - derive/(?<!\d)([2-9])([1-9])(?!\d)/$1ui$2/
+    - derive/\./dm/
+    - derive/10/ui/
+    - derive/0/ly/
+    - derive/1/yi/
+    - derive/2/er/
+    - derive/2/ld/
+    - derive/3/sj/
+    - derive/4/si/
+    - derive/5/wu/
+    - derive/6/lq/
+    - derive/7/qi/
+    - derive/8/ba/
+    - derive/9/jq/
 # 小鹤双拼
 algebra_flypy:
-  - derive/(?<!\d)1([1-9])(?!\d)/ui$1/
-  - derive/([1-9])0000(?!0)/$1wj/
-  - derive/([1-9])000(?!0)/$1qm/
-  - derive/([1-9])00(?!0)/$1bd/
-  - derive/([2-9])0(?!0)/$1ui/
-  - derive/(?<!\d)([2-9])([1-9])(?!\d)/$1ui$2/
-  - derive/\./dm/
-  - derive/10/ui/
-  - derive/0/lk/
-  - derive/1/yi/
-  - derive/2/er/
-  - derive/2/ll/
-  - derive/3/sj/
-  - derive/4/si/
-  - derive/5/wu/
-  - derive/6/lq/
-  - derive/7/qi/
-  - derive/8/ba/
-  - derive/9/jq/
+  __include: algebra_common
+  __append:
+    - derive/(?<!\d)1([1-9])(?!\d)/ui$1/
+    - derive/([1-9])0000(?!0)/$1wj/
+    - derive/([1-9])000(?!0)/$1qm/
+    - derive/([1-9])00(?!0)/$1bd/
+    - derive/([2-9])0(?!0)/$1ui/
+    - derive/(?<!\d)([2-9])([1-9])(?!\d)/$1ui$2/
+    - derive/\./dm/
+    - derive/10/ui/
+    - derive/0/lk/
+    - derive/1/yi/
+    - derive/2/er/
+    - derive/2/ll/
+    - derive/3/sj/
+    - derive/4/si/
+    - derive/5/wu/
+    - derive/6/lq/
+    - derive/7/qi/
+    - derive/8/ba/
+    - derive/9/jq/
 # 微软双拼
 algebra_mspy:
-  - derive/(?<!\d)1([1-9])(?!\d)/ui$1/
-  - derive/([1-9])0000(?!0)/$1wj/
-  - derive/([1-9])000(?!0)/$1qm/
-  - derive/([1-9])00(?!0)/$1bl/
-  - derive/([2-9])0(?!0)/$1ui/
-  - derive/(?<!\d)([2-9])([1-9])(?!\d)/$1ui$2/
-  - derive/\./dm/
-  - derive/10/ui/
-  - derive/0/l;/
-  - derive/1/yi/
-  - derive/2/er/
-  - derive/2/ld/
-  - derive/3/sj/
-  - derive/4/si/
-  - derive/5/wu/
-  - derive/6/lq/
-  - derive/7/qi/
-  - derive/8/ba/
-  - derive/9/jq/
+  __include: algebra_common
+  __append:
+    - derive/(?<!\d)1([1-9])(?!\d)/ui$1/
+    - derive/([1-9])0000(?!0)/$1wj/
+    - derive/([1-9])000(?!0)/$1qm/
+    - derive/([1-9])00(?!0)/$1bl/
+    - derive/([2-9])0(?!0)/$1ui/
+    - derive/(?<!\d)([2-9])([1-9])(?!\d)/$1ui$2/
+    - derive/\./dm/
+    - derive/10/ui/
+    - derive/0/l;/
+    - derive/1/yi/
+    - derive/2/er/
+    - derive/2/ld/
+    - derive/3/sj/
+    - derive/4/si/
+    - derive/5/wu/
+    - derive/6/lq/
+    - derive/7/qi/
+    - derive/8/ba/
+    - derive/9/jq/
 # 智能ABC双拼
 algebra_abc:
-  - derive/(?<!\d)1([1-9])(?!\d)/vi$1/
-  - derive/([1-9])0000(?!0)/$1wj/
-  - derive/([1-9])000(?!0)/$1qw/
-  - derive/([1-9])00(?!0)/$1bl/
-  - derive/([2-9])0(?!0)/$1vi/
-  - derive/(?<!\d)([2-9])([1-9])(?!\d)/$1vi$2/
-  - derive/\./dw/
-  - derive/10/vi/
-  - derive/0/ly/
-  - derive/1/yi/
-  - derive/2/or/
-  - derive/2/lt/
-  - derive/3/sj/
-  - derive/4/si/
-  - derive/5/wu/
-  - derive/6/lr/
-  - derive/7/qi/
-  - derive/8/ba/
-  - derive/9/jr/
+  __include: algebra_common
+  __append:
+    - derive/(?<!\d)1([1-9])(?!\d)/vi$1/
+    - derive/([1-9])0000(?!0)/$1wj/
+    - derive/([1-9])000(?!0)/$1qw/
+    - derive/([1-9])00(?!0)/$1bl/
+    - derive/([2-9])0(?!0)/$1vi/
+    - derive/(?<!\d)([2-9])([1-9])(?!\d)/$1vi$2/
+    - derive/\./dw/
+    - derive/10/vi/
+    - derive/0/ly/
+    - derive/1/yi/
+    - derive/2/or/
+    - derive/2/lt/
+    - derive/3/sj/
+    - derive/4/si/
+    - derive/5/wu/
+    - derive/6/lr/
+    - derive/7/qi/
+    - derive/8/ba/
+    - derive/9/jr/
 # 紫光双拼
 algebra_ziguang:
-  - derive/(?<!\d)1([1-9])(?!\d)/ii$1/
-  - derive/([1-9])0000(?!0)/$1wr/
-  - derive/([1-9])000(?!0)/$1qf/
-  - derive/([1-9])00(?!0)/$1bp/
-  - derive/([2-9])0(?!0)/$1ii/
-  - derive/(?<!\d)([2-9])([1-9])(?!\d)/$1ii$2/
-  - derive/\./df/
-  - derive/10/ii/
-  - derive/0/l;/
-  - derive/1/yi/
-  - derive/2/er/
-  - derive/2/lg/
-  - derive/3/sr/
-  - derive/4/si/
-  - derive/5/wu/
-  - derive/6/lj/
-  - derive/7/qi/
-  - derive/8/ba/
-  - derive/9/jj/
+  __include: algebra_common
+  __append:
+    - derive/(?<!\d)1([1-9])(?!\d)/ii$1/
+    - derive/([1-9])0000(?!0)/$1wr/
+    - derive/([1-9])000(?!0)/$1qf/
+    - derive/([1-9])00(?!0)/$1bp/
+    - derive/([2-9])0(?!0)/$1ii/
+    - derive/(?<!\d)([2-9])([1-9])(?!\d)/$1ii$2/
+    - derive/\./df/
+    - derive/10/ii/
+    - derive/0/l;/
+    - derive/1/yi/
+    - derive/2/er/
+    - derive/2/lg/
+    - derive/3/sr/
+    - derive/4/si/
+    - derive/5/wu/
+    - derive/6/lj/
+    - derive/7/qi/
+    - derive/8/ba/
+    - derive/9/jj/