Группа :: Редакторы
Пакет: emacs22
Главная Изменения Спек Патчи Загрузить Bugs and FR
Патч: leim-22.0.50-uk.patch
diff -Naur emacs.orig/leim/quail/cyrillic.el emacs/leim/quail/cyrillic.el
--- emacs.orig/leim/quail/cyrillic.el 2005-09-03 15:14:08 +0600
+++ emacs/leim/quail/cyrillic.el 2005-09-03 16:16:39 +0600
@@ -615,112 +615,210 @@
;; Fixme: add GHE_WITH_UPTURN.
(quail-define-package
"cyrillic-ukrainian" "Ukrainian" ",L6(BU" nil
- ",L$'5@B7(B-,L&.(B UKRAINIAN (ISO 8859-5 encoding)
+ ",L9FC:5=3(B UKRAINIAN (ISO 8859-5 encoding)
-Sorry, but 'ghe with upturn' is not included in ISO 8859-5."
+Sorry, but 'ghe with upturn' is not included in ISO 8859-5,
+so we mimic it with 'gje'"
nil t t t t nil nil nil nil nil t)
-;; 1! 2" 3# 4$ 5% 6& 7' 8( 9) 0= /? +* <>
-;; ,L$(B ,L'(B ,L5(B ,L@(B ,LB(B ,L7(B ,LC(B ,L8(B ,L>(B ,L?(B ,LH(B ,L&(B
-;; ,L0(B ,LA(B ,L4(B ,LD(B ,L3(B ,LE(B ,L((B ,L:(B ,L;(B ,LG(B ,L.(B ,L6(B
-;; ,L%(B ,L/(B ,LF(B ,L2(B ,L1(B ,L=(B ,L<(B ,; .: -_
+;; ,L#(B 1! 2" 3' 4* 5: 6, 7. 8; 9( 0) -_ += \|
+;; ,L9(B ,LF(B ,LC(B ,L:(B ,L5(B ,L=(B ,L3(B ,LH(B ,LI(B ,L7(B ,LE(B ,L'(B
+;; ,LD(B ,L&(B ,L2(B ,L0(B ,L?(B ,L@(B ,L>(B ,L;(B ,L4(B ,L6(B ,L$(B
+;; ,LO(B ,LG(B ,LA(B ,L<(B ,L8(B ,LB(B ,LL(B ,L1(B ,LN(B /?
(quail-define-rules
- ("1" ?1)
- ("2" ?2)
- ("3" ?3)
- ("4" ?4)
- ("5" ?5)
- ("6" ?6)
- ("7" ?7)
- ("8" ?8)
- ("9" ?9)
- ("0" ?0)
- ("-" ?/)
- ("=" ?+)
- ("`" ?<)
- ("q" ?,Lt(B)
- ("w" ?,Lw(B)
- ("e" ?,LU(B)
- ("r" ?,L`(B)
- ("t" ?,Lb(B)
- ("y" ?,LW(B)
- ("u" ?,Lc(B)
- ("i" ?,LX(B)
- ("o" ?,L^(B)
- ("p" ?,L_(B)
- ("[" ?,Lh(B)
- ("]" ?,Lv(B)
- ("a" ?,LP(B)
- ("s" ?,La(B)
- ("d" ?,LT(B)
- ("f" ?,Ld(B)
- ("g" ?,LS(B)
- ("h" ?,Le(B)
- ("j" ?,Lx(B)
- ("k" ?,LZ(B)
- ("l" ?,L[(B)
- (";" ?,Lg(B)
- ("'" ?,L~(B)
- ("\\" ?,LV(B)
- ("z" ?,Lu(B)
- ("x" ?,L(B)
- ("c" ?,Lf(B)
- ("v" ?,LR(B)
- ("b" ?,LQ(B)
- ("n" ?,L](B)
- ("m" ?,L\(B)
- ("," ?,)
- ("." ?.)
- ("/" ?-)
+ ("`" ?,Ls(B) ("~" ?,L#(B)
+ ("1" ?1) ("!" ?!)
+ ("2" ?2) ("@" ?\")
+ ("3" ?3) ("#" ?')
+ ("4" ?4) ("$" ?*)
+ ("5" ?5) ("%" ?:)
+ ("6" ?6) ("^" ?,)
+ ("7" ?7) ("&" ?.)
+ ("8" ?8) ("*" ?\;)
+ ("9" ?9) ("(" ?\()
+ ("0" ?0) (")" ?\))
+ ("-" ?-) ("_" ?_)
+ ("=" ?=) ("+" ?+)
+ ("\\" ?\\) ("|" ?|)
+
+ ("q" ?,LY(B) ("Q" ?,L9(B)
+ ("w" ?,Lf(B) ("W" ?,LF(B)
+ ("e" ?,Lc(B) ("E" ?,LC(B)
+ ("r" ?,LZ(B) ("R" ?,L:(B)
+ ("t" ?,LU(B) ("T" ?,L5(B)
+ ("y" ?,L](B) ("Y" ?,L=(B)
+ ("u" ?,LS(B) ("U" ?,L3(B)
+ ("i" ?,Lh(B) ("I" ?,LH(B)
+ ("o" ?,Li(B) ("O" ?,LI(B)
+ ("p" ?,LW(B) ("P" ?,L7(B)
+ ("[" ?,Le(B) ("{" ?,LE(B)
+ ("]" ?,Lw(B) ("}" ?,L'(B)
+
+ ("a" ?,Ld(B) ("A" ?,LD(B)
+ ("s" ?,Lv(B) ("S" ?,L&(B)
+ ("d" ?,LR(B) ("D" ?,L2(B)
+ ("f" ?,LP(B) ("F" ?,L0(B)
+ ("g" ?,L_(B) ("G" ?,L?(B)
+ ("h" ?,L`(B) ("H" ?,L@(B)
+ ("j" ?,L^(B) ("J" ?,L>(B)
+ ("k" ?,L[(B) ("K" ?,L;(B)
+ ("l" ?,LT(B) ("L" ?,L4(B)
+ (";" ?,LV(B) (":" ?,L6(B)
+ ("'" ?,Lt(B) ("\"" ?,L$(B)
+
+ ("z" ?,Lo(B) ("Z" ?,LO(B)
+ ("x" ?,Lg(B) ("X" ?,LG(B)
+ ("c" ?,La(B) ("C" ?,LA(B)
+ ("v" ?,L\(B) ("V" ?,L<(B)
+ ("b" ?,LX(B) ("B" ?,L8(B)
+ ("n" ?,Lb(B) ("N" ?,LB(B)
+ ("m" ?,Ll(B) ("M" ?,LL(B)
+ ("," ?,LQ(B) ("<" ?,L1(B)
+ ("." ?,Ln(B) (">" ?,LN(B)
+ ("/" ?/) ("?" ??))
- ("!" ?!)
- ("@" ?\")
- ("#" ?#)
- ("$" ?$)
- ("%" ?%)
- ("^" ?&)
- ("&" ?')
- ("*" ?\()
- ("(" ?\))
- (")" ?=)
- ("_" ??)
- ("+" ?*)
- ("~" ?>)
- ("Q" ?,L$(B)
- ("W" ?,L'(B)
- ("E" ?,L5(B)
- ("R" ?,L@(B)
- ("T" ?,LB(B)
- ("Y" ?,L7(B)
- ("U" ?,LC(B)
- ("I" ?,L8(B)
- ("O" ?,L>(B)
- ("P" ?,L?(B)
- ("{" ?,LH(B)
- ("}" ?,L&(B)
- ("A" ?,L0(B)
- ("S" ?,LA(B)
- ("D" ?,L4(B)
- ("F" ?,LD(B)
- ("G" ?,L3(B)
- ("H" ?,LE(B)
- ("J" ?,L((B)
- ("K" ?,L:(B)
- ("L" ?,L;(B)
- (":" ?,LG(B)
- ("\"" ?,L.(B)
- ("|" ?,L6(B)
- ("Z" ?,L%(B)
- ("X" ?,L/(B)
- ("C" ?,LF(B)
- ("V" ?,L2(B)
- ("B" ?,L1(B)
- ("N" ?,L=(B)
- ("M" ?,L<(B)
- ("<" ?\;)
- (">" ?:)
- ("?" ?_))
+;;
+
+(quail-define-package
+ "cyrillic-ukrainian-ms" "Cyrillic" ",L6(Bu" nil
+ ",L9FC:5=3(B-MS UKRAINIAN (ISO 8859-5 encoding)
+
+Sorry, but 'ghe with upturn' is not included in ISO 8859-5,
+so we mimic it with 'gje'"
+ nil t t t t nil nil nil nil nil t)
+
+;; ,L#(B 1! 2" 3# 4; 5% 6: 7? 8* 9( 0) -_ += \|
+;; ,L9(B ,LF(B ,LC(B ,L:(B ,L5(B ,L=(B ,L3(B ,LH(B ,LI(B ,L7(B ,LE(B ,L'(B
+;; ,LD(B ,L&(B ,L2(B ,L0(B ,L?(B ,L@(B ,L>(B ,L;(B ,L4(B ,L6(B ,L$(B
+;; ,LO(B ,LG(B ,LA(B ,L<(B ,L8(B ,LB(B ,LL(B ,L1(B ,LN(B ,.
+
+(quail-define-rules
+ ("`" ?,Ls(B) ("~" ?,L#(B)
+ ("1" ?1) ("!" ?!)
+ ("2" ?2) ("@" ?\")
+ ("3" ?3) ("#" ?#)
+ ("4" ?4) ("$" ?\;)
+ ("5" ?5) ("%" ?%)
+ ("6" ?6) ("^" ?:)
+ ("7" ?7) ("&" ??)
+ ("8" ?8) ("*" ?*)
+ ("9" ?9) ("(" ?\()
+ ("0" ?0) (")" ?\))
+ ("-" ?-) ("_" ?_)
+ ("=" ?=) ("+" ?+)
+ ("\\" ?/) ("|" ?|)
+
+ ("q" ?,LY(B) ("Q" ?,L9(B)
+ ("w" ?,Lf(B) ("W" ?,LF(B)
+ ("e" ?,Lc(B) ("E" ?,LC(B)
+ ("r" ?,LZ(B) ("R" ?,L:(B)
+ ("t" ?,LU(B) ("T" ?,L5(B)
+ ("y" ?,L](B) ("Y" ?,L=(B)
+ ("u" ?,LS(B) ("U" ?,L3(B)
+ ("i" ?,Lh(B) ("I" ?,LH(B)
+ ("o" ?,Li(B) ("O" ?,LI(B)
+ ("p" ?,LW(B) ("P" ?,L7(B)
+ ("[" ?,Le(B) ("{" ?,LE(B)
+ ("]" ?,Lw(B) ("}" ?,L'(B)
+
+ ("a" ?,Ld(B) ("A" ?,LD(B)
+ ("s" ?,Lv(B) ("S" ?,L&(B)
+ ("d" ?,LR(B) ("D" ?,L2(B)
+ ("f" ?,LP(B) ("F" ?,L0(B)
+ ("g" ?,L_(B) ("G" ?,L?(B)
+ ("h" ?,L`(B) ("H" ?,L@(B)
+ ("j" ?,L^(B) ("J" ?,L>(B)
+ ("k" ?,L[(B) ("K" ?,L;(B)
+ ("l" ?,LT(B) ("L" ?,L4(B)
+ (";" ?,LV(B) (":" ?,L6(B)
+ ("'" ?,Lt(B) ("\"" ?,L$(B)
+
+ ("z" ?,Lo(B) ("Z" ?,LO(B)
+ ("x" ?,Lg(B) ("X" ?,LG(B)
+ ("c" ?,La(B) ("C" ?,LA(B)
+ ("v" ?,L\(B) ("V" ?,L<(B)
+ ("b" ?,LX(B) ("B" ?,L8(B)
+ ("n" ?,Lb(B) ("N" ?,LB(B)
+ ("m" ?,Ll(B) ("M" ?,LL(B)
+ ("," ?,LQ(B) ("<" ?,L1(B)
+ ("." ?,Ln(B) (">" ?,LN(B)
+ ("/" ?.) ("?" ?,))
+
+;;
+
+(quail-define-package
+ "cyrillic-ruskrainian" "Cyrillic" ",L@C(B" nil
+ "Russian and Ukrainian characters input method with postfix modifiers
+
+Same as Russian ,L9FC:5=3(B, but you can also input Ukrainian letters:
+ ,L3(B ' -> ,L#(B
+ ,L8(B ' -> ,L&(B
+ ,L8(B \" -> ,L'(B
+ ,LM(B / -> ,L$(B
+
+Doubling the postfix separates the letter and postfix
+"
+ nil t t t t nil nil nil nil nil t)
+
+;;
+
+(quail-define-rules
+ ("`" ?,Lq(B) ("~" ?,L!(B)
+ ("1" ?1) ("!" ?!)
+ ("2" ?2) ("@" ?\")
+ ("3" ?3) ("#" ?')
+ ("4" ?4) ("$" ?*)
+ ("5" ?5) ("%" ?:)
+ ("6" ?6) ("^" ?,)
+ ("7" ?7) ("&" ?.)
+ ("8" ?8) ("*" ?\;)
+ ("9" ?9) ("(" ?\()
+ ("0" ?0) (")" ?\))
+ ("-" ?-) ("_" ?_)
+ ("=" ?=) ("+" ?+)
+ ("\\" ?\\) ("|" ?|)
+
+ ("q" ?,LY(B) ("Q" ?,L9(B)
+ ("w" ?,Lf(B) ("W" ?,LF(B)
+ ("e" ?,Lc(B) ("E" ?,LC(B)
+ ("r" ?,LZ(B) ("R" ?,L:(B)
+ ("t" ?,LU(B) ("T" ?,L5(B)
+ ("y" ?,L](B) ("Y" ?,L=(B)
+ ("u" ?,LS(B) ("U" ?,L3(B) ("u#" ?,Ls(B) ("U#" ?,L#(B)
+ ("i" ?,Lh(B) ("I" ?,LH(B)
+ ("o" ?,Li(B) ("O" ?,LI(B)
+ ("p" ?,LW(B) ("P" ?,L7(B)
+ ("[" ?,Le(B) ("{" ?,LE(B)
+ ("]" ?,Lj(B) ("}" ?,LJ(B)
+
+ ("a" ?,Ld(B) ("A" ?,LD(B)
+ ("s" ?,Lk(B) ("S" ?,LK(B)
+ ("d" ?,LR(B) ("D" ?,L2(B)
+ ("f" ?,LP(B) ("F" ?,L0(B)
+ ("g" ?,L_(B) ("G" ?,L?(B)
+ ("h" ?,L`(B) ("H" ?,L@(B)
+ ("j" ?,L^(B) ("J" ?,L>(B)
+ ("k" ?,L[(B) ("K" ?,L;(B)
+ ("l" ?,LT(B) ("L" ?,L4(B)
+ (";" ?,LV(B) (":" ?,L6(B)
+ ("'" ?,Lm(B) ("\"" ?,LM(B) ("'/" ?,Lt(B) ("\"/" ?,L$(B)
+
+ ("z" ?,Lo(B) ("Z" ?,LO(B)
+ ("x" ?,Lg(B) ("X" ?,LG(B)
+ ("c" ?,La(B) ("C" ?,LA(B)
+ ("v" ?,L\(B) ("V" ?,L<(B)
+ ("b" ?,LX(B) ("B" ?,L8(B) ("b#" ?,Lv(B) ("B#" ?,L&(B) ("b@" ?,Lw(B) ("B@" ?,L'(B)
+ ("n" ?,Lb(B) ("N" ?,LB(B)
+ ("m" ?,Ll(B) ("M" ?,LL(B)
+ ("," ?,LQ(B) ("<" ?,L1(B)
+ ("." ?,Ln(B) (">" ?,LN(B)
+ ("/" ?/) ("?" ??)
+
+ ("u##" [",LS(B'"]) ("U##" [",L3(B'"])
+ ("'//" [",Lm(B/"]) ("\"//" [",LM(B/"])
+ ("b##" [",LX(B'"]) ("B##" [",L8(B'"])
+ ("b@@" [",LX(B\""]) ("B@@" [",L8(B\""]))
(quail-define-package