("cyrillic-translit"): Fix rules with

combining acute accent.  Add rules ("e\\" ?� ("E\\" ?�ange conflicting rules ("u'" ? ) to ("u~" ? ), and ("U'" ? )
to ("U~" ? ).  Doc fix.

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 395f672614d2a6043a13fc77e4b56ef97cc1f19d..57562bcc853374c2d5fe261d80561f9525365795 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,13 @@
+2008-07-12  Juri Linkov  <juri@jurta.org>
+
+       * quail/rfc1345.el: Replace non-printable control characters with
+       equivalent text-only notations.
+
+       * 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.
+
 2008-07-10  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * quail/cyrillic.el : Add more rules to cyrillic-translit, make

diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index 1294fa6b9f15cbbdebf3dea432a906eaa5e5e21f..a38700248c0643a0224ed092f3cb209c744d96bc 100644 (file)
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -1004,17 +1004,17 @@ Most convenient for entering Russian, but all Cyrillic characters
 are included.  Should handle most cases.  However:
   for \e,Lf\e(B (TSE) use \"c\", never \"ts\"
   \e,Li\e(B (SHCHA = Bulgarian SHT) = \"shch\", \"sj\", \"/sht\" or \"/t\",
-  \e,Lm\e(B (REVERSE ROUNDED E) = \"e'\" or \"e`\"
+  \e,Lm\e(B (REVERSE ROUNDED E) = \"e\\\"
   \e,Le\e(B (KHA) when after \e,La\e(B (S) = \"x\" or \"kh\"
   \e,Lj\e(B (HARD SIGN) = \"~\", \e,LJ\e(B (CAPITAL HARD SIGN) = \"~~\",
   \e,Ll\e(B (SOFT SIGN) = \"'\", \e,LL\e(B (CAPITAL SOFT SIGN) = \"''\",
   \e,Lo\e(B (YA) = \"ya\", \"ja\" or \"q\".
 
 Russian alphabet: a b v=w g d e yo=jo zh z i j=j' k l m n o p r s t
-u f h=kh=x c ch sh shch=sj=/s=/sht ~ y ' e' yu=ju ya=ja=q
+u f h=kh=x c ch sh shch=sj=/s=/sht ~ y ' e\\ yu=ju ya=ja=q
 
 Also included are Ukrainian \e,Lt\e(B (YE) = \"/e\" and \e,Lw\e(B (YI) = \"yi\",
-Belarusian \e,L~\e(B (SHORT U) = \"u'\",
+Belarusian \e,L~\e(B (SHORT U) = \"u~\",
 Serbo-Croatian \e,Lr\e(B (DJE) = \"/d\", \e,L{\e(B (CHJE)= \"/ch\",
 Macedonian \e,Ls\e(B (GJE) = \"/g\", \e,Lu\e(B (DZE) = \"/s\", \e,L|\e(B (KJE) = \"/k\",
 cyrillic \e,Lv\e(B (I DECIMAL) = \"/i\", \e,Lx\e(B (JE) = \"/j\",
@@ -1022,57 +1022,57 @@ cyrillic \e,Lv\e(B (I DECIMAL) = \"/i\", \e,Lx\e(B (JE) = \"/j\",
  nil t t t t nil nil nil nil nil t)
 
 (quail-define-rules
- ("a" ?\e,LP\e(B) 
- ("a'" ["\e,LP\e(B'"])  ("a`" ["\e,LP\e$(O+\\e(B"]) ;; combining
+ ("a" ?\e,LP\e(B)
+ ("a'" ["\e,LP\e$(O+Z\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(B'"]) ("e`" ["\e,LU\e$(O+\\e(B"]) ;; combining
+ ("e'" ["\e,LU\e$(O+Z\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,LX\e(B'"]) ("i`" ["\e,LX\e(B`"]) ;; combining
+ ("i'" ["\e,LX\e$(O+Z\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(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(B'"]) ("u`" ["\e,Lc\e$(O+\\e(B"]) ;; combining
- ("f" ?\e,Ld\e(B) ("h" ?\e,Le\e(B) ("kh" ?\e,Le\e(B)
+ ("m" ?\e,L\\e(B) ("n" ?\e,L]\e(B) ("o" ?\e,L^\e(B)
+ ("o'" ["\e,L^\e$(O+Z\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+Z\e(B"]) ("u`" ["\e,Lc\e$(O+\\e(B"]) ;; combining
+ ("f" ?\e,Ld\e(B) ("x" ?\e,Le\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,Le\e(B) ("'" ?\e,Ll\e(B)
- ("@" ?\e,Lm\e(B)
+ ("~" ?\e,Lj\e(B) ("y" ?\e,Lk\e(B) ("'" ?\e,Ll\e(B) ("`" ?\e,Ll\e(B)
+ ("@" ?\e,Lm\e(B) ("e\\" ?\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(B'"])  ("A`" ["\e,L0\e$(O+\\e(B"]) ;; COMBINING
+ ("A" ?\e,L0\e(B)
+ ("A'" ["\e,L0\e$(O+Z\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(B'"]) ("E`" ["\e,L5\e$(O+\\e(B"]) ;; COMBINING
+ ("E'" ["\e,L5\e$(O+Z\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,L8\e(B'"]) ("I`" ["\e,L8\e(B`"]) ;; COMBINING
+ ("I'" ["\e,L8\e$(O+Z\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(B'"]) ("O`" ["\e,L>\e$(O+\\e(B"]) ;; COMBINING
+ ("O'" ["\e,L>\e$(O+Z\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(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)
+ ("U'" ["\e,LC\e$(O+Z\e(B"]) ("U`" ["\e,LC\e$(O+\\e(B"]) ;; COMBINING
+ ("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)
  ("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,LE\e(B) ("''" ?\e,LL\e(B)
- ("@@" ?\e,LM\e(B)
+ ("~~" ?\e,LJ\e(B) ("Y" ?\e,LK\e(B) ("''" ?\e,LL\e(B)
+ ("@@" ?\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)
 
- ("/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)
  ("/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)
  ("/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)
@@ -1127,26 +1127,26 @@ cyrillic \e,Lv\e(B (I DECIMAL) = \"/i\", \e,Lx\e(B (JE) = \"/j\",
  ("/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,F!\e(B)
- ("/,," ?\e,Y%\e(B)
- ("/," ?\e$,1rz\e(B)
+ ("/-"  ?\e$(G!9\e(B)  ;; EN DASH
+ ("/--" ?\e$(G!7\e(B)  ;; EM DASH
+ ("/*" ?\e$(O#@\e(B)   ;; BULLET
+ ("/." ?\e$,1s$\e(B)  ;; ONE DOT LEADER
+ ("/.."        ?\e$(G!-\e(B)  ;; TWO DOT LEADER
+ ("/..." ?\e$A!-\e(B) ;; HORIZONTAL ELLIPSIS
+ ("/,," ?\e,Y%\e(B)  ;; DOUBLE LOW-9 QUOTATION MARK
+ ("/," ?\e$,1rz\e(B)   ;; SINGLE LOW-9 QUOTATION MARK
+ ("/''" ?\e,Y!\e(B)  ;; RIGHT DOUBLE QUOTATION MARK
+ ("/'" ?\e,F"\e(B)   ;; RIGHT SINGLE QUOTATION MARK
+ ("/``" ?\e,Y4\e(B)  ;; LEFT DOUBLE QUOTATION MARK
+ ("/`" ?\e,F!\e(B)   ;; LEFT SINGLE QUOTATION MARK
+ ("/<<" ?\e,A+\e(B)  ;; LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+ ("/>>" ?\e,A;\e(B)  ;; RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
 
  ("/&" ?\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)
 )
 
 ;; Originally from Yudit's `Belarusian input table according to