* quail/cyrillic.el (russian-typewriter): Change keyboard layout.

(Bug#904)

2 files changed, 39 insertions, 34 deletions

diff --git a/leim/ChangeLog b/leim/ChangeLog
index e217e6a1724..54f7caccdcd 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-05  Vasily Korytov <vasily@korytov.pp.ru>
+
+        * quail/cyrillic.el (russian-typewriter): Change keyboard layout.
+        (Bug#904)
+
 2009-09-09  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (install): Set umask to world-readable before creating
diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index 4aec979b580..1e609b80505 100644
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -52,25 +52,25 @@
  ",L9FC:5=(B Russian typewriter layout (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
+;;  ,Lp(B1 -2 /3 "4 :5 ,6 .7 _8 ?9 %0 != ;\ |+
+;;   ,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  /?
+;;     ,LO(B  ,LG(B  ,LA(B  ,L<(B  ,L8(B  ,LB(B  ,LL(B  ,L1(B  ,LN(B  ,L!(B
 
 (quail-define-rules
- ("1" ?1)
- ("2" ?2)
- ("3" ?3)
- ("4" ?4)
- ("5" ?5)
- ("6" ?6)
- ("7" ?7)
- ("8" ?8)
- ("9" ?9)
- ("0" ?0)
- ("-" ?-)
- ("=" ?=)
- ("`" ?,Lq(B)
+ ("1" ?,Lp(B)
+ ("2" ?-)
+ ("3" ?/)
+ ("4" ?\")
+ ("5" ?:)
+ ("6" ?,)
+ ("7" ?.)
+ ("8" ?_)
+ ("9" ??)
+ ("0" ?%)
+ ("-" ?!)
+ ("=" ?\;)
+ ("`" ?|)
  ("q" ?,LY(B)
  ("w" ?,Lf(B)
  ("e" ?,Lc(B)
@@ -94,7 +94,7 @@
  ("l" ?,LT(B)
  (";" ?,LV(B)
  ("'" ?,Lm(B)
- ("\\" ?\\)
+ ("\\" ?\))
  ("z" ?,Lo(B)
  ("x" ?,Lg(B)
  ("c" ?,La(B)
@@ -104,21 +104,21 @@
  ("m" ?,Ll(B)
  ("," ?,LQ(B)
  ("." ?,Ln(B)
- ("/" ?/)
-
- ("!" ?!)
- ("@" ?\")
- ("#" ?')
- ("$" ?*)
- ("%" ?:)
- ("^" ?,)
- ("&" ?.)
- ("*" ?\;)
- ("(" ?\()
- (")" ?\))
- ("_" ?_)
- ("+" ?+)
- ("~" ?,L!(B)
+ ("/" ?,Lq(B)
+
+ ("!" ?1)
+ ("@" ?2)
+ ("#" ?3)
+ ("$" ?4)
+ ("%" ?5)
+ ("^" ?6)
+ ("&" ?7)
+ ("*" ?8)
+ ("(" ?9)
+ (")" ?0)
+ ("_" ?=)
+ ("+" ?\\)
+ ("~" ?+)
  ("Q" ?,L9(B)
  ("W" ?,LF(B)
  ("E" ?,LC(B)
@@ -142,7 +142,7 @@
  ("L" ?,L4(B)
  (":" ?,L6(B)
  ("\"" ?,LM(B)
- ("|" ?|)
+ ("|" ?\()
  ("Z" ?,LO(B)
  ("X" ?,LG(B)
  ("C" ?,LA(B)
@@ -152,7 +152,7 @@
  ("M" ?,LL(B)
  ("<" ?,L1(B)
  (">" ?,LN(B)
- ("?" ??)
+ ("?" ?,L!(B)
  )
 
 ;; Maintain the obsolete name for now.