fix(editor): Wrong fuzz logic in the Hsu keyboard layout

chewing · May 21, 2024 · 9821f7f · 9821f7f
1 parent 1f0b85e
commit 9821f7f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/.github/ISSUE_TEMPLATE/release-checklist.md b/.github/ISSUE_TEMPLATE/release-checklist.md
@@ -22,4 +22,5 @@ assignees: ''
 - [ ] Git tag and sign tag
 - [ ] cargo publish
 - [ ] Tag new release on GitHub
+- [ ] Update website
 - [ ] Send announcement
diff --git a/NEWS b/NEWS
@@ -1,9 +1,18 @@
+What's New in libchewing 0.8.2 (May 21, 2024)
+---------------------------------------------------------
+
+* Bug fixed
+  - Wrong Hsu (許氏) keyboard fuzz conversion (ㄍㄧ to ㄐㄧ and ㄍㄩ to ㄐㄩ)
+    (introduced in v0.8.0)
+
+
 What's New in libchewing 0.8.1 (May 15, 2024)
 ---------------------------------------------------------
 
 * Bug fixed
   - Fail to build on aarch64 due to type mismatch. (introduced in v0.8.0)
 
+
 What's New in libchewing 0.8.0 (May 14, 2024)
 ---------------------------------------------------------
 

diff --git a/src/editor/zhuyin_layout/hsu.rs b/src/editor/zhuyin_layout/hsu.rs
@@ -110,8 +110,9 @@ impl SyllableEditor for Hsu {
 
             // fuzzy ㄍㄧ to ㄐㄧ and ㄍㄩ to ㄐㄩ
             match (self.syllable.initial(), self.syllable.medial()) {
-                (Some(Bopomofo::G), Some(Bopomofo::I)) | (Some(Bopomofo::J), Some(Bopomofo::I)) => {
-                    self.syllable.update(Bopomofo::IU);
+                (Some(Bopomofo::G), Some(Bopomofo::I))
+                | (Some(Bopomofo::G), Some(Bopomofo::IU)) => {
+                    self.syllable.update(Bopomofo::J);
                 }
                 _ => (),
             }

diff --git a/tests/test-bopomofo.c b/tests/test-bopomofo.c
@@ -1543,6 +1543,22 @@ void test_KB_HSU()
     ok_preedit_buffer(ctx, "\xE7\x88\xBE" /* 爾 */);
     chewing_clean_preedit_buf(ctx);
 
+    type_keystroke_by_string(ctx, "g");
+    ok_bopomofo_buffer(ctx, "ㄍ");
+    type_keystroke_by_string(ctx, "e");
+    ok_bopomofo_buffer(ctx, "ㄍㄧ");
+    type_keystroke_by_string(ctx, " ");
+    ok_preedit_buffer(ctx, "機");  /* convert "ㄍㄧ" to "ㄐㄧ" */
+    chewing_clean_preedit_buf(ctx);
+
+    type_keystroke_by_string(ctx, "g");
+    ok_bopomofo_buffer(ctx, "ㄍ");
+    type_keystroke_by_string(ctx, "u");
+    ok_bopomofo_buffer(ctx, "ㄍㄩ");
+    type_keystroke_by_string(ctx, " ");
+    ok_preedit_buffer(ctx, "居");  /* convert "ㄍㄩ" to "ㄐㄩ" */
+    chewing_clean_preedit_buf(ctx);
+
     chewing_delete(ctx);
 }