From d38ffc41f496bbb708c13f716584e003c4418668 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Tue, 5 Jun 2001 20:23:27 +0000 Subject: [PATCH] (cyrillic-koi8-r-decode-table) (cyrillic-alternativnyj-decode-table): Fill it out with Unicode. (ccl-encode-koi8): Generalize for use by unification code. (cyrillic-koi8): Doc fix. (cp878, cp866): New coding system alias. (cyrillic-koi8-u-decode-table): New variable. (koi8-u, font-ccl-encoder-alist, ccl-encode-koi8-u-font): New ccl program. (koi8-u"): New coding system. ("Cyrillic-KOI8-U"): New language environment. (cyrillic-alternativnyj): Define mime-charset. --- lisp/language/cyrillic.el | 123 +++++++++++++++++++++++++++++++++----- 1 file changed, 108 insertions(+), 15 deletions(-) diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el index 094885a5054..2399f2343a9 100644 --- a/lisp/language/cyrillic.el +++ b/lisp/language/cyrillic.el @@ -25,7 +25,11 @@ ;;; Commentary: ;; The character set ISO8859-5 is supported. KOI-8 and ALTERNATIVNYJ -;; are converted to ISO8859-5 internally. +;; are converted to ISO8859-5 internally. See +;; . For more info +;; on Cyrillic charsets, see +;; . KOI-8 and +;; ALTERNATIVNYJ are converted to ISO8859-5 internally. ;;; Code: @@ -55,8 +59,11 @@ (documentation . "Support for Cyrillic ISO-8859-5.")) '("Cyrillic")) -;; KOI-8 staff +;; KOI-8 stuff +;; The mule-unicode portion of this is from +;; http://www.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT, +;; which references RFC 1489. (defvar cyrillic-koi8-r-decode-table [ 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 @@ -67,10 +74,10 @@ 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 - 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 - 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 - 160 161 162 ?,Lq(B 164 165 166 167 168 169 170 171 172 173 174 175 - 176 177 178 ?,L!(B 180 181 182 183 184 185 186 187 188 189 190 191 + ?$,2 (B ?$,2 "(B ?$,2 ,(B ?$,2 0(B ?$,2 4(B ?$,2 8(B ?$,2 <(B ?$,2 D(B ?$,2 L(B ?$,2 T(B ?$,2 \(B ?$,2!@(B ?$,2!D(B ?$,2!H(B ?$,2!L(B ?$,2!P(B + ?$,2!Q(B ?$,2!R(B ?$,2!S(B ?$,1{ (B ?$,2!`(B ?$,1x9(B ?$,1x:(B ?$,1xh(B ?$,1y$(B ?$,1y%(B ?,A (B ?$,1{!(B ?,A0(B ?,A2(B ?,A7(B ?,Aw(B + ?$,2 p(B ?$,2 q(B ?$,2 r(B ?,Lq(B ?$,2 s(B ?$,2 t(B ?$,2 u(B ?$,2 v(B ?$,2 w(B ?$,2 x(B ?$,2 y(B ?$,2 z(B ?$,2 {(B ?$,2 |(B ?$,2 }(B ?$,2 ~(B + ?$,2 (B ?$,2! (B ?$,2!!(B ?,L!(B ?$,2!"(B ?$,2!#(B ?$,2!$(B ?$,2!%(B ?$,2!&(B ?$,2!'(B ?$,2!((B ?$,2!)(B ?$,2!*(B ?$,2!+(B ?$,2!,(B ?,A)(B ?,Ln(B ?,LP(B ?,LQ(B ?,Lf(B ?,LT(B ?,LU(B ?,Ld(B ?,LS(B ?,Le(B ?,LX(B ?,LY(B ?,LZ(B ?,L[(B ?,L\(B ?,L](B ?,L^(B ?,L_(B ?,Lo(B ?,L`(B ?,La(B ?,Lb(B ?,Lc(B ?,LV(B ?,LR(B ?,Ll(B ?,Lk(B ?,LW(B ?,Lh(B ?,Lm(B ?,Li(B ?,Lg(B ?,Lj(B ?,LN(B ?,L0(B ?,L1(B ?,LF(B ?,L4(B ?,L5(B ?,LD(B ?,L3(B ?,LE(B ?,L8(B ?,L9(B ?,L:(B ?,L;(B ?,L<(B ?,L=(B ?,L>(B @@ -93,16 +100,15 @@ ((translate-character cyrillic-koi8-r-nonascii-translation-table r0 r1) (write-multibyte-character r0 r1) (repeat)))))) - "CCL program to decode KOI8.") + "CCL program to decode KOI8-R.") (define-ccl-program ccl-encode-koi8 `(1 ((loop (read-multibyte-character r0 r1) - (if (r0 == ,(charset-id 'cyrillic-iso8859-5)) - (translate-character cyrillic-koi8-r-encode-table r0 r1)) + (translate-character cyrillic-koi8-r-encode-table r0 r1) (write-repeat r1)))) - "CCL program to encode KOI8.") + "CCL program to encode KOI8-R.") (make-coding-system 'cyrillic-koi8 4 @@ -110,7 +116,7 @@ ;; but it is also used for Korean. ;; So people who use koi8 for languages other than Russian ;; will have to forgive us. - ?R "KOI8 8-bit encoding for Cyrillic (MIME: KOI8-R)" + ?R "KOI8-R 8-bit encoding for Cyrillic (MIME: KOI8-R)" '(ccl-decode-koi8 . ccl-encode-koi8) `((safe-chars . ,(let ((table (make-char-table 'safe-chars)) (i 0)) @@ -125,6 +131,7 @@ (define-coding-system-alias 'koi8-r 'cyrillic-koi8) (define-coding-system-alias 'koi8 'cyrillic-koi8) +(define-coding-system-alias 'cp878 'cyrillic-koi8) (define-ccl-program ccl-encode-koi8-font `(0 @@ -148,6 +155,90 @@ (documentation . "Support for Cyrillic KOI8-R.")) '("Cyrillic")) + +(defvar cyrillic-koi8-u-decode-table + [ + 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 + 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 + 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 + 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 + 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 + 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 + ?$,2 (B ?$,2 "(B ?$,2 ,(B ?$,2 0(B ?$,2 4(B ?$,2 8(B ?$,2 <(B ?$,2 D(B ?$,2 L(B ?$,2 T(B ?$,2 \(B ?$,2!@(B ?$,2!D(B ?$,2!H(B ?$,2!L(B ?$,2!P(B + ?$,2!Q(B ?$,2!R(B ?$,2!S(B ?$,1{ (B ?$,2!`(B ?$,1x9(B ?$,1x:(B ?$,1xh(B ?$,1y$(B ?$,1y%(B ?,A (B ?$,1{!(B ?,A0(B ?,A2(B ?,A7(B ?,Aw(B + ?$,2 p(B ?$,2 q(B ?$,2 r(B ?,Lq(B ?,Lt(B ?$,2 t(B ?,Lv(B ?,Lw(B ?$,2 w(B ?$,2 x(B ?$,2 y(B ?$,2 z(B ?$,2 {(B ?$,1)Q(B ?$,2 }(B ?$,2 ~(B + ?$,2 (B ?$,2! (B ?$,2!!(B ?,L!(B ?,L$(B ?$,2!#(B ?,L&(B ?,L'(B ?$,2!&(B ?$,2!'(B ?$,2!((B ?$,2!)(B ?$,2!*(B ?$,1)P(B ?$,2!,(B ?,A)(B + ?,Ln(B ?,LP(B ?,LQ(B ?,Lf(B ?,LT(B ?,LU(B ?,Ld(B ?,LS(B ?,Le(B ?,LX(B ?,LY(B ?,LZ(B ?,L[(B ?,L\(B ?,L](B ?,L^(B + ?,L_(B ?,Lo(B ?,L`(B ?,La(B ?,Lb(B ?,Lc(B ?,LV(B ?,LR(B ?,Ll(B ?,Lk(B ?,LW(B ?,Lh(B ?,Lm(B ?,Li(B ?,Lg(B ?,Lj(B + ?,LN(B ?,L0(B ?,L1(B ?,LF(B ?,L4(B ?,L5(B ?,LD(B ?,L3(B ?,LE(B ?,L8(B ?,L9(B ?,L:(B ?,L;(B ?,L<(B ?,L=(B ?,L>(B + ?,L?(B ?,LO(B ?,L@(B ?,LA(B ?,LB(B ?,LC(B ?,L6(B ?,L2(B ?,LL(B ?,LK(B ?,L7(B ?,LH(B ?,LM(B ?,LI(B ?,LG(B ?,LJ(B ] + "Cyrillic KOI8-U decoding table.") + +(let ((table (make-translation-table-from-vector + cyrillic-koi8-u-decode-table))) + (define-translation-table 'cyrillic-koi8-u-nonascii-translation-table table) + (define-translation-table 'cyrillic-koi8-u-encode-table + (char-table-extra-slot table 0))) + +(define-ccl-program ccl-decode-koi8-u + `(3 + ((loop + (r0 = 0) + (read r1) + (if (r1 < 128) + (write-repeat r1) + ((translate-character cyrillic-koi8-u-nonascii-translation-table r0 r1) + (write-multibyte-character r0 r1) + (repeat)))))) + "CCL program to decode KOI8-U.") + +(define-ccl-program ccl-encode-koi8-u + `(1 + ((loop + (read-multibyte-character r0 r1) + (translate-character cyrillic-koi8-u-encode-table r0 r1) + (write-repeat r1)))) + "CCL program to encode KOI8-U.") + +(make-coding-system + 'koi8-u 4 + ?U "KOI8 8-bit encoding for Cyrillic (MIME: KOI8-U)" + '(ccl-decode-koi8-u . ccl-encode-koi8-u) + `((safe-chars . ,(let ((table (make-char-table 'safe-chars)) + (i 0)) + (while (< i 256) + (aset table (aref cyrillic-koi8-u-decode-table i) t) + (setq i (1+ i))) + table)) + (mime-charset . koi8-u) + (valid-codes (0 . 127) 163 179 (192 . 255)) + (charset-origin-alist (cyrillic-iso8859-5 "KOI8-U" + cyrillic-encode-koi8-u-char)))) + +(define-ccl-program ccl-encode-koi8-u-font + `(0 + ((translate-character cyrillic-koi8-u-encode-table r0 r1))) + "CCL program to encode Cyrillic chars to KOI-U font.") + +(setq font-ccl-encoder-alist + (cons '("koi8-u" . ccl-encode-koi8-u-font) font-ccl-encoder-alist)) + +(set-language-info-alist + "Cyrillic-KOI8-U" `((charset cyrillic-iso8859-5) + (nonascii-translation + . ,(get 'cyrillic-koi8-u-nonascii-translation-table + 'translation-table)) + (coding-system cyrillic-koi8-u) + (coding-priority cyrillic-koi8-u) + (input-method . "cyrillic-jcuken") + (features cyril-util) + (unibyte-display . cyrillic-koi8-u) + (sample-text . "Russian (,L@caaZXY(B) ,L7T`PRabRcYbU(B!") + (documentation . "Support for Cyrillic KOI8-U.")) + '("Cyrillic")) + ;;; ALTERNATIVNYJ staff (defvar cyrillic-alternativnyj-decode-table @@ -163,11 +254,11 @@ ?,L0(B ?,L1(B ?,L2(B ?,L3(B ?,L4(B ?,L5(B ?,L6(B ?,L7(B ?,L8(B ?,L9(B ?,L:(B ?,L;(B ?,L<(B ?,L=(B ?,L>(B ?,L?(B ?,L@(B ?,LA(B ?,LB(B ?,LC(B ?,LD(B ?,LE(B ?,LF(B ?,LG(B ?,LH(B ?,LI(B ?,LJ(B ?,LK(B ?,LL(B ?,LM(B ?,LN(B ?,LO(B ?,LP(B ?,LQ(B ?,LR(B ?,LS(B ?,LT(B ?,LU(B ?,LV(B ?,LW(B ?,LX(B ?,LY(B ?,LZ(B ?,L[(B ?,L\(B ?,L](B ?,L^(B ?,L_(B - 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 - 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 - 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 + ?$,2!Q(B ?$,2!R(B ?$,2!S(B ?$,2 "(B ?$,2 D(B ?$,2!!(B ?$,2!"(B ?$,2 v(B ?$,2 u(B ?$,2!#(B ?$,2 q(B ?$,2 w(B ?$,2 }(B ?$,2 |(B ?$,2 {(B ?$,2 0(B + ?$,2 4(B ?$,2 T(B ?$,2 L(B ?$,2 <(B ?$,2 (B ?$,2 \(B ?$,2 ~(B ?$,2 (B ?$,2 z(B ?$,2 t(B ?$,2!)(B ?$,2!&(B ?$,2! (B ?$,2 p(B ?$,2!,(B ?$,2!'(B + ?$,2!((B ?$,2!$(B ?$,2!%(B ?$,2 y(B ?$,2 x(B ?$,2 r(B ?$,2 s(B ?$,2!+(B ?$,2!*(B ?$,2 8(B ?$,2 ,(B ?$,2!H(B ?$,2!D(B ?$,2!L(B ?$,2!P(B ?$,2!@(B ?,L`(B ?,La(B ?,Lb(B ?,Lc(B ?,Ld(B ?,Le(B ?,Lf(B ?,Lg(B ?,Lh(B ?,Li(B ?,Lj(B ?,Lk(B ?,Ll(B ?,Lm(B ?,Ln(B ?,Lo(B - ?,L!(B ?,Lq(B 242 243 244 245 246 247 248 249 250 251 252 253 254 ?,Lp(B] + ?,L!(B ?,Lq(B ?$,1($(B ?$,1(t(B ?$,1('(B ?$,1(w(B ?$,1(.(B ?$,1(~(B ?,A0(B ?$,1s"(B ?,A7(B ?$,1x:(B ?,Lp(B ?,A$(B ?$,2!`(B ?,L (B] "Cyrillic ALTERNATIVNYJ decoding table.") (let ((table (make-translation-table-from-vector @@ -211,11 +302,13 @@ (setq i (1+ i))) table)) (valid-codes (0 . 175) (224 . 241) 255) + (mime-charset . cp866) (charset-origin-alist (cyrillic-iso8859-5 "ALTERNATIVNYJ" cyrillic-encode-koi8-r-char)))) (define-coding-system-alias 'alternativnyj 'cyrillic-alternativnyj) +(define-coding-system-alias 'cp866 'cyrillic-alternativnyj) (define-ccl-program ccl-encode-alternativnyj-font '(0 -- 2.39.5