("cyrillic-translit"): Put combining accent rules into one group.

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 57562bc..225e91f 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -6,7 +6,7 @@
        * quail/cyrillic.el ("cyrillic-translit"): Fix rules with
        combining acute accent.  Add rules ("e\\" ?э) ("E\\" ?Э).
        Change conflicting rules ("u'" ?ў) to ("u~" ?ў), and ("U'" ?Ў)
-       to ("U~" ?Ў).  Doc fix.
+       to ("U~" ?Ў).  Doc fix.  Put combining accent rules into one group.
 
 2008-07-10  Teodor Zlatanov  <tzz@lifelogs.com>
 

diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index a387002..3bdea75 100644 (file)
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -1022,52 +1022,50 @@ cyrillic \e,Lv\e(B (I DECIMAL) = \"/i\", \e,Lx\e(B (JE) = \"/j\",
  nil t t t t nil nil nil nil nil t)
 
 (quail-define-rules
- ("a" ?\e,LP\e(B)
- ("a'" ["\e,LP\e$(O+Z\e(B"]) ("a`" ["\e,LP\e$(O+\\e(B"]) ;; combining
- ("b" ?\e,LQ\e(B) ("v" ?\e,LR\e(B) ("w" ?\e,LR\e(B) ("g" ?\e,LS\e(B) ("d" ?\e,LT\e(B)
+ ("a" ?\e,LP\e(B) ("b" ?\e,LQ\e(B) ("v" ?\e,LR\e(B) ("w" ?\e,LR\e(B) ("g" ?\e,LS\e(B) ("d" ?\e,LT\e(B)
  ("e" ?\e,LU\e(B) ("je" ?\e,LU\e(B)
- ("e'" ["\e,LU\e$(O+Z\e(B"]) ("e`" ["\e,LU\e$(O+\\e(B"]) ;; combining
  ("yo" ?\e,Lq\e(B) ("jo" ?\e,Lq\e(B)
  ("zh" ?\e,LV\e(B) ("z" ?\e,LW\e(B) ("i" ?\e,LX\e(B)
- ("i'" ["\e,LX\e$(O+Z\e(B"]) ("i`" ["\e,LX\e(B`"]) ;; combining
  ("j" ?\e,LY\e(B) ("j'" ?\e,LY\e(B) ("j`" ?\e,LY\e(B) ("k" ?\e,LZ\e(B) ("l" ?\e,L[\e(B)
- ("m" ?\e,L\\e(B) ("n" ?\e,L]\e(B) ("o" ?\e,L^\e(B)
- ("o'" ["\e,L^\e$(O+Z\e(B"]) ("o`" ["\e,L^\e$(O+\\e(B"]) ;; combining
- ("p" ?\e,L_\e(B) ("r" ?\e,L`\e(B) ("s" ?\e,La\e(B) ("t" ?\e,Lb\e(B) ("u" ?\e,Lc\e(B)
- ("u'" ["\e,Lc\e$(O+Z\e(B"]) ("u`" ["\e,Lc\e$(O+\\e(B"]) ;; combining
+ ("m" ?\e,L\\e(B) ("n" ?\e,L]\e(B) ("o" ?\e,L^\e(B) ("p" ?\e,L_\e(B) ("r" ?\e,L`\e(B) ("s" ?\e,La\e(B) ("t" ?\e,Lb\e(B) ("u" ?\e,Lc\e(B)
  ("f" ?\e,Ld\e(B) ("x" ?\e,Le\e(B) ("h" ?\e,Le\e(B) ("kh" ?\e,Le\e(B)
  ("c" ?\e,Lf\e(B) ("ch" ?\e,Lg\e(B)
  ("sh" ?\e,Lh\e(B)
  ("shch" ?\e,Li\e(B) ("sj" ?\e,Li\e(B)
  ("/sht" ?\e,Li\e(B) ("/t" ?\e,Li\e(B)
  ("~" ?\e,Lj\e(B) ("y" ?\e,Lk\e(B) ("'" ?\e,Ll\e(B) ("`" ?\e,Ll\e(B)
- ("@" ?\e,Lm\e(B) ("e\\" ?\e,Lm\e(B)
+ ("e\\" ?\e,Lm\e(B) ("@" ?\e,Lm\e(B)
  ("yu" ?\e,Ln\e(B) ("ju" ?\e,Ln\e(B)
  ("ya" ?\e,Lo\e(B) ("ja" ?\e,Lo\e(B) ("q" ?\e,Lo\e(B)
 
- ("A" ?\e,L0\e(B)
- ("A'" ["\e,L0\e$(O+Z\e(B"]) ("A`" ["\e,L0\e$(O+\\e(B"]) ;; COMBINING
- ("B" ?\e,L1\e(B) ("V" ?\e,L2\e(B) ("W" ?\e,L2\e(B) ("G" ?\e,L3\e(B) ("D" ?\e,L4\e(B)
+ ("A" ?\e,L0\e(B) ("B" ?\e,L1\e(B) ("V" ?\e,L2\e(B) ("W" ?\e,L2\e(B) ("G" ?\e,L3\e(B) ("D" ?\e,L4\e(B)
  ("E" ?\e,L5\e(B) ("Je" ?\e,L5\e(B) ("JE" ?\e,L5\e(B)
- ("E'" ["\e,L5\e$(O+Z\e(B"]) ("E`" ["\e,L5\e$(O+\\e(B"]) ;; COMBINING
  ("Yo" ?\e,L!\e(B) ("YO" ?\e,L!\e(B) ("Jo" ?\e,L!\e(B) ("JO" ?\e,L!\e(B)
  ("Zh" ?\e,L6\e(B) ("ZH" ?\e,L6\e(B) ("Z" ?\e,L7\e(B) ("I" ?\e,L8\e(B)
- ("I'" ["\e,L8\e$(O+Z\e(B"]) ("I`" ["\e,L8\e(B`"]) ;; COMBINING
  ("J" ?\e,L9\e(B) ("J'" ?\e,L9\e(B) ("J`" ?\e,L9\e(B) ("K" ?\e,L:\e(B) ("L" ?\e,L;\e(B)
- ("M" ?\e,L<\e(B) ("N" ?\e,L=\e(B) ("O" ?\e,L>\e(B)
- ("O'" ["\e,L>\e$(O+Z\e(B"]) ("O`" ["\e,L>\e$(O+\\e(B"]) ;; COMBINING
- ("P" ?\e,L?\e(B) ("R" ?\e,L@\e(B) ("S" ?\e,LA\e(B) ("T" ?\e,LB\e(B) ("U" ?\e,LC\e(B)
- ("U'" ["\e,LC\e$(O+Z\e(B"]) ("U`" ["\e,LC\e$(O+\\e(B"]) ;; COMBINING
+ ("M" ?\e,L<\e(B) ("N" ?\e,L=\e(B) ("O" ?\e,L>\e(B) ("P" ?\e,L?\e(B) ("R" ?\e,L@\e(B) ("S" ?\e,LA\e(B) ("T" ?\e,LB\e(B) ("U" ?\e,LC\e(B)
  ("F" ?\e,LD\e(B) ("X" ?\e,LE\e(B) ("H" ?\e,LE\e(B) ("Kh" ?\e,LE\e(B) ("KH" ?\e,LE\e(B)
  ("C" ?\e,LF\e(B) ("Ch" ?\e,LG\e(B) ("CH" ?\e,LG\e(B)
  ("Sh" ?\e,LH\e(B) ("SH" ?\e,LH\e(B)
  ("Shch" ?\e,LI\e(B) ("SHCH" ?\e,LI\e(B) ("Sj" ?\e,LI\e(B) ("SJ" ?\e,LI\e(B)
  ("/Sht" ?\e,LI\e(B) ("/SHT" ?\e,LI\e(B) ("/T" ?\e,LI\e(B)
  ("~~" ?\e,LJ\e(B) ("Y" ?\e,LK\e(B) ("''" ?\e,LL\e(B)
- ("@@" ?\e,LM\e(B) ("E\\" ?\e,LM\e(B)
+ ("E\\" ?\e,LM\e(B) ("@@" ?\e,LM\e(B)
  ("Yu" ?\e,LN\e(B) ("YU" ?\e,LN\e(B) ("Ju" ?\e,LN\e(B) ("JU" ?\e,LN\e(B)
  ("Ya" ?\e,LO\e(B) ("YA" ?\e,LO\e(B) ("Ja" ?\e,LO\e(B) ("JA" ?\e,LO\e(B) ("Q" ?\e,LO\e(B)
 
+ ;; Combining accents
+ ("a'" ["\e,LP\e$(O+Z\e(B"]) ("a`" ["\e,LP\e$(O+\\e(B"])
+ ("e'" ["\e,LU\e$(O+Z\e(B"]) ("e`" ["\e,LU\e$(O+\\e(B"])
+ ("i'" ["\e,LX\e$(O+Z\e(B"]) ("i`" ["\e,LX\e$(O+\\e(B"])
+ ("o'" ["\e,L^\e$(O+Z\e(B"]) ("o`" ["\e,L^\e$(O+\\e(B"])
+ ("u'" ["\e,Lc\e$(O+Z\e(B"]) ("u`" ["\e,Lc\e$(O+\\e(B"])
+ ("A'" ["\e,L0\e$(O+Z\e(B"]) ("A`" ["\e,L0\e$(O+\\e(B"])
+ ("E'" ["\e,L5\e$(O+Z\e(B"]) ("E`" ["\e,L5\e$(O+\\e(B"])
+ ("I'" ["\e,L8\e$(O+Z\e(B"]) ("I`" ["\e,L8\e$(O+\\e(B"])
+ ("O'" ["\e,L>\e$(O+Z\e(B"]) ("O`" ["\e,L>\e$(O+\\e(B"])
+ ("U'" ["\e,LC\e$(O+Z\e(B"]) ("U`" ["\e,LC\e$(O+\\e(B"])
+
  ("/e" ?\e,Lt\e(B) ("yi" ?\e,Lw\e(B) ("u~" ?\e,L~\e(B)
  ("/d" ?\e,Lr\e(B) ("/ch" ?\e,L{\e(B)
  ("/g" ?\e,Ls\e(B) ("/s" ?\e,Lu\e(B) ("/k" ?\e,L|\e(B)
@@ -1077,6 +1075,27 @@ cyrillic \e,Lv\e(B (I DECIMAL) = \"/i\", \e,Lx\e(B (JE) = \"/j\",
  ("/G" ?\e,L#\e(B) ("/S" ?\e,L%\e(B) ("/K" ?\e,L,\e(B)
  ("/I" ?\e,L&\e(B) ("/J" ?\e,L(\e(B) ("/L" ?\e,L)\e(B) ("/N" ?\e,L*\e(B) ("/Z" ?\e,L/\e(B)
 
+ ("/-"  ?\e$(G!9\e(B)  ;; EN DASH
+ ("/--" ?\e$(G!7\e(B)  ;; EM DASH
+ ("/*" ?\e$(O#@\e(B)   ;; BULLET
+ ("/." ?\e$,1s$\e(B)   ;; ONE DOT LEADER
+ ("/.." ?\e$(G!-\e(B)  ;; TWO DOT LEADER
+ ("/..." ?\e$A!-\e(B) ;; HORIZONTAL ELLIPSIS
+ ("/,," ?\e,Y%\e(B)  ;; DOUBLE LOW-9 QUOTATION MARK
+ ("/," ?\e$,1rz\e(B)   ;; SINGLE LOW-9 QUOTATION MARK
+ ("/''" ?\e,Y!\e(B)  ;; RIGHT DOUBLE QUOTATION MARK
+ ("/'" ?\e,F"\e(B)   ;; RIGHT SINGLE QUOTATION MARK
+ ("/``" ?\e,Y4\e(B)  ;; LEFT DOUBLE QUOTATION MARK
+ ("/`" ?\e,F!\e(B)   ;; LEFT SINGLE QUOTATION MARK
+ ("/<<" ?\e,A+\e(B)  ;; LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+ ("/>>" ?\e,A;\e(B)  ;; RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+
+ ("/&" ?\e,A'\e(B)
+ ("/ab" ?\e,A'\e(B)                             ; _\e,LPQ\e(B_\e,LWPf\e(B
+ ("/pa" ?\e,A'\e(B)                             ; _pa_ragraph
+ ("/#" ?\e,Lp\e(B)
+ ("/no" ?\e,Lp\e(B)                             ; _\e,L]^\e(B_\e,L\U`\e(B
+
  ("/c" ?\e,A)\e(B)
  ("/tm" ?\e$(D"o\e(B)
  ("/reg" ?\e,A.\e(B)
@@ -1126,27 +1145,6 @@ cyrillic \e,Lv\e(B (I DECIMAL) = \"/i\", \e,Lx\e(B (JE) = \"/j\",
  ("/rx" ?\e$(G&>\e(B)
  ("/rxi" ?\e$(O,?\e(B)
  ("/rxii" ?\e$(O,@\e(B)
-
- ("/-"  ?\e$(G!9\e(B)  ;; EN DASH
- ("/--" ?\e$(G!7\e(B)  ;; EM DASH
- ("/*" ?\e$(O#@\e(B)   ;; BULLET
- ("/." ?\e$,1s$\e(B)  ;; ONE DOT LEADER
- ("/.."        ?\e$(G!-\e(B)  ;; TWO DOT LEADER
- ("/..." ?\e$A!-\e(B) ;; HORIZONTAL ELLIPSIS
- ("/,," ?\e,Y%\e(B)  ;; DOUBLE LOW-9 QUOTATION MARK
- ("/," ?\e$,1rz\e(B)   ;; SINGLE LOW-9 QUOTATION MARK
- ("/''" ?\e,Y!\e(B)  ;; RIGHT DOUBLE QUOTATION MARK
- ("/'" ?\e,F"\e(B)   ;; RIGHT SINGLE QUOTATION MARK
- ("/``" ?\e,Y4\e(B)  ;; LEFT DOUBLE QUOTATION MARK
- ("/`" ?\e,F!\e(B)   ;; LEFT SINGLE QUOTATION MARK
- ("/<<" ?\e,A+\e(B)  ;; LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
- ("/>>" ?\e,A;\e(B)  ;; RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-
- ("/&" ?\e,A'\e(B)
- ("/ab" ?\e,A'\e(B)                              ; _\e,LPQ\e(B_\e,LWPf\e(B
- ("/pa" ?\e,A'\e(B)                              ; _pa_ragraph
- ("/#" ?\e$,1uV\e(B)
- ("/no" ?\e$,1uV\e(B)                            ; _\e,L]^\e(B_\e,L\U`\e(B
 )
 
 ;; Originally from Yudit's `Belarusian input table according to