("spanish-postfix"): Add rule U" and u".

[bpt/emacs.git] / leim / quail / ethiopic.el

diff --git a/leim/quail/ethiopic.el b/leim/quail/ethiopic.el
index 7eb65c8..037a181 100644 (file)
--- a/leim/quail/ethiopic.el
+++ b/leim/quail/ethiopic.el
@@ -1,6 +1,6 @@
 ;; quail/ethiopic.el --- Quail package for inputting Ethiopic characters
 
-;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
+;; Copyright (C) 1997, 1998 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
 
 ;; Keywords: multilingual, input method, ethiopic
@@ -35,7 +35,7 @@
 
 (quail-define-package
  "ethiopic" "Ethiopic"
- '("\e$(3$O#U!.\e(B "
+ '("\e$(3$Q#U!.\e(B "
    (ethio-prefer-ascii-space "_" "\e$(3$h\e(B")
    (ethio-prefer-ascii-punctuation "." "\e$(3$i\e(B"))
  t "  QUAIL PACKAGE FOR ETHIOPIC (TIGRIGNA AND AMHARIC)
@@ -785,20 +785,20 @@ C-' or `M-x ethio-gemination'
  ("GWE" ?\e$(3%S\e(B)
  ("GW'" ?\e$(3%c\e(B)
 
- ("te" ?\e$(3$'\e(B)
- ("tu" ?\e$(3$(\e(B)
- ("ti" ?\e$(3$)\e(B)
- ("ta" ?\e$(3$*\e(B)
- ("tE" ?\e$(3$+\e(B)
- ("t" ?\e$(3$,\e(B)
- ("to" ?\e$(3$-\e(B)
- ("tW" ?\e$(3$.\e(B)
- ("tWa" ?\e$(3$.\e(B)
- ("tWe" ["\e$(3$,%n\e(B"])
- ("tWu" ["\e$(3$,%r\e(B"])
- ("tWi" ["\e$(3$,%o\e(B"])
- ("tWE" ["\e$(3$,%q\e(B"])
- ("tW'" ["\e$(3$,%r\e(B"])
+ ("Te" ?\e$(3$'\e(B)
+ ("Tu" ?\e$(3$(\e(B)
+ ("Ti" ?\e$(3$)\e(B)
+ ("Ta" ?\e$(3$*\e(B)
+ ("TE" ?\e$(3$+\e(B)
+ ("T" ?\e$(3$,\e(B)
+ ("To" ?\e$(3$-\e(B)
+ ("TW" ?\e$(3$.\e(B)
+ ("TWa" ?\e$(3$.\e(B)
+ ("TWe" ["\e$(3$,%n\e(B"])
+ ("TWu" ["\e$(3$,%r\e(B"])
+ ("TWi" ["\e$(3$,%o\e(B"])
+ ("TWE" ["\e$(3$,%q\e(B"])
+ ("TW'" ["\e$(3$,%r\e(B"])
 
  ("Ce" ?\e$(3$/\e(B)
  ("Cu" ?\e$(3$0\e(B)
@@ -1026,16 +1026,11 @@ C-' or `M-x ethio-gemination'
  ("`1000000" ["\e$(3%$%%\e(B"])
 )
 
-(add-hook 'quail-mode-hook
-         (lambda nil
-           (if (not (string= (quail-name) "ethiopic"))
-               nil
-             ;; Also turn on the Ethio minor mode.
-             (ethio-mode 1)
-             ;; The translation of `a' depends on the language
-             ;; (either Tigrigna or Amharic). 
-             (quail-defrule "a"
-                            (if (ethio-prefer-amharic-p) ?\e$(3"c\e(B ?\e$(3"f\e(B)
-                            "ethiopic"))))
+(defun ethio-select-a-translation ()
+  ;; The translation of `a' depends on the language
+  ;; (either Tigrigna or Amharic). 
+  (quail-defrule "a"
+                (if (ethio-prefer-amharic-p) ?\e$(3"c\e(B ?\e$(3"f\e(B)
+                "ethiopic"))
 
 ;;; quail/ethiopic.el ends here