Change coding system name koi8 to koi8-r.

Remove prefix "coding-system-" from coding system symbol names.

1 files changed, 147 insertions, 7 deletions

diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 4c3e07eb19a..d7d82c2397f 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -24,15 +24,155 @@
 
 ;;; Commentary:
 
-;; The character set ISO8859-5 is supported.
+;; The character set ISO8859-5 is supported.  KOI-8 and ALTERNATIVNYJ
+;; are converted to ISO8859-5 internally.
 
 ;;; Code:
 
+;; ISO-8859-5 staff
+
 (make-coding-system
- 'coding-system-iso-8859-5 2 ?5 "MIME ISO-8859-5"
+ 'iso-8859-5 2 ?5 "MIME ISO-8859-5"
  '((ascii t) (cyrillic-iso8859-5 t) nil nil
    nil ascii-eol ascii-cntl nil nil nil nil))
 
+;; KOI-8 staff
+
+(define-ccl-program ccl-decode-koi8
+  '(3
+    ((read r0)
+     (loop
+      (write-read-repeat
+       r0
+       [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
+	  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
+	  32  32  32 ?,Lq(B   32  32  32  32  32  32  32  32  32  32  32  32
+	  32  32  32 ?,L!(B   32  32  32  32  32  32  32  32  32  32  32  32
+	  ?,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 ]))))
+  "CCL program to decode KOI8.")
+
+(define-ccl-program ccl-encode-koi8
+  `(1
+    ((read r0)
+     (loop
+      (if (r0 != ,(charset-id 'cyrillic-iso8859-5))
+	  (write-read-repeat r0)
+	((read r0)
+	 (r0 -= 160)
+	 (write-read-repeat
+	  r0
+	  [ 32 179  32  32  32  32  32  32  32  32  32  32  32  32  32  32
+	       225 226 247 231 228 229 246 250 233 234 235 236 237 238 239 240
+	       242 243 244 245 230 232 227 254 251 253 255 249 248 252 224 241
+	       193 194 215 199 196 197 214 218 201 202 203 204 205 206 207 208
+	       210 211 212 213 198 200 195 222 219 221 223 217 216 220 192 209
+	       32 163  32  32  32  32  32  32  32  32  32  32  32  32  32  32])
+	 )))))
+  "CCL program to encode KOI8.")
+	     
+(make-coding-system
+ 'koi8-r 4
+ ?K "Coding-system used for KOI8."
+ (cons ccl-decode-koi8 ccl-encode-koi8))
+
+(define-coding-system-alias 'koi8-r 'koi8)
+
+(define-ccl-program ccl-encode-koi8-font
+  '(0
+    ((r1 -= 160)
+     (r1 = r1
+	 [ 32 179  32  32  32  32  32  32  32  32  32  32  32  32  32  32
+	      225 226 247 231 228 229 246 250 233 234 235 236 237 238 239 240
+	      242 243 244 245 230 232 227 254 251 253 255 249 248 252 224 241
+	      193 194 215 199 196 197 214 218 201 202 203 204 205 206 207 208
+	      210 211 212 213 198 200 195 222 219 221 223 217 216 220 192 209
+	      32 163  32  32  32  32  32  32  32  32  32  32  32  32  32  32])
+     ))
+  "CCL program to encode Cyrillic chars to KOI font.")
+
+(setq font-ccl-encoder-alist
+      (cons (cons "koi8" ccl-encode-koi8-font) font-ccl-encoder-alist))
+
+;;; ALTERNATIVNYJ staff
+
+(define-ccl-program ccl-decode-alternativnyj
+  '(3
+    ((read r0)
+     (loop
+      (write-read-repeat
+       r0
+       [  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
+	 ?,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
+	 32  32  32  32  32  32  32  32  32  32  32  32  32  32  32  32
+	 32  32  32  32  32  32  32  32  32  32  32  32  32  32  32  32
+	 32  32  32  32  32  32  32  32  32  32  32  32  32  32  32  32
+	 ?,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   32  32  32  32  32  32  32  32  32  32  32  32  32 ?,Lp(B]))))
+  "CCL program to decode Alternativnyj.")
+
+(define-ccl-program ccl-encode-alternativnyj
+  `(1
+    ((read r0)
+     (loop
+      (if (r0 != ,(charset-id 'cyrillic-iso8859-5))
+	  (write-read-repeat r0)
+	((read r0)
+	 (r0 -= 160)
+	 (write-read-repeat
+	  r0
+	  [ 32 240  32  32  32  32  32  32  32  32  32  32  32  32  32  32
+	       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 163 164 165 166 167 168 169 170 171 172 173 174 175
+	       224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239
+	       255 241  32  32  32  32  32  32  32  32  32  32  32  32  32  32])
+	 )))))
+  "CCL program to encode Alternativnyj.")
+	     
+(make-coding-system
+ 'alternativnyj 4
+ ?A "Coding-system used for Alternativnyj"
+ (cons ccl-decode-alternativnyj ccl-encode-alternativnyj))
+
+(define-ccl-program ccl-encode-alternativnyj-font
+  '(0
+    ((r1 -= 160)
+     (r1 = r1
+	 [ 32 240  32  32  32  32  32  32  32  32  32  32  32  32  32  32
+	      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 163 164 165 166 167 168 169 170 171 172 173 174 175
+	      224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239
+	      255 241  32  32  32  32  32  32  32  32  32  32  32  32  32  32])
+     ))
+  "CCL program to encode Cyrillic chars to Alternativnyj font.")
+
+(setq font-ccl-encoder-alist
+      (cons (cons "alternativnyj" ccl-encode-alternativnyj-font)
+	    font-ccl-encoder-alist))
+
+;;; GENERAL
+
 (register-input-method
  "Cyrillic" '("quail-jcuken" quail-use-package "quail/cyrillic"))
 (register-input-method
@@ -49,15 +189,15 @@
 (defun setup-cyrillic-environment ()
   (setq primary-language "Cyrillic")
 
-  (setq coding-category-iso-8-1 'coding-system-iso-8859-5)
+  (setq coding-category-iso-8-1 'iso-8859-5)
 
   (set-coding-priority
    '(coding-category-iso-7
      coding-category-iso-8-1))
 
-  (setq-default buffer-file-coding-system 'coding-system-iso-8859-5)
-  (set-terminal-coding-system 'coding-system-iso-8859-5)
-  (set-keyboard-coding-system 'coding-system-iso-8859-5)
+  (setq-default buffer-file-coding-system 'iso-8859-5)
+  (set-terminal-coding-system 'iso-8859-5)
+  (set-keyboard-coding-system 'iso-8859-5)
 
   (setq default-input-method '("Cyrillic" . "quail-yawerty"))
   )
@@ -65,7 +205,7 @@
 (set-language-info-alist
  "Cyrillic" '((setup-function . setup-cyrillic-environment)
 	      (charset . (cyrillic-iso8859-5))
-	      (coding-system . (coding-system-iso-8859-5))
+	      (coding-system . (iso-8859-5 koi8 alternativnyj))
 	      (documentation . t)
 	      (sample-text . "Russian (,L@caaZXY(B)	,L7T`PRabRcYbU(B!")))