From 2fa65e0e7557f69e5ef6f8fe7b91d211a717e92e Mon Sep 17 00:00:00 2001
From: ksqsf <i@ksqsf.moe>
Date: Thu, 21 Dec 2023 18:39:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8D=E5=BE=AE=E5=A2=9E=E5=BC=B7=20speller?=
 =?UTF-8?q?=20algebra=20=E5=B0=8D=E7=89=B9=E6=AE=8A=E9=9F=B3=E7=A2=BC?=
 =?UTF-8?q?=E7=B7=A8=E7=A2=BC=E7=9A=84=E5=85=BC=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

如 mspy 中的 ing 爲 ;
---
 moran.schema.yaml          |  8 ++++----
 moran_aux.schema.yaml      |  2 +-
 moran_reverse.schema.yaml  | 16 ++++++++--------
 moran_sentence.schema.yaml |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/moran.schema.yaml b/moran.schema.yaml
index 841e02d..cf15247 100644
--- a/moran.schema.yaml
+++ b/moran.schema.yaml
@@ -90,10 +90,10 @@ speller:
   alphabet: abcdefghijklmnopqrstuvwxyz
   delimiter: " '"
   algebra:
-    - derive/^(\w+);(\w)(\w)$/$1$2$3o/ # 全碼 YYXXo
-    - abbrev/^(\w+);(\w)(\w)$/$1$2$3/  # 降低 YYXX 優先級
-    - derive/^(\w+);(\w)(\w)$/$1$2/    # 構詞可以用 YYX
-    - derive/^(\w+);(\w)(\w)$/$1/      # 構詞可以用 YY
+    - derive/^(.+);(\w)(\w)$/$1$2$3o/ # 全碼 YYXXo
+    - abbrev/^(.+);(\w)(\w)$/$1$2$3/  # 降低 YYXX 優先級
+    - derive/^(.+);(\w)(\w)$/$1$2/    # 構詞可以用 YYX
+    - derive/^(.+);(\w)(\w)$/$1/      # 構詞可以用 YY
     #- abbrev/^([a-z]).+$/$1/           # 首字母簡拼（※ 嚴重影響出字速度，不建議開啓）
 
 ascii_composer:
diff --git a/moran_aux.schema.yaml b/moran_aux.schema.yaml
index 9f04997..f4a8239 100644
--- a/moran_aux.schema.yaml
+++ b/moran_aux.schema.yaml
@@ -79,7 +79,7 @@ speller:
   alphabet: abcdefghijklmnopqrstuvwxyz
   delimiter: " '"
   algebra:
-    - derive/^(\w*);(\w)(\w)$/$1/      # 構詞可以用 YY
+    - derive/^(.*);(\w)(\w)$/$1/      # 構詞可以用 YY
 
 ascii_composer:
   switch_key:
diff --git a/moran_reverse.schema.yaml b/moran_reverse.schema.yaml
index 1b31a3f..9ff4715 100644
--- a/moran_reverse.schema.yaml
+++ b/moran_reverse.schema.yaml
@@ -26,11 +26,11 @@ translator:
 speller:
   alphabet: abcdefghijklmnopqrstuvwxyz
   algebra:
-    - derive/^(\w)(\w);(\w)(\w)$/\1\2\3\4/
-    - derive/^(\w)(\w);(\w)(\w)$/\1\2`/
-    - derive/^(\w)(\w);(\w)(\w)$/\1\2``/
-    - derive/^(\w)(\w);(\w)(\w)$/\1\2\3`/
-    - derive/^(\w)(\w);(\w)(\w)$/\1\2`\4/
-    - derive/^(\w)(\w);(\w)(\w)$/``\3\4/
-    - derive/^(\w)(\w);(\w)(\w)$/``\3/
-    - derive/^(\w)(\w);(\w)(\w)$/```\4/
+    - derive/^(.)(.);(\w)(\w)$/\1\2\3\4/
+    - derive/^(.)(.);(\w)(\w)$/\1\2`/
+    - derive/^(.)(.);(\w)(\w)$/\1\2``/
+    - derive/^(.)(.);(\w)(\w)$/\1\2\3`/
+    - derive/^(.)(.);(\w)(\w)$/\1\2`\4/
+    - derive/^(.)(.);(\w)(\w)$/``\3\4/
+    - derive/^(.)(.);(\w)(\w)$/``\3/
+    - derive/^(.)(.);(\w)(\w)$/```\4/
diff --git a/moran_sentence.schema.yaml b/moran_sentence.schema.yaml
index 9758acc..ba31ce8 100644
--- a/moran_sentence.schema.yaml
+++ b/moran_sentence.schema.yaml
@@ -79,10 +79,10 @@ speller:
   alphabet: abcdefghijklmnopqrstuvwxyz
   delimiter: " '"
   algebra:
-    - derive/^(\w*);(\w)(\w)$/$1$2$3o/ # 全碼 YYXXo
-    - abbrev/^(\w*);(\w)(\w)$/$1$2$3/  # 全碼 YYXX，優先級更低
-    - derive/^(\w*);(\w)(\w)$/$1$2/    # 構詞可以用 YYX
-    - derive/^(\w*);(\w)(\w)$/$1/      # 構詞可以用 YY
+    - derive/^(.*);(\w)(\w)$/$1$2$3o/ # 全碼 YYXXo
+    - abbrev/^(.*);(\w)(\w)$/$1$2$3/  # 全碼 YYXX，優先級更低
+    - derive/^(.*);(\w)(\w)$/$1$2/    # 構詞可以用 YYX
+    - derive/^(.*);(\w)(\w)$/$1/      # 構詞可以用 YY
     #- abbrev/^([a-z]).+$/$1/           # 首字母簡拼（※ 嚴重影響出字速度，在簡詞完善後可能關閉）
 
 ascii_composer: