From 817dce9cec8c199ea1aec532c518d9c2f24b7ffa Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Wed, 26 Oct 2005 08:08:17 +0000
Subject: [PATCH] *** empty log message ***

---
 cjk-util.mim |   32 +-------------------------------
 zh-py.mim    |   48 ++++++------------------------------------------
 2 files changed, 7 insertions(+), 73 deletions(-)

diff --git a/cjk-util.mim b/cjk-util.mim
index 3d2774b..a0660ad 100644
--- a/cjk-util.mim
+++ b/cjk-util.mim
@@ -22,8 +22,6 @@
 
 (input-method t nil cjk-util)
 
-(title "AＡ")
-
 (description "Provide utilities for CJK input methods.
 This is acutually not a standalone input method, but is expected
 to be included in the other input method (e.g. zh-py).
@@ -75,37 +73,9 @@ is inserted, then the mode is turned off.
  (exit-fullwidth-mode
   ("<<" (shift t)))
  (enter-single-fullwidth-mode
-  ("Z" (shift single-fullwidth-mode)))
-
- ;; Typing 1, 2, ..., 0 selects the 0th, 1st, ..., 9th candidate.
- (choose
-  ("1" (select 0))
-  ("2" (select 1))
-  ("3" (select 2))
-  ("4" (select 3))
-  ("5" (select 4))
-  ("6" (select 5))
-  ("7" (select 6))
-  ("8" (select 7))
-  ("9" (select 8))
-  ("0" (select 9)))
-
- (change-candidate
-  ((Left) (select @-))
-  ((C-b) (select @-))
-  ((Right) (select @+))
-  ((C-f) (select @+))
-  ((Up) (select @[))
-  ((C-p) (select @[))
-  ((Down) (select @]))
-  ((C-n) (select @]))))
+  ("Z" (shift single-fullwidth-mode))))
 
 (state
- (init
-  "A"
-  (enter-fullwidth-mode)
-  (enter-single-fullwidth-mode))
-
  (fullwidth-mode
   "Ａ"
   (fullwidth (commit))
diff --git a/zh-py.mim b/zh-py.mim
index 3fe018e..0c30365 100644
--- a/zh-py.mim
+++ b/zh-py.mim
@@ -46,7 +46,7 @@ temporarily by typing \"Z\".
   ;; ("i")
   ("j") ("k") ("l") ("m") ("n") ("o") ("p") ("q") ("r") ("s") ("t")
   ;; ("u") ("v")
-  ("w") ("x") ("y") ("z") )
+  ("w") ("x") ("y") ("z"))
 
  ;; Big table of Pinyin vs the corresponding Chinese characters.  This
  ;; part is generated automatically from the Unihan database
@@ -1337,23 +1337,10 @@ temporarily by typing \"Z\".
   ("zun" ("尊遵蹲撙樽鳟䔿僔噂墫壿嶟捘燇繜罇臶譐跧銌鐏鱒鷷"))
   ("zuo" ("作做坐左座昨琢撮凿乍佐柞阼唑嘬怍迮胙祚砟笮酢㑅㘀㘴㛗㝾㣱㤰㭮"
 	  "㶡㸲䇥䋏䎰䔘䜊䝫䞢䞰䟄䟶䦈䩦䬤䯿侳咗唨夎岝岞捽椊毑秨稓筰糳繓"
-	  "苲莋葃葄袏鈼鑿飵")))
-
- (backspace
-  ((BackSpace)))
-
- (return
-  ((Return)))
-
- (focus-change
-  ;; When an input spot is moved, commit the current predit by shifting
-  ;; to init.
-  ((input-focus-move) (shift init))
-  ;; When an input focus is out or in, keep the current preedit.
-  ((input-focus-out) (set KK @@) (sub KK 1) (undo KK))
-  ((input-focus-in) (set KK @@) (sub KK 1) (undo KK))))
+	  "苲莋葃葄袏鈼鑿飵"))))
 
 (include (t nil cjk-util) map)
+(include (t nil zh-util) map)
 
 (state
   ;; When an initial character of Pinyin is typed, re-handle it in
@@ -1367,33 +1354,10 @@ temporarily by typing \"Z\".
   ;; When a complete Pinyin sequence is typed, shift to "select" state
   ;; to allow users to select one from the candidates.
   (pinyin (shift select))
-  ;; When Return is typed, fix the current preedit.
-  (return (shift init))
-  (nil (hide) (shift check-undo)))
-
- (check-undo
-  ;; When Backspace is typed, cancel the last input.
-  (backspace (undo))
-  (focus-change)
-  ;; When anything else is typed, produce the current candidate (if
-  ;; any), and re-handle the last input in "init" state.
-  (nil (hide) (shift init)))
-
- (select
-  (t (set K @@) (sub K 1))
-  ;; When a number is typed, select the corresponding canidate,
-  ;; produce it, and shift to "init" state.
-  (focus-change)
-  (choose (hide) (shift init))
-  (change-candidate)
-  (backspace (undo K))
-  ;; When Return is typed, fix the current preedit.
-  (return (shift init))
-  ;; When anything else is typed, produce the current candidate,
-  ;; and re-handle the last input in "init" state.
-  (nil (hide) (shift init))))
+  (nil (hide) (shift check-undo))))
 
-(include (t nil cjk-util) state fullwidth-mode single-fullwidth-mode)
+(include (t nil cjk-util) state)
+(include (t nil zh-util) state)
 
 ;; Local Variables:
 ;; mode: lisp
-- 
1.7.10.4