--- a/lisp/leim/quail/cyrillic.el	Mon Aug 13 09:59:07 2007 +0200
+++ b/lisp/leim/quail/cyrillic.el	Mon Aug 13 10:00:02 2007 +0200
@@ -1,7 +1,7 @@
 ;;; quail/cyrillic.el -- Quail package for inputting Cyrillic characters
 
-;; Copyright (C) 1995 Free Software Foundation, Inc.
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
+;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
+;; Licensed to the Free Software Foundation.
 
 ;; Keywords: multilingual, input method, Cyrillic
 
@@ -18,22 +18,22 @@
 ;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; 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.
 
 ;;; Code:
 
 (require 'quail)
 
-(quail-define-package "quail-jcuken" "Cyrillic" ",L9FC:5=(B" nil
-		      "Cyrillic (ISO 8859-5) encoding.
-
-They say this layout is widely used in Russia."
-		      nil t t t t)
+(quail-define-package
+ "cyrillic-jcuken" "Cyrillic" ",L69(B" nil
+ ",L9FC:5=(B keyboard layout widely used in Russia (ISO 8859-5 encoding)"
+ nil t t t t nil nil nil nil nil t)
 
 ;;  1! 2@ 3# 4" 5: 6, 7. 8* 9( 0) -_ =+ ,L!(B
 ;;   ,L9(B  ,LF(B  ,LC(B  ,L:(B  ,L5(B  ,L=(B  ,L3(B  ,LH(B  ,LI(B  ,L7(B  ,LE(B  ,Lj(B
-;;    ,LD(B  ,LK(B  ,L2(B  ,L0(B  ,L?(B  ,L@(B  ,L>(B  ,L;(B  ,L4(B  ,L6(B  ,LM(B
+;;    ,LD(B  ,LK(B  ,L2(B  ,L0(B  ,L?(B  ,L@(B  ,L>(B  ,L;(B  ,L4(B ,L6(B  ,LM(B
 ;;     ,LO(B  ,LG(B  ,LA(B  ,L<(B  ,L8(B  ,LB(B  ,LL(B  ,L1(B  ,LN(B  /?
 
 (quail-define-rules
@@ -135,121 +135,10 @@
 
 ;;
 
-(quail-define-package "quail-jis-russian" "Cyrillic" "$B'+'8'5','&'/(B" nil
-		      "JIS X0208.1983 encoding.
-
-The layout is same as jcuken, but uses JIS characters."
-		      nil t t t t)
-
-;;  1! 2@ 3# 4" 5: 6, 7. 8* 9( 0) -_ =+ ,L!(B
-;;   ,L9(B  ,LF(B  ,LC(B  ,L:(B  ,L5(B  ,L=(B  ,L3(B  ,LH(B  ,LI(B  ,L7(B  ,LE(B  ,Lj(B
-;;    ,LD(B  ,LK(B  ,L2(B  ,L0(B  ,L?(B  ,L@(B  ,L>(B  ,L;(B  ,L4(B  ,L6(B  ,LM(B
-;;     ,LO(B  ,LG(B  ,LA(B  ,L<(B  ,L8(B  ,LB(B  ,LL(B  ,L1(B  ,LN(B  /?
-
-(quail-define-rules
- ("1" ?$B#1(B)
- ("2" ?$B#2(B)
- ("3" ?$B#3(B)
- ("4" ?$B#4(B)
- ("5" ?$B#5(B)
- ("6" ?$B#6(B)
- ("7" ?$B#7(B)
- ("8" ?$B#8(B)
- ("9" ?$B#9(B)
- ("0" ?$B#0(B)
- ("-" ?$B!](B)
- ("=" ?$B!a(B)
- ("`" ?$B'W(B)
- ("q" ?$B'[(B)
- ("w" ?$B'h(B)
- ("e" ?$B'e(B)
- ("r" ?$B'\(B)
- ("t" ?$B'V(B)
- ("y" ?$B'_(B)
- ("u" ?$B'T(B)
- ("i" ?$B'j(B)
- ("o" ?$B'k(B)
- ("p" ?$B'Y(B)
- ("[" ?$B'g(B)
- ("]" ?$B'l(B)
- ("a" ?$B'f(B)
- ("s" ?$B'm(B)
- ("d" ?$B'S(B)
- ("f" ?$B'Q(B)
- ("g" ?$B'a(B)
- ("h" ?$B'b(B)
- ("j" ?$B'`(B)
- ("k" ?$B'](B)
- ("l" ?$B'U(B)
- (";" ?$B'X(B)
- ("'" ?$B'o(B)
- ("\\" ?$B!@(B)
- ("z" ?$B'q(B)
- ("x" ?$B'i(B)
- ("c" ?$B'c(B)
- ("v" ?$B'^(B)
- ("b" ?$B'Z(B)
- ("n" ?$B'd(B)
- ("m" ?$B'n(B)
- ("," ?$B'R(B)
- ("." ?$B'p(B)
- ("/" ?$B!?(B)
- 
- ("!" ?$B!*(B)
- ("@" ?$B!w(B)
- ("#" ?$B!t(B)
- ("$" ?$B!I(B)
- ("%" ?$B!'(B)
- ("^" ?$B!$(B)
- ("&" ?$B!%(B)
- ("*" ?$B!v(B)
- ("(" ?$B!J(B)
-  (")" ?$B!K(B)
- ("_" ?$B!2(B)
- ("+" ?$B!\(B)
- ("~" ?$B''(B)
- ("Q" ?$B'+(B)
- ("W" ?$B'8(B)
- ("E" ?$B'5(B)
- ("R" ?$B',(B)
- ("T" ?$B'&(B)
- ("Y" ?$B'/(B)
- ("U" ?$B'$(B)
- ("I" ?$B':(B)
- ("O" ?$B';(B)
- ("P" ?$B')(B)
- ("{" ?$B'7(B)
- ("}" ?$B'<(B)
- ("A" ?$B'6(B)
- ("S" ?$B'=(B)
- ("D" ?$B'#(B)
- ("F" ?$B'!(B)
- ("G" ?$B'1(B)
- ("H" ?$B'2(B)
- ("J" ?$B'0(B)
- ("K" ?$B'-(B)
- ("L" ?$B'%(B)
- (":" ?$B'((B)
- ("\"" ?$B'?(B)
- ("|" ?$B!C(B)
- ("Z" ?$B'A(B)
- ("X" ?$B'9(B)
- ("C" ?$B'3(B)
- ("V" ?$B'.(B)
- ("B" ?$B'*(B)
- ("N" ?$B'4(B)
- ("M" ?$B'>(B)
- ("<" ?$B'"(B)
- (">" ?$B'@(B)
- ("?" ?$B!)(B))
-
-;;
-
-(quail-define-package "quail-macedonian" "Cyrillic" ",L)*5@B7(B-,L#,(B" nil
-		      "Cyrillic (ISO 8859-5) encoding.
-
-This layout is based on JUS.I.K1.004."
-		      nil t t t t)
+(quail-define-package
+ "cyrillic-macedonian" "Cyrillic" ",L6(BM" nil
+ ",L)*5@B7(B-,L#,(B keyboard layout based on JUS.I.K1.004 (ISO 8859-5 encoding)"
+ nil t t t t nil nil nil nil nil t)
 
 ;;  1! 2" 3# 4$ 5% 6& 7' 8( 9) 0= /? +* <>
 ;;   ,L)(B  ,L*(B  ,L5(B  ,L@(B  ,LB(B  ,L7(B  ,LC(B  ,L8(B  ,L>(B  ,L?(B  ,LH(B  ,L#(B
@@ -355,11 +244,10 @@
 
 ;;
 
-(quail-define-package "quail-serbian" "Cyrillic" ",L)*5@B7(B-,L"+(B" nil
-		      "Cyrillic (ISO 8859-5) encoding.
-
-This layout is based on JUS.I.K1.005."
-		      nil t t t t)
+(quail-define-package
+ "cyrillic-serbian" "Cyrillic" ",L6(BS" nil
+ ",L)*5@B7(B-,L"+(B keyboard layout based on JUS.I.K1.005 (ISO 8859-5 encoding)"
+ nil t t t t nil nil nil nil nil t)
 
 ;;  1! 2" 3# 4$ 5% 6& 7' 8( 9) 0= /? +* <>
 ;;   ,L)(B  ,L*(B  ,L5(B  ,L@(B  ,LB(B  ,L7(B  ,LC(B  ,L8(B  ,L>(B  ,L?(B  ,LH(B  ,L"(B
@@ -465,9 +353,10 @@
 
 ;;
 
-(quail-define-package "quail-beylorussian" "Cyrillic" ",L)*5@B7(B-,L&.(B" nil
-		      "Cyrillic (ISO 8859-5) encoding."
-		      nil t t t t)
+(quail-define-package
+ "cyrillic-beylorussian" "Cyrillic" ",L6(BB" nil
+ ",L)*5@B7(B-,L&.(B BEYLORUSSIAN (ISO 8859-5 encoding)"
+ nil t t t t nil nil nil nil nil t)
 
 ;;  1! 2" 3# 4$ 5% 6& 7' 8( 9) 0= /? +* <>
 ;;   ,L)(B  ,L*(B  ,L5(B  ,L@(B  ,LB(B  ,L7(B  ,LC(B  ,L8(B  ,L>(B  ,L?(B  ,LH(B  ,L&(B
@@ -573,11 +462,12 @@
 
 ;;
 
-(quail-define-package "quail-ukrainian" "Cyrillic" ",L$'5@B7(B-,L&.(B" nil
-		      "Cyrillic (ISO 8859-5) encoding.
+(quail-define-package 
+ "cyrillic-ukrainian" "Cyrillic" ",L6(BU" nil
+ ",L$'5@B7(B-,L&.(B UKRAINIAN (ISO 8859-5 encoding)
 
 Sorry, but 'ghe with upturn' is not included in ISO 8859-5"
-		      nil t t t t)
+ nil t t t t nil nil nil nil nil t)
 
 ;;  1! 2" 3# 4$ 5% 6& 7' 8( 9) 0= /? +* <>
 ;;   ,L$(B  ,L'(B  ,L5(B  ,L@(B  ,LB(B  ,L7(B  ,LC(B  ,L8(B  ,L>(B  ,L?(B  ,LH(B  ,L&(B
@@ -683,8 +573,9 @@
 
 ;;
 
-(quail-define-package "quail-yawerty" "Cyrillic" ",LO25@BK(B" nil
-		      "Cyrillic (ISO 8859-5) encoding.
+(quail-define-package 
+ "cyrillic-yawerty" "Cyrillic" ",L6O(B" nil
+ ",LO25@BK(B Roman transcription (ISO 8859-5 encoding)
 
 This layout is based on Roman transcription.
 When preceded by a '/', the second and the third rows (number key row) change
@@ -693,7 +584,7 @@
   keytop | Q  W  E  R  T  Y  U  I  O  P  A  S  D
  --------+---------------------------------------
   input  | ,L"(B  ,L#(B  ,L$(B  ,L%(B  ,L&(B  ,L'(B  ,L((B  ,L)(B  ,L*(B  ,L+(B  ,L,(B  ,L.(B  ,L/(B"
-		      nil t t t t)
+ nil t t t t nil nil nil nil nil t)
 
 ;;  1! 2,Lq(B 3,Lj(B 4,L!(B 5% 6^ 7& 8* 9( 0) -_ ,LG(B  ,LN(B
 ;;   ,LO(B  ,L2(B  ,L5(B  ,L@(B  ,LB(B  ,LK(B  ,LC(B  ,L8(B  ,L>(B  ,L?(B  ,LH(B  ,LI(B
@@ -829,3 +720,128 @@
  ("/A" ?,L,(B)
  ("/S" ?,L.(B)
  ("/D" ?,L/(B))
+
+;; This was provided by Valery Alexeev <valery@domovoy.math.uga.edu>.
+
+(quail-define-package
+ "cyrillic-translit" "Cyrillic" ",L6(Bt" nil
+ "Intuitively transliterated keyboard layout.
+Most convenient for entering Russian but all cyrillic characters are included.
+Should handle most cases. However:
+  for ,Lf(B (TSE) use \"c\", never \"ts\"
+  ,Li(B (SHCHA = Bulgarian SHT) = \"shch\", \"sj\", \"/sht\" or \"/t\",
+  ,Lm(B (REVERSE ROUNDED E) = \"e'\" or \"e`\"
+  ,Le(B (KHA) when after ,La(B (S) = \"x\" or \"kh\"
+  ,Lj(B (HARD SIGN) = \"~\", ,LJ(B (CAPITAL HARD SIGN) = \"~~\",
+  ,Ll(B (SOFT SIGN) = \"'\", ,LL(B (CAPITAL SOFT SIGN) = \"''\",
+  ,Lo(B (YA) = \"ya\", \"ja\" or \"q\".
+
+Russian alphabet: a b v=w g d e yo=jo zh z i j=j' k l m n o p r s t
+u f h=kh=x c ch sh shch=sj=/s=/sht ~ y ' e' yu=ju ya=ja=q
+
+Also included are Ukrainian ,Lt(B (YE) = \"/e\" and ,Lw(B (YI) = \"yi\", 
+Belorussian ,L~(B (SHORT U) = \"u'\",
+Serbo-Croatian ,Lr(B (DJE) = \"/d\", ,L{(B (CHJE)= \"/ch\", 
+Macedonian ,Ls(B (GJE) = \"/g\", ,Lu(B (DZE) = \"/s\", ,L|(B (KJE) = \"/k\",
+cyrillic ,Lv(B (I DECIMAL) = \"/i\", ,Lx(B (JE) = \"/j\", 
+,Ly(B (LJE) = \"/l\", ,Lz(B (NJE) = \"/n\" and ,L(B (DZE) =\"/z\"."
+ nil t t t t nil nil nil nil nil t)
+
+(quail-define-rules
+ ("a" ?,LP(B)("b" ?,LQ(B) ("v" ?,LR(B) ("w" ?,LR(B) ("g" ?,LS(B) ("d" ?,LT(B) 
+ ("e" ?,LU(B) ("je" ?,LU(B) 
+ ("yo" ?,Lq(B) ("jo" ?,Lq(B)
+ ("zh" ?,LV(B) ("z" ?,LW(B) ("i" ?,LX(B) 
+ ("j" ?,LY(B) ("j'" ?,LY(B) ("j`" ?,LY(B) ("k" ?,LZ(B) ("l" ?,L[(B)
+ ("m" ?,L\(B) ("n" ?,L](B) ("o" ?,L^(B) ("p" ?,L_(B) ("r" ?,L`(B) ("s" ?,La(B) ("t" ?,Lb(B) ("u" ?,Lc(B)
+ ("f" ?,Ld(B) ("x" ?,Le(B) ("h" ?,Le(B) ("kh" ?,Le(B)
+ ("c" ?,Lf(B) ("ch" ?,Lg(B)
+ ("sh" ?,Lh(B) 
+ ("shch" ?,Li(B) ("sj" ?,Li(B) 
+ ("/sht" ?,Li(B) ("/t" ?,Li(B) 
+ ("~" ?,Lj(B) ("y" ?,Lk(B) ("'" ?,Ll(B) ("`" ?,Ll(B) 
+ ("e'" ?,Lm(B) ("e`" ?,Lm(B) ("@" ?,Lm(B) 
+ ("yu" ?,Ln(B) ("ju" ?,Ln(B) 
+ ("ya" ?,Lo(B) ("ja" ?,Lo(B) ("q" ?,Lo(B)
+
+ ("A" ?,L0(B) ("B" ?,L1(B) ("V" ?,L2(B) ("W" ?,L2(B) ("G" ?,L3(B) ("D" ?,L4(B) 
+ ("E" ?,L5(B) ("Je" ?,L5(B) ("JE" ?,L5(B)
+ ("Yo" ?,L!(B) ("YO" ?,L!(B) ("Jo" ?,L!(B) ("JO" ?,L!(B) 
+ ("Zh" ?,L6(B) ("ZH" ?,L6(B) ("Z" ?,L7(B) ("I" ?,L8(B) 
+ ("J" ?,L9(B) ("J'" ?,L9(B) ("J`" ?,L9(B) ("K" ?,L:(B) ("L" ?,L;(B)
+ ("M" ?,L<(B) ("N" ?,L=(B) ("O" ?,L>(B) ("P" ?,L?(B) ("R" ?,L@(B) ("S" ?,LA(B) ("T" ?,LB(B) ("U" ?,LC(B)
+ ("F" ?,LD(B) ("X" ?,LE(B) ("H" ?,LE(B) ("Kh" ?,LE(B) ("KH" ?,LE(B)
+ ("C" ?,LF(B) ("Ch" ?,LG(B) ("CH" ?,LG(B) 
+ ("Sh" ?,LH(B) ("SH" ?,LH(B) 
+ ("Shch" ?,LI(B) ("SHCH" ?,LI(B) ("Sj" ?,LI(B) ("SJ" ?,LI(B) 
+ ("/Sht" ?,LI(B) ("/SHT" ?,LI(B) ("/T" ?,LI(B) 
+ ("~~" ",LJ(B") ("Y" ?,LK(B) ("''" ",LL(B") ("E'" ?,LM(B) ("E`" ?,LM(B) 
+ ("Yu" ?,LN(B) ("YU" ?,LN(B) ("Ju" ?,LN(B) ("JU" ?,LN(B) 
+ ("Ya" ?,LO(B) ("YA" ?,LO(B) ("Ja" ?,LO(B) ("JA" ?,LO(B) ("Q" ?,LO(B)
+
+ ("/e" ?,Lt(B) ("yi" ?,Lw(B) ("u'" ?,L~(B)
+ ("/d" ?,Lr(B) ("/ch" ?,L{(B)
+ ("/g" ?,Ls(B) ("/s" ?,Lu(B) ("/k" ?,L|(B)
+ ("/i" ?,Lv(B) ("/j" ?,Lx(B) ("/l" ?,Ly(B) ("/n" ?,Lz(B) ("/z" ?,L(B)
+ ("/E" ?,L$(B) ("YE" ?,L$(B) ("Yi" ?,L'(B) ("YI" ?,L'(B) ("U'" ?,L.(B) 
+ ("/D" ?,L"(B) ("/Ch" ?,L+(B) ("/CH" ?,L+(B)
+ ("/G" ?,L#(B) ("/S" ?,L%(B) ("/K" ?,L,(B) 
+ ("/I" ?,L&(B) ("/J" ?,L((B) ("/L" ?,L)(B) ("/N" ?,L*(B) ("/Z" ?,L/(B)
+)
+
+(quail-define-package
+ "cyrillic-translit-bulgarian" "Cyrillic" ",L6(Btb" nil
+ "Intuitively transliterated keyboard layout optimized for Bulgarian.
+The only difference with cyrillic-translit is that \"sht\" translates as
+,Li(B (SHCHA = Bulgarian SHT) insteat of ,Lhb(B (SH+T)."
+ nil t t t t nil nil nil nil nil t)
+
+(quail-define-rules
+ ("a" ?,LP(B)("b" ?,LQ(B) ("v" ?,LR(B) ("w" ?,LR(B) ("g" ?,LS(B) ("d" ?,LT(B) 
+ ("e" ?,LU(B) ("je" ?,LU(B) 
+ ("yo" ?,Lq(B) ("jo" ?,Lq(B)
+ ("zh" ?,LV(B) ("z" ?,LW(B) ("i" ?,LX(B) 
+ ("j" ?,LY(B) ("j'" ?,LY(B) ("j`" ?,LY(B) ("k" ?,LZ(B) ("l" ?,L[(B)
+ ("m" ?,L\(B) ("n" ?,L](B) ("o" ?,L^(B) ("p" ?,L_(B) ("r" ?,L`(B) ("s" ?,La(B) ("t" ?,Lb(B) ("u" ?,Lc(B)
+ ("f" ?,Ld(B) ("x" ?,Le(B) ("h" ?,Le(B) ("kh" ?,Le(B)
+ ("c" ?,Lf(B) ("ch" ?,Lg(B)
+ ("sh" ?,Lh(B) 
+ ("shch" ?,Li(B) ("sj" ?,Li(B) 
+ ("/sht" ?,Li(B) ("/t" ?,Li(B) ("sht" ?,Li(B)
+ ("~" ?,Lj(B) ("y" ?,Lk(B) ("'" ?,Ll(B) ("`" ?,Ll(B) 
+ ("e'" ?,Lm(B) ("e`" ?,Lm(B) ("@" ?,Lm(B) 
+ ("yu" ?,Ln(B) ("ju" ?,Ln(B) 
+ ("ya" ?,Lo(B) ("ja" ?,Lo(B) ("q" ?,Lo(B)
+
+ ("A" ?,L0(B) ("B" ?,L1(B) ("V" ?,L2(B) ("W" ?,L2(B) ("G" ?,L3(B) ("D" ?,L4(B) 
+ ("E" ?,L5(B) ("Je" ?,L5(B) ("JE" ?,L5(B)
+ ("Yo" ?,L!(B) ("YO" ?,L!(B) ("Jo" ?,L!(B) ("JO" ?,L!(B) 
+ ("Zh" ?,L6(B) ("ZH" ?,L6(B) ("Z" ?,L7(B) ("I" ?,L8(B) 
+ ("J" ?,L9(B) ("J'" ?,L9(B) ("J`" ?,L9(B) ("K" ?,L:(B) ("L" ?,L;(B)
+ ("M" ?,L<(B) ("N" ?,L=(B) ("O" ?,L>(B) ("P" ?,L?(B) ("R" ?,L@(B) ("S" ?,LA(B) ("T" ?,LB(B) ("U" ?,LC(B)
+ ("F" ?,LD(B) ("X" ?,LE(B) ("H" ?,LE(B) ("Kh" ?,LE(B) ("KH" ?,LE(B)
+ ("C" ?,LF(B) ("Ch" ?,LG(B) ("CH" ?,LG(B) 
+ ("Sh" ?,LH(B) ("SH" ?,LH(B) 
+ ("Shch" ?,LI(B) ("SHCH" ?,LI(B) ("Sj" ?,LI(B) ("SJ" ?,LI(B) 
+ ("/Sht" ?,LI(B) ("/SHT" ?,LI(B) ("/T" ?,LI(B) ("Sht" ?,LI(B) ("SHT" ?,LI(B) 
+ ("~~" ",LJ(B") ("Y" ?,LK(B) ("''" ",LL(B") ("E'" ?,LM(B) ("E`" ?,LM(B) 
+ ("Yu" ?,LN(B) ("YU" ?,LN(B) ("Ju" ?,LN(B) ("JU" ?,LN(B) 
+ ("Ya" ?,LO(B) ("YA" ?,LO(B) ("Ja" ?,LO(B) ("JA" ?,LO(B) ("Q" ?,LO(B)
+
+ ("/e" ?,Lt(B) ("yi" ?,Lw(B) ("u'" ?,L~(B)
+ ("/d" ?,Lr(B) ("/ch" ?,L{(B)
+ ("/g" ?,Ls(B) ("/s" ?,Lu(B) ("/k" ?,L|(B)
+ ("/i" ?,Lv(B) ("/j" ?,Lx(B) ("/l" ?,Ly(B) ("/n" ?,Lz(B) ("/z" ?,L(B)
+ ("/E" ?,L$(B) ("YE" ?,L$(B) ("Yi" ?,L'(B) ("YI" ?,L'(B) ("U'" ?,L.(B) 
+ ("/D" ?,L"(B) ("/Ch" ?,L+(B) ("/CH" ?,L+(B)
+ ("/G" ?,L#(B) ("/S" ?,L%(B) ("/K" ?,L,(B) 
+ ("/I" ?,L&(B) ("/J" ?,L((B) ("/L" ?,L)(B) ("/N" ?,L*(B) ("/Z" ?,L/(B)
+)
+
+
+
+
+
+;; Local Variables:
+;; buffer-file-coding-system: iso-2022-7bit
+;; End: