("cyrillic-translit"): Add two rules "//'" and

"//`" for combining accents as a separate character.  Keep two
rules "i`" and "I`" for characters where accent is not a separate
character.  Revert changes that added postfix combining accents.

diff --git a/leim/ChangeLog b/leim/ChangeLog
index c289b6591bb426495aa3bdee031fb0cf5f683516..3356354eb82cda863a4a26cbec870deb0d6a5ac0 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-19  Juri Linkov  <juri@jurta.org>
+
+       * quail/cyrillic.el ("cyrillic-translit"): Add two rules "//'" and
+       "//`" for combining accents as a separate character.  Keep two
+       rules "i`" and "I`" for characters where accent is not a separate
+       character.  Revert changes that added postfix combining accents.
+
 2008-07-17  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
        * Makefile.in (install): Perform post-install cleanup inside NS app

diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index 3bdea754edb738534231b5de17df2bb2c1ebee7f..324d0d1c8dd03a7162a2caae8de5af3258e17e80 100644 (file)
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -1034,7 +1034,7 @@ cyrillic \e,Lv\e(B (I DECIMAL) = \"/i\", \e,Lx\e(B (JE) = \"/j\",
  ("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\\" ?\e,Lm\e(B) ("@" ?\e,Lm\e(B)
+ ("e\\" ?\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)
 
@@ -1050,31 +1050,25 @@ cyrillic \e,Lv\e(B (I DECIMAL) = \"/i\", \e,Lx\e(B (JE) = \"/j\",
  ("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,LM\e(B)
+ ("E\\" ?\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)
+ ("/e" ?\e,Lt\e(B) ("yi" ?\e,Lw\e(B) ("u'" ?\e,L~\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)
  ("/i" ?\e,Lv\e(B) ("/j" ?\e,Lx\e(B) ("/l" ?\e,Ly\e(B) ("/n" ?\e,Lz\e(B) ("/z" ?\e,L\7f\e(B)
- ("/E" ?\e,L$\e(B) ("YE" ?\e,L$\e(B) ("Yi" ?\e,L'\e(B) ("YI" ?\e,L'\e(B) ("U~" ?\e,L.\e(B)
+ ("/E" ?\e,L$\e(B) ("YE" ?\e,L$\e(B) ("Yi" ?\e,L'\e(B) ("YI" ?\e,L'\e(B) ("U'" ?\e,L.\e(B) ("U~" ?\e,L.\e(B)
  ("/D" ?\e,L"\e(B) ("/Ch" ?\e,L+\e(B) ("/CH" ?\e,L+\e(B)
  ("/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)
 
+ ;; Combining accents as a separate character
+ ("//'" ?\e$(O+Z\e(B) ("//`" ?\e$(O+\\e(B)
+
+ ;; In the following two rules the accent is not a separate character
+ ("i`" ?\e$,1(}\e(B) ("I`" ?\e$,1(-\e(B)
+
  ("/-"  ?\e$(G!9\e(B)  ;; EN DASH
  ("/--" ?\e$(G!7\e(B)  ;; EM DASH
  ("/*" ?\e$(O#@\e(B)   ;; BULLET
@@ -1099,7 +1093,7 @@ cyrillic \e,Lv\e(B (I DECIMAL) = \"/i\", \e,Lx\e(B (JE) = \"/j\",
  ("/c" ?\e,A)\e(B)
  ("/tm" ?\e$(D"o\e(B)
  ("/reg" ?\e,A.\e(B)
- ("/eu"   ?\e,b$\e(B)
+ ("/eu"  ?\e,b$\e(B)
  ("/ce"  ?\e,A"\e(B)
 
  ;; fractions