leim-list.el change

diff --git a/AUTHORS b/AUTHORS
index d72efb7..09d00ed 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,16 +4,17 @@ KAWABATA, Taichi  <kawabata@exa.onlab.ntt.co.jp>
 MORIOKA Tomohiko  <tomo@etl.go.jp>
        Use of custom.
 
-NIIBE Yutaka <gniibe@chroot.org>
+NIIBE Yutaka <gniibe@m17n.org>
        Design a part of ITS programming.
        Wrote ITS:
            its.el
            its/hira.el
-       Wrote tamago.el, menudiag.el, tamago-cnv.el, tamago-comm.el,
-       and tamago-mlh.el.
+       Wrote egg.el, menudiag.el, egg-cnv.el, egg-com.el,
+       and egg-mlh.el.
        Wrote backend conversion engine interface:
-           SJ3: tamago-lib/sj3.el, tamago-lib/sj3rpc.el,
-           WNN: tamago-lib/wnn.el, and tamago-lib/wnnrpc.el.
+           ANTHY: egg/anthy.el, egg/anthyipc.el, 
+           SJ3: egg/sj3.el, egg/sj3rpc.el,
+           WNN: egg/wnn.el, and egg/wnnrpc.el.
 
 KATAYAMA Yoshio <kate@pfu.co.jp>
        Design ITS programming.

diff --git a/ChangeLog b/ChangeLog
index c40633d..9f6ca96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-08-23  NIIBE Yutaka  <gniibe@m17n.org>
+
+       * AUTHORS (NIIBE Yutaka): Updated.
+       * egg-mlh.el: Update e-mail address.
+
+       * leim-list.el: Removed eval-when contstuct.  Reoved "loading
+       another" feature.
+       (egg-activate-anthy): Added.
+
+2002-08-23  Katsumi Yamaoka  <yamaoka@jpl.org>, NIIBE Yutaka  <gniibe@m17n.org>
+
+       * egg-util.el: Removed.
+
 2002-08-08  NIIBE Yutaka  <gniibe@m17n.org>
 
        * Makefile.in (EGGSRCS): Added anthy.el and anthyipc.el

diff --git a/egg-mlh.el b/egg-mlh.el
index bb87d28..cd88264 100644 (file)
--- a/egg-mlh.el
+++ b/egg-mlh.el
@@ -3,10 +3,10 @@
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc
 
-;; Author: NIIBE Yutaka <gniibe@chroot.org>
+;; Author: NIIBE Yutaka <gniibe@m17n.org>
 ;;         KATAYAMA Yoshio <kate@pfu.co.jp>      ; Multilingual Enhancement
 
-;; Maintainer: TOMURA Satoru <tomura@etl.go.jp>
+;; Maintainer: NIIBE Yutaka <gniibe@m17n.org>
 
 ;; Keywords: mule, multilingual, input method
 

