This commit was manufactured by cvs2svn to create tag 'egg-tomo-leim'.

diff --git a/ChangeLog b/ChangeLog
index 832d252..5cdd3ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+1998-02-07  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * leim-list-egg.el: Delete autoload setting for `egg-mode'.
+       Delete input method registration for "japanese-egg".
+
+       * egg.el: Comment out setting for Wnn.
+
+       * leim-list-egg.el: Add autoload setting for
+       `egg-activate-{wnn|sj3}'.
+
+       * egg/sj3.el (egg-activate-sj3): Add DOC-string.
+
+       * egg/sj3.el (egg-activate-sj3): New function.
+       Require egg.
+       Load egg/sj3rpc.el.
+
+       * egg/wnn.el (egg-activate-wnn): New function.
+       Require egg.
+       Load egg/wnnrpc.el.
+
+1998-02-07  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * leim-list-egg.el (japanese-egg-wnn): New input method.
+       (japanese-egg-sj3): New input method.
+
+1997-11-20  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * leim-list-egg.el: Rename `egg-ja' -> `japanese-egg'.
+
+1997-11-20  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * egg/wnn.el (wnn): New group.
+       (wnn-server): Use `defcustom'.
+       (wnn-usr-dic-dir): Use `defcustom'.
+
+       * egg.el (egg): New group.
+
+1997-11-20  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * menudiag.el (menudiag-mode-map): Swap binding for left and
+       right.
+
+       * egg.el (egg-toroku-region): `wnn-get-environment' requires
+       dictionary-specification.
+
+       * leim-list-egg.el: add autoload setting for egg-mode.
+
 1997-11-03  KATAYAMA Yoshio <kate@pfu.co.jp>
 
        * euc-cn.el: New file.  Original name was yincoding.el.

diff --git a/egg.el b/egg.el
index c386176..d722a3a 100644 (file)
--- a/egg.el
+++ b/egg.el
@@ -103,7 +103,7 @@
 ;; XXX: Should use backend interface
 (defun egg-toroku-region (start end)
   (interactive "r")
-  (let* ((env (wnn-get-environment))   ; XXX
+  (let* ((env (wnn-get-environment wnn-dictionary-specification)) ; XXX
         (kanji (buffer-substring start end))
         (yomi (read-multilingual-string 
                (format "\e$B<-=qEPO?!X\e(B%s\e$B!Y\e(B  \e$BFI$_\e(B:" kanji)))
@@ -146,13 +146,17 @@
 (require 'egg-mlh)
 (require 'egg-cnv)
 (require 'egg-com)
+(require 'custom)
+
+(defgroup egg nil
+  "Tamagotchy --- EGG Versio 4.0")
 
 (load-library "its/hira")
 (setq-default its-current-map its-hira-map)
 
-(load-library "egg/wnn")
-(load-library "egg/wnnrpc")
-(setq egg-conversion-backend wnn-conversion-backend)
+;;(load-library "egg/wnn")
+;;(load-library "egg/wnnrpc")
+;;(setq egg-conversion-backend wnn-conversion-backend)
 
 ;;(load-library "egg/sj3rpc")
 ;;(load-library "egg/sj3")

diff --git a/egg/sj3.el b/egg/sj3.el
index c5ad963..cf05bfa 100644 (file)
--- a/egg/sj3.el
+++ b/egg/sj3.el
@@ -243,4 +243,16 @@ Return the list of bunsetsu."
 (defun sj3-fini ()
   )
 
+;;; setup
+
+(require 'egg)
+(load "egg/sj3rpc")
+
+;;;###autoload
+(defun egg-activate-sj3 (&optional arg)
+  "Activate SJ3 backend of Tamagotchy."
+  (setq egg-conversion-backend sj3-conversion-backend)
+  (egg-mode arg)
+  )
+
 ;;; egg/sj3.el ends here.

diff --git a/egg/wnn.el b/egg/wnn.el
index 6474eb9..d043bf0 100644 (file)
--- a/egg/wnn.el
+++ b/egg/wnn.el
@@ -29,6 +29,10 @@
 
 ;;; Code:
 
+(defgroup wnn nil
+  "Wnn interface for Tamagotchy"
+  :group 'egg)
+
 (eval-when-compile
   (defmacro WNN-const (c)
     (cond ((eq c 'BUN_SENTOU) -1)
@@ -132,8 +136,10 @@
 (defsubst wnn-bunsetsu-set-zenkouho-pos (bunsetsu zp)
   (aset bunsetsu 18 zp))
 \f
-(defvar wnn-server "localhost"
-  "Hostname of wnn server")
+(defcustom wnn-server "localhost"
+  "Hostname of wnn server"
+  :group 'wnn
+  :type 'string)
 
 (defvar wnn-environment nil
   "Environment for WNN kana-kanji conversion")
@@ -368,8 +374,10 @@ Return the list of bunsetsu."
     [("ud")                 nil            5 t t])
   "")
 
-(defvar wnn-usr-dic-dir (concat "usr/" (user-login-name))
-  "*Directory of user dictionary for Wnn.")
+(defcustom wnn-usr-dic-dir (concat "usr/" (user-login-name))
+  "*Directory of user dictionary for Wnn."
+  :group 'wnn
+  :type 'string)
 
 (defun wnn-filename (p)
   ""
@@ -663,4 +671,17 @@ Take one argument DIC-SPEC for dictionary specification."
     (wnnrpc-add-word env dic-number yomi kanji comment
                     hinshi-id initial-freq)))
 
+
+;;; setup
+
+(require 'egg)
+(load "egg/wnnrpc")
+
+;;;###autoload
+(defun egg-activate-wnn (&optional arg)
+  "Activate Wnn backend of Tamagotchy."
+  (setq egg-conversion-backend wnn-conversion-backend)
+  (egg-mode arg)
+  )
+
 ;;; egg/wnn.el ends here.

diff --git a/leim-list-egg.el b/leim-list-egg.el
index d360439..089fa66 100644 (file)
--- a/leim-list-egg.el
+++ b/leim-list-egg.el
@@ -1,4 +1,12 @@
 ;;; Tamago
+
+(autoload 'egg-activate-wnn "egg/wnn" "Activate Wnn backend of Tamagotchy." t)
+(autoload 'egg-activate-sj3 "egg/sj3" "Activate SJ3 backend of Tamagotchy." t)
+
 (register-input-method
- "egg-ja" "Japanese" 'egg-mode
- "A\e$(B$"\e(B"  "Romaji -> Hiragana -> Kanji&Kana")
+ "japanese-egg-wnn" "Japanese" 'egg-activate-wnn
+ "A\e$B$"\e(B"  "Romaji -> Hiragana -> Kanji&Kana")
+
+(register-input-method
+ "japanese-egg-sj3" "Japanese" 'egg-activate-sj3
+ "A\e$B$"\e(B"  "Romaji -> Hiragana -> Kanji&Kana")

diff --git a/menudiag.el b/menudiag.el
index f9caf06..639401a 100644 (file)
--- a/menudiag.el
+++ b/menudiag.el
@@ -77,8 +77,8 @@
     (define-key map "\C-l" 'menudiag-redraw)
     (define-key map "\C-m" 'menudiag-select-this-item)
     (define-key map [return] 'menudiag-select-this-item)
-    (define-key map [left] 'menudiag-forward-item)
-    (define-key map [right] 'menudiag-backward-item)
+    (define-key map [left] 'menudiag-backward-item)
+    (define-key map [right] 'menudiag-forward-item)
     (define-key map [up] 'menudiag-previous-line)
     (define-key map [down] 'menudiag-next-line)
     (define-key map [menudiag-continuation] 'menudiag-follow-continuation)