annotate src/mule-charset.c @ 406:b8cc9ab3f761 r21-2-33

Import from CVS: tag r21-2-33
author cvs
date Mon, 13 Aug 2007 11:17:09 +0200
parents a86b2b5e0111
children 697ef44129c6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1 /* Functions to handle multilingual characters.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
2 Copyright (C) 1992, 1995 Free Software Foundation, Inc.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
3 Copyright (C) 1995 Sun Microsystems, Inc.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
4
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
5 This file is part of XEmacs.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
6
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
7 XEmacs is free software; you can redistribute it and/or modify it
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
9 Free Software Foundation; either version 2, or (at your option) any
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
10 later version.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
11
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
15 for more details.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
16
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
18 along with XEmacs; see the file COPYING. If not, write to
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
20 Boston, MA 02111-1307, USA. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
21
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
22 /* Synched up with: FSF 20.3. Not in FSF. */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
23
298
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 284
diff changeset
24 /* Rewritten by Ben Wing <ben@xemacs.org>. */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
25
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
26 #include <config.h>
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
27 #include "lisp.h"
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
28
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
29 #include "buffer.h"
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
30 #include "chartab.h"
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
31 #include "elhash.h"
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
32 #include "lstream.h"
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
33 #include "device.h"
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
34 #include "faces.h"
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
35 #include "mule-ccl.h"
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
36
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
37 /* The various pre-defined charsets. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
38
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
39 Lisp_Object Vcharset_ascii;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
40 Lisp_Object Vcharset_control_1;
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
41 Lisp_Object Vcharset_latin_iso8859_1;
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
42 Lisp_Object Vcharset_latin_iso8859_2;
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
43 Lisp_Object Vcharset_latin_iso8859_3;
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
44 Lisp_Object Vcharset_latin_iso8859_4;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
45 Lisp_Object Vcharset_thai_tis620;
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
46 Lisp_Object Vcharset_greek_iso8859_7;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
47 Lisp_Object Vcharset_arabic_iso8859_6;
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
48 Lisp_Object Vcharset_hebrew_iso8859_8;
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
49 Lisp_Object Vcharset_katakana_jisx0201;
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
50 Lisp_Object Vcharset_latin_jisx0201;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
51 Lisp_Object Vcharset_cyrillic_iso8859_5;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
52 Lisp_Object Vcharset_latin_iso8859_9;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
53 Lisp_Object Vcharset_japanese_jisx0208_1978;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
54 Lisp_Object Vcharset_chinese_gb2312;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
55 Lisp_Object Vcharset_japanese_jisx0208;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
56 Lisp_Object Vcharset_korean_ksc5601;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
57 Lisp_Object Vcharset_japanese_jisx0212;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
58 Lisp_Object Vcharset_chinese_cns11643_1;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
59 Lisp_Object Vcharset_chinese_cns11643_2;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
60 Lisp_Object Vcharset_chinese_big5_1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
61 Lisp_Object Vcharset_chinese_big5_2;
396
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
62
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
63 #ifdef ENABLE_COMPOSITE_CHARS
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
64 Lisp_Object Vcharset_composite;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
65
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
66 /* Hash tables for composite chars. One maps string representing
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
67 composed chars to their equivalent chars; one goes the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
68 other way. */
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
69 Lisp_Object Vcomposite_char_char2string_hash_table;
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
70 Lisp_Object Vcomposite_char_string2char_hash_table;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
71
396
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
72 static int composite_char_row_next;
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
73 static int composite_char_col_next;
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
74
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
75 #endif /* ENABLE_COMPOSITE_CHARS */
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
76
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
77 struct charset_lookup *chlook;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
78
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
79 static const struct lrecord_description charset_lookup_description_1[] = {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
80 { XD_LISP_OBJECT_ARRAY, offsetof (struct charset_lookup, charset_by_leading_byte), 128+4*128*2 },
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
81 { XD_END }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
82 };
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
83
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
84 static const struct struct_description charset_lookup_description = {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
85 sizeof (struct charset_lookup),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
86 charset_lookup_description_1
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
87 };
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
88
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
89 /* Table of number of bytes in the string representation of a character
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
90 indexed by the first byte of that representation.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
91
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
92 rep_bytes_by_first_byte(c) is more efficient than the equivalent
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
93 canonical computation:
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
94
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
95 XCHARSET_REP_BYTES (CHARSET_BY_LEADING_BYTE (c)) */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
96
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
97 const Bytecount rep_bytes_by_first_byte[0xA0] =
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
98 { /* 0x00 - 0x7f are for straight ASCII */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
99 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
100 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
101 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
102 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
103 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
104 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
105 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
106 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
107 /* 0x80 - 0x8f are for Dimension-1 official charsets */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
108 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
109 /* 0x90 - 0x9d are for Dimension-2 official charsets */
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
110 /* 0x9e is for Dimension-1 private charsets */
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
111 /* 0x9f is for Dimension-2 private charsets */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
112 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
113 };
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
114
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
115 Lisp_Object Qcharsetp;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
116
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
117 /* Qdoc_string, Qdimension, Qchars defined in general.c */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
118 Lisp_Object Qregistry, Qfinal, Qgraphic;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
119 Lisp_Object Qdirection;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
120 Lisp_Object Qreverse_direction_charset;
392
1f50e6fe4f3f Import from CVS: tag r21-2-11
cvs
parents: 380
diff changeset
121 Lisp_Object Qleading_byte;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
122 Lisp_Object Qshort_name, Qlong_name;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
123
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
124 Lisp_Object Qascii,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
125 Qcontrol_1,
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
126 Qlatin_iso8859_1,
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
127 Qlatin_iso8859_2,
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
128 Qlatin_iso8859_3,
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
129 Qlatin_iso8859_4,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
130 Qthai_tis620,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
131 Qgreek_iso8859_7,
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
132 Qarabic_iso8859_6,
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
133 Qhebrew_iso8859_8,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
134 Qkatakana_jisx0201,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
135 Qlatin_jisx0201,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
136 Qcyrillic_iso8859_5,
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
137 Qlatin_iso8859_9,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
138 Qjapanese_jisx0208_1978,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
139 Qchinese_gb2312,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
140 Qjapanese_jisx0208,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
141 Qkorean_ksc5601,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
142 Qjapanese_jisx0212,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
143 Qchinese_cns11643_1,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
144 Qchinese_cns11643_2,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
145 Qchinese_big5_1,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
146 Qchinese_big5_2,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
147 Qcomposite;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
148
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
149 Lisp_Object Ql2r, Qr2l;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
150
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
151 Lisp_Object Vcharset_hash_table;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
152
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
153 /* Composite characters are characters constructed by overstriking two
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
154 or more regular characters.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
155
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
156 1) The old Mule implementation involves storing composite characters
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
157 in a buffer as a tag followed by all of the actual characters
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
158 used to make up the composite character. I think this is a bad
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
159 idea; it greatly complicates code that wants to handle strings
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
160 one character at a time because it has to deal with the possibility
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
161 of great big ungainly characters. It's much more reasonable to
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
162 simply store an index into a table of composite characters.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
163
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
164 2) The current implementation only allows for 16,384 separate
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
165 composite characters over the lifetime of the XEmacs process.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
166 This could become a potential problem if the user
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
167 edited lots of different files that use composite characters.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
168 Due to FSF bogosity, increasing the number of allowable
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
169 composite characters under Mule would decrease the number
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
170 of possible faces that can exist. Mule already has shrunk
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
171 this to 2048, and further shrinkage would become uncomfortable.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
172 No such problems exist in XEmacs.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
173
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
174 Composite characters could be represented as 0x80 C1 C2 C3,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
175 where each C[1-3] is in the range 0xA0 - 0xFF. This allows
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
176 for slightly under 2^20 (one million) composite characters
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
177 over the XEmacs process lifetime, and you only need to
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
178 increase the size of a Mule character from 19 to 21 bits.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
179 Or you could use 0x80 C1 C2 C3 C4, allowing for about
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
180 85 million (slightly over 2^26) composite characters. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
181
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
182
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
183 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
184 /* Basic Emchar functions */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
185 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
186
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
187 /* Convert a non-ASCII Mule character C into a one-character Mule-encoded
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
188 string in STR. Returns the number of bytes stored.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
189 Do not call this directly. Use the macro set_charptr_emchar() instead.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
190 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
191
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
192 Bytecount
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
193 non_ascii_set_charptr_emchar (Bufbyte *str, Emchar c)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
194 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
195 Bufbyte *p;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
196 Bufbyte lb;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
197 int c1, c2;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
198 Lisp_Object charset;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
199
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
200 p = str;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
201 BREAKUP_CHAR (c, charset, c1, c2);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
202 lb = CHAR_LEADING_BYTE (c);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
203 if (LEADING_BYTE_PRIVATE_P (lb))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
204 *p++ = PRIVATE_LEADING_BYTE_PREFIX (lb);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
205 *p++ = lb;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
206 if (EQ (charset, Vcharset_control_1))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
207 c1 += 0x20;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
208 *p++ = c1 | 0x80;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
209 if (c2)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
210 *p++ = c2 | 0x80;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
211
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
212 return (p - str);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
213 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
214
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
215 /* Return the first character from a Mule-encoded string in STR,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
216 assuming it's non-ASCII. Do not call this directly.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
217 Use the macro charptr_emchar() instead. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
218
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
219 Emchar
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
220 non_ascii_charptr_emchar (const Bufbyte *str)
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
221 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
222 Bufbyte i0 = *str, i1, i2 = 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
223 Lisp_Object charset;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
224
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
225 if (i0 == LEADING_BYTE_CONTROL_1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
226 return (Emchar) (*++str - 0x20);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
227
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
228 if (LEADING_BYTE_PREFIX_P (i0))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
229 i0 = *++str;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
230
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
231 i1 = *++str & 0x7F;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
232
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
233 charset = CHARSET_BY_LEADING_BYTE (i0);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
234 if (XCHARSET_DIMENSION (charset) == 2)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
235 i2 = *++str & 0x7F;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
236
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
237 return MAKE_CHAR (charset, i1, i2);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
238 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
239
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
240 /* Return whether CH is a valid Emchar, assuming it's non-ASCII.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
241 Do not call this directly. Use the macro valid_char_p() instead. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
242
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
243 int
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
244 non_ascii_valid_char_p (Emchar ch)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
245 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
246 int f1, f2, f3;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
247
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
248 /* Must have only lowest 19 bits set */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
249 if (ch & ~0x7FFFF)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
250 return 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
251
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
252 f1 = CHAR_FIELD1 (ch);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
253 f2 = CHAR_FIELD2 (ch);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
254 f3 = CHAR_FIELD3 (ch);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
255
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
256 if (f1 == 0)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
257 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
258 Lisp_Object charset;
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 367
diff changeset
259
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
260 if (f2 < MIN_CHAR_FIELD2_OFFICIAL ||
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
261 (f2 > MAX_CHAR_FIELD2_OFFICIAL && f2 < MIN_CHAR_FIELD2_PRIVATE) ||
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
262 f2 > MAX_CHAR_FIELD2_PRIVATE)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
263 return 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
264 if (f3 < 0x20)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
265 return 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
266
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
267 if (f3 != 0x20 && f3 != 0x7F && !(f2 >= MIN_CHAR_FIELD2_PRIVATE &&
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
268 f2 <= MAX_CHAR_FIELD2_PRIVATE))
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
269 return 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
270
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
271 /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
272 NOTE: This takes advantage of the fact that
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
273 FIELD2_TO_OFFICIAL_LEADING_BYTE and
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
274 FIELD2_TO_PRIVATE_LEADING_BYTE are the same.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
275 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
276 charset = CHARSET_BY_LEADING_BYTE (f2 + FIELD2_TO_OFFICIAL_LEADING_BYTE);
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
277 if (EQ (charset, Qnil))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
278 return 0;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
279 return (XCHARSET_CHARS (charset) == 96);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
280 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
281 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
282 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
283 Lisp_Object charset;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
284
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
285 if (f1 < MIN_CHAR_FIELD1_OFFICIAL ||
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
286 (f1 > MAX_CHAR_FIELD1_OFFICIAL && f1 < MIN_CHAR_FIELD1_PRIVATE) ||
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
287 f1 > MAX_CHAR_FIELD1_PRIVATE)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
288 return 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
289 if (f2 < 0x20 || f3 < 0x20)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
290 return 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
291
396
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
292 #ifdef ENABLE_COMPOSITE_CHARS
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
293 if (f1 + FIELD1_TO_OFFICIAL_LEADING_BYTE == LEADING_BYTE_COMPOSITE)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
294 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
295 if (UNBOUNDP (Fgethash (make_int (ch),
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
296 Vcomposite_char_char2string_hash_table,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
297 Qunbound)))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
298 return 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
299 return 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
300 }
396
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
301 #endif /* ENABLE_COMPOSITE_CHARS */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
302
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
303 if (f2 != 0x20 && f2 != 0x7F && f3 != 0x20 && f3 != 0x7F
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
304 && !(f1 >= MIN_CHAR_FIELD1_PRIVATE && f1 <= MAX_CHAR_FIELD1_PRIVATE))
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
305 return 1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
306
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
307 if (f1 <= MAX_CHAR_FIELD1_OFFICIAL)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
308 charset =
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
309 CHARSET_BY_LEADING_BYTE (f1 + FIELD1_TO_OFFICIAL_LEADING_BYTE);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
310 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
311 charset =
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
312 CHARSET_BY_LEADING_BYTE (f1 + FIELD1_TO_PRIVATE_LEADING_BYTE);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
313
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
314 if (EQ (charset, Qnil))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
315 return 0;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
316 return (XCHARSET_CHARS (charset) == 96);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
317 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
318 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
319
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
320
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
321 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
322 /* Basic string functions */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
323 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
324
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
325 /* Copy the character pointed to by PTR into STR, assuming it's
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
326 non-ASCII. Do not call this directly. Use the macro
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
327 charptr_copy_char() instead. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
328
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
329 Bytecount
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
330 non_ascii_charptr_copy_char (const Bufbyte *ptr, Bufbyte *str)
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
331 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
332 Bufbyte *strptr = str;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
333 *strptr = *ptr++;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
334 switch (REP_BYTES_BY_FIRST_BYTE (*strptr))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
335 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
336 /* Notice fallthrough. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
337 case 4: *++strptr = *ptr++;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
338 case 3: *++strptr = *ptr++;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
339 case 2: *++strptr = *ptr;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
340 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
341 default:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
342 abort ();
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
343 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
344 return strptr + 1 - str;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
345 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
346
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
347
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
348 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
349 /* streams of Emchars */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
350 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
351
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
352 /* Treat a stream as a stream of Emchar's rather than a stream of bytes.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
353 The functions below are not meant to be called directly; use
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
354 the macros in insdel.h. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
355
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
356 Emchar
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
357 Lstream_get_emchar_1 (Lstream *stream, int ch)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
358 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
359 Bufbyte str[MAX_EMCHAR_LEN];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
360 Bufbyte *strptr = str;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
361
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
362 str[0] = (Bufbyte) ch;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
363 switch (REP_BYTES_BY_FIRST_BYTE (ch))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
364 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
365 /* Notice fallthrough. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
366 case 4:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
367 ch = Lstream_getc (stream);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
368 assert (ch >= 0);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
369 *++strptr = (Bufbyte) ch;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
370 case 3:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
371 ch = Lstream_getc (stream);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
372 assert (ch >= 0);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
373 *++strptr = (Bufbyte) ch;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
374 case 2:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
375 ch = Lstream_getc (stream);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
376 assert (ch >= 0);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
377 *++strptr = (Bufbyte) ch;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
378 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
379 default:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
380 abort ();
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
381 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
382 return charptr_emchar (str);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
383 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
384
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
385 int
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
386 Lstream_fput_emchar (Lstream *stream, Emchar ch)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
387 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
388 Bufbyte str[MAX_EMCHAR_LEN];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
389 Bytecount len = set_charptr_emchar (str, ch);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
390 return Lstream_write (stream, str, len);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
391 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
392
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
393 void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
394 Lstream_funget_emchar (Lstream *stream, Emchar ch)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
395 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
396 Bufbyte str[MAX_EMCHAR_LEN];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
397 Bytecount len = set_charptr_emchar (str, ch);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
398 Lstream_unread (stream, str, len);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
399 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
400
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
401
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
402 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
403 /* charset object */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
404 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
405
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
406 static Lisp_Object
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
407 mark_charset (Lisp_Object obj)
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
408 {
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
409 Lisp_Charset *cs = XCHARSET (obj);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
410
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
411 mark_object (cs->short_name);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
412 mark_object (cs->long_name);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
413 mark_object (cs->doc_string);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
414 mark_object (cs->registry);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
415 mark_object (cs->ccl_program);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
416 return cs->name;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
417 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
418
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
419 static void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
420 print_charset (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
421 {
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
422 Lisp_Charset *cs = XCHARSET (obj);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
423 char buf[200];
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
424
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
425 if (print_readably)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
426 error ("printing unreadable object #<charset %s 0x%x>",
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
427 string_data (XSYMBOL (CHARSET_NAME (cs))->name),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
428 cs->header.uid);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
429
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
430 write_c_string ("#<charset ", printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
431 print_internal (CHARSET_NAME (cs), printcharfun, 0);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
432 write_c_string (" ", printcharfun);
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
433 print_internal (CHARSET_SHORT_NAME (cs), printcharfun, 1);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
434 write_c_string (" ", printcharfun);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
435 print_internal (CHARSET_LONG_NAME (cs), printcharfun, 1);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
436 write_c_string (" ", printcharfun);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
437 print_internal (CHARSET_DOC_STRING (cs), printcharfun, 1);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
438 sprintf (buf, " %s %s cols=%d g%d final='%c' reg=",
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
439 CHARSET_TYPE (cs) == CHARSET_TYPE_94 ? "94" :
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
440 CHARSET_TYPE (cs) == CHARSET_TYPE_96 ? "96" :
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
441 CHARSET_TYPE (cs) == CHARSET_TYPE_94X94 ? "94x94" :
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
442 "96x96",
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
443 CHARSET_DIRECTION (cs) == CHARSET_LEFT_TO_RIGHT ? "l2r" : "r2l",
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
444 CHARSET_COLUMNS (cs),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
445 CHARSET_GRAPHIC (cs),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
446 CHARSET_FINAL (cs));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
447 write_c_string (buf, printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
448 print_internal (CHARSET_REGISTRY (cs), printcharfun, 0);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
449 sprintf (buf, " 0x%x>", cs->header.uid);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
450 write_c_string (buf, printcharfun);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
451 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
452
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
453 static const struct lrecord_description charset_description[] = {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
454 { XD_LISP_OBJECT, offsetof (Lisp_Charset, name) },
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
455 { XD_LISP_OBJECT, offsetof (Lisp_Charset, doc_string) },
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
456 { XD_LISP_OBJECT, offsetof (Lisp_Charset, registry) },
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
457 { XD_LISP_OBJECT, offsetof (Lisp_Charset, short_name) },
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
458 { XD_LISP_OBJECT, offsetof (Lisp_Charset, long_name) },
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
459 { XD_LISP_OBJECT, offsetof (Lisp_Charset, reverse_direction_charset) },
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
460 { XD_LISP_OBJECT, offsetof (Lisp_Charset, ccl_program) },
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
461 { XD_END }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
462 };
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
463
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 241
diff changeset
464 DEFINE_LRECORD_IMPLEMENTATION ("charset", charset,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
465 mark_charset, print_charset, 0, 0, 0, charset_description,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
466 Lisp_Charset);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
467 /* Make a new charset. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
468
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
469 static Lisp_Object
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
470 make_charset (int id, Lisp_Object name, unsigned char rep_bytes,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
471 unsigned char type, unsigned char columns, unsigned char graphic,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
472 Bufbyte final, unsigned char direction, Lisp_Object short_name,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
473 Lisp_Object long_name, Lisp_Object doc,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
474 Lisp_Object reg)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
475 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 241
diff changeset
476 Lisp_Object obj;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
477 Lisp_Charset *cs = alloc_lcrecord_type (Lisp_Charset, &lrecord_charset);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
478
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
479 zero_lcrecord (cs);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
480
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
481 XSETCHARSET (obj, cs);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
482
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 185
diff changeset
483 CHARSET_ID (cs) = id;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
484 CHARSET_NAME (cs) = name;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
485 CHARSET_SHORT_NAME (cs) = short_name;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
486 CHARSET_LONG_NAME (cs) = long_name;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
487 CHARSET_REP_BYTES (cs) = rep_bytes;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
488 CHARSET_DIRECTION (cs) = direction;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
489 CHARSET_TYPE (cs) = type;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
490 CHARSET_COLUMNS (cs) = columns;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
491 CHARSET_GRAPHIC (cs) = graphic;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
492 CHARSET_FINAL (cs) = final;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
493 CHARSET_DOC_STRING (cs) = doc;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
494 CHARSET_REGISTRY (cs) = reg;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
495 CHARSET_CCL_PROGRAM (cs) = Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
496 CHARSET_REVERSE_DIRECTION_CHARSET (cs) = Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
497
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 272
diff changeset
498 CHARSET_DIMENSION (cs) = (CHARSET_TYPE (cs) == CHARSET_TYPE_94 ||
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 272
diff changeset
499 CHARSET_TYPE (cs) == CHARSET_TYPE_96) ? 1 : 2;
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 272
diff changeset
500 CHARSET_CHARS (cs) = (CHARSET_TYPE (cs) == CHARSET_TYPE_94 ||
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 272
diff changeset
501 CHARSET_TYPE (cs) == CHARSET_TYPE_94X94) ? 94 : 96;
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
502
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
503 if (final)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
504 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
505 /* some charsets do not have final characters. This includes
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
506 ASCII, Control-1, Composite, and the two faux private
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
507 charsets. */
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
508 assert (NILP (chlook->charset_by_attributes[type][final][direction]));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
509 chlook->charset_by_attributes[type][final][direction] = obj;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
510 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
511
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
512 assert (NILP (chlook->charset_by_leading_byte[id - 128]));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
513 chlook->charset_by_leading_byte[id - 128] = obj;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
514
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
515 /* Some charsets are "faux" and don't have names or really exist at
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
516 all except in the leading-byte table. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
517 if (!NILP (name))
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
518 Fputhash (name, obj, Vcharset_hash_table);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
519 return obj;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
520 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
521
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
522 static int
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
523 get_unallocated_leading_byte (int dimension)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
524 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
525 int lb;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
526
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
527 if (dimension == 1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
528 {
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 400
diff changeset
529 if (chlook->next_allocated_1_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_1)
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
530 lb = 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
531 else
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 400
diff changeset
532 lb = chlook->next_allocated_1_byte_leading_byte++;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
533 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
534 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
535 {
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 400
diff changeset
536 if (chlook->next_allocated_2_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_2)
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
537 lb = 0;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
538 else
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 400
diff changeset
539 lb = chlook->next_allocated_2_byte_leading_byte++;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
540 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
541
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
542 if (!lb)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
543 signal_simple_error
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
544 ("No more character sets free for this dimension",
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
545 make_int (dimension));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
546
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
547 return lb;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
548 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
549
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
550
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
551 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
552 /* Basic charset Lisp functions */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
553 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
554
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
555 DEFUN ("charsetp", Fcharsetp, 1, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
556 Return non-nil if OBJECT is a charset.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
557 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
558 (object))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
559 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 241
diff changeset
560 return CHARSETP (object) ? Qt : Qnil;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
561 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
562
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
563 DEFUN ("find-charset", Ffind_charset, 1, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
564 Retrieve the charset of the given name.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
565 If CHARSET-OR-NAME is a charset object, it is simply returned.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
566 Otherwise, CHARSET-OR-NAME should be a symbol. If there is no such charset,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
567 nil is returned. Otherwise the associated charset object is returned.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
568 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
569 (charset_or_name))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
570 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
571 if (CHARSETP (charset_or_name))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
572 return charset_or_name;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 241
diff changeset
573
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
574 CHECK_SYMBOL (charset_or_name);
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
575 return Fgethash (charset_or_name, Vcharset_hash_table, Qnil);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
576 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
577
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
578 DEFUN ("get-charset", Fget_charset, 1, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
579 Retrieve the charset of the given name.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
580 Same as `find-charset' except an error is signalled if there is no such
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
581 charset instead of returning nil.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
582 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
583 (name))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
584 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
585 Lisp_Object charset = Ffind_charset (name);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
586
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
587 if (NILP (charset))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
588 signal_simple_error ("No such charset", name);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
589 return charset;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
590 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
591
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
592 /* We store the charsets in hash tables with the names as the key and the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
593 actual charset object as the value. Occasionally we need to use them
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
594 in a list format. These routines provide us with that. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
595 struct charset_list_closure
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
596 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
597 Lisp_Object *charset_list;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
598 };
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
599
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 213
diff changeset
600 static int
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
601 add_charset_to_list_mapper (Lisp_Object key, Lisp_Object value,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
602 void *charset_list_closure)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
603 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
604 /* This function can GC */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
605 struct charset_list_closure *chcl =
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
606 (struct charset_list_closure*) charset_list_closure;
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
607 Lisp_Object *charset_list = chcl->charset_list;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
608
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
609 *charset_list = Fcons (XCHARSET_NAME (value), *charset_list);
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 213
diff changeset
610 return 0;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
611 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
612
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
613 DEFUN ("charset-list", Fcharset_list, 0, 0, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
614 Return a list of the names of all defined charsets.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
615 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
616 ())
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
617 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
618 Lisp_Object charset_list = Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
619 struct gcpro gcpro1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
620 struct charset_list_closure charset_list_closure;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
621
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
622 GCPRO1 (charset_list);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
623 charset_list_closure.charset_list = &charset_list;
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
624 elisp_maphash (add_charset_to_list_mapper, Vcharset_hash_table,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
625 &charset_list_closure);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
626 UNGCPRO;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
627
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
628 return charset_list;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
629 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
630
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
631 DEFUN ("charset-name", Fcharset_name, 1, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
632 Return the name of the given charset.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
633 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
634 (charset))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
635 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 241
diff changeset
636 return XCHARSET_NAME (Fget_charset (charset));
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
637 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
638
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
639 DEFUN ("make-charset", Fmake_charset, 3, 3, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
640 Define a new character set.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
641 This function is for use with Mule support.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
642 NAME is a symbol, the name by which the character set is normally referred.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
643 DOC-STRING is a string describing the character set.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
644 PROPS is a property list, describing the specific nature of the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
645 character set. Recognized properties are:
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
646
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
647 'short-name Short version of the charset name (ex: Latin-1)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
648 'long-name Long version of the charset name (ex: ISO8859-1 (Latin-1))
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
649 'registry A regular expression matching the font registry field for
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
650 this character set.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
651 'dimension Number of octets used to index a character in this charset.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
652 Either 1 or 2. Defaults to 1.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
653 'columns Number of columns used to display a character in this charset.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
654 Only used in TTY mode. (Under X, the actual width of a
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
655 character can be derived from the font used to display the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
656 characters.) If unspecified, defaults to the dimension
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
657 (this is almost always the correct value).
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
658 'chars Number of characters in each dimension (94 or 96).
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
659 Defaults to 94. Note that if the dimension is 2, the
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
660 character set thus described is 94x94 or 96x96.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
661 'final Final byte of ISO 2022 escape sequence. Must be
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
662 supplied. Each combination of (DIMENSION, CHARS) defines a
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
663 separate namespace for final bytes. Note that ISO
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
664 2022 restricts the final byte to the range
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
665 0x30 - 0x7E if dimension == 1, and 0x30 - 0x5F if
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
666 dimension == 2. Note also that final bytes in the range
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
667 0x30 - 0x3F are reserved for user-defined (not official)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
668 character sets.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
669 'graphic 0 (use left half of font on output) or 1 (use right half
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
670 of font on output). Defaults to 0. For example, for
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
671 a font whose registry is ISO8859-1, the left half
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
672 (octets 0x20 - 0x7F) is the `ascii' character set, while
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
673 the right half (octets 0xA0 - 0xFF) is the `latin-1'
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
674 character set. With 'graphic set to 0, the octets
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
675 will have their high bit cleared; with it set to 1,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
676 the octets will have their high bit set.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
677 'direction 'l2r (left-to-right) or 'r2l (right-to-left).
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
678 Defaults to 'l2r.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
679 'ccl-program A compiled CCL program used to convert a character in
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
680 this charset into an index into the font. This is in
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
681 addition to the 'graphic property. The CCL program
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
682 is passed the octets of the character, with the high
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
683 bit cleared and set depending upon whether the value
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
684 of the 'graphic property is 0 or 1.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
685 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
686 (name, doc_string, props))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
687 {
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
688 int id, dimension = 1, chars = 94, graphic = 0, final = 0, columns = -1;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
689 int direction = CHARSET_LEFT_TO_RIGHT;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
690 int type;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
691 Lisp_Object registry = Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
692 Lisp_Object charset;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
693 Lisp_Object rest, keyword, value;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
694 Lisp_Object ccl_program = Qnil;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
695 Lisp_Object short_name = Qnil, long_name = Qnil;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
696
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
697 CHECK_SYMBOL (name);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
698 if (!NILP (doc_string))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
699 CHECK_STRING (doc_string);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
700
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
701 charset = Ffind_charset (name);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
702 if (!NILP (charset))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
703 signal_simple_error ("Cannot redefine existing charset", name);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
704
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
705 EXTERNAL_PROPERTY_LIST_LOOP (rest, keyword, value, props)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
706 {
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
707 if (EQ (keyword, Qshort_name))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
708 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
709 CHECK_STRING (value);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
710 short_name = value;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
711 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
712
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
713 if (EQ (keyword, Qlong_name))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
714 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
715 CHECK_STRING (value);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
716 long_name = value;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
717 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
718
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
719 else if (EQ (keyword, Qdimension))
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
720 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
721 CHECK_INT (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
722 dimension = XINT (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
723 if (dimension < 1 || dimension > 2)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
724 signal_simple_error ("Invalid value for 'dimension", value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
725 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
726
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
727 else if (EQ (keyword, Qchars))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
728 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
729 CHECK_INT (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
730 chars = XINT (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
731 if (chars != 94 && chars != 96)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
732 signal_simple_error ("Invalid value for 'chars", value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
733 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
734
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
735 else if (EQ (keyword, Qcolumns))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
736 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
737 CHECK_INT (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
738 columns = XINT (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
739 if (columns != 1 && columns != 2)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
740 signal_simple_error ("Invalid value for 'columns", value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
741 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
742
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
743 else if (EQ (keyword, Qgraphic))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
744 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
745 CHECK_INT (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
746 graphic = XINT (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
747 if (graphic < 0 || graphic > 1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
748 signal_simple_error ("Invalid value for 'graphic", value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
749 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
750
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
751 else if (EQ (keyword, Qregistry))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
752 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
753 CHECK_STRING (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
754 registry = value;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
755 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
756
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
757 else if (EQ (keyword, Qdirection))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
758 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
759 if (EQ (value, Ql2r))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
760 direction = CHARSET_LEFT_TO_RIGHT;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
761 else if (EQ (value, Qr2l))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
762 direction = CHARSET_RIGHT_TO_LEFT;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
763 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
764 signal_simple_error ("Invalid value for 'direction", value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
765 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
766
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
767 else if (EQ (keyword, Qfinal))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
768 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
769 CHECK_CHAR_COERCE_INT (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
770 final = XCHAR (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
771 if (final < '0' || final > '~')
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
772 signal_simple_error ("Invalid value for 'final", value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
773 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
774
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
775 else if (EQ (keyword, Qccl_program))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
776 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
777 CHECK_VECTOR (value);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
778 ccl_program = value;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
779 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
780
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
781 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
782 signal_simple_error ("Unrecognized property", keyword);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
783 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
784
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
785 if (!final)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
786 error ("'final must be specified");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
787 if (dimension == 2 && final > 0x5F)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
788 signal_simple_error
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
789 ("Final must be in the range 0x30 - 0x5F for dimension == 2",
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
790 make_char (final));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
791
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
792 if (dimension == 1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
793 type = (chars == 94) ? CHARSET_TYPE_94 : CHARSET_TYPE_96;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
794 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
795 type = (chars == 94) ? CHARSET_TYPE_94X94 : CHARSET_TYPE_96X96;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
796
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
797 if (!NILP (CHARSET_BY_ATTRIBUTES (type, final, CHARSET_LEFT_TO_RIGHT)) ||
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
798 !NILP (CHARSET_BY_ATTRIBUTES (type, final, CHARSET_RIGHT_TO_LEFT)))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
799 error
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
800 ("Character set already defined for this DIMENSION/CHARS/FINAL combo");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
801
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
802 id = get_unallocated_leading_byte (dimension);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
803
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
804 if (NILP (doc_string))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
805 doc_string = build_string ("");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
806
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
807 if (NILP (registry))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
808 registry = build_string ("");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
809
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
810 if (NILP (short_name))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
811 XSETSTRING (short_name, XSYMBOL (name)->name);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
812
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
813 if (NILP (long_name))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
814 long_name = doc_string;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
815
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
816 if (columns == -1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
817 columns = dimension;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
818 charset = make_charset (id, name, dimension + 2, type, columns, graphic,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
819 final, direction, short_name, long_name, doc_string, registry);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
820 if (!NILP (ccl_program))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
821 XCHARSET_CCL_PROGRAM (charset) = ccl_program;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
822 return charset;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
823 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
824
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 272
diff changeset
825 DEFUN ("make-reverse-direction-charset", Fmake_reverse_direction_charset,
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 272
diff changeset
826 2, 2, 0, /*
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
827 Make a charset equivalent to CHARSET but which goes in the opposite direction.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
828 NEW-NAME is the name of the new charset. Return the new charset.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
829 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
830 (charset, new_name))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
831 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
832 Lisp_Object new_charset = Qnil;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
833 int id, dimension, columns, graphic, final;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
834 int direction, type;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
835 Lisp_Object registry, doc_string, short_name, long_name;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
836 Lisp_Charset *cs;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
837
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
838 charset = Fget_charset (charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
839 if (!NILP (XCHARSET_REVERSE_DIRECTION_CHARSET (charset)))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
840 signal_simple_error ("Charset already has reverse-direction charset",
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
841 charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
842
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
843 CHECK_SYMBOL (new_name);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
844 if (!NILP (Ffind_charset (new_name)))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
845 signal_simple_error ("Cannot redefine existing charset", new_name);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
846
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
847 cs = XCHARSET (charset);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
848
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
849 type = CHARSET_TYPE (cs);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
850 columns = CHARSET_COLUMNS (cs);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
851 dimension = CHARSET_DIMENSION (cs);
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
852 id = get_unallocated_leading_byte (dimension);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
853
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
854 graphic = CHARSET_GRAPHIC (cs);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
855 final = CHARSET_FINAL (cs);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
856 direction = CHARSET_RIGHT_TO_LEFT;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
857 if (CHARSET_DIRECTION (cs) == CHARSET_RIGHT_TO_LEFT)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
858 direction = CHARSET_LEFT_TO_RIGHT;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
859 doc_string = CHARSET_DOC_STRING (cs);
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
860 short_name = CHARSET_SHORT_NAME (cs);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
861 long_name = CHARSET_LONG_NAME (cs);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
862 registry = CHARSET_REGISTRY (cs);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
863
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
864 new_charset = make_charset (id, new_name, dimension + 2, type, columns,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
865 graphic, final, direction, short_name, long_name,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
866 doc_string, registry);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
867
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
868 CHARSET_REVERSE_DIRECTION_CHARSET (cs) = new_charset;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
869 XCHARSET_REVERSE_DIRECTION_CHARSET (new_charset) = charset;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
870
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
871 return new_charset;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
872 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
873
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 280
diff changeset
874 /* #### Reverse direction charsets not yet implemented. */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
875 #if 0
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 272
diff changeset
876 DEFUN ("charset-reverse-direction-charset", Fcharset_reverse_direction_charset,
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 272
diff changeset
877 1, 1, 0, /*
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
878 Return the reverse-direction charset parallel to CHARSET, if any.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
879 This is the charset with the same properties (in particular, the same
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
880 dimension, number of characters per dimension, and final byte) as
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
881 CHARSET but whose characters are displayed in the opposite direction.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
882 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
883 (charset))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
884 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
885 charset = Fget_charset (charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
886 return XCHARSET_REVERSE_DIRECTION_CHARSET (charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
887 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
888 #endif
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
889
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
890 DEFUN ("charset-from-attributes", Fcharset_from_attributes, 3, 4, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
891 Return a charset with the given DIMENSION, CHARS, FINAL, and DIRECTION.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
892 If DIRECTION is omitted, both directions will be checked (left-to-right
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
893 will be returned if character sets exist for both directions).
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
894 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
895 (dimension, chars, final, direction))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
896 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
897 int dm, ch, fi, di = -1;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
898 int type;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
899 Lisp_Object obj = Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
900
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
901 CHECK_INT (dimension);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
902 dm = XINT (dimension);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
903 if (dm < 1 || dm > 2)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
904 signal_simple_error ("Invalid value for DIMENSION", dimension);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
905
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
906 CHECK_INT (chars);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
907 ch = XINT (chars);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
908 if (ch != 94 && ch != 96)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
909 signal_simple_error ("Invalid value for CHARS", chars);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
910
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
911 CHECK_CHAR_COERCE_INT (final);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
912 fi = XCHAR (final);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
913 if (fi < '0' || fi > '~')
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
914 signal_simple_error ("Invalid value for FINAL", final);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
915
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
916 if (EQ (direction, Ql2r))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
917 di = CHARSET_LEFT_TO_RIGHT;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
918 else if (EQ (direction, Qr2l))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
919 di = CHARSET_RIGHT_TO_LEFT;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
920 else if (!NILP (direction))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
921 signal_simple_error ("Invalid value for DIRECTION", direction);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
922
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
923 if (dm == 2 && fi > 0x5F)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
924 signal_simple_error
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
925 ("Final must be in the range 0x30 - 0x5F for dimension == 2", final);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
926
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
927 if (dm == 1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
928 type = (ch == 94) ? CHARSET_TYPE_94 : CHARSET_TYPE_96;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
929 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
930 type = (ch == 94) ? CHARSET_TYPE_94X94 : CHARSET_TYPE_96X96;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
931
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
932 if (di == -1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
933 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
934 obj = CHARSET_BY_ATTRIBUTES (type, fi, CHARSET_LEFT_TO_RIGHT);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
935 if (NILP (obj))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
936 obj = CHARSET_BY_ATTRIBUTES (type, fi, CHARSET_RIGHT_TO_LEFT);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
937 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
938 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
939 obj = CHARSET_BY_ATTRIBUTES (type, fi, di);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
940
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
941 if (CHARSETP (obj))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
942 return XCHARSET_NAME (obj);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
943 return obj;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
944 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
945
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
946 DEFUN ("charset-short-name", Fcharset_short_name, 1, 1, 0, /*
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
947 Return short name of CHARSET.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
948 */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
949 (charset))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
950 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
951 return XCHARSET_SHORT_NAME (Fget_charset (charset));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
952 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
953
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
954 DEFUN ("charset-long-name", Fcharset_long_name, 1, 1, 0, /*
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
955 Return long name of CHARSET.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
956 */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
957 (charset))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
958 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
959 return XCHARSET_LONG_NAME (Fget_charset (charset));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
960 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
961
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
962 DEFUN ("charset-description", Fcharset_description, 1, 1, 0, /*
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
963 Return description of CHARSET.
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
964 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
965 (charset))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
966 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
967 return XCHARSET_DOC_STRING (Fget_charset (charset));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
968 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
969
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
970 DEFUN ("charset-dimension", Fcharset_dimension, 1, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
971 Return dimension of CHARSET.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
972 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
973 (charset))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
974 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
975 return make_int (XCHARSET_DIMENSION (Fget_charset (charset)));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
976 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
977
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
978 DEFUN ("charset-property", Fcharset_property, 2, 2, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
979 Return property PROP of CHARSET.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
980 Recognized properties are those listed in `make-charset', as well as
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
981 'name and 'doc-string.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
982 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
983 (charset, prop))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
984 {
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
985 Lisp_Charset *cs;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
986
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
987 charset = Fget_charset (charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
988 cs = XCHARSET (charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
989
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
990 CHECK_SYMBOL (prop);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
991 if (EQ (prop, Qname)) return CHARSET_NAME (cs);
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
992 if (EQ (prop, Qshort_name)) return CHARSET_SHORT_NAME (cs);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
993 if (EQ (prop, Qlong_name)) return CHARSET_LONG_NAME (cs);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
994 if (EQ (prop, Qdoc_string)) return CHARSET_DOC_STRING (cs);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
995 if (EQ (prop, Qdimension)) return make_int (CHARSET_DIMENSION (cs));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
996 if (EQ (prop, Qcolumns)) return make_int (CHARSET_COLUMNS (cs));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
997 if (EQ (prop, Qgraphic)) return make_int (CHARSET_GRAPHIC (cs));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
998 if (EQ (prop, Qfinal)) return make_char (CHARSET_FINAL (cs));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
999 if (EQ (prop, Qchars)) return make_int (CHARSET_CHARS (cs));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1000 if (EQ (prop, Qregistry)) return CHARSET_REGISTRY (cs);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1001 if (EQ (prop, Qccl_program)) return CHARSET_CCL_PROGRAM (cs);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1002 if (EQ (prop, Qdirection))
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 241
diff changeset
1003 return CHARSET_DIRECTION (cs) == CHARSET_LEFT_TO_RIGHT ? Ql2r : Qr2l;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1004 if (EQ (prop, Qreverse_direction_charset))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1005 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1006 Lisp_Object obj = CHARSET_REVERSE_DIRECTION_CHARSET (cs);
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 367
diff changeset
1007 if (NILP (obj))
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 367
diff changeset
1008 return Qnil;
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 367
diff changeset
1009 else
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 367
diff changeset
1010 return XCHARSET_NAME (obj);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1011 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1012 signal_simple_error ("Unrecognized charset property name", prop);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1013 return Qnil; /* not reached */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1014 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1015
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 185
diff changeset
1016 DEFUN ("charset-id", Fcharset_id, 1, 1, 0, /*
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 185
diff changeset
1017 Return charset identification number of CHARSET.
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 185
diff changeset
1018 */
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 185
diff changeset
1019 (charset))
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 185
diff changeset
1020 {
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1021 return make_int(XCHARSET_LEADING_BYTE (Fget_charset (charset)));
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 185
diff changeset
1022 }
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 185
diff changeset
1023
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1024 /* #### We need to figure out which properties we really want to
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1025 allow to be set. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1026
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1027 DEFUN ("set-charset-ccl-program", Fset_charset_ccl_program, 2, 2, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1028 Set the 'ccl-program property of CHARSET to CCL-PROGRAM.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1029 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1030 (charset, ccl_program))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1031 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1032 charset = Fget_charset (charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1033 CHECK_VECTOR (ccl_program);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1034 XCHARSET_CCL_PROGRAM (charset) = ccl_program;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1035 return Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1036 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1037
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1038 static void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1039 invalidate_charset_font_caches (Lisp_Object charset)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1040 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1041 /* Invalidate font cache entries for charset on all devices. */
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1042 Lisp_Object devcons, concons, hash_table;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1043 DEVICE_LOOP_NO_BREAK (devcons, concons)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1044 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1045 struct device *d = XDEVICE (XCAR (devcons));
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1046 hash_table = Fgethash (charset, d->charset_font_cache, Qunbound);
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1047 if (!UNBOUNDP (hash_table))
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1048 Fclrhash (hash_table);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1049 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1050 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1051
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1052 /* Japanese folks may want to (set-charset-registry 'ascii "jisx0201") */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1053 DEFUN ("set-charset-registry", Fset_charset_registry, 2, 2, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1054 Set the 'registry property of CHARSET to REGISTRY.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1055 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1056 (charset, registry))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1057 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1058 charset = Fget_charset (charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1059 CHECK_STRING (registry);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1060 XCHARSET_REGISTRY (charset) = registry;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1061 invalidate_charset_font_caches (charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1062 face_property_was_changed (Vdefault_face, Qfont, Qglobal);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1063 return Qnil;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1064 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
1065
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1066
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1067 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1068 /* Lisp primitives for working with characters */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1069 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1070
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1071 DEFUN ("make-char", Fmake_char, 2, 3, 0, /*
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1072 Make a character from CHARSET and octets ARG1 and ARG2.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1073 ARG2 is required only for characters from two-dimensional charsets.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1074 For example, (make-char 'latin-iso8859-2 185) will return the Latin 2
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1075 character s with caron.
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1076 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1077 (charset, arg1, arg2))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1078 {
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1079 Lisp_Charset *cs;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1080 int a1, a2;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1081 int lowlim, highlim;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1082
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1083 charset = Fget_charset (charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1084 cs = XCHARSET (charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1085
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1086 if (EQ (charset, Vcharset_ascii)) lowlim = 0, highlim = 127;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1087 else if (EQ (charset, Vcharset_control_1)) lowlim = 0, highlim = 31;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1088 else if (CHARSET_CHARS (cs) == 94) lowlim = 33, highlim = 126;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1089 else /* CHARSET_CHARS (cs) == 96) */ lowlim = 32, highlim = 127;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1090
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1091 CHECK_INT (arg1);
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1092 /* It is useful (and safe, according to Olivier Galibert) to strip
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1093 the 8th bit off ARG1 and ARG2 becaue it allows programmers to
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1094 write (make-char 'latin-iso8859-2 CODE) where code is the actual
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1095 Latin 2 code of the character. */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1096 a1 = XINT (arg1) & 0x7f;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1097 if (a1 < lowlim || a1 > highlim)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1098 args_out_of_range_3 (arg1, make_int (lowlim), make_int (highlim));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1099
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1100 if (CHARSET_DIMENSION (cs) == 1)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1101 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1102 if (!NILP (arg2))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1103 signal_simple_error
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1104 ("Charset is of dimension one; second octet must be nil", arg2);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1105 return make_char (MAKE_CHAR (charset, a1, 0));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1106 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1107
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1108 CHECK_INT (arg2);
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1109 a2 = XINT (arg2) & 0x7f;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1110 if (a2 < lowlim || a2 > highlim)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1111 args_out_of_range_3 (arg2, make_int (lowlim), make_int (highlim));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1112
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1113 return make_char (MAKE_CHAR (charset, a1, a2));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1114 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1115
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1116 DEFUN ("char-charset", Fchar_charset, 1, 1, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1117 Return the character set of char CH.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1118 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1119 (ch))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1120 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1121 CHECK_CHAR_COERCE_INT (ch);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1122
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1123 return XCHARSET_NAME (CHARSET_BY_LEADING_BYTE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1124 (CHAR_LEADING_BYTE (XCHAR (ch))));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1125 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1126
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1127 DEFUN ("char-octet", Fchar_octet, 1, 2, 0, /*
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1128 Return the octet numbered N (should be 0 or 1) of char CH.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1129 N defaults to 0 if omitted.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1130 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1131 (ch, n))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1132 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1133 Lisp_Object charset;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1134 int octet0, octet1;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1135
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1136 CHECK_CHAR_COERCE_INT (ch);
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1137
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1138 BREAKUP_CHAR (XCHAR (ch), charset, octet0, octet1);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1139
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1140 if (NILP (n) || EQ (n, Qzero))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1141 return make_int (octet0);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1142 else if (EQ (n, make_int (1)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1143 return make_int (octet1);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1144 else
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1145 signal_simple_error ("Octet number must be 0 or 1", n);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1146 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1147
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1148 DEFUN ("split-char", Fsplit_char, 1, 1, 0, /*
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1149 Return list of charset and one or two position-codes of CHAR.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1150 */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1151 (character))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1152 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1153 /* This function can GC */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1154 struct gcpro gcpro1, gcpro2;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1155 Lisp_Object charset = Qnil;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1156 Lisp_Object rc = Qnil;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1157 int c1, c2;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1158
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1159 GCPRO2 (charset, rc);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1160 CHECK_CHAR_COERCE_INT (character);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1161
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1162 BREAKUP_CHAR (XCHAR (character), charset, c1, c2);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1163
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1164 if (XCHARSET_DIMENSION (Fget_charset (charset)) == 2)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1165 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1166 rc = list3 (XCHARSET_NAME (charset), make_int (c1), make_int (c2));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1167 }
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1168 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1169 {
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1170 rc = list2 (XCHARSET_NAME (charset), make_int (c1));
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1171 }
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1172 UNGCPRO;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1173
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1174 return rc;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1175 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1176
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1177
396
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
1178 #ifdef ENABLE_COMPOSITE_CHARS
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1179 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1180 /* composite character functions */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1181 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1182
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1183 Emchar
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1184 lookup_composite_char (Bufbyte *str, int len)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1185 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1186 Lisp_Object lispstr = make_string (str, len);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1187 Lisp_Object ch = Fgethash (lispstr,
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1188 Vcomposite_char_string2char_hash_table,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1189 Qunbound);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1190 Emchar emch;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1191
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1192 if (UNBOUNDP (ch))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1193 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1194 if (composite_char_row_next >= 128)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1195 signal_simple_error ("No more composite chars available", lispstr);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1196 emch = MAKE_CHAR (Vcharset_composite, composite_char_row_next,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1197 composite_char_col_next);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1198 Fputhash (make_char (emch), lispstr,
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1199 Vcomposite_char_char2string_hash_table);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1200 Fputhash (lispstr, make_char (emch),
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1201 Vcomposite_char_string2char_hash_table);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1202 composite_char_col_next++;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1203 if (composite_char_col_next >= 128)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1204 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1205 composite_char_col_next = 32;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1206 composite_char_row_next++;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1207 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1208 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1209 else
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1210 emch = XCHAR (ch);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1211 return emch;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1212 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1213
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1214 Lisp_Object
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1215 composite_char_string (Emchar ch)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1216 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1217 Lisp_Object str = Fgethash (make_char (ch),
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1218 Vcomposite_char_char2string_hash_table,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1219 Qunbound);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1220 assert (!UNBOUNDP (str));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1221 return str;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1222 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1223
396
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
1224 xxDEFUN ("make-composite-char", Fmake_composite_char, 1, 1, 0, /*
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1225 Convert a string into a single composite character.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1226 The character is the result of overstriking all the characters in
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1227 the string.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1228 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1229 (string))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1230 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1231 CHECK_STRING (string);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1232 return make_char (lookup_composite_char (XSTRING_DATA (string),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1233 XSTRING_LENGTH (string)));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1234 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1235
396
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
1236 xxDEFUN ("composite-char-string", Fcomposite_char_string, 1, 1, 0, /*
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1237 Return a string of the characters comprising a composite character.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1238 */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1239 (ch))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1240 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1241 Emchar emch;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1242
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1243 CHECK_CHAR (ch);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1244 emch = XCHAR (ch);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1245 if (CHAR_LEADING_BYTE (emch) != LEADING_BYTE_COMPOSITE)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1246 signal_simple_error ("Must be composite char", ch);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1247 return composite_char_string (emch);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1248 }
396
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
1249 #endif /* ENABLE_COMPOSITE_CHARS */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1250
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1251
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1252 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1253 /* initialization */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1254 /************************************************************************/
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1255
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1256 void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1257 syms_of_mule_charset (void)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1258 {
400
a86b2b5e0111 Import from CVS: tag r21-2-30
cvs
parents: 398
diff changeset
1259 INIT_LRECORD_IMPLEMENTATION (charset);
a86b2b5e0111 Import from CVS: tag r21-2-30
cvs
parents: 398
diff changeset
1260
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1261 DEFSUBR (Fcharsetp);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1262 DEFSUBR (Ffind_charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1263 DEFSUBR (Fget_charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1264 DEFSUBR (Fcharset_list);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1265 DEFSUBR (Fcharset_name);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1266 DEFSUBR (Fmake_charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1267 DEFSUBR (Fmake_reverse_direction_charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1268 /* DEFSUBR (Freverse_direction_charset); */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1269 DEFSUBR (Fcharset_from_attributes);
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1270 DEFSUBR (Fcharset_short_name);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1271 DEFSUBR (Fcharset_long_name);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1272 DEFSUBR (Fcharset_description);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1273 DEFSUBR (Fcharset_dimension);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1274 DEFSUBR (Fcharset_property);
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 185
diff changeset
1275 DEFSUBR (Fcharset_id);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1276 DEFSUBR (Fset_charset_ccl_program);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1277 DEFSUBR (Fset_charset_registry);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1278
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1279 DEFSUBR (Fmake_char);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1280 DEFSUBR (Fchar_charset);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1281 DEFSUBR (Fchar_octet);
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1282 DEFSUBR (Fsplit_char);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1283
396
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
1284 #ifdef ENABLE_COMPOSITE_CHARS
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1285 DEFSUBR (Fmake_composite_char);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1286 DEFSUBR (Fcomposite_char_string);
396
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
1287 #endif
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1288
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1289 defsymbol (&Qcharsetp, "charsetp");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1290 defsymbol (&Qregistry, "registry");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1291 defsymbol (&Qfinal, "final");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1292 defsymbol (&Qgraphic, "graphic");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1293 defsymbol (&Qdirection, "direction");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1294 defsymbol (&Qreverse_direction_charset, "reverse-direction-charset");
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1295 defsymbol (&Qshort_name, "short-name");
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1296 defsymbol (&Qlong_name, "long-name");
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1297
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1298 defsymbol (&Ql2r, "l2r");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1299 defsymbol (&Qr2l, "r2l");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1300
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1301 /* Charsets, compatible with FSF 20.3
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1302 Naming convention is Script-Charset[-Edition] */
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1303 defsymbol (&Qascii, "ascii");
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1304 defsymbol (&Qcontrol_1, "control-1");
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1305 defsymbol (&Qlatin_iso8859_1, "latin-iso8859-1");
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1306 defsymbol (&Qlatin_iso8859_2, "latin-iso8859-2");
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1307 defsymbol (&Qlatin_iso8859_3, "latin-iso8859-3");
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1308 defsymbol (&Qlatin_iso8859_4, "latin-iso8859-4");
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1309 defsymbol (&Qthai_tis620, "thai-tis620");
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1310 defsymbol (&Qgreek_iso8859_7, "greek-iso8859-7");
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1311 defsymbol (&Qarabic_iso8859_6, "arabic-iso8859-6");
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1312 defsymbol (&Qhebrew_iso8859_8, "hebrew-iso8859-8");
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1313 defsymbol (&Qkatakana_jisx0201, "katakana-jisx0201");
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1314 defsymbol (&Qlatin_jisx0201, "latin-jisx0201");
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1315 defsymbol (&Qcyrillic_iso8859_5, "cyrillic-iso8859-5");
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1316 defsymbol (&Qlatin_iso8859_9, "latin-iso8859-9");
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1317 defsymbol (&Qjapanese_jisx0208_1978, "japanese-jisx0208-1978");
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1318 defsymbol (&Qchinese_gb2312, "chinese-gb2312");
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1319 defsymbol (&Qjapanese_jisx0208, "japanese-jisx0208");
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1320 defsymbol (&Qkorean_ksc5601, "korean-ksc5601");
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1321 defsymbol (&Qjapanese_jisx0212, "japanese-jisx0212");
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1322 defsymbol (&Qchinese_cns11643_1, "chinese-cns11643-1");
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1323 defsymbol (&Qchinese_cns11643_2, "chinese-cns11643-2");
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1324 defsymbol (&Qchinese_big5_1, "chinese-big5-1");
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1325 defsymbol (&Qchinese_big5_2, "chinese-big5-2");
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
1326
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1327 defsymbol (&Qcomposite, "composite");
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1328 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1329
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1330 void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1331 vars_of_mule_charset (void)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1332 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1333 int i, j, k;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1334
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1335 chlook = xnew (struct charset_lookup);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1336 dumpstruct (&chlook, &charset_lookup_description);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1337
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
1338 /* Table of charsets indexed by leading byte. */
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1339 for (i = 0; i < countof (chlook->charset_by_leading_byte); i++)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1340 chlook->charset_by_leading_byte[i] = Qnil;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
1341
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
1342 /* Table of charsets indexed by type/final-byte/direction. */
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1343 for (i = 0; i < countof (chlook->charset_by_attributes); i++)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1344 for (j = 0; j < countof (chlook->charset_by_attributes[0]); j++)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1345 for (k = 0; k < countof (chlook->charset_by_attributes[0][0]); k++)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1346 chlook->charset_by_attributes[i][j][k] = Qnil;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1347
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 400
diff changeset
1348 chlook->next_allocated_1_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_1;
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 400
diff changeset
1349 chlook->next_allocated_2_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_2;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1350 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1351
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1352 void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1353 complex_vars_of_mule_charset (void)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1354 {
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1355 staticpro (&Vcharset_hash_table);
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1356 Vcharset_hash_table =
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1357 make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 167
diff changeset
1358
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1359 /* Predefined character sets. We store them into variables for
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1360 ease of access. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1361
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1362 staticpro (&Vcharset_ascii);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1363 Vcharset_ascii =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1364 make_charset (LEADING_BYTE_ASCII, Qascii, 1,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1365 CHARSET_TYPE_94, 1, 0, 'B',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1366 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1367 build_string ("ASCII"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1368 build_string ("ASCII)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1369 build_string ("ASCII (ISO646 IRV)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1370 build_string ("\\(iso8859-[0-9]*\\|-ascii\\)"));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1371 staticpro (&Vcharset_control_1);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1372 Vcharset_control_1 =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1373 make_charset (LEADING_BYTE_CONTROL_1, Qcontrol_1, 2,
377
d883f39b8495 Import from CVS: tag r21-2b4
cvs
parents: 371
diff changeset
1374 CHARSET_TYPE_94, 1, 1, 0,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1375 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1376 build_string ("C1"),
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1377 build_string ("Control characters"),
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1378 build_string ("Control characters 128-191"),
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1379 build_string (""));
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1380 staticpro (&Vcharset_latin_iso8859_1);
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1381 Vcharset_latin_iso8859_1 =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1382 make_charset (LEADING_BYTE_LATIN_ISO8859_1, Qlatin_iso8859_1, 2,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1383 CHARSET_TYPE_96, 1, 1, 'A',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1384 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1385 build_string ("Latin-1"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1386 build_string ("ISO8859-1 (Latin-1)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1387 build_string ("ISO8859-1 (Latin-1)"),
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 74
diff changeset
1388 build_string ("iso8859-1"));
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1389 staticpro (&Vcharset_latin_iso8859_2);
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1390 Vcharset_latin_iso8859_2 =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1391 make_charset (LEADING_BYTE_LATIN_ISO8859_2, Qlatin_iso8859_2, 2,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1392 CHARSET_TYPE_96, 1, 1, 'B',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1393 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1394 build_string ("Latin-2"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1395 build_string ("ISO8859-2 (Latin-2)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1396 build_string ("ISO8859-2 (Latin-2)"),
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 74
diff changeset
1397 build_string ("iso8859-2"));
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1398 staticpro (&Vcharset_latin_iso8859_3);
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1399 Vcharset_latin_iso8859_3 =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1400 make_charset (LEADING_BYTE_LATIN_ISO8859_3, Qlatin_iso8859_3, 2,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1401 CHARSET_TYPE_96, 1, 1, 'C',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1402 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1403 build_string ("Latin-3"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1404 build_string ("ISO8859-3 (Latin-3)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1405 build_string ("ISO8859-3 (Latin-3)"),
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 74
diff changeset
1406 build_string ("iso8859-3"));
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1407 staticpro (&Vcharset_latin_iso8859_4);
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1408 Vcharset_latin_iso8859_4 =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1409 make_charset (LEADING_BYTE_LATIN_ISO8859_4, Qlatin_iso8859_4, 2,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1410 CHARSET_TYPE_96, 1, 1, 'D',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1411 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1412 build_string ("Latin-4"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1413 build_string ("ISO8859-4 (Latin-4)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1414 build_string ("ISO8859-4 (Latin-4)"),
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 74
diff changeset
1415 build_string ("iso8859-4"));
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1416 staticpro (&Vcharset_thai_tis620);
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1417 Vcharset_thai_tis620 =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1418 make_charset (LEADING_BYTE_THAI_TIS620, Qthai_tis620, 2,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1419 CHARSET_TYPE_96, 1, 1, 'T',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1420 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1421 build_string ("TIS620"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1422 build_string ("TIS620 (Thai)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1423 build_string ("TIS620.2529 (Thai)"),
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 74
diff changeset
1424 build_string ("tis620"));
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1425 staticpro (&Vcharset_greek_iso8859_7);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1426 Vcharset_greek_iso8859_7 =
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1427 make_charset (LEADING_BYTE_GREEK_ISO8859_7, Qgreek_iso8859_7, 2,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1428 CHARSET_TYPE_96, 1, 1, 'F',
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1429 CHARSET_LEFT_TO_RIGHT,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1430 build_string ("ISO8859-7"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1431 build_string ("ISO8859-7 (Greek)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1432 build_string ("ISO8859-7 (Greek)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1433 build_string ("iso8859-7"));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1434 staticpro (&Vcharset_arabic_iso8859_6);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1435 Vcharset_arabic_iso8859_6 =
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1436 make_charset (LEADING_BYTE_ARABIC_ISO8859_6, Qarabic_iso8859_6, 2,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1437 CHARSET_TYPE_96, 1, 1, 'G',
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1438 CHARSET_RIGHT_TO_LEFT,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1439 build_string ("ISO8859-6"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1440 build_string ("ISO8859-6 (Arabic)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1441 build_string ("ISO8859-6 (Arabic)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1442 build_string ("iso8859-6"));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1443 staticpro (&Vcharset_hebrew_iso8859_8);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1444 Vcharset_hebrew_iso8859_8 =
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1445 make_charset (LEADING_BYTE_HEBREW_ISO8859_8, Qhebrew_iso8859_8, 2,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1446 CHARSET_TYPE_96, 1, 1, 'H',
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1447 CHARSET_RIGHT_TO_LEFT,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1448 build_string ("ISO8859-8"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1449 build_string ("ISO8859-8 (Hebrew)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1450 build_string ("ISO8859-8 (Hebrew)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1451 build_string ("iso8859-8"));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1452 staticpro (&Vcharset_katakana_jisx0201);
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1453 Vcharset_katakana_jisx0201 =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1454 make_charset (LEADING_BYTE_KATAKANA_JISX0201, Qkatakana_jisx0201, 2,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1455 CHARSET_TYPE_94, 1, 1, 'I',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1456 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1457 build_string ("JISX0201 Kana"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1458 build_string ("JISX0201.1976 (Japanese Kana)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1459 build_string ("JISX0201.1976 Japanese Kana"),
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 74
diff changeset
1460 build_string ("jisx0201.1976"));
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1461 staticpro (&Vcharset_latin_jisx0201);
74
54cc21c15cbb Import from CVS: tag r20-0b32
cvs
parents: 70
diff changeset
1462 Vcharset_latin_jisx0201 =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1463 make_charset (LEADING_BYTE_LATIN_JISX0201, Qlatin_jisx0201, 2,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1464 CHARSET_TYPE_94, 1, 0, 'J',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1465 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1466 build_string ("JISX0201 Roman"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1467 build_string ("JISX0201.1976 (Japanese Roman)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1468 build_string ("JISX0201.1976 Japanese Roman"),
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 74
diff changeset
1469 build_string ("jisx0201.1976"));
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1470 staticpro (&Vcharset_cyrillic_iso8859_5);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1471 Vcharset_cyrillic_iso8859_5 =
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1472 make_charset (LEADING_BYTE_CYRILLIC_ISO8859_5, Qcyrillic_iso8859_5, 2,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1473 CHARSET_TYPE_96, 1, 1, 'L',
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1474 CHARSET_LEFT_TO_RIGHT,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1475 build_string ("ISO8859-5"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1476 build_string ("ISO8859-5 (Cyrillic)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1477 build_string ("ISO8859-5 (Cyrillic)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1478 build_string ("iso8859-5"));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1479 staticpro (&Vcharset_latin_iso8859_9);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1480 Vcharset_latin_iso8859_9 =
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1481 make_charset (LEADING_BYTE_LATIN_ISO8859_9, Qlatin_iso8859_9, 2,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1482 CHARSET_TYPE_96, 1, 1, 'M',
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1483 CHARSET_LEFT_TO_RIGHT,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1484 build_string ("Latin-5"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1485 build_string ("ISO8859-9 (Latin-5)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1486 build_string ("ISO8859-9 (Latin-5)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1487 build_string ("iso8859-9"));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1488 staticpro (&Vcharset_japanese_jisx0208_1978);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1489 Vcharset_japanese_jisx0208_1978 =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1490 make_charset (LEADING_BYTE_JAPANESE_JISX0208_1978, Qjapanese_jisx0208_1978, 3,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1491 CHARSET_TYPE_94X94, 2, 0, '@',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1492 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1493 build_string ("JISX0208.1978"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1494 build_string ("JISX0208.1978 (Japanese)"),
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 78
diff changeset
1495 build_string
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1496 ("JISX0208.1978 Japanese Kanji (so called \"old JIS\")"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1497 build_string ("\\(jisx0208\\|jisc6226\\)\\.1978"));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1498 staticpro (&Vcharset_chinese_gb2312);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1499 Vcharset_chinese_gb2312 =
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1500 make_charset (LEADING_BYTE_CHINESE_GB2312, Qchinese_gb2312, 3,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1501 CHARSET_TYPE_94X94, 2, 0, 'A',
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1502 CHARSET_LEFT_TO_RIGHT,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1503 build_string ("GB2312"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1504 build_string ("GB2312)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1505 build_string ("GB2312 Chinese simplified"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1506 build_string ("gb2312"));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1507 staticpro (&Vcharset_japanese_jisx0208);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1508 Vcharset_japanese_jisx0208 =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1509 make_charset (LEADING_BYTE_JAPANESE_JISX0208, Qjapanese_jisx0208, 3,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1510 CHARSET_TYPE_94X94, 2, 0, 'B',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1511 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1512 build_string ("JISX0208"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1513 build_string ("JISX0208.1983/1990 (Japanese)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1514 build_string ("JISX0208.1983/1990 Japanese Kanji"),
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 74
diff changeset
1515 build_string ("jisx0208.19\\(83\\|90\\)"));
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1516 staticpro (&Vcharset_korean_ksc5601);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1517 Vcharset_korean_ksc5601 =
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1518 make_charset (LEADING_BYTE_KOREAN_KSC5601, Qkorean_ksc5601, 3,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1519 CHARSET_TYPE_94X94, 2, 0, 'C',
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1520 CHARSET_LEFT_TO_RIGHT,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1521 build_string ("KSC5601"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1522 build_string ("KSC5601 (Korean"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1523 build_string ("KSC5601 Korean Hangul and Hanja"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1524 build_string ("ksc5601"));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1525 staticpro (&Vcharset_japanese_jisx0212);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1526 Vcharset_japanese_jisx0212 =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1527 make_charset (LEADING_BYTE_JAPANESE_JISX0212, Qjapanese_jisx0212, 3,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1528 CHARSET_TYPE_94X94, 2, 0, 'D',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1529 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1530 build_string ("JISX0212"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1531 build_string ("JISX0212 (Japanese)"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1532 build_string ("JISX0212 Japanese Supplement"),
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 74
diff changeset
1533 build_string ("jisx0212"));
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1534
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 74
diff changeset
1535 #define CHINESE_CNS_PLANE_RE(n) "cns11643[.-]\\(.*[.-]\\)?" n "$"
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1536 staticpro (&Vcharset_chinese_cns11643_1);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1537 Vcharset_chinese_cns11643_1 =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1538 make_charset (LEADING_BYTE_CHINESE_CNS11643_1, Qchinese_cns11643_1, 3,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1539 CHARSET_TYPE_94X94, 2, 0, 'G',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1540 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1541 build_string ("CNS11643-1"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1542 build_string ("CNS11643-1 (Chinese traditional)"),
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 78
diff changeset
1543 build_string
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1544 ("CNS 11643 Plane 1 Chinese traditional"),
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1545 build_string (CHINESE_CNS_PLANE_RE("1")));
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1546 staticpro (&Vcharset_chinese_cns11643_2);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1547 Vcharset_chinese_cns11643_2 =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1548 make_charset (LEADING_BYTE_CHINESE_CNS11643_2, Qchinese_cns11643_2, 3,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1549 CHARSET_TYPE_94X94, 2, 0, 'H',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1550 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1551 build_string ("CNS11643-2"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1552 build_string ("CNS11643-2 (Chinese traditional)"),
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 78
diff changeset
1553 build_string
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1554 ("CNS 11643 Plane 2 Chinese traditional"),
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1555 build_string (CHINESE_CNS_PLANE_RE("2")));
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1556 staticpro (&Vcharset_chinese_big5_1);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1557 Vcharset_chinese_big5_1 =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1558 make_charset (LEADING_BYTE_CHINESE_BIG5_1, Qchinese_big5_1, 3,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1559 CHARSET_TYPE_94X94, 2, 0, '0',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1560 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1561 build_string ("Big5"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1562 build_string ("Big5 (Level-1)"),
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 78
diff changeset
1563 build_string
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1564 ("Big5 Level-1 Chinese traditional"),
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 74
diff changeset
1565 build_string ("big5"));
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1566 staticpro (&Vcharset_chinese_big5_2);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1567 Vcharset_chinese_big5_2 =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1568 make_charset (LEADING_BYTE_CHINESE_BIG5_2, Qchinese_big5_2, 3,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1569 CHARSET_TYPE_94X94, 2, 0, '1',
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1570 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1571 build_string ("Big5"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1572 build_string ("Big5 (Level-2)"),
167
85ec50267440 Import from CVS: tag r20-3b10
cvs
parents: 78
diff changeset
1573 build_string
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1574 ("Big5 Level-2 Chinese traditional"),
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 74
diff changeset
1575 build_string ("big5"));
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1576
396
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
1577
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
1578 #ifdef ENABLE_COMPOSITE_CHARS
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1579 /* #### For simplicity, we put composite chars into a 96x96 charset.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1580 This is going to lead to problems because you can run out of
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1581 room, esp. as we don't yet recycle numbers. */
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1582 staticpro (&Vcharset_composite);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1583 Vcharset_composite =
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1584 make_charset (LEADING_BYTE_COMPOSITE, Qcomposite, 3,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1585 CHARSET_TYPE_96X96, 2, 0, 0,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1586 CHARSET_LEFT_TO_RIGHT,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1587 build_string ("Composite"),
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1588 build_string ("Composite characters"),
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1589 build_string ("Composite characters"),
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1590 build_string (""));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1591
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 396
diff changeset
1592 /* #### not dumped properly */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1593 composite_char_row_next = 32;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1594 composite_char_col_next = 32;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1595
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1596 Vcomposite_char_string2char_hash_table =
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1597 make_lisp_hash_table (500, HASH_TABLE_NON_WEAK, HASH_TABLE_EQUAL);
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1598 Vcomposite_char_char2string_hash_table =
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1599 make_lisp_hash_table (500, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1600 staticpro (&Vcomposite_char_string2char_hash_table);
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 377
diff changeset
1601 staticpro (&Vcomposite_char_char2string_hash_table);
396
6719134a07c2 Import from CVS: tag r21-2-13
cvs
parents: 392
diff changeset
1602 #endif /* ENABLE_COMPOSITE_CHARS */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1603
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1604 }