Add more rules to cyrillic-translit, make

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

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