Add more rules to cyrillic-translit, make

everything postfix.  Adjust to eliminate conflicts.

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 7d88db8db1127ed7c8d55c9ab564d503e3aa9fc1..395f672614d2a6043a13fc77e4b56ef97cc1f19d 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-10  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * quail/cyrillic.el : Add more rules to cyrillic-translit, make
+       everything postfix.  Adjust to eliminate conflicts.
+
 2008-06-30  Juanma Barranquero  <lekktu@gmail.com>
 
        * quail/hangul3.el: Remove (unneeded since 2008-06-03).

diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index b92baaa50cdb89d060182d2c9d529b6a9568e368..1294fa6b9f15cbbdebf3dea432a906eaa5e5e21f 100644 (file)
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -1023,45 +1023,48 @@ cyrillic \e,Lv\e(B (I DECIMAL) = \"/i\", \e,Lx\e(B (JE) = \"/j\",
 
 (quail-define-rules
  ("a" ?\e,LP\e(B) 
- ("a`" ["\e,LP\e$(O+\\e(B"]) ;; combining
+ ("a'" ["\e,LP\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)
  ("e" ?\e,LU\e(B) ("je" ?\e,LU\e(B)
- ("e`" ["\e,LU\e$(O+\\e(B"]) ;; combining
+ ("e'" ["\e,LU\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,LX\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+\\e(B"]) ;; combining
+ ("o'" ["\e,L^\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
+ ("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) ("x" ?\e,Ll\e(B)
- ("e'" ?\e,Lm\e(B) ("e`" ?\e,Lm\e(B) ("@" ?\e,Lm\e(B)
+ ("~" ?\e,Lj\e(B) ("y" ?\e,Lk\e(B) ("x" ?\e,Le\e(B) ("'" ?\e,Ll\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+\\e(B"]) ;; combining
+ ("A'" ["\e,L0\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)
- ("E" ?\e,L5\e(B) ("Je" ?\e,L5\e(B) ("JE" ?\e,L5\e(B) 
- ("E`" ["\e,L5\e$(O+\\e(B"]) ;; combining
+ ("E" ?\e,L5\e(B) ("Je" ?\e,L5\e(B) ("JE" ?\e,L5\e(B)
+ ("E'" ["\e,L5\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,L8\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+\\e(B"]) ;; combining
+ ("O'" ["\e,L>\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
+ ("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) ("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) ("X" "\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,LE\e(B) ("''" ?\e,LL\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)
 
@@ -1130,12 +1133,12 @@ cyrillic \e,Lv\e(B (I DECIMAL) = \"/i\", \e,Lx\e(B (JE) = \"/j\",
  ("/." ?\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,F"\e(B)
+ ("/``" ?\e,Y4\e(B)
+ ("/`" ?\e,F!\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