diff --git a/egg-util.el b/egg-util.el
deleted file mode 100644 (file)
index a730fe3..0000000
--- a/egg-util.el
+++ /dev/null
@@ -1,62 +0,0 @@
-;;; egg-util.el --- Utilities with Egg
-
-;; Copyright (C) 2000 ElectroTechinical Laboratory, Japan
-;; Copyright (C) 2000 TOMURA Satoru <tomura@etl.go.jp>
-
-;; Author: TOMURA Satoru <tomura@etl.go.jp>
-
-;; Maintainer: TOMURA Satoru <tomura@etl.go.jp>
-
-;; Keywords: mule, multilingual, input method
-
-;; This file is part of EGG.
-
-;; EGG is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; EGG is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Commentary:
-
-;;; Code:
-
-(provide 'egg-util)
-
-(defun add-directory-to-load-path (dir)
-  (let ((dir (expand-file-name dir)))
-    (add-to-list 'load-path dir)
-    (let ((default-directory dir))
-      (normal-top-level-add-subdirs-to-load-path))))
-
-(defun locate-libraries (library &optional nosuffix path interactive-call)
-  (let ((lpath (or path load-path))
-       (result nil))
-    (while lpath
-      (let ((path (locate-library library nosuffix lpath interactive-call)))
-       (if path
-           (progn
-             (setq lpath (cdr-safe 
-                          (member (directory-file-name (file-name-directory path))
-                                  lpath))
-                   result (cons path result)))
-         (progn
-           (setq lpath nil
-                 result (reverse result))))))
-    result))
-
-(defun load-libraries (library &optional path)
-  (let ((files (locate-libraries library nil (or path load-path) nil)))
-    (while files
-      (load-file (car files))
-      (setq files (cdr files)))))
-

diff --git a/leim-list.el b/leim-list.el
index 1983905..82cefc2 100644 (file)
--- a/leim-list.el
+++ b/leim-list.el
@@ -1,8 +1,8 @@
 ;;; leim-list.el --- Egg setup for leim API
 
-;; Copyright (C) 1999, 2000 Free Software Foundation, Inc
+;; Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc
 
-;; Author: NIIBE Yutaka <gniibe@chroot.org>
+;; Author: NIIBE Yutaka <gniibe@m17n.org>
 ;;         KATAYAMA Yoshio <kate@pfu.co.jp>
 ;;         TOMURA Satoru <tomura@etl.go.jp>
 
@@ -31,68 +31,74 @@
 
 ;;; Code:
 
-(when site-run-file
-  (autoload 'egg-activate-wnn "egg/wnn" "Activate Wnn backend of Tamago 4." t)
-  (autoload 'egg-activate-sj3 "egg/sj3" "Activate SJ3 backend of Tamago 4." t)
-  (autoload 'egg-activate-canna "egg/canna"
-    "Activate CANNA backend of Tamago 4." t)
-
-  (register-input-method
-   "japanese-egg-wnn" "Japanese" 'egg-activate-wnn
-   "\e$B$"\e(B.."  "Romaji -> Hiragana -> Kanji&Kana"
-   'its-select-hiragana)
-
-  (register-input-method
-   "japanese-egg-sj3" "Japanese" 'egg-activate-sj3
-   "\e$B$"\e(B.."  "Romaji -> Hiragana -> Kanji&Kana"
-   'its-select-hiragana)
-
-  (register-input-method
-   "japanese-egg-canna" "Japanese" 'egg-activate-canna
-   "\e$B$"\e(B.."  "Romaji -> Hiragana -> Kanji&Kana"
-   'its-select-hiragana)
-
-  (register-input-method
-   "chinese-gb-egg-wnn-py" "Chinese-GB" 'egg-activate-wnn
-   "\e$AF4\e(BG"  "Pinyin -> Simplified Hanzi"
-   'its-select-pinyin-cn)
-
-  (register-input-method
-   "chinese-gb-egg-wnn-zy" "Chinese-GB" 'egg-activate-wnn
-   "\e$AW"\e(BG"  "Zhunyin -> Simplified Hanzi"
-   'its-select-zhuyin-cn)
-
-  (register-input-method
-   "chinese-gb-egg-wnn-qm" "Chinese-GB" 'egg-activate-wnn
-   "\e$AG.\e(B"  "QianMa Simplified Hanzi inputmethod"
-   'its-select-qianma)
-
-  (register-input-method
-   "chinese-gb-egg-wnn-wb" "Chinese-GB" 'egg-activate-wnn
-   "\e$ANe\e(B"  "WuBi Simplified Hanzi inputmethod"
-   'its-select-wubi)
-
-  (register-input-method
-   "chinese-cns-egg-wnn-py" "Chinese-CNS" 'egg-activate-wnn
-   "\e$(GQ;\e(BC"  "Pinyin -> Traditional Hanzi"
-   'its-select-pinyin-tw)
-
-  (register-input-method
-   "chinese-cns-egg-wnn-zy" "Chinese-CNS" 'egg-activate-wnn
-   "\e$(GNC\e(BC"  "Zhunyin -> Traditional Hanzi"
-   'its-select-zhuyin-tw)
-
-  (register-input-method
-   "korean-egg-wnn" "Korean" 'egg-activate-wnn
-   "\e$(CGQ\e(B"  "Hangul -> Hanja"
-   'its-select-hangul)
-
-  (autoload 'egg-mode "egg" "Toggle EGG  mode." t)
-
-  (set-language-info "Japanese"    'input-method "japanese-egg-wnn")
-  (set-language-info "Chinese-GB"  'input-method "chinese-gb-egg-wnn-py")
-  (set-language-info "Chinese-CNS" 'input-method "chinese-cns-egg-wnn-py")
-  (set-language-info "Korean"      'input-method "korean-egg-wnn")
+(autoload 'egg-activate-anthy "egg/anthy"
+  "Activate ANTHY  backend of Tamago 4." t)
+(autoload 'egg-activate-wnn "egg/wnn" "Activate Wnn backend of Tamago 4." t)
+(autoload 'egg-activate-sj3 "egg/sj3" "Activate SJ3 backend of Tamago 4." t)
+(autoload 'egg-activate-canna "egg/canna"
+  "Activate CANNA backend of Tamago 4." t)
+
+(register-input-method
+ "japanese-egg-anthy" "Japanese" 'egg-activate-anthy
+ "\e$B$"\e(B.."  "Romaji -> Hiragana -> Kanji&Kana"
+ 'its-select-hiragana)
+
+(register-input-method
+ "japanese-egg-wnn" "Japanese" 'egg-activate-wnn
+ "\e$B$"\e(B.."  "Romaji -> Hiragana -> Kanji&Kana"
+ 'its-select-hiragana)
+
+(register-input-method
+ "japanese-egg-sj3" "Japanese" 'egg-activate-sj3
+ "\e$B$"\e(B.."  "Romaji -> Hiragana -> Kanji&Kana"
+ 'its-select-hiragana)
+
+(register-input-method
+ "japanese-egg-canna" "Japanese" 'egg-activate-canna
+ "\e$B$"\e(B.."  "Romaji -> Hiragana -> Kanji&Kana"
+ 'its-select-hiragana)
+
+(register-input-method
+ "chinese-gb-egg-wnn-py" "Chinese-GB" 'egg-activate-wnn
+ "\e$AF4\e(BG"  "Pinyin -> Simplified Hanzi"
+ 'its-select-pinyin-cn)
+
+(register-input-method
+ "chinese-gb-egg-wnn-zy" "Chinese-GB" 'egg-activate-wnn
+ "\e$AW"\e(BG"  "Zhunyin -> Simplified Hanzi"
+ 'its-select-zhuyin-cn)
+
+(register-input-method
+ "chinese-gb-egg-wnn-qm" "Chinese-GB" 'egg-activate-wnn
+ "\e$AG.\e(B"  "QianMa Simplified Hanzi inputmethod"
+ 'its-select-qianma)
+
+(register-input-method
+ "chinese-gb-egg-wnn-wb" "Chinese-GB" 'egg-activate-wnn
+ "\e$ANe\e(B"  "WuBi Simplified Hanzi inputmethod"
+ 'its-select-wubi)
+
+(register-input-method
+ "chinese-cns-egg-wnn-py" "Chinese-CNS" 'egg-activate-wnn
+ "\e$(GQ;\e(BC"  "Pinyin -> Traditional Hanzi"
+ 'its-select-pinyin-tw)
+
+(register-input-method
+ "chinese-cns-egg-wnn-zy" "Chinese-CNS" 'egg-activate-wnn
+ "\e$(GNC\e(BC"  "Zhunyin -> Traditional Hanzi"
+ 'its-select-zhuyin-tw)
+
+(register-input-method
+ "korean-egg-wnn" "Korean" 'egg-activate-wnn
+ "\e$(CGQ\e(B"  "Hangul -> Hanja"
+ 'its-select-hangul)
+
+(autoload 'egg-mode "egg" "Toggle EGG  mode." t)
+
+(set-language-info "Japanese"    'input-method "japanese-egg-wnn")
+(set-language-info "Chinese-GB"  'input-method "chinese-gb-egg-wnn-py")
+(set-language-info "Chinese-CNS" 'input-method "chinese-cns-egg-wnn-py")
+(set-language-info "Korean"      'input-method "korean-egg-wnn")
 
 (defgroup leim nil 
   "LEIM stands for Libraries of Emacs Input Methods."
@@ -101,6 +107,9 @@
 (defgroup egg nil "" 
   :group 'leim :load "egg")
 
+(defgroup anthy nil ""
+  :group 'egg :load "egg/anthy")
+
 (defgroup wnn nil ""
   :group 'egg :load "egg/wnn")
 
@@ -116,17 +125,4 @@
 (defgroup hira nil ""
   :group 'its :load "its/hira")
 
-;;;;
-
-  (require 'egg-util)
-
-  (defun load-leim-list-except-this ()
-    (load-libraries "leim-list" 
-                   (cdr-safe
-                    (member (directory-file-name (file-name-directory load-file-name))
-                            load-path))))
-
-  (message "Finished loading %s \n   and load others..." load-file-name)
-  (load-leim-list-except-this)
-
-  )
+;;; leim-list.el ends here.