annotate src/mule-charset.c @ 359:8e84bee8ddd0 r21-1-9

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