From dd3bec667fa9dc108a472e1c7c0a4fd06eb8fc29 Mon Sep 17 00:00:00 2001
From: gaboolic <23441099@qq.com>
Date: Sun, 16 Jun 2024 22:30:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E6=A8=A1=E5=BC=8F=E4=B9=9F?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=B8=80=E9=83=A8=E5=88=86=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E4=B8=8A=E5=B1=8F=E3=80=82=E4=BE=8B=E5=A6=82=20=E2=80=9Czmhu?=
 =?UTF-8?q?=E2=80=9D=E5=8F=AF=E4=BB=A5=E8=87=AA=E5=8A=A8=E4=B8=8A=E5=B1=8F?=
 =?UTF-8?q?=E2=80=9C=E6=80=8E=E4=B9=88=E5=9B=9E=E4=BA=8B=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom_phrase/custom_phrase.txt |  4 ++--
 flypy_flypy.schema.yaml         | 35 ++++++++++++++++++++++----------
 moqi_ms.schema.yaml             | 36 ++++++++++++++++++++++++---------
 moqi_sogou.schema.yaml          | 36 ++++++++++++++++++++++++---------
 moqi_xh.schema.yaml             |  4 ++--
 moqi_zrm.schema.yaml            | 23 +++++++++++++--------
 6 files changed, 97 insertions(+), 41 deletions(-)

diff --git a/custom_phrase/custom_phrase.txt b/custom_phrase/custom_phrase.txt
index 91ca5fbd..cdff6ae2 100755
--- a/custom_phrase/custom_phrase.txt
+++ b/custom_phrase/custom_phrase.txt
@@ -46,7 +46,7 @@
 同时	t	2
 特别是	t	1
 已经	y	2
-也不是	y	1
+有没有	y	1
 什么	u	2
 是不是	u	1
 差点	i	2
@@ -81,7 +81,7 @@
 只是	v	2
 准不准	v	1
 不是	b	2
-不一定	b	1
+不知道	b	1
 那么	n	2
 能不能	n	1
 没有	m	2
diff --git a/flypy_flypy.schema.yaml b/flypy_flypy.schema.yaml
index 31d80897..5a794b12 100755
--- a/flypy_flypy.schema.yaml
+++ b/flypy_flypy.schema.yaml
@@ -29,6 +29,10 @@ __include: moqi.yaml:/punctuator # 标点
 __include: moqi.yaml:/guide # 引导前缀配置
 
 speller:
+  max_code_length: 5
+  # table_translator翻译器，支持自动上屏。例如 “zmhu”可以自动上屏“怎么回事”
+  auto_select: true
+  auto_select_pattern: ^[a-z]+/|^[a-df-zA-DF-Z]\w{3}|^e\w{4}
   # 如果不想让什么标点直接上屏，可以加在 alphabet，或者编辑标点符号为两个及以上的映射
   alphabet: zyxwvutsrqponmlkjihgfedcbaZYXWVUTSRQPONMLKJIHGFEDCBA[/|
   # initials 定义仅作为始码的按键，排除 ` 让单个的 ` 可以直接上屏
@@ -79,20 +83,26 @@ speller:
 
     - derive|^(.+)[[](\w)(\w)$|$1| # 纯双拼的情况
     - derive|^(.+)[[](\w)(\w)$|$1$2| # 双拼+一位辅助码的情况
+    - derive|^(.+)[[](\w)(\w)$|$1[$2| # 双拼+[一位辅助码的情况
     - abbrev|^(.+)[[](\w)(\w)$|$1$2$3| # 双拼+2位辅助码的情况，abbrev类型不可以整句内输入2位辅助码，必须加o或/
     - derive|^(.+)[[](\w)(\w)$|$1$2$3o| # 整句模式下，输入syffo 出单字 增强单字性能
     - derive|^(.+)[[](\w)(\w)$|$1$2$3/| # 整句模式下，输入syff/ 出单字 增强单字性能
     # - derive/[[]// ## 取消注释后：直接引导2位辅助码；否则只能引导1位辅助码或者2位辅助码加/
 
     ## 飞键 可选择性开启
-    # - derive/^([yh])j/$1q/
-    # - derive/^qx/qw/
+    - derive/^([y])j/$1f/
+    - derive/^qx/qw/
+    - derive/^xq/xo/
+    - derive/^qq/qo/
+    - derive/^ww/wi/
+    - derive/^y([a-df-qs-z])/e$1/ # y -> e互击
+    - derive/^j([a-twyz])/f$1/ # j -> f互击
     # - derive/^jn/jv/
     # - derive/^mn/mv/
     # - derive/^jm/jz/
-    # - derive/^([y])h/$1g/
+    - derive/^([y])h/$1g/
     # - derive/^([rgv])f/$1m/
-    # - derive/^([rgv])c/$1n/
+    - derive/^([rgv])c/$1n/
 
 user_dict_set:
   dictionary: flypy_flypy.extended
@@ -197,15 +207,18 @@ key_binder:
 
 
     - { match: "[a-z]{1,3}", accept: Tab,  send_sequence: "/1" }
+    - { match: "[a-z]{1,3}", accept: "/",  send_sequence: "/1" }
+    - { match: "[a-z]{1,3}", accept: ".",  send_sequence: "/1" }
     # - { when: composing, match: "[a-z]{2}", accept: Tab, send: '|' }
 
-
-    ## 对以下4行取消注释后：启用光标回退至特定音节后、补充辅助码的功能
-    ## （自然码等其他双拼用户请在 pinyin_switch.yaml 中设置）
-    #- { when: composing, accept: Control+1, send_sequence: '{Home}{Shift+Right}[' }
-    #- { when: composing, accept: Control+2, send_sequence: '{Home}{Shift+Right}{Shift+Right}[' }
-    #- { when: composing, accept: Control+3, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}[' }
-    #- { when: composing, accept: Control+4, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    ## 启用光标回退至特定音节后、补充辅助码的功能。补充完辅助码后，可以再按一次tab回到整句检查
+    - { when: composing, accept: Control+1, send_sequence: '{Home}{Shift+Right}[' }
+    - { when: composing, accept: Control+2, send_sequence: '{Home}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+3, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+4, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+5, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+6, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+7, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
 
 # 启用語言模型
 #__include: moqi:/octagram/enable_for_sentence
diff --git a/moqi_ms.schema.yaml b/moqi_ms.schema.yaml
index c5443ff0..66a89116 100755
--- a/moqi_ms.schema.yaml
+++ b/moqi_ms.schema.yaml
@@ -28,6 +28,10 @@ __include: moqi.yaml:/punctuator # 标点
 __include: moqi.yaml:/guide # 引导前缀配置
 
 speller:
+  max_code_length: 5
+  # table_translator翻译器，支持自动上屏。例如 “zmhu”可以自动上屏“怎么回事”
+  auto_select: true
+  auto_select_pattern: ^[a-z]+/|^[a-df-zA-DF-Z]\w{3}|^e\w{4}
   # 如果不想让什么标点直接上屏，可以加在 alphabet，或者编辑标点符号为两个及以上的映射
   alphabet: zyxwvutsrqponmlkjihgfedcbaZYXWVUTSRQPONMLKJIHGFEDCBA[/|;
   # initials 定义仅作为始码的按键，排除 ` 让单个的 ` 可以直接上屏
@@ -67,6 +71,7 @@ speller:
 
     - derive|^(.+)[[](\w)(\w)$|$1| # 纯双拼的情况
     - derive|^(.+)[[](\w)(\w)$|$1$2| # 双拼+一位辅助码的情况
+    - derive|^(.+)[[](\w)(\w)$|$1[$2| # 双拼+[一位辅助码的情况
     - abbrev|^(.+)[[](\w)(\w)$|$1$2$3| # 双拼+2位辅助码的情况，abbrev类型不可以整句内输入2位辅助码，必须加o或/
     - derive|^(.+)[[](\w)(\w)$|$1$2$3o| # 整句模式下，输入syffo 出单字 增强单字性能
     - derive|^(.+)[[](\w)(\w)$|$1$2$3/| # 整句模式下，输入syff/ 出单字 增强单字性能
@@ -156,14 +161,27 @@ key_binder:
 
 
     - { match: "[a-z]{1,3}", accept: Tab,  send_sequence: "/1" }
+    - { match: "[a-z]{1,3}", accept: "/",  send_sequence: "/1" }
+    - { match: "[a-z]{1,3}", accept: ".",  send_sequence: "/1" }
     # - { when: composing, match: "[a-z]{2}", accept: Tab, send: '|' }
 
-
-    ## 对以下4行取消注释后：启用光标回退至特定音节后、补充辅助码的功能
-    #- { when: composing, accept: Control+1, send_sequence: '{Home}{Shift+Right}[' }
-    #- { when: composing, accept: Control+2, send_sequence: '{Home}{Shift+Right}{Shift+Right}[' }
-    #- { when: composing, accept: Control+3, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}[' }
-    #- { when: composing, accept: Control+4, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
-
-
-
+    ## 启用光标回退至特定音节后、补充辅助码的功能。补充完辅助码后，可以再按一次tab回到整句检查
+    - { when: composing, accept: Control+1, send_sequence: '{Home}{Shift+Right}[' }
+    - { when: composing, accept: Control+2, send_sequence: '{Home}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+3, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+4, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+5, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+6, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+7, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+
+# 启用語言模型
+# __include: moqi:/octagram/enable_for_sentence
+
+# 3码出简让全
+custom_phrase_3_code:
+  dictionary: ""
+  user_dict: custom_phrase/custom_phrase_3_code
+  db_class: stabledb
+  enable_sentence: false
+  enable_completion: false
+  initial_quality: 1 #本表词和系统词重码居后
\ No newline at end of file
diff --git a/moqi_sogou.schema.yaml b/moqi_sogou.schema.yaml
index 7cc2acb4..0daa6b8f 100755
--- a/moqi_sogou.schema.yaml
+++ b/moqi_sogou.schema.yaml
@@ -28,6 +28,10 @@ __include: moqi.yaml:/punctuator # 标点
 __include: moqi.yaml:/guide # 引导前缀配置
 
 speller:
+  max_code_length: 5
+  # table_translator翻译器，支持自动上屏。例如 “zmhu”可以自动上屏“怎么回事”
+  auto_select: true
+  auto_select_pattern: ^[a-z]+/|^[a-df-zA-DF-Z]\w{3}|^e\w{4}
   # 如果不想让什么标点直接上屏，可以加在 alphabet，或者编辑标点符号为两个及以上的映射
   alphabet: zyxwvutsrqponmlkjihgfedcbaZYXWVUTSRQPONMLKJIHGFEDCBA[/|;
   # initials 定义仅作为始码的按键，排除 ` 让单个的 ` 可以直接上屏
@@ -72,6 +76,7 @@ speller:
 
     - derive|^(.+)[[](\w)(\w)$|$1| # 纯双拼的情况
     - derive|^(.+)[[](\w)(\w)$|$1$2| # 双拼+一位辅助码的情况
+    - derive|^(.+)[[](\w)(\w)$|$1[$2| # 双拼+[一位辅助码的情况
     - abbrev|^(.+)[[](\w)(\w)$|$1$2$3| # 双拼+2位辅助码的情况，abbrev类型不可以整句内输入2位辅助码，必须加o或/
     - derive|^(.+)[[](\w)(\w)$|$1$2$3o| # 整句模式下，输入syffo 出单字 增强单字性能
     - derive|^(.+)[[](\w)(\w)$|$1$2$3/| # 整句模式下，输入syff/ 出单字 增强单字性能
@@ -161,14 +166,27 @@ key_binder:
 
 
     - { match: "[a-z]{1,3}", accept: Tab,  send_sequence: "/1" }
+    - { match: "[a-z]{1,3}", accept: "/",  send_sequence: "/1" }
+    - { match: "[a-z]{1,3}", accept: ".",  send_sequence: "/1" }
     # - { when: composing, match: "[a-z]{2}", accept: Tab, send: '|' }
 
-
-    ## 对以下4行取消注释后：启用光标回退至特定音节后、补充辅助码的功能
-    #- { when: composing, accept: Control+1, send_sequence: '{Home}{Shift+Right}[' }
-    #- { when: composing, accept: Control+2, send_sequence: '{Home}{Shift+Right}{Shift+Right}[' }
-    #- { when: composing, accept: Control+3, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}[' }
-    #- { when: composing, accept: Control+4, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
-
-
-
+    ## 启用光标回退至特定音节后、补充辅助码的功能。补充完辅助码后，可以再按一次tab回到整句检查
+    - { when: composing, accept: Control+1, send_sequence: '{Home}{Shift+Right}[' }
+    - { when: composing, accept: Control+2, send_sequence: '{Home}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+3, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+4, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+5, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+6, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+7, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+
+# 启用語言模型
+# __include: moqi:/octagram/enable_for_sentence
+
+# 3码出简让全
+custom_phrase_3_code:
+  dictionary: ""
+  user_dict: custom_phrase/custom_phrase_3_code
+  db_class: stabledb
+  enable_sentence: false
+  enable_completion: false
+  initial_quality: 1 #本表词和系统词重码居后
\ No newline at end of file
diff --git a/moqi_xh.schema.yaml b/moqi_xh.schema.yaml
index fd12d4de..e9bac71d 100755
--- a/moqi_xh.schema.yaml
+++ b/moqi_xh.schema.yaml
@@ -91,9 +91,9 @@ speller:
     ## 飞键 可选择性开启
     - derive/^([y])j/$1f/
     - derive/^qx/qw/
+    - derive/^xq/xo/
     - derive/^qq/qo/
     - derive/^ww/wi/
-    
     - derive/^y([a-df-qs-z])/e$1/ # y -> e互击
     - derive/^j([a-twyz])/f$1/ # j -> f互击
     # - derive/^jn/jv/
@@ -191,7 +191,7 @@ key_binder:
     - { when: composing, accept: Control+7, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
 
 # 启用語言模型
-__include: moqi:/octagram/enable_for_sentence
+# __include: moqi:/octagram/enable_for_sentence
 
 # 3码出简让全
 custom_phrase_3_code:
diff --git a/moqi_zrm.schema.yaml b/moqi_zrm.schema.yaml
index a750e97c..c721746e 100755
--- a/moqi_zrm.schema.yaml
+++ b/moqi_zrm.schema.yaml
@@ -28,6 +28,10 @@ __include: moqi.yaml:/punctuator # 标点
 __include: moqi.yaml:/guide # 引导前缀配置
 
 speller:
+  max_code_length: 5
+  # table_translator翻译器，支持自动上屏。例如 “zmhu”可以自动上屏“怎么回事”
+  auto_select: true
+  auto_select_pattern: ^[a-z]+/|^[a-df-zA-DF-Z]\w{3}|^e\w{4}
   # 如果不想让什么标点直接上屏，可以加在 alphabet，或者编辑标点符号为两个及以上的映射
   alphabet: zyxwvutsrqponmlkjihgfedcbaZYXWVUTSRQPONMLKJIHGFEDCBA[/|
   # initials 定义仅作为始码的按键，排除 ` 让单个的 ` 可以直接上屏
@@ -64,6 +68,7 @@ speller:
 
     - derive|^(.+)[[](\w)(\w)$|$1| # 纯双拼的情况
     - derive|^(.+)[[](\w)(\w)$|$1$2| # 双拼+一位辅助码的情况
+    - derive|^(.+)[[](\w)(\w)$|$1[$2| # 双拼+[一位辅助码的情况
     - abbrev|^(.+)[[](\w)(\w)$|$1$2$3| # 双拼+2位辅助码的情况，abbrev类型不可以整句内输入2位辅助码，必须加o或/
     - derive|^(.+)[[](\w)(\w)$|$1$2$3o| # 整句模式下，输入syffo 出单字 增强单字性能
     - derive|^(.+)[[](\w)(\w)$|$1$2$3/| # 整句模式下，输入syff/ 出单字 增强单字性能
@@ -155,16 +160,18 @@ key_binder:
 
 
     - { match: "[a-z]{1,3}", accept: Tab,  send_sequence: "/1" }
+    - { match: "[a-z]{1,3}", accept: "/",  send_sequence: "/1" }
+    - { match: "[a-z]{1,3}", accept: ".",  send_sequence: "/1" }
     # - { when: composing, match: "[a-z]{2}", accept: Tab, send: '|' }
 
-
-    ## 对以下4行取消注释后：启用光标回退至特定音节后、补充辅助码的功能
-    #- { when: composing, accept: Control+1, send_sequence: '{Home}{Shift+Right}[' }
-    #- { when: composing, accept: Control+2, send_sequence: '{Home}{Shift+Right}{Shift+Right}[' }
-    #- { when: composing, accept: Control+3, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}[' }
-    #- { when: composing, accept: Control+4, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
-
-
+    ## 启用光标回退至特定音节后、补充辅助码的功能。补充完辅助码后，可以再按一次tab回到整句检查
+    - { when: composing, accept: Control+1, send_sequence: '{Home}{Shift+Right}[' }
+    - { when: composing, accept: Control+2, send_sequence: '{Home}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+3, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+4, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+5, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+6, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
+    - { when: composing, accept: Control+7, send_sequence: '{Home}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}{Shift+Right}[' }
 
 # 启用語言模型
 #__include: moqi:/octagram/enable_for_sentence
\ No newline at end of file