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

2 files changed, 40 insertions, 42 deletions

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 57562bcc853..225e91f0df7 100644
--- 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 a38700248c0..3bdea754edb 100644
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -1022,52 +1022,50 @@ cyrillic ,Lv(B (I DECIMAL) = \"/i\", ,Lx(B (JE) = \"/j\",
  nil t t t t nil nil nil nil nil t)
 
 (quail-define-rules
- ("a" ?,LP(B)
- ("a'" [",LP$(O+Z(B"]) ("a`" [",LP$(O+\(B"]) ;; combining
- ("b" ?,LQ(B) ("v" ?,LR(B) ("w" ?,LR(B) ("g" ?,LS(B) ("d" ?,LT(B)
+ ("a" ?,LP(B) ("b" ?,LQ(B) ("v" ?,LR(B) ("w" ?,LR(B) ("g" ?,LS(B) ("d" ?,LT(B)
  ("e" ?,LU(B) ("je" ?,LU(B)
- ("e'" [",LU$(O+Z(B"]) ("e`" [",LU$(O+\(B"]) ;; combining
  ("yo" ?,Lq(B) ("jo" ?,Lq(B)
  ("zh" ?,LV(B) ("z" ?,LW(B) ("i" ?,LX(B)
- ("i'" [",LX$(O+Z(B"]) ("i`" [",LX(B`"]) ;; combining
  ("j" ?,LY(B) ("j'" ?,LY(B) ("j`" ?,LY(B) ("k" ?,LZ(B) ("l" ?,L[(B)
- ("m" ?,L\(B) ("n" ?,L](B) ("o" ?,L^(B)
- ("o'" [",L^$(O+Z(B"]) ("o`" [",L^$(O+\(B"]) ;; combining
- ("p" ?,L_(B) ("r" ?,L`(B) ("s" ?,La(B) ("t" ?,Lb(B) ("u" ?,Lc(B)
- ("u'" [",Lc$(O+Z(B"]) ("u`" [",Lc$(O+\(B"]) ;; combining
+ ("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)
- ("@" ?,Lm(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)
- ("A'" [",L0$(O+Z(B"]) ("A`" [",L0$(O+\(B"]) ;; COMBINING
- ("B" ?,L1(B) ("V" ?,L2(B) ("W" ?,L2(B) ("G" ?,L3(B) ("D" ?,L4(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)
- ("E'" [",L5$(O+Z(B"]) ("E`" [",L5$(O+\(B"]) ;; COMBINING
  ("Yo" ?,L!(B) ("YO" ?,L!(B) ("Jo" ?,L!(B) ("JO" ?,L!(B)
  ("Zh" ?,L6(B) ("ZH" ?,L6(B) ("Z" ?,L7(B) ("I" ?,L8(B)
- ("I'" [",L8$(O+Z(B"]) ("I`" [",L8(B`"]) ;; COMBINING
  ("J" ?,L9(B) ("J'" ?,L9(B) ("J`" ?,L9(B) ("K" ?,L:(B) ("L" ?,L;(B)
- ("M" ?,L<(B) ("N" ?,L=(B) ("O" ?,L>(B)
- ("O'" [",L>$(O+Z(B"]) ("O`" [",L>$(O+\(B"]) ;; COMBINING
- ("P" ?,L?(B) ("R" ?,L@(B) ("S" ?,LA(B) ("T" ?,LB(B) ("U" ?,LC(B)
- ("U'" [",LC$(O+Z(B"]) ("U`" [",LC$(O+\(B"]) ;; COMBINING
+ ("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)
- ("@@" ?,LM(B) ("E\\" ?,LM(B)
+ ("E\\" ?,LM(B) ("@@" ?,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)
 
+ ;; Combining accents
+ ("a'" [",LP$(O+Z(B"]) ("a`" [",LP$(O+\(B"])
+ ("e'" [",LU$(O+Z(B"]) ("e`" [",LU$(O+\(B"])
+ ("i'" [",LX$(O+Z(B"]) ("i`" [",LX$(O+\(B"])
+ ("o'" [",L^$(O+Z(B"]) ("o`" [",L^$(O+\(B"])
+ ("u'" [",Lc$(O+Z(B"]) ("u`" [",Lc$(O+\(B"])
+ ("A'" [",L0$(O+Z(B"]) ("A`" [",L0$(O+\(B"])
+ ("E'" [",L5$(O+Z(B"]) ("E`" [",L5$(O+\(B"])
+ ("I'" [",L8$(O+Z(B"]) ("I`" [",L8$(O+\(B"])
+ ("O'" [",L>$(O+Z(B"]) ("O`" [",L>$(O+\(B"])
+ ("U'" [",LC$(O+Z(B"]) ("U`" [",LC$(O+\(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)
@@ -1077,6 +1075,27 @@ cyrillic ,Lv(B (I DECIMAL) = \"/i\", ,Lx(B (JE) = \"/j\",
  ("/G" ?,L#(B) ("/S" ?,L%(B) ("/K" ?,L,(B)
  ("/I" ?,L&(B) ("/J" ?,L((B) ("/L" ?,L)(B) ("/N" ?,L*(B) ("/Z" ?,L/(B)
 
+ ("/-"  ?$(G!9(B)  ;; EN DASH
+ ("/--" ?$(G!7(B)  ;; EM DASH
+ ("/*" ?$(O#@(B)   ;; BULLET
+ ("/." ?$,1s$(B)   ;; ONE DOT LEADER
+ ("/.." ?$(G!-(B)  ;; TWO DOT LEADER
+ ("/..." ?$A!-(B) ;; HORIZONTAL ELLIPSIS
+ ("/,," ?,Y%(B)  ;; DOUBLE LOW-9 QUOTATION MARK
+ ("/," ?$,1rz(B)   ;; SINGLE LOW-9 QUOTATION MARK
+ ("/''" ?,Y!(B)  ;; RIGHT DOUBLE QUOTATION MARK
+ ("/'" ?,F"(B)   ;; RIGHT SINGLE QUOTATION MARK
+ ("/``" ?,Y4(B)  ;; LEFT DOUBLE QUOTATION MARK
+ ("/`" ?,F!(B)   ;; LEFT SINGLE QUOTATION MARK
+ ("/<<" ?,A+(B)  ;; LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+ ("/>>" ?,A;(B)  ;; RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+
+ ("/&" ?,A'(B)
+ ("/ab" ?,A'(B)                             ; _,LPQ(B_,LWPf(B
+ ("/pa" ?,A'(B)                             ; _pa_ragraph
+ ("/#" ?,Lp(B)
+ ("/no" ?,Lp(B)                             ; _,L]^(B_,L\U`(B
+
  ("/c" ?,A)(B)
  ("/tm" ?$(D"o(B)
  ("/reg" ?,A.(B)
@@ -1126,27 +1145,6 @@ cyrillic ,Lv(B (I DECIMAL) = \"/i\", ,Lx(B (JE) = \"/j\",
  ("/rx" ?$(G&>(B)
  ("/rxi" ?$(O,?(B)
  ("/rxii" ?$(O,@(B)
-
- ("/-"  ?$(G!9(B)  ;; EN DASH
- ("/--" ?$(G!7(B)  ;; EM DASH
- ("/*" ?$(O#@(B)   ;; BULLET
- ("/."	?$,1s$(B)  ;; ONE DOT LEADER
- ("/.."	?$(G!-(B)  ;; TWO DOT LEADER
- ("/..." ?$A!-(B) ;; HORIZONTAL ELLIPSIS
- ("/,," ?,Y%(B)  ;; DOUBLE LOW-9 QUOTATION MARK
- ("/," ?$,1rz(B)   ;; SINGLE LOW-9 QUOTATION MARK
- ("/''" ?,Y!(B)  ;; RIGHT DOUBLE QUOTATION MARK
- ("/'" ?,F"(B)   ;; RIGHT SINGLE QUOTATION MARK
- ("/``" ?,Y4(B)  ;; LEFT DOUBLE QUOTATION MARK
- ("/`" ?,F!(B)   ;; LEFT SINGLE QUOTATION MARK
- ("/<<" ?,A+(B)  ;; LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
- ("/>>" ?,A;(B)  ;; RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-
- ("/&" ?,A'(B)
- ("/ab" ?,A'(B) 				; _,LPQ(B_,LWPf(B
- ("/pa" ?,A'(B) 				; _pa_ragraph
- ("/#" ?$,1uV(B)
- ("/no" ?$,1uV(B)				; _,L]^(B_,L\U`(B
 )
 
 ;; Originally from Yudit's `Belarusian input table according to