1 files changed, 7 insertions, 123 deletions
diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index e35d45b5afe..87ff6090ae9 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, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2002 Free Software Foundation, Inc.
 ;; Keywords: mule, multilingual, Cyrillic
@@ -25,22 +25,17 @@
 ;;; Code:
+;; Fixme: are the next two useful?
 ;;;###autoload
 (defun cyrillic-encode-koi8-r-char (char)
  "Return KOI8-R external character code of CHAR if appropriate."
-  (aref (char-table-extra-slot
+  (encode-char char 'koi8-r))
-         (get 'cyrillic-koi8-r-nonascii-translation-table 'translation-table)
-         0)
-        char))
 ;;;###autoload
 (defun cyrillic-encode-alternativnyj-char (char)
  "Return ALTERNATIVNYJ external character code of CHAR if appropriate."
-  (aref (char-table-extra-slot
+  (encode-char char 'alternativnyj))
-         (get 'cyrillic-alternativnyj-nonascii-translation-table
-              'translation-table)
-         0)
-        char))
 ;; Display
@@ -174,117 +169,13 @@ If the argument is nil, we return the display table to its standard state."
    (aset standard-display-table ?,L*(B  [?N?j])
    (aset standard-display-table ?,L/(B  [?D?j])
-    ;; Unicode version:
-    (aset standard-display-table ?$,1(P(B  [?a])
-    (aset standard-display-table ?$,1(Q(B  [?b])
-    (aset standard-display-table ?$,1(R(B  [?v])
-    (aset standard-display-table ?$,1(S(B  [?g])
-    (aset standard-display-table ?$,1(T(B  [?d])
-    (aset standard-display-table ?$,1(U(B  [?e])
-    (aset standard-display-table ?$,1(q(B  [?y?o])
-    (aset standard-display-table ?$,1(V(B  [?z?h])
-    (aset standard-display-table ?$,1(W(B  [?z])
-    (aset standard-display-table ?$,1(X(B  [?i])
-    (aset standard-display-table ?$,1(Y(B  [?j])
-    (aset standard-display-table ?$,1(Z(B  [?k])
-    (aset standard-display-table ?$,1([(B  [?l])
-    (aset standard-display-table ?$,1(\(B  [?m])
-    (aset standard-display-table ?$,1(](B  [?n])
-    (aset standard-display-table ?$,1(^(B  [?o])
-    (aset standard-display-table ?$,1(_(B  [?p])
-    (aset standard-display-table ?$,1(`(B  [?r])
-    (aset standard-display-table ?$,1(a(B  [?s])
-    (aset standard-display-table ?$,1(b(B  [?t])
-    (aset standard-display-table ?$,1(c(B  [?u])
-    (aset standard-display-table ?$,1(d(B  [?f])
-    (aset standard-display-table ?$,1(e(B  [?k?h])
-    (aset standard-display-table ?$,1(f(B  [?t?s])
-    (aset standard-display-table ?$,1(g(B  [?c?h])
-    (aset standard-display-table ?$,1(h(B  [?s?h])
-    (aset standard-display-table ?$,1(i(B  [?s?c?h])
-    (aset standard-display-table ?$,1(j(B  [?~])
-    (aset standard-display-table ?$,1(k(B  [?y])
-    (aset standard-display-table ?$,1(l(B  [?'])
-    (aset standard-display-table ?$,1(m(B  [?e?'])
-    (aset standard-display-table ?$,1(n(B  [?y?u])
-    (aset standard-display-table ?$,1(o(B  [?y?a])
-    (aset standard-display-table ?$,1(0(B  [?A])
-    (aset standard-display-table ?$,1(1(B  [?B])
-    (aset standard-display-table ?$,1(2(B  [?V])
-    (aset standard-display-table ?$,1(3(B  [?G])
-    (aset standard-display-table ?$,1(4(B  [?D])
-    (aset standard-display-table ?$,1(5(B  [?E])
-    (aset standard-display-table ?$,1(!(B  [?Y?o])
-    (aset standard-display-table ?$,1(6(B  [?Z?h])
-    (aset standard-display-table ?$,1(7(B  [?Z])
-    (aset standard-display-table ?$,1(8(B  [?I])
-    (aset standard-display-table ?$,1(9(B  [?J])
-    (aset standard-display-table ?$,1(:(B  [?K])
-    (aset standard-display-table ?$,1(;(B  [?L])
-    (aset standard-display-table ?$,1(<(B  [?M])
-    (aset standard-display-table ?$,1(=(B  [?N])
-    (aset standard-display-table ?$,1(>(B  [?O])
-    (aset standard-display-table ?$,1(?(B  [?P])
-    (aset standard-display-table ?$,1(@(B  [?R])
-    (aset standard-display-table ?$,1(A(B  [?S])
-    (aset standard-display-table ?$,1(B(B  [?T])
-    (aset standard-display-table ?$,1(C(B  [?U])
-    (aset standard-display-table ?$,1(D(B  [?F])
-    (aset standard-display-table ?$,1(E(B  [?K?h])
-    (aset standard-display-table ?$,1(F(B  [?T?s])
-    (aset standard-display-table ?$,1(G(B  [?C?h])
-    (aset standard-display-table ?$,1(H(B  [?S?h])
-    (aset standard-display-table ?$,1(I(B  [?S?c?h])
-    (aset standard-display-table ?$,1(J(B  [?~])
-    (aset standard-display-table ?$,1(K(B  [?Y])
-    (aset standard-display-table ?$,1(L(B  [?'])
-    (aset standard-display-table ?$,1(M(B  [?E?'])
-    (aset standard-display-table ?$,1(N(B  [?Y?u])
-    (aset standard-display-table ?$,1(O(B  [?Y?a])
-    (aset standard-display-table ?$,1(t(B  [?i?e])
-    (aset standard-display-table ?$,1(w(B  [?i])
-    (aset standard-display-table ?$,1(~(B  [?u])
-    (aset standard-display-table ?$,1(r(B  [?d?j])
-    (aset standard-display-table ?$,1({(B  [?c?h?j])
-    (aset standard-display-table ?$,1(s(B  [?g?j])
-    (aset standard-display-table ?$,1(u(B  [?s])
-    (aset standard-display-table ?$,1(|(B  [?k])
-    (aset standard-display-table ?$,1(v(B  [?i])
-    (aset standard-display-table ?$,1(x(B  [?j])
-    (aset standard-display-table ?$,1(y(B  [?l?j])
-    (aset standard-display-table ?$,1(z(B  [?n?j])
-    (aset standard-display-table ?$,1((B  [?d?z])
-    (aset standard-display-table ?$,1($(B  [?Y?e])
-    (aset standard-display-table ?$,1('(B  [?Y?i])
-    (aset standard-display-table ?$,1(.(B  [?U])
-    (aset standard-display-table ?$,1("(B  [?D?j])
-    (aset standard-display-table ?$,1(+(B  [?C?h?j])
-    (aset standard-display-table ?$,1(#(B  [?G?j])
-    (aset standard-display-table ?$,1(%(B  [?S])
-    (aset standard-display-table ?$,1(,(B  [?K])
-    (aset standard-display-table ?$,1(&(B  [?I])
-    (aset standard-display-table ?$,1(((B  [?J])
-    (aset standard-display-table ?$,1()(B  [?L?j])
-    (aset standard-display-table ?$,1(*(B  [?N?j])
-    (aset standard-display-table ?$,1(/(B  [?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 ?,LO(B [?I?a]))
-      ;; Unicode version:
-      (aset standard-display-table ?$,1(i(B [?s?h?t])
-      (aset standard-display-table ?$,1(I(B [?S?h?t])
-      (aset standard-display-table ?$,1(n(B [?i?u])
-      (aset standard-display-table ?$,1(N(B [?I?u])
-      (aset standard-display-table ?$,1(o(B [?i?a])
-      (aset standard-display-table ?$,1(O(B [?I?a]))
    (when (equal cyrillic-language "Ukrainian") ; based on the official
                                        ; transliteration table
@@ -293,14 +184,7 @@ If the argument is nil, we return the display table to its standard state."
      (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 ?,Lo(B [?i?a]))))
-      ;; Unicode version:
-      (aset standard-display-table ?$,1(X(B [?y])
-      (aset standard-display-table ?$,1(8(B [?Y])
-      (aset standard-display-table ?$,1(Y(B [?i])
-      (aset standard-display-table ?$,1(9(B [?Y])
-      (aset standard-display-table ?$,1(n(B [?i?u])
-      (aset standard-display-table ?$,1(o(B [?i?a]))))
 ;;
 (provide 'cyril-util)

diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el index e35d45b5afe..87ff6090ae9 100644 --- a/lisp/language/cyril-util.el +++ b/lisp/language/cyril-util.el
@@ -1,6 +1,6 @@
1	;;; cyril-util.el --- utilities for Cyrillic scripts	1	;;; cyril-util.el --- utilities for Cyrillic scripts
2		2
3	;; Copyright (C) 1997, 2001 Free Software Foundation, Inc.	3	;; Copyright (C) 1997, 2001, 2002 Free Software Foundation, Inc.
4		4
5	;; Keywords: mule, multilingual, Cyrillic	5	;; Keywords: mule, multilingual, Cyrillic
6		6
@@ -25,22 +25,17 @@
25		25
26	;;; Code:	26	;;; Code:
27		27
		28	;; Fixme: are the next two useful?
		29
28	;;;###autoload	30	;;;###autoload
29	(defun cyrillic-encode-koi8-r-char (char)	31	(defun cyrillic-encode-koi8-r-char (char)
30	"Return KOI8-R external character code of CHAR if appropriate."	32	"Return KOI8-R external character code of CHAR if appropriate."
31	(aref (char-table-extra-slot	33	(encode-char char 'koi8-r))
32	(get 'cyrillic-koi8-r-nonascii-translation-table 'translation-table)
33	0)
34	char))
35		34
36	;;;###autoload	35	;;;###autoload
37	(defun cyrillic-encode-alternativnyj-char (char)	36	(defun cyrillic-encode-alternativnyj-char (char)
38	"Return ALTERNATIVNYJ external character code of CHAR if appropriate."	37	"Return ALTERNATIVNYJ external character code of CHAR if appropriate."
39	(aref (char-table-extra-slot	38	(encode-char char 'alternativnyj))
40	(get 'cyrillic-alternativnyj-nonascii-translation-table
41	'translation-table)
42	0)
43	char))
44		39
45		40
46	;; Display	41	;; Display
@@ -174,117 +169,13 @@ If the argument is nil, we return the display table to its standard state."
174	(aset standard-display-table ?,L*(B [?N?j])	169	(aset standard-display-table ?,L*(B [?N?j])
175	(aset standard-display-table ?,L/(B [?D?j])	170	(aset standard-display-table ?,L/(B [?D?j])
176		171
177	;; Unicode version:
178	(aset standard-display-table ?$,1(P(B [?a])
179	(aset standard-display-table ?$,1(Q(B [?b])
180	(aset standard-display-table ?$,1(R(B [?v])
181	(aset standard-display-table ?$,1(S(B [?g])
182	(aset standard-display-table ?$,1(T(B [?d])
183	(aset standard-display-table ?$,1(U(B [?e])
184	(aset standard-display-table ?$,1(q(B [?y?o])
185	(aset standard-display-table ?$,1(V(B [?z?h])
186	(aset standard-display-table ?$,1(W(B [?z])
187	(aset standard-display-table ?$,1(X(B [?i])
188	(aset standard-display-table ?$,1(Y(B [?j])
189	(aset standard-display-table ?$,1(Z(B [?k])
190	(aset standard-display-table ?$,1([(B [?l])
191	(aset standard-display-table ?$,1(\(B [?m])
192	(aset standard-display-table ?$,1(](B [?n])
193	(aset standard-display-table ?$,1(^(B [?o])
194	(aset standard-display-table ?$,1(_(B [?p])
195	(aset standard-display-table ?$,1(`(B [?r])
196	(aset standard-display-table ?$,1(a(B [?s])
197	(aset standard-display-table ?$,1(b(B [?t])
198	(aset standard-display-table ?$,1(c(B [?u])
199	(aset standard-display-table ?$,1(d(B [?f])
200	(aset standard-display-table ?$,1(e(B [?k?h])
201	(aset standard-display-table ?$,1(f(B [?t?s])
202	(aset standard-display-table ?$,1(g(B [?c?h])
203	(aset standard-display-table ?$,1(h(B [?s?h])
204	(aset standard-display-table ?$,1(i(B [?s?c?h])
205	(aset standard-display-table ?$,1(j(B [?~])
206	(aset standard-display-table ?$,1(k(B [?y])
207	(aset standard-display-table ?$,1(l(B [?'])
208	(aset standard-display-table ?$,1(m(B [?e?'])
209	(aset standard-display-table ?$,1(n(B [?y?u])
210	(aset standard-display-table ?$,1(o(B [?y?a])
211
212	(aset standard-display-table ?$,1(0(B [?A])
213	(aset standard-display-table ?$,1(1(B [?B])
214	(aset standard-display-table ?$,1(2(B [?V])
215	(aset standard-display-table ?$,1(3(B [?G])
216	(aset standard-display-table ?$,1(4(B [?D])
217	(aset standard-display-table ?$,1(5(B [?E])
218	(aset standard-display-table ?$,1(!(B [?Y?o])
219	(aset standard-display-table ?$,1(6(B [?Z?h])
220	(aset standard-display-table ?$,1(7(B [?Z])
221	(aset standard-display-table ?$,1(8(B [?I])
222	(aset standard-display-table ?$,1(9(B [?J])
223	(aset standard-display-table ?$,1(:(B [?K])
224	(aset standard-display-table ?$,1(;(B [?L])
225	(aset standard-display-table ?$,1(<(B [?M])
226	(aset standard-display-table ?$,1(=(B [?N])
227	(aset standard-display-table ?$,1(>(B [?O])
228	(aset standard-display-table ?$,1(?(B [?P])
229	(aset standard-display-table ?$,1(@(B [?R])
230	(aset standard-display-table ?$,1(A(B [?S])
231	(aset standard-display-table ?$,1(B(B [?T])
232	(aset standard-display-table ?$,1(C(B [?U])
233	(aset standard-display-table ?$,1(D(B [?F])
234	(aset standard-display-table ?$,1(E(B [?K?h])
235	(aset standard-display-table ?$,1(F(B [?T?s])
236	(aset standard-display-table ?$,1(G(B [?C?h])
237	(aset standard-display-table ?$,1(H(B [?S?h])
238	(aset standard-display-table ?$,1(I(B [?S?c?h])
239	(aset standard-display-table ?$,1(J(B [?~])
240	(aset standard-display-table ?$,1(K(B [?Y])
241	(aset standard-display-table ?$,1(L(B [?'])
242	(aset standard-display-table ?$,1(M(B [?E?'])
243	(aset standard-display-table ?$,1(N(B [?Y?u])
244	(aset standard-display-table ?$,1(O(B [?Y?a])
245
246	(aset standard-display-table ?$,1(t(B [?i?e])
247	(aset standard-display-table ?$,1(w(B [?i])
248	(aset standard-display-table ?$,1(~(B [?u])
249	(aset standard-display-table ?$,1(r(B [?d?j])
250	(aset standard-display-table ?$,1({(B [?c?h?j])
251	(aset standard-display-table ?$,1(s(B [?g?j])
252	(aset standard-display-table ?$,1(u(B [?s])
253	(aset standard-display-table ?$,1(\|(B [?k])
254	(aset standard-display-table ?$,1(v(B [?i])
255	(aset standard-display-table ?$,1(x(B [?j])
256	(aset standard-display-table ?$,1(y(B [?l?j])
257	(aset standard-display-table ?$,1(z(B [?n?j])
258	(aset standard-display-table ?$,1((B [?d?z])
259
260	(aset standard-display-table ?$,1($(B [?Y?e])
261	(aset standard-display-table ?$,1('(B [?Y?i])
262	(aset standard-display-table ?$,1(.(B [?U])
263	(aset standard-display-table ?$,1("(B [?D?j])
264	(aset standard-display-table ?$,1(+(B [?C?h?j])
265	(aset standard-display-table ?$,1(#(B [?G?j])
266	(aset standard-display-table ?$,1(%(B [?S])
267	(aset standard-display-table ?$,1(,(B [?K])
268	(aset standard-display-table ?$,1(&(B [?I])
269	(aset standard-display-table ?$,1(((B [?J])
270	(aset standard-display-table ?$,1()(B [?L?j])
271	(aset standard-display-table ?$,1(*(B [?N?j])
272	(aset standard-display-table ?$,1(/(B [?D?j])
273
274	(when (equal cyrillic-language "Bulgarian")	172	(when (equal cyrillic-language "Bulgarian")
275	(aset standard-display-table ?,Li(B [?s?h?t])	173	(aset standard-display-table ?,Li(B [?s?h?t])
276	(aset standard-display-table ?,LI(B [?S?h?t])	174	(aset standard-display-table ?,LI(B [?S?h?t])
277	(aset standard-display-table ?,Ln(B [?i?u])	175	(aset standard-display-table ?,Ln(B [?i?u])
278	(aset standard-display-table ?,LN(B [?I?u])	176	(aset standard-display-table ?,LN(B [?I?u])
279	(aset standard-display-table ?,Lo(B [?i?a])	177	(aset standard-display-table ?,Lo(B [?i?a])
280	(aset standard-display-table ?,LO(B [?I?a])	178	(aset standard-display-table ?,LO(B [?I?a]))
281	;; Unicode version:
282	(aset standard-display-table ?$,1(i(B [?s?h?t])
283	(aset standard-display-table ?$,1(I(B [?S?h?t])
284	(aset standard-display-table ?$,1(n(B [?i?u])
285	(aset standard-display-table ?$,1(N(B [?I?u])
286	(aset standard-display-table ?$,1(o(B [?i?a])
287	(aset standard-display-table ?$,1(O(B [?I?a]))
288		179
289	(when (equal cyrillic-language "Ukrainian") ; based on the official	180	(when (equal cyrillic-language "Ukrainian") ; based on the official
290	; transliteration table	181	; transliteration table
@@ -293,14 +184,7 @@ If the argument is nil, we return the display table to its standard state."
293	(aset standard-display-table ?,LY(B [?i])	184	(aset standard-display-table ?,LY(B [?i])
294	(aset standard-display-table ?,L9(B [?Y])	185	(aset standard-display-table ?,L9(B [?Y])
295	(aset standard-display-table ?,Ln(B [?i?u])	186	(aset standard-display-table ?,Ln(B [?i?u])
296	(aset standard-display-table ?,Lo(B [?i?a])	187	(aset standard-display-table ?,Lo(B [?i?a]))))
297	;; Unicode version:
298	(aset standard-display-table ?$,1(X(B [?y])
299	(aset standard-display-table ?$,1(8(B [?Y])
300	(aset standard-display-table ?$,1(Y(B [?i])
301	(aset standard-display-table ?$,1(9(B [?Y])
302	(aset standard-display-table ?$,1(n(B [?i?u])
303	(aset standard-display-table ?$,1(o(B [?i?a]))))
304		188
305	;;	189	;;
306	(provide 'cyril-util)	190	(provide 'cyril-util)