Reinstate some commented-out redundancies.

("russian-typewriter"): Renamed from cyrillic-typewriter.  Make
cyrillic-jcuken effectively an alias for it.
("russian-computer"): New.
("bulgarian-phonetic"): Renamed from bulgarian-pho.
("bulgarian-bds"): Renamed from bulgarian-standard.

diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index 982301e505fb00113b3ebef992256ced63fbc74e..a37412a3de9061d048ac057a1b8b9c4d779f3c29 100644 (file)
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -41,7 +41,7 @@
 ;; in X Windows and console layouts for GNU/Linux.  [See
 ;; `russian-computer' below.]
 (quail-define-package
- "cyrillic-typewriter" "Russian" "\e,L69\e(B" nil
+ "russian-typewriter" "Russian" "\e,L69\e(B" nil
  "\e,L9FC:5=\e(B Russian typewriter layout."
  nil t t t t nil nil nil nil nil t)
 
@@ -145,6 +145,119 @@
  ("M" ?\e,LL\e(B)
  ("<" ?\e,L1\e(B)
  (">" ?\e,LN\e(B)
+ ("?" ??)
+ )
+
+;; Maintain the obsolete name for now.
+(push (cons "cyrillic-jcuken"
+           (cdr (assoc "russian-typewriter" input-method-alist)))
+      input-method-alist)
+
+;; See comment above.  This is the variant `winkeys' from `ru' in XKB.
+(quail-define-package
+ "russian-computer" "Russian" "RU" nil
+ "\e,L9FC:5=\e(B Russian computer layout"
+ nil t t t t nil nil nil nil nil t)
+
+;;  1! 2" 3\e,Lp\e(B 4; 5% 6: 7? 8* 9( 0) -_ =+ \e,Lq!\e(B
+;;   \e,L9\e(B  \e,LF\e(B  \e,LC\e(B  \e,L:\e(B  \e,L5\e(B  \e,L=\e(B  \e,L3\e(B  \e,LH\e(B  \e,LI\e(B  \e,L7\e(B  \e,LE\e(B  \e,Lj\e(B
+;;    \e,LD\e(B  \e,LK\e(B  \e,L2\e(B  \e,L0\e(B  \e,L?\e(B  \e,L@\e(B  \e,L>\e(B  \e,L;\e(B  \e,L4\e(B \e,L6\e(B  \e,LM\e(B
+;;     \e,LO\e(B  \e,LG\e(B  \e,LA\e(B  \e,L<\e(B  \e,L8\e(B  \e,LB\e(B  \e,LL\e(B  \e,L1\e(B  \e,LN\e(B  .,
+
+(quail-define-rules
+ ("1" ?1)
+ ("2" ?2)
+ ("3" ?3)
+ ("4" ?4)
+ ("5" ?5)
+ ("6" ?6)
+ ("7" ?7)
+ ("8" ?8)
+ ("9" ?9)
+ ("0" ?0)
+ ("-" ?-)
+ ("=" ?=)
+ ("`" ?\e,Lq\e(B)
+ ("q" ?\e,LY\e(B)
+ ("w" ?\e,Lf\e(B)
+ ("e" ?\e,Lc\e(B)
+ ("r" ?\e,LZ\e(B)
+ ("t" ?\e,LU\e(B)
+ ("y" ?\e,L]\e(B)
+ ("u" ?\e,LS\e(B)
+ ("i" ?\e,Lh\e(B)
+ ("o" ?\e,Li\e(B)
+ ("p" ?\e,LW\e(B)
+ ("[" ?\e,Le\e(B)
+ ("]" ?\e,Lj\e(B)
+ ("a" ?\e,Ld\e(B)
+ ("s" ?\e,Lk\e(B)
+ ("d" ?\e,LR\e(B)
+ ("f" ?\e,LP\e(B)
+ ("g" ?\e,L_\e(B)
+ ("h" ?\e,L`\e(B)
+ ("j" ?\e,L^\e(B)
+ ("k" ?\e,L[\e(B)
+ ("l" ?\e,LT\e(B)
+ (";" ?\e,LV\e(B)
+ ("'" ?\e,Lm\e(B)
+ ("\\" ?\\)
+ ("z" ?\e,Lo\e(B)
+ ("x" ?\e,Lg\e(B)
+ ("c" ?\e,La\e(B)
+ ("v" ?\e,L\\e(B)
+ ("b" ?\e,LX\e(B)
+ ("n" ?\e,Lb\e(B)
+ ("m" ?\e,Ll\e(B)
+ ("," ?\e,LQ\e(B)
+ ("." ?\e,Ln\e(B)
+ ("/" ?.)
+ ("!" ?!)
+ ("@" ?\")
+ ("#" ?\e,Lp\e(B)
+ ("$" ?\;)
+ ("%" ?%)
+ ("^" ?:)
+ ("&" ??)
+ ("*" ?*)
+ ("(" ?()
+ (")" ?))
+ ("_" ?_)
+ ("+" ?+)
+ ("~" ?\e,L!\e(B)
+ ("Q" ?\e,L9\e(B)
+ ("W" ?\e,LF\e(B)
+ ("E" ?\e,LC\e(B)
+ ("R" ?\e,L:\e(B)
+ ("T" ?\e,L5\e(B)
+ ("Y" ?\e,L=\e(B)
+ ("U" ?\e,L3\e(B)
+ ("I" ?\e,LH\e(B)
+ ("O" ?\e,LI\e(B)
+ ("P" ?\e,L7\e(B)
+ ("{" ?\e,LE\e(B)
+ ("}" ?\e,LJ\e(B)
+ ("A" ?\e,LD\e(B)
+ ("S" ?\e,LK\e(B)
+ ("D" ?\e,L2\e(B)
+ ("F" ?\e,L0\e(B)
+ ("G" ?\e,L?\e(B)
+ ("H" ?\e,L@\e(B)
+ ("J" ?\e,L>\e(B)
+ ("K" ?\e,L;\e(B)
+ ("L" ?\e,L4\e(B)
+ (":" ?\e,L6\e(B)
+ ("\"" ?\e,LM\e(B)
+ ("|" ?|)
+ ("Z" ?\e,LO\e(B)
+ ("X" ?\e,LG\e(B)
+ ("C" ?\e,LA\e(B)
+ ("V" ?\e,L<\e(B)
+ ("B" ?\e,L8\e(B)
+ ("N" ?\e,LB\e(B)
+ ("M" ?\e,LL\e(B)
+ ("<" ?\e,L1\e(B)
+ (">" ?\e,LN\e(B)
  ("?" ?,))
 
 ;; Mikhailian couldn't check the next two.  
@@ -641,7 +754,7 @@
  ("l" ?\e,LT\e(B)
  (";" ?\e,LV\e(B)
  ("'" ?\e,Lt\e(B)
-;;  ("\\" ?\\)
+ ("\\" ?\\)
  ("z" ?\e,Lo\e(B)
  ("x" ?\e,Lg\e(B)
  ("c" ?\e,La\e(B)
@@ -652,18 +765,18 @@
  ("," ?\e,LQ\e(B)
  ("." ?\e,Ln\e(B)
  ("/" ?.)
-;;  ("!" ?!)
+ ("!" ?!)
  ("@" ?\")
  ("#" ?\e,Lp\e(B)
  ("$" ?\;)
-;;  ("%" ?%)
+ ("%" ?%)
  ("^" ?:)
  ("&" ??)
-;;  ("*" ?*)
-;;  ("(" ?()
-;;  (")" ?))
-;;  ("_" ?_)
-;;  ("+" ?+)
+ ("*" ?*)
+ ("(" ?()
+ (")" ?))
+ ("_" ?_)
+ ("+" ?+)
  ("~" ?')
  ("Q" ?\e,L9\e(B)
  ("W" ?\e,LF\e(B)
@@ -864,6 +977,10 @@ as follows.
 ;; method is not so obvious as translit input method but each letter
 ;; is one keypress and a *lot* of people know it).
 
+;; Anton Zinoviev <anton@lml.bas.bg> wrote:
+;; I would say that the main idea for cyrillic-translit is to be
+;; language-independent and universal.  It should be able to generate all
+;; Cyrillic symbols.
 (quail-define-package
  "cyrillic-translit" "Cyrillic" "\e,L6\e(Bt" nil
  "Intuitively transliterated keyboard layout.
@@ -931,7 +1048,7 @@ cyrillic \e,Lv\e(B (I DECIMAL) = \"/i\", \e,Lx\e(B (JE) = \"/j\",
 )
 
 ;; Originally from Yudit's `Belarusian input table according to
-;; STB955-94 belarusian standard' by Alexander Mikhailian
+;; STB955-94 belarusian standard' (not all) by Alexander Mikhailian
 ;; <mikhailian@altern.org>, subsequently amended by AM.
 (quail-define-package
  "belarusian" "Belarusian" "BE" nil
@@ -987,18 +1104,6 @@ cyrillic \e,Lv\e(B (I DECIMAL) = \"/i\", \e,Lx\e(B (JE) = \"/j\",
  ("?" ?,)
 
  ("`" ?\e,Lq\e(B)
- ("1" ?1)
- ("2" ?2)
- ("3" ?3)
- ("4" ?4)
- ("5" ?5)
- ("6" ?6)
- ("7" ?7)
- ("8" ?8)
- ("9" ?9)
- ("0" ?0)
- ("-" ?-)
- ("=" ?=)
  ("q" ?\e,LY\e(B)
  ("w" ?\e,Lf\e(B)
  ("e" ?\e,Lc\e(B)
@@ -1022,7 +1127,6 @@ cyrillic \e,Lv\e(B (I DECIMAL) = \"/i\", \e,Lx\e(B (JE) = \"/j\",
  ("l" ?\e,LT\e(B)
  (";" ?\e,LV\e(B)
  ("'" ?\e,Lm\e(B)
- ("\\" ?\\)
  ("z" ?\e,Lo\e(B)
  ("x" ?\e,Lg\e(B)
  ("c" ?\e,La\e(B)
@@ -1039,9 +1143,10 @@ cyrillic \e,Lv\e(B (I DECIMAL) = \"/i\", \e,Lx\e(B (JE) = \"/j\",
 
 ;; Extra commentary and the indicator from an independent
 ;; (cyrillic-iso8859-5) implementation by Ognyan Kulev
-;; <ogi@fmi.uni-sofia.bg>.
+;; <ogi@fmi.uni-sofia.bg> and name changes from Anton Zinoviev
+;; <anton@lml.bas.bg>.
 (quail-define-package
- "bulgarian-pho" "Bulgarian" "\e,L61D\e(B"
+ "bulgarian-phonetic" "Bulgarian" "\e$,1(6(1(D\e(B"
  nil
  "Bulgarian Phonetic keyboard layout.
 
@@ -1124,7 +1229,7 @@ Use /& for \e,A'\e(B (Cyrillic paragraph) and /# for \e,Lp\e(B."
 ;; This follows XKB bg.
 
 (quail-define-package
- "bulgarian-standard" "Bulgarian" "\e,L14A\e(B" nil
+ "bulgarian-bds" "Bulgarian" "\e$,1(1(4(A\e(B" nil
  "Bulgarian standard keyboard layout (BDS)
 
 This keyboard layout is standard for Bulgarian typewriters."