("french-alt-postfix", "german-alt-postfix")

("spanish-alt-postfix", "turkish-latin-3-alt-postfix")
("turkish-alt-postfix"): Fix language assignment.
("dutch"): Assign to Dutch.  Use chars, not strings.
("lithuanian-numeric", "lithuanian-keyboard", "latvian-keyboard"):
New.

diff --git a/leim/quail/latin-alt.el b/leim/quail/latin-alt.el
index b57c8f0a9185135f7815964ceb8391d28ee7d818..361fd172ebbf4cf2693928cf463db83b75b82f74 100644 (file)
--- a/leim/quail/latin-alt.el
+++ b/leim/quail/latin-alt.el
@@ -1017,7 +1017,7 @@ OEE -> OE
  )
 
 (quail-define-package
- "french-alt-postfix" "Latin-1" "FR<" t
+ "french-alt-postfix" "French" "FR<" t
  "French (Fran\e,Ag\e(Bais) input method with postfix modifiers
 
 ` pour grave, ' pour aigu, ^ pour circonflexe, et \" pour tr\e,Ai\e(Bma.
@@ -1092,7 +1092,7 @@ Par exemple: e'' -> e'
  )
 
 (quail-define-package
- "german-alt-postfix" "Latin-1" "DE<" t
+ "german-alt-postfix" "German" "DE<" t
  "German (Deutsch) input method
 
 ae  -> \e,Ad\e(B
@@ -1330,7 +1330,7 @@ aee -> ae   o\"\" -> o\"   etc.
  )
 
 (quail-define-package
- "spanish-alt-postfix" "Latin-1" "ES<" t
+ "spanish-alt-postfix" "Spanish" "ES<" t
  "Spanish (Espa\e,Aq\e(Bol) input method with postfix modifiers
 
 A' -> \e,AA\e(B
@@ -1406,8 +1406,8 @@ Doubling the postfix separates the letter and postfix: e.g. aee -> ae
  )
 
 (quail-define-package
- "turkish-latin-3-alt-postfix" "Latin-3" "TR3<<" t
- "Turkish (T\e,C|\e(Brk\e,Cg\e(Be) input method with postfix modifiers.
+ "turkish-latin-3-alt-postfix" "Turkish" "TR3<<" t
+ "Turkish (T\e,A|\e(Brk\e,Ag\e(Be) input method with postfix modifiers.
 
 This is for those who use Latin-3 (ISO-8859-3) for Turkish.  If you
 use Latin-5 (ISO-8859-9), you should use \"turkish-alt-postfix\" instead.
@@ -1468,8 +1468,8 @@ Doubling the postfix separates the letter and postfix: e.g. a^^ -> a^
  )
 
 (quail-define-package
- "turkish-alt-postfix" "Latin-5" "TR\e,M+\e(B" t
- "Turkish (T\e,M|\e(Brk\e,Mg\e(Be) input method with postfix modifiers.
+ "turkish-alt-postfix" "Turkish" "TR\e,A+\e(B" t
+ "Turkish (T\e,A|\e(Brk\e,Ag\e(Be) input method with postfix modifiers.
 
 This is for those who use Latin-5 (ISO-8859-9) for Turkish.  If you
 use Latin-3 (ISO-8859-3), you should use
@@ -1533,7 +1533,7 @@ Doubling the postfix separates the letter and postfix: e.g. a^^ -> a^
 ;; Dutch Quail input method derived from the one in Yudit by Roman
 ;; Czyborra.
 (quail-define-package
- "dutch" "Latin" "NL" t
+ "dutch" "Dutch" "NL" t
  "Dutch character mixfix input method.
 Uses the `mule-unicode-0100-24ff' charset to supplement Latin-1.
 
@@ -1557,67 +1557,161 @@ Doubling the postfix separates the letter and postfix: e.g. a'' -> a'
 " nil t nil nil nil nil nil nil nil nil t)
 
 (quail-define-rules
- ("fl." "\e$,1!R\e(B") ;; LATIN SMALL LETTER F WITH HOOK (florin currency symbol)
- ("eur." "\e$,1tL\e(B") ;; EURO SIGN
+ ("fl." ?\e$,1!R\e(B) ;; LATIN SMALL LETTER F WITH HOOK (florin currency symbol)
+ ("eur." ?\e$,1tL\e(B) ;; EURO SIGN
  ;; \e$,1r|\e(BThe 25th letter of the Dutch alphabet.\e$,1r}\e(B
- ("ij" "\e$,1 S\e(B") ;; LATIN SMALL LIGATURE IJ   
- ("IJ" "\e$,1 R\e(B") ;; LATIN CAPITAL LIGATURE IJ   
+ ("ij" ?\e$,1 S\e(B) ;; LATIN SMALL LIGATURE IJ   
+ ("IJ" ?\e$,1 R\e(B) ;; LATIN CAPITAL LIGATURE IJ   
  ;; \e$,1r|\e(BTrema on the second letter of vowel pair.\e$,1r}\e(B  Yudit uses `:', not `"'.
- ("\"a" "\e,Ad\e(B") ;; LATIN SMALL LETTER A WITH DIAERESIS 
- ("\"e" "\e,Ak\e(B") ;; LATIN SMALL LETTER E WITH DIAERESIS 
- ("\"i" "\e,Ao\e(B") ;; LATIN SMALL LETTER I WITH DIAERESIS 
- ("\"o" "\e,Av\e(B") ;; LATIN SMALL LETTER O WITH DIAERESIS 
- ("\"u" "\e,A|\e(B") ;; LATIN SMALL LETTER U WITH DIAERESIS 
- ("\"A" "\e,AD\e(B") ;; LATIN CAPITAL LETTER A WITH DIAERESIS 
- ("\"E" "\e,AK\e(B") ;; LATIN CAPITAL LETTER E WITH DIAERESIS 
- ("\"I" "\e,AO\e(B") ;; LATIN CAPITAL LETTER I WITH DIAERESIS 
- ("\"O" "\e,AV\e(B") ;; LATIN CAPITAL LETTER O WITH DIAERESIS 
- ("\"U" "\e,A\\e(B") ;; LATIN CAPITAL LETTER U WITH DIAERESIS 
+ ("\"a" ?\e,Ad\e(B) ;; LATIN SMALL LETTER A WITH DIAERESIS 
+ ("\"e" ?\e,Ak\e(B) ;; LATIN SMALL LETTER E WITH DIAERESIS 
+ ("\"i" ?\e,Ao\e(B) ;; LATIN SMALL LETTER I WITH DIAERESIS 
+ ("\"o" ?\e,Av\e(B) ;; LATIN SMALL LETTER O WITH DIAERESIS 
+ ("\"u" ?\e,A|\e(B) ;; LATIN SMALL LETTER U WITH DIAERESIS 
+ ("\"A" ?\e,AD\e(B) ;; LATIN CAPITAL LETTER A WITH DIAERESIS 
+ ("\"E" ?\e,AK\e(B) ;; LATIN CAPITAL LETTER E WITH DIAERESIS 
+ ("\"I" ?\e,AO\e(B) ;; LATIN CAPITAL LETTER I WITH DIAERESIS 
+ ("\"O" ?\e,AV\e(B) ;; LATIN CAPITAL LETTER O WITH DIAERESIS 
+ ("\"U" ?\e,A\\e(B) ;; LATIN CAPITAL LETTER U WITH DIAERESIS 
  ;; \e$,1r|\e(BAcute, marking emphasis on long vowels\e$,1r}\e(B:
- ("a'" "\e,Aa\e(B") ;; LATIN SMALL LETTER A WITH ACUTE 
- ("e'" "\e,Ai\e(B") ;; LATIN SMALL LETTER E WITH ACUTE 
- ("i'" "\e,Am\e(B") ;; LATIN SMALL LETTER I WITH ACUTE 
- ("o'" "\e,As\e(B") ;; LATIN SMALL LETTER O WITH ACUTE 
- ("u'" "\e,Az\e(B") ;; LATIN SMALL LETTER U WITH ACUTE 
- ("A'" "\e,AA\e(B") ;; LATIN CAPITAL LETTER A WITH ACUTE 
- ("E'" "\e,AI\e(B") ;; LATIN CAPITAL LETTER E WITH ACUTE 
- ("I'" "\e,AM\e(B") ;; LATIN CAPITAL LETTER I WITH ACUTE 
- ("O'" "\e,AS\e(B") ;; LATIN CAPITAL LETTER O WITH ACUTE 
- ("U'" "\e,AZ\e(B") ;; LATIN CAPITAL LETTER U WITH ACUTE 
+ ("a'" ?\e,Aa\e(B) ;; LATIN SMALL LETTER A WITH ACUTE 
+ ("e'" ?\e,Ai\e(B) ;; LATIN SMALL LETTER E WITH ACUTE 
+ ("i'" ?\e,Am\e(B) ;; LATIN SMALL LETTER I WITH ACUTE 
+ ("o'" ?\e,As\e(B) ;; LATIN SMALL LETTER O WITH ACUTE 
+ ("u'" ?\e,Az\e(B) ;; LATIN SMALL LETTER U WITH ACUTE 
+ ("A'" ?\e,AA\e(B) ;; LATIN CAPITAL LETTER A WITH ACUTE 
+ ("E'" ?\e,AI\e(B) ;; LATIN CAPITAL LETTER E WITH ACUTE 
+ ("I'" ?\e,AM\e(B) ;; LATIN CAPITAL LETTER I WITH ACUTE 
+ ("O'" ?\e,AS\e(B) ;; LATIN CAPITAL LETTER O WITH ACUTE 
+ ("U'" ?\e,AZ\e(B) ;; LATIN CAPITAL LETTER U WITH ACUTE 
  ;; \e$,1r|\e(BGrave, marking emphasis on short vowels\e$,1r}\e(B:
- ("a`" "\e,A`\e(B") ;; LATIN SMALL LETTER A WITH GRAVE
- ("e`" "\e,Ah\e(B") ;; LATIN SMALL LETTER E WITH GRAVE 
- ("i`" "\e,Al\e(B") ;; LATIN SMALL LETTER I WITH GRAVE 
- ("o`" "\e,Ar\e(B") ;; LATIN SMALL LETTER O WITH GRAVE 
- ("u`" "\e,Ay\e(B") ;; LATIN SMALL LETTER U WITH GRAVE 
- ("A`" "\e,A@\e(B") ;; LATIN CAPITAL LETTER A WITH GRAVE 
- ("E`" "\e,AH\e(B") ;; LATIN CAPITAL LETTER E WITH GRAVE 
- ("I`" "\e,AL\e(B") ;; LATIN CAPITAL LETTER I WITH GRAVE 
- ("O`" "\e,AR\e(B") ;; LATIN CAPITAL LETTER O WITH GRAVE 
- ("U`" "\e,AY\e(B") ;; LATIN CAPITAL LETTER U WITH GRAVE
+ ("a`" ?\e,A`\e(B) ;; LATIN SMALL LETTER A WITH GRAVE
+ ("e`" ?\e,Ah\e(B) ;; LATIN SMALL LETTER E WITH GRAVE 
+ ("i`" ?\e,Al\e(B) ;; LATIN SMALL LETTER I WITH GRAVE 
+ ("o`" ?\e,Ar\e(B) ;; LATIN SMALL LETTER O WITH GRAVE 
+ ("u`" ?\e,Ay\e(B) ;; LATIN SMALL LETTER U WITH GRAVE 
+ ("A`" ?\e,A@\e(B) ;; LATIN CAPITAL LETTER A WITH GRAVE 
+ ("E`" ?\e,AH\e(B) ;; LATIN CAPITAL LETTER E WITH GRAVE 
+ ("I`" ?\e,AL\e(B) ;; LATIN CAPITAL LETTER I WITH GRAVE 
+ ("O`" ?\e,AR\e(B) ;; LATIN CAPITAL LETTER O WITH GRAVE 
+ ("U`" ?\e,AY\e(B) ;; LATIN CAPITAL LETTER U WITH GRAVE
  ;; \e$,1r|\e(BCater for the use of many French words and use of the circumflex
  ;; in Frisian.\e$,1r}\e(B  Yudit used `;' for cedilla.
- ("c," "\e,Ag\e(B") ;; LATIN SMALL LETTER C WITH CEDILLA 
- ("C," "\e,AG\e(B") ;; LATIN CAPITAL LETTER C WITH CEDILLA 
- ("a^" "\e,Ab\e(B") ;; LATIN SMALL LETTER A WITH CIRCUMFLEX 
- ("e^" "\e,Aj\e(B") ;; LATIN SMALL LETTER E WITH CIRCUMFLEX 
- ("i^" "\e,An\e(B") ;; LATIN SMALL LETTER I WITH CIRCUMFLEX 
- ("o^" "\e,At\e(B") ;; LATIN SMALL LETTER O WITH CIRCUMFLEX 
- ("u^" "\e,A{\e(B") ;; LATIN SMALL LETTER U WITH CIRCUMFLEX 
- ("A^" "\e,AB\e(B") ;; LATIN CAPITAL LETTER A WITH CIRCUMFLEX 
- ("E^" "\e,AJ\e(B") ;; LATIN CAPITAL LETTER E WITH CIRCUMFLEX 
- ("I^" "\e,AN\e(B") ;; LATIN CAPITAL LETTER I WITH CIRCUMFLEX 
- ("O^" "\e,AT\e(B") ;; LATIN CAPITAL LETTER O WITH CIRCUMFLEX 
- ("U^" "\e,A[\e(B") ;; LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+ ("c," ?\e,Ag\e(B) ;; LATIN SMALL LETTER C WITH CEDILLA 
+ ("C," ?\e,AG\e(B) ;; LATIN CAPITAL LETTER C WITH CEDILLA 
+ ("a^" ?\e,Ab\e(B) ;; LATIN SMALL LETTER A WITH CIRCUMFLEX 
+ ("e^" ?\e,Aj\e(B) ;; LATIN SMALL LETTER E WITH CIRCUMFLEX 
+ ("i^" ?\e,An\e(B) ;; LATIN SMALL LETTER I WITH CIRCUMFLEX 
+ ("o^" ?\e,At\e(B) ;; LATIN SMALL LETTER O WITH CIRCUMFLEX 
+ ("u^" ?\e,A{\e(B) ;; LATIN SMALL LETTER U WITH CIRCUMFLEX 
+ ("A^" ?\e,AB\e(B) ;; LATIN CAPITAL LETTER A WITH CIRCUMFLEX 
+ ("E^" ?\e,AJ\e(B) ;; LATIN CAPITAL LETTER E WITH CIRCUMFLEX 
+ ("I^" ?\e,AN\e(B) ;; LATIN CAPITAL LETTER I WITH CIRCUMFLEX 
+ ("O^" ?\e,AT\e(B) ;; LATIN CAPITAL LETTER O WITH CIRCUMFLEX 
+ ("U^" ?\e,A[\e(B) ;; LATIN CAPITAL LETTER U WITH CIRCUMFLEX
  ;; \e$,1r|\e(BFollow the example of the Dutch POSIX locale, using ISO-8859-9 to
  ;; cater to the many Turks in Dutch society.\e$,1r}\e(B  Perhaps German methods
  ;; should do so too.  Follow turkish-alt-postfix here.
- ("i/" "\e$,1 Q\e(B") ;; LATIN SMALL LETTER I WITH NO DOT
- ("s," "\e$,1 \7f\e(B") ;; LATIN SMALL LETTER S WITH CEDILLA 
- ("g^" "\e$,1 ?\e(B") ;; LATIN SMALL LETTER G WITH BREVE 
- ("I/" "\e$,1 P\e(B") ;; LATIN CAPITAL LETTER I WITH DOT ABOVE
- ("S," "\e$,1 ~\e(B") ;; LATIN CAPITAL LETTER S WITH CEDILLA 
- ("G^" "\e$,1 >\e(B") ;; LATIN CAPITAL LETTER G WITH BREVE 
+ ("i/" ?\e$,1 Q\e(B) ;; LATIN SMALL LETTER I WITH NO DOT
+ ("s," ?\e$,1 \7f\e(B) ;; LATIN SMALL LETTER S WITH CEDILLA 
+ ("g^" ?\e$,1 ?\e(B) ;; LATIN SMALL LETTER G WITH BREVE 
+ ("I/" ?\e$,1 P\e(B) ;; LATIN CAPITAL LETTER I WITH DOT ABOVE
+ ("S," ?\e$,1 ~\e(B) ;; LATIN CAPITAL LETTER S WITH CEDILLA 
+ ("G^" ?\e$,1 >\e(B) ;; LATIN CAPITAL LETTER G WITH BREVE 
  )
 
+;; Originally from Yudit, discussed with Albertas Agejevas
+;; <alga@uosis.mif.vu.lt>
+(quail-define-package
+ "lithuanian-numeric" "Lithuanian" "LtN" t
+ "Lithuanian numeric input method.
+" nil t t t t nil nil nil nil nil t)
+
+(quail-define-rules
+ (?1 ?\e$,1 %\e(B)
+ (?2 ?\e$,1 -\e(B)
+ (?3 ?\e$,1 9\e(B)
+ (?4 ?\e$,1 7\e(B)
+ (?5 ?\e$,1 O\e(B)
+ (?6 ?\e$,1!!\e(B)
+ (?7 ?\e$,1!3\e(B)
+ (?8 ?\e$,1!+\e(B)
+ (?9 ?\e$,1r~\e(B)
+ (?0 ?\e$,1r|\e(B)
+ (?= ?\e$,1!>\e(B)
+ (?! ?\e$,1 $\e(B)
+ (?@ ?\e$,1 ,\e(B)
+ (?# ?\e$,1 8\e(B)
+ (?$ ?\e$,1 6\e(B)
+ (?% ?\e$,1 N\e(B)
+ (?^ ?\e$,1! \e(B)
+ (?& ?\e$,1!2\e(B)
+ (?* ?\e$,1!*\e(B)
+ (?+ ?\e$,1!=\e(B))
+
+
+;; From XFree 4.1 /usr/X11R6/lib/X11/xkb/symbols/lt, suggested by
+;; Albertas Agejevas <alga@uosis.mif.vu.lt>
+(quail-define-package
+ "lithuanian-keyboard" "Lithuanian" "Lt" t
+ "Lithuanian standard keyboard input method.
+" nil t t t t nil nil nil nil nil t)
+
+(quail-define-rules
+ (?1 ?\e$,1 %\e(B)
+ (?! ?\e$,1 $\e(B)
+ (?2 ?\e$,1 -\e(B)
+ (?@ ?\e$,1 ,\e(B)
+ (?# ?\e$,1 8\e(B)
+ (?4 ?\e$,1 7\e(B)
+ (?$ ?\e$,1 6\e(B)
+ (?5 ?\e$,1 O\e(B)
+ (?% ?\e$,1 N\e(B)
+ (?6 ?\e$,1!!\e(B)
+ (?^ ?\e$,1! \e(B)
+ (?7 ?\e$,1!3\e(B)
+ (?& ?\e$,1!2\e(B)
+ (?9 ?\e$,1r~\e(B)
+ (?0 ?\e$,1r|\e(B)
+ (?= ?\e$,1!>\e(B)
+ (?+ ?\e$,1!=\e(B))
+
+;; From XFree 4.1 /usr/X11R6/lib/X11/xkb/symbols/lv
+(quail-define-package
+ "latvian-keyboard" "Latvian" "Lv" t
+ "Latvian standard keyboard input method.
+" nil t t t t nil nil nil nil nil t)
+
+(quail-define-rules
+ (?4 ?\e$,1tL\e(B)
+ (?$ ?\e,A"\e(B)
+ (?e ?\e$,1 3\e(B)
+ (?E ?\e$,1 2\e(B)
+ (?r ?\e$,1 w\e(B)
+ (?R ?\e$,1 v\e(B)
+ (?u ?\e$,1!+\e(B)
+ (?U ?\e$,1!*\e(B)
+ (?i ?\e$,1 K\e(B)
+ (?I ?\e$,1 J\e(B)
+ (?o ?\e$,1 m\e(B)
+ (?O ?\e$,1 l\e(B)
+ (?a ?\e$,1 !\e(B)
+ (?A ?\e$,1  \e(B)
+ (?s ?\e$,1!!\e(B)
+ (?S ?\e$,1! \e(B)
+ (?g ?\e$,1 C\e(B)
+ (?G ?\e$,1 B\e(B)
+ (?k ?\e$,1 W\e(B)
+ (?K ?\e$,1 V\e(B)
+ (?l ?\e$,1 \\e(B)
+ (?L ?\e$,1 [\e(B)
+ (?\' ?\e$,1r|\e(B)
+ (?\" ?\e$,1r~\e(B)
+ (?z ?\e$,1!>\e(B)
+ (?Z ?\e$,1!=\e(B)
+ (?c ?\e$,1 -\e(B)
+ (?C ?\e$,1 ,\e(B)
+ (?n ?\e$,1 f\e(B)
+ (?N ?\e$,1 e\e(B))
+
 ;;; latin-alt.el ends here