Add more rules to cyrillic-translit, make

everything postfix, and move ' '' and ` mappings to x.

1 files changed, 80 insertions, 18 deletions

diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index 979c47d96ce..b92baaa50cd 100644
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -1023,41 +1023,45 @@ cyrillic ,Lv(B (I DECIMAL) = \"/i\", ,Lx(B (JE) = \"/j\",
 
 (quail-define-rules
  ("a" ?,LP(B) 
- ("'a" ?,A`(B) ; not strictly Cyrillic but may be used
+ ("a`" [",LP$(O+\(B"]) ;; combining
  ("b" ?,LQ(B) ("v" ?,LR(B) ("w" ?,LR(B) ("g" ?,LS(B) ("d" ?,LT(B)
  ("e" ?,LU(B) ("je" ?,LU(B)
- ("'e" ?$,1(p(B) ("yo" ?,Lq(B) ("jo" ?,Lq(B)
+ ("e`" [",LU$(O+\(B"]) ;; combining
+ ("yo" ?,Lq(B) ("jo" ?,Lq(B)
  ("zh" ?,LV(B) ("z" ?,LW(B) ("i" ?,LX(B)
- ("'i" ?$,1(}(B) ("j" ?,LY(B) ("j'" ?,LY(B) ("j`" ?,LY(B) ("k" ?,LZ(B) ("l" ?,L[(B)
+ ("i`" ?$,1(}(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) 
- ("'o" ?,Ar(B) ; not strictly Cyrillic but may be used
- ("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)
+ ("o`" [",L^$(O+\(B"]) ;; combining
+ ("p" ?,L_(B) ("r" ?,L`(B) ("s" ?,La(B) ("t" ?,Lb(B) ("u" ?,Lc(B) 
+ ("u`" [",Lc$(O+\(B"]) ;; combining
+ ("f" ?,Ld(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)
+ ("~" ?,Lj(B) ("y" ?,Lk(B) ("x" ?,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) 
- ("'A" ?,A@(B) ; not strictly Cyrillic but may be used
+ ("A`" [",L0$(O+\(B"]) ;; combining
  ("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" ?$,1( (B) ("Yo" ?,L!(B) ("YO" ?,L!(B) ("Jo" ?,L!(B) ("JO" ?,L!(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" ?$,1(-(B) ("J" ?,L9(B) ("J'" ?,L9(B) ("J`" ?,L9(B) ("K" ?,L:(B) ("L" ?,L;(B)
+ ("I`" ?$,1(-(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)
- ("'O" ?,AR(B) ; not strictly Cyrillic but may be used
+ ("O`" [",L>$(O+\(B"]) ;; combining
  ("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)
+ ("U`" [",LC$(O+\(B"]) ;; combining
+ ("F" ?,LD(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)
+ ("~~" ",LJ(B") ("Y" ?,LK(B) ("X" ",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)
 
@@ -1070,18 +1074,76 @@ 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)
 
- ;; quote marks: low 99 and high 66, low 9 and high 6
- (",," ?,Y%(B)
- ("\"\"" ?,Y4(B)
+ ("/c" ?,A)(B)
+ ("/tm" ?$(D"o(B)
+ ("/reg" ?,A.(B)
+ ("/eu"   ?,b$(B)
+ ("/ce"  ?,A"(B)
+
+ ;; fractions
+ ("/78" ?$(C(~(B)
+ ("/58" ?$(C(}(B)
+ ("/38" ?$(C(|(B)
+ ("/18" ?$(C({(B)
+ ("/56" ?$,1v:(B)
+ ("/16" ?$,1v9(B)
+ ("/45" ?$,1v8(B)
+ ("/35" ?$,1v7(B)
+ ("/25" ?$,1v6(B)
+ ("/15" ?$(O'z(B)
+ ("/23" ?$(O'y(B)
+ ("/13" ?$(O'x(B)
+ ("/34" ?,A>(B)
+ ("/12" ?,A=(B)
+ ("/14" ?,A<(B)
+
+ ;; Roman numerals, commonly used for months and section/subsection numbers
+ ("/RI" ?$A"q(B)
+ ("/RII" ?$A"r(B)
+ ("/RIII" ?$A"s(B)
+ ("/RIV" ?$A"t(B)
+ ("/RV" ?$A"u(B)
+ ("/RVI" ?$A"v(B)
+ ("/RVII" ?$A"w(B)
+ ("/RVIII" ?$A"x(B)
+ ("/RIX" ?$A"y(B)
+ ("/RX" ?$A"z(B)
+ ("/RXI" ?$A"{(B)
+ ("/RXII" ?$A"|(B)
+
+ ("/ri" ?$(G&5(B)
+ ("/rii" ?$(G&6(B)
+ ("/riii" ?$(G&7(B)
+ ("/riv" ?$(G&8(B)
+ ("/rv" ?$(G&9(B)
+ ("/rvi" ?$(G&:(B)
+ ("/rvii" ?$(G&;(B)
+ ("/rviii" ?$(G&<(B)
+ ("/rix" ?$(G&=(B)
+ ("/rx" ?$(G&>(B)
+ ("/rxi" ?$(O,?(B)
+ ("/rxii" ?$(O,@(B)
+
+ ("/-"  ?$(G!9(B)
+ ("/--" ?$(G!7(B)
+ ("/*" ?$(O#@(B)
+ ("/."  ?$,1s$(B) ;; ONE DOT LEADER
+ ("/.." ?$(G!-(B) ;; TWO DOT LEADER
+ ("/..." ?$A!-(B);; HORIZONTAL ELLIPSIS
+ ("/``" ?,Y!(B)
+ ("/`" ?,F"(B)
+ ("/''" ?,Y4(B)
+ ("/,," ?,Y%(B)
  ("/," ?$,1rz(B)
  ("/'" ?,F!(B)
 
  ("/&" ?,A'(B)
  ("/ab" ?,A'(B)                               ; _,LPQ(B_,LWPf(B
+ ("/pa" ?,A'(B)                               ; _pa_ragraph
  ("/#" ?$,1uV(B)
  ("/no" ?$,1uV(B)                             ; _,L]^(B_,L\U`(B
- ("<<" ?,A+(B)
- (">>" ?,A;(B)
+ ("/<<" ?,A+(B)
+ ("/>>" ?,A;(B)
 )
 
 ;; Originally from Yudit's `Belarusian input table according to