X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/412f24b9ddf1e07022f8c5fe05f0717f130c4c02..44caa96dc5c16cbc4ee1bb26ec880af2e2ecf9f8:/lisp/language/cyril-util.el diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el index e833bb7ab0..15a92dd73a 100644 --- a/lisp/language/cyril-util.el +++ b/lisp/language/cyril-util.el @@ -1,6 +1,6 @@ ;;; cyril-util.el --- utilities for Cyrillic scripts -;; Copyright (C) 1997-1998, 2001-2011 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2001-2016 Free Software Foundation, Inc. ;; Keywords: mule, multilingual, Cyrillic @@ -41,7 +41,7 @@ ;; Written by Valery Alexeev . (defvar cyrillic-language-alist - (list '("Belorussian") '("Bulgarian") '("Macedonian") + (list '("Belarusian") '("Bulgarian") '("Macedonian") '("Russian") '("Serbo-Croatian") '("Ukrainian")) "List of known cyrillic languages.") @@ -71,124 +71,124 @@ If the argument is nil, we return the display table to its standard state." (if (null cyrillic-language) (setq standard-display-table (make-display-table)) - (aset standard-display-table ?,LP(B [?a]) - (aset standard-display-table ?,LQ(B [?b]) - (aset standard-display-table ?,LR(B [?v]) - (aset standard-display-table ?,LS(B [?g]) - (aset standard-display-table ?,LT(B [?d]) - (aset standard-display-table ?,LU(B [?e]) - (aset standard-display-table ?,Lq(B [?y ?o]) - (aset standard-display-table ?,LV(B [?z ?h]) - (aset standard-display-table ?,LW(B [?z]) - (aset standard-display-table ?,LX(B [?i]) - (aset standard-display-table ?,LY(B [?j]) - (aset standard-display-table ?,LZ(B [?k]) - (aset standard-display-table ?,L[(B [?l]) - (aset standard-display-table ?,L\(B [?m]) - (aset standard-display-table ?,L](B [?n]) - (aset standard-display-table ?,L^(B [?o]) - (aset standard-display-table ?,L_(B [?p]) - (aset standard-display-table ?,L`(B [?r]) - (aset standard-display-table ?,La(B [?s]) - (aset standard-display-table ?,Lb(B [?t]) - (aset standard-display-table ?,Lc(B [?u]) - (aset standard-display-table ?,Ld(B [?f]) - (aset standard-display-table ?,Le(B [?k ?h]) - (aset standard-display-table ?,Lf(B [?t ?s]) - (aset standard-display-table ?,Lg(B [?c ?h]) - (aset standard-display-table ?,Lh(B [?s ?h]) - (aset standard-display-table ?,Li(B [?s ?c ?h]) - (aset standard-display-table ?,Lj(B [?~]) - (aset standard-display-table ?,Lk(B [?y]) - (aset standard-display-table ?,Ll(B [?']) - (aset standard-display-table ?,Lm(B [?e ?']) - (aset standard-display-table ?,Ln(B [?y ?u]) - (aset standard-display-table ?,Lo(B [?y ?a]) - - (aset standard-display-table ?,L0(B [?A]) - (aset standard-display-table ?,L1(B [?B]) - (aset standard-display-table ?,L2(B [?V]) - (aset standard-display-table ?,L3(B [?G]) - (aset standard-display-table ?,L4(B [?D]) - (aset standard-display-table ?,L5(B [?E]) - (aset standard-display-table ?,L!(B [?Y ?o]) - (aset standard-display-table ?,L6(B [?Z ?h]) - (aset standard-display-table ?,L7(B [?Z]) - (aset standard-display-table ?,L8(B [?I]) - (aset standard-display-table ?,L9(B [?J]) - (aset standard-display-table ?,L:(B [?K]) - (aset standard-display-table ?,L;(B [?L]) - (aset standard-display-table ?,L<(B [?M]) - (aset standard-display-table ?,L=(B [?N]) - (aset standard-display-table ?,L>(B [?O]) - (aset standard-display-table ?,L?(B [?P]) - (aset standard-display-table ?,L@(B [?R]) - (aset standard-display-table ?,LA(B [?S]) - (aset standard-display-table ?,LB(B [?T]) - (aset standard-display-table ?,LC(B [?U]) - (aset standard-display-table ?,LD(B [?F]) - (aset standard-display-table ?,LE(B [?K ?h]) - (aset standard-display-table ?,LF(B [?T ?s]) - (aset standard-display-table ?,LG(B [?C ?h]) - (aset standard-display-table ?,LH(B [?S ?h]) - (aset standard-display-table ?,LI(B [?S ?c ?h]) - (aset standard-display-table ?,LJ(B [?~]) - (aset standard-display-table ?,LK(B [?Y]) - (aset standard-display-table ?,LL(B [?']) - (aset standard-display-table ?,LM(B [?E ?']) - (aset standard-display-table ?,LN(B [?Y ?u]) - (aset standard-display-table ?,LO(B [?Y ?a]) - - (aset standard-display-table ?,Lt(B [?i ?e]) - (aset standard-display-table ?,Lw(B [?i]) - (aset standard-display-table ?,L~(B [?u]) - (aset standard-display-table ?,Lr(B [?d ?j]) - (aset standard-display-table ?,L{(B [?c ?h ?j]) - (aset standard-display-table ?,Ls(B [?g ?j]) - (aset standard-display-table ?,Lu(B [?s]) - (aset standard-display-table ?,L|(B [?k]) - (aset standard-display-table ?,Lv(B [?i]) - (aset standard-display-table ?,Lx(B [?j]) - (aset standard-display-table ?,Ly(B [?l ?j]) - (aset standard-display-table ?,Lz(B [?n ?j]) - (aset standard-display-table ?,L(B [?d ?z]) - - (aset standard-display-table ?,L$(B [?Y ?e]) - (aset standard-display-table ?,L'(B [?Y ?i]) - (aset standard-display-table ?,L.(B [?U]) - (aset standard-display-table ?,L"(B [?D ?j]) - (aset standard-display-table ?,L+(B [?C ?h ?j]) - (aset standard-display-table ?,L#(B [?G ?j]) - (aset standard-display-table ?,L%(B [?S]) - (aset standard-display-table ?,L,(B [?K]) - (aset standard-display-table ?,L&(B [?I]) - (aset standard-display-table ?,L((B [?J]) - (aset standard-display-table ?,L)(B [?L ?j]) - (aset standard-display-table ?,L*(B [?N ?j]) - (aset standard-display-table ?,L/(B [?D ?j]) + (aset standard-display-table ?а [?a]) + (aset standard-display-table ?б [?b]) + (aset standard-display-table ?в [?v]) + (aset standard-display-table ?г [?g]) + (aset standard-display-table ?д [?d]) + (aset standard-display-table ?е [?e]) + (aset standard-display-table ?ё [?y ?o]) + (aset standard-display-table ?ж [?z ?h]) + (aset standard-display-table ?з [?z]) + (aset standard-display-table ?и [?i]) + (aset standard-display-table ?й [?j]) + (aset standard-display-table ?к [?k]) + (aset standard-display-table ?л [?l]) + (aset standard-display-table ?м [?m]) + (aset standard-display-table ?н [?n]) + (aset standard-display-table ?о [?o]) + (aset standard-display-table ?п [?p]) + (aset standard-display-table ?р [?r]) + (aset standard-display-table ?с [?s]) + (aset standard-display-table ?т [?t]) + (aset standard-display-table ?у [?u]) + (aset standard-display-table ?ф [?f]) + (aset standard-display-table ?х [?k ?h]) + (aset standard-display-table ?ц [?t ?s]) + (aset standard-display-table ?ч [?c ?h]) + (aset standard-display-table ?ш [?s ?h]) + (aset standard-display-table ?щ [?s ?c ?h]) + (aset standard-display-table ?ъ [?~]) + (aset standard-display-table ?ы [?y]) + (aset standard-display-table ?ь [?']) + (aset standard-display-table ?э [?e ?']) + (aset standard-display-table ?ю [?y ?u]) + (aset standard-display-table ?я [?y ?a]) + + (aset standard-display-table ?А [?A]) + (aset standard-display-table ?Б [?B]) + (aset standard-display-table ?В [?V]) + (aset standard-display-table ?Г [?G]) + (aset standard-display-table ?Д [?D]) + (aset standard-display-table ?Е [?E]) + (aset standard-display-table ?Ё [?Y ?o]) + (aset standard-display-table ?Ж [?Z ?h]) + (aset standard-display-table ?З [?Z]) + (aset standard-display-table ?И [?I]) + (aset standard-display-table ?Й [?J]) + (aset standard-display-table ?К [?K]) + (aset standard-display-table ?Л [?L]) + (aset standard-display-table ?М [?M]) + (aset standard-display-table ?Н [?N]) + (aset standard-display-table ?О [?O]) + (aset standard-display-table ?П [?P]) + (aset standard-display-table ?Р [?R]) + (aset standard-display-table ?С [?S]) + (aset standard-display-table ?Т [?T]) + (aset standard-display-table ?У [?U]) + (aset standard-display-table ?Ф [?F]) + (aset standard-display-table ?Х [?K ?h]) + (aset standard-display-table ?Ц [?T ?s]) + (aset standard-display-table ?Ч [?C ?h]) + (aset standard-display-table ?Ш [?S ?h]) + (aset standard-display-table ?Щ [?S ?c ?h]) + (aset standard-display-table ?Ъ [?~]) + (aset standard-display-table ?Ы [?Y]) + (aset standard-display-table ?Ь [?']) + (aset standard-display-table ?Э [?E ?']) + (aset standard-display-table ?Ю [?Y ?u]) + (aset standard-display-table ?Я [?Y ?a]) + + (aset standard-display-table ?є [?i ?e]) + (aset standard-display-table ?ї [?i]) + (aset standard-display-table ?ў [?u]) + (aset standard-display-table ?ђ [?d ?j]) + (aset standard-display-table ?ћ [?c ?h ?j]) + (aset standard-display-table ?ѓ [?g ?j]) + (aset standard-display-table ?ѕ [?s]) + (aset standard-display-table ?ќ [?k]) + (aset standard-display-table ?і [?i]) + (aset standard-display-table ?ј [?j]) + (aset standard-display-table ?љ [?l ?j]) + (aset standard-display-table ?њ [?n ?j]) + (aset standard-display-table ?џ [?d ?z]) + + (aset standard-display-table ?Є [?Y ?e]) + (aset standard-display-table ?Ї [?Y ?i]) + (aset standard-display-table ?Ў [?U]) + (aset standard-display-table ?Ђ [?D ?j]) + (aset standard-display-table ?Ћ [?C ?h ?j]) + (aset standard-display-table ?Ѓ [?G ?j]) + (aset standard-display-table ?Ѕ [?S]) + (aset standard-display-table ?Ќ [?K]) + (aset standard-display-table ?І [?I]) + (aset standard-display-table ?Ј [?J]) + (aset standard-display-table ?Љ [?L ?j]) + (aset standard-display-table ?Њ [?N ?j]) + (aset standard-display-table ?Џ [?D ?j]) (when (equal cyrillic-language "Bulgarian") - (aset standard-display-table ?,Li(B [?s ?h ?t]) - (aset standard-display-table ?,LI(B [?S ?h ?t]) - (aset standard-display-table ?,Ln(B [?i ?u]) - (aset standard-display-table ?,LN(B [?I ?u]) - (aset standard-display-table ?,Lo(B [?i ?a]) - (aset standard-display-table ?,LO(B [?I ?a])) + (aset standard-display-table ?щ [?s ?h ?t]) + (aset standard-display-table ?Щ [?S ?h ?t]) + (aset standard-display-table ?ю [?i ?u]) + (aset standard-display-table ?Ю [?I ?u]) + (aset standard-display-table ?я [?i ?a]) + (aset standard-display-table ?Я [?I ?a])) (when (equal cyrillic-language "Ukrainian") ; based on the official ; transliteration table - (aset standard-display-table ?,LX(B [?y]) - (aset standard-display-table ?,L8(B [?Y]) - (aset standard-display-table ?,LY(B [?i]) - (aset standard-display-table ?,L9(B [?Y]) - (aset standard-display-table ?,Ln(B [?i ?u]) - (aset standard-display-table ?,Lo(B [?i ?a])))) + (aset standard-display-table ?и [?y]) + (aset standard-display-table ?И [?Y]) + (aset standard-display-table ?й [?i]) + (aset standard-display-table ?Й [?Y]) + (aset standard-display-table ?ю [?i ?u]) + (aset standard-display-table ?я [?i ?a])))) ;; (provide 'cyril-util) ;; Local Variables: -;; coding: iso-2022-7bit +;; coding: utf-8 ;; End: ;;; cyril-util.el ends here