Mercurial > emacs
annotate src/charset.c @ 20892:18f3cb26243f before-miles-orphaned-changes gcc-2_8_1-980401 gcc-2_8_1-980407 gcc-2_8_1-980412 gcc-2_8_1-980413 gcc-2_8_1-RELEASE gcc_2_8_1-980315 libc-980214 libc-980215 libc-980216 libc-980217 libc-980218 libc-980219 libc-980220 libc-980221 libc-980222 libc-980223 libc-980224 libc-980225 libc-980226 libc-980227 libc-980228 libc-980301 libc-980302 libc-980303 libc-980304 libc-980306 libc-980307 libc-980308 libc-980309 libc-980310 libc-980311 libc-980312 libc-980313 libc-980314 libc-980315 libc-980316 libc-980317 libc-980318 libc-980319 libc-980320 libc-980321 libc-980322 libc-980323 libc-980324 libc-980325 libc-980326 libc-980327 libc-980328 libc-980329 libc-980330 libc-980331 libc-980401 libc-980402 libc-980403 libc-980404 libc-980405 libc-980406 libc-980407 libc-980408 libc-980409 libc-980410 libc-980411 libc-980412 libc-980413 libc-980414 libc-980428 libc-980429 libc-980430 libc-980501 libc-980502 libc-980503 libc-980504 libc-980505 libc-980506 libc-980507 libc-980508 libc-980509 libc-980510 libc-980512 libc-980513 libc-980514 libc-980515 libc-980516 libc-980517 libc-980518 libc-980519 libc-980520 libc-980521 libc-980522 libc-980523 libc-980524 libc-980525 libc-980526 libc-980527 libc-980528 libc-980529 libc-980530 libc-980531 libc-980601 libc-980602 libc-980603 libc-980604 libc-980605 libc-980606 libc-980607 libc-980608 libc-980609 libc-980610 libc-980611 libc-980612 libc-980613
Add PentiumII (i786). Add '7' to all i[3456] entries.
Add AMD and Cyrix names for P5 and P6.
author | Richard Kenner <kenner@gnu.org> |
---|---|
date | Fri, 13 Feb 1998 12:16:46 +0000 |
parents | c7cfd531cf2b |
children | 5ceea9d50194 |
rev | line source |
---|---|
18341
33e78cc7f058
Change copyright notices.
Richard M. Stallman <rms@gnu.org>
parents:
18003
diff
changeset
|
1 /* Basic multilingual character support. |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
2 Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN. |
18341
33e78cc7f058
Change copyright notices.
Richard M. Stallman <rms@gnu.org>
parents:
18003
diff
changeset
|
3 Licensed to the Free Software Foundation. |
17052 | 4 |
17071 | 5 This file is part of GNU Emacs. |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
9 the Free Software Foundation; either version 2, or (at your option) | |
10 any later version. | |
17052 | 11 |
17071 | 12 GNU Emacs is distributed in the hope that it will be useful, |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
17052 | 16 |
17071 | 17 You should have received a copy of the GNU General Public License |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
20 Boston, MA 02111-1307, USA. */ | |
17052 | 21 |
22 /* At first, see the document in `charset.h' to understand the code in | |
23 this file. */ | |
24 | |
25 #include <stdio.h> | |
26 | |
27 #ifdef emacs | |
28 | |
29 #include <sys/types.h> | |
30 #include <config.h> | |
31 #include "lisp.h" | |
32 #include "buffer.h" | |
33 #include "charset.h" | |
34 #include "coding.h" | |
17843 | 35 #include "disptab.h" |
17052 | 36 |
37 #else /* not emacs */ | |
38 | |
39 #include "mulelib.h" | |
40 | |
41 #endif /* emacs */ | |
42 | |
43 Lisp_Object Qcharset, Qascii, Qcomposition; | |
44 | |
45 /* Declaration of special leading-codes. */ | |
46 int leading_code_composition; /* for composite characters */ | |
47 int leading_code_private_11; /* for private DIMENSION1 of 1-column */ | |
48 int leading_code_private_12; /* for private DIMENSION1 of 2-column */ | |
49 int leading_code_private_21; /* for private DIMENSION2 of 1-column */ | |
50 int leading_code_private_22; /* for private DIMENSION2 of 2-column */ | |
51 | |
52 /* Declaration of special charsets. */ | |
53 int charset_ascii; /* ASCII */ | |
54 int charset_composition; /* for a composite character */ | |
55 int charset_latin_iso8859_1; /* ISO8859-1 (Latin-1) */ | |
56 int charset_jisx0208_1978; /* JISX0208.1978 (Japanese Kanji old set) */ | |
57 int charset_jisx0208; /* JISX0208.1983 (Japanese Kanji) */ | |
58 int charset_katakana_jisx0201; /* JISX0201.Kana (Japanese Katakana) */ | |
59 int charset_latin_jisx0201; /* JISX0201.Roman (Japanese Roman) */ | |
60 int charset_big5_1; /* Big5 Level 1 (Chinese Traditional) */ | |
61 int charset_big5_2; /* Big5 Level 2 (Chinese Traditional) */ | |
62 | |
20720
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
63 int min_composite_char; |
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
64 |
17052 | 65 Lisp_Object Qcharset_table; |
66 | |
67 /* A char-table containing information of each character set. */ | |
68 Lisp_Object Vcharset_table; | |
69 | |
70 /* A vector of charset symbol indexed by charset-id. This is used | |
71 only for returning charset symbol from C functions. */ | |
72 Lisp_Object Vcharset_symbol_table; | |
73 | |
74 /* A list of charset symbols ever defined. */ | |
75 Lisp_Object Vcharset_list; | |
76 | |
20720
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
77 /* Vector of unification table ever defined. |
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
78 An ID of a unification table is an index of this vector. */ |
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
79 Lisp_Object Vcharacter_unification_table_vector; |
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
80 |
17052 | 81 /* Tables used by macros BYTES_BY_CHAR_HEAD and WIDTH_BY_CHAR_HEAD. */ |
82 int bytes_by_char_head[256]; | |
83 int width_by_char_head[256]; | |
84 | |
85 /* Mapping table from ISO2022's charset (specified by DIMENSION, | |
86 CHARS, and FINAL-CHAR) to Emacs' charset. */ | |
87 int iso_charset_table[2][2][128]; | |
88 | |
17186
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
89 /* Table of pointers to the structure `cmpchar_info' indexed by |
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
90 CMPCHAR-ID. */ |
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
91 struct cmpchar_info **cmpchar_table; |
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
92 /* The current size of `cmpchar_table'. */ |
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
93 static int cmpchar_table_size; |
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
94 /* Number of the current composite characters. */ |
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
95 int n_cmpchars; |
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
96 |
17052 | 97 /* Variables used locally in the macro FETCH_MULTIBYTE_CHAR. */ |
98 unsigned char *_fetch_multibyte_char_p; | |
99 int _fetch_multibyte_char_len; | |
100 | |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
101 /* Offset to add to a non-ASCII value when inserting it. */ |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
102 int nonascii_insert_offset; |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
103 |
20890
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
104 /* Translation table for converting non-ASCII unibyte characters |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
105 to multibyte codes, or nil. */ |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
106 Lisp_Object Vnonascii_translate_table; |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
107 |
19384 | 108 #define min(X, Y) ((X) < (Y) ? (X) : (Y)) |
109 #define max(X, Y) ((X) > (Y) ? (X) : (Y)) | |
110 | |
17052 | 111 /* Set STR a pointer to the multi-byte form of the character C. If C |
112 is not a composite character, the multi-byte form is set in WORKBUF | |
113 and STR points WORKBUF. The caller should allocate at least 4-byte | |
114 area at WORKBUF in advance. Returns the length of the multi-byte | |
17834
e154b943bbba
(non_ascii_char_to_string): Signal error if the
Kenichi Handa <handa@m17n.org>
parents:
17818
diff
changeset
|
115 form. If C is an invalid character to have a multi-byte form, |
e154b943bbba
(non_ascii_char_to_string): Signal error if the
Kenichi Handa <handa@m17n.org>
parents:
17818
diff
changeset
|
116 signal an error. |
17052 | 117 |
118 Use macro `CHAR_STRING (C, WORKBUF, STR)' instead of calling this | |
119 function directly if C can be an ASCII character. */ | |
120 | |
121 int | |
122 non_ascii_char_to_string (c, workbuf, str) | |
123 int c; | |
124 unsigned char *workbuf, **str; | |
125 { | |
17322
a7d9b8e167ca
(non_ascii_char_to_string, update_charset_table,
Kenichi Handa <handa@m17n.org>
parents:
17186
diff
changeset
|
126 int charset, c1, c2; |
17052 | 127 |
128 if (COMPOSITE_CHAR_P (c)) | |
129 { | |
130 int cmpchar_id = COMPOSITE_CHAR_ID (c); | |
131 | |
132 if (cmpchar_id < n_cmpchars) | |
133 { | |
134 *str = cmpchar_table[cmpchar_id]->data; | |
135 return cmpchar_table[cmpchar_id]->len; | |
136 } | |
137 else | |
138 { | |
19025
8d7c6644d2f9
(non_ascii_char_to_string): Fix typos.
Richard M. Stallman <rms@gnu.org>
parents:
18537
diff
changeset
|
139 error ("Invalid character: %d", c); |
17052 | 140 } |
141 } | |
142 | |
143 SPLIT_NON_ASCII_CHAR (c, charset, c1, c2); | |
17834
e154b943bbba
(non_ascii_char_to_string): Signal error if the
Kenichi Handa <handa@m17n.org>
parents:
17818
diff
changeset
|
144 if (!charset |
e154b943bbba
(non_ascii_char_to_string): Signal error if the
Kenichi Handa <handa@m17n.org>
parents:
17818
diff
changeset
|
145 || ! CHARSET_DEFINED_P (charset) |
e154b943bbba
(non_ascii_char_to_string): Signal error if the
Kenichi Handa <handa@m17n.org>
parents:
17818
diff
changeset
|
146 || c1 >= 0 && c1 < 32 |
e154b943bbba
(non_ascii_char_to_string): Signal error if the
Kenichi Handa <handa@m17n.org>
parents:
17818
diff
changeset
|
147 || c2 >= 0 && c2 < 32) |
19025
8d7c6644d2f9
(non_ascii_char_to_string): Fix typos.
Richard M. Stallman <rms@gnu.org>
parents:
18537
diff
changeset
|
148 error ("Invalid character: %d", c); |
17052 | 149 |
150 *str = workbuf; | |
151 *workbuf++ = CHARSET_LEADING_CODE_BASE (charset); | |
152 if (*workbuf = CHARSET_LEADING_CODE_EXT (charset)) | |
153 workbuf++; | |
154 *workbuf++ = c1 | 0x80; | |
17322
a7d9b8e167ca
(non_ascii_char_to_string, update_charset_table,
Kenichi Handa <handa@m17n.org>
parents:
17186
diff
changeset
|
155 if (c2 >= 0) |
17052 | 156 *workbuf++ = c2 | 0x80; |
157 | |
158 return (workbuf - *str); | |
159 } | |
160 | |
161 /* Return a non-ASCII character of which multi-byte form is at STR of | |
162 length LEN. If ACTUAL_LEN is not NULL, the actual length of the | |
163 character is set to the address ACTUAL_LEN. | |
164 | |
165 Use macro `STRING_CHAR (STR, LEN)' instead of calling this function | |
166 directly if STR can hold an ASCII character. */ | |
167 | |
168 string_to_non_ascii_char (str, len, actual_len) | |
169 unsigned char *str; | |
170 int len, *actual_len; | |
171 { | |
172 int charset; | |
173 unsigned char c1, c2; | |
174 register int c; | |
175 | |
176 if (SPLIT_STRING (str, len, charset, c1, c2) == CHARSET_ASCII) | |
177 { | |
178 if (actual_len) | |
179 *actual_len = 1; | |
180 return (int) *str; | |
181 } | |
182 | |
183 c = MAKE_NON_ASCII_CHAR (charset, c1, c2); | |
184 | |
185 if (actual_len) | |
186 *actual_len = (charset == CHARSET_COMPOSITION | |
187 ? cmpchar_table[COMPOSITE_CHAR_ID (c)]->len | |
188 : BYTES_BY_CHAR_HEAD (*str)); | |
189 return c; | |
190 } | |
191 | |
192 /* Return the length of the multi-byte form at string STR of length LEN. */ | |
193 int | |
194 multibyte_form_length (str, len) | |
195 unsigned char *str; | |
196 int len; | |
197 { | |
198 int charset; | |
199 unsigned char c1, c2; | |
200 register int c; | |
201 | |
202 if (SPLIT_STRING (str, len, charset, c1, c2) == CHARSET_ASCII) | |
203 return 1; | |
204 | |
205 return (charset == CHARSET_COMPOSITION | |
206 ? cmpchar_table[(c1 << 7) | c2]->len | |
207 : BYTES_BY_CHAR_HEAD (*str)); | |
208 } | |
209 | |
210 /* Check if string STR of length LEN contains valid multi-byte form of | |
211 a character. If valid, charset and position codes of the character | |
212 is set at *CHARSET, *C1, and *C2, and return 0. If not valid, | |
213 return -1. This should be used only in the macro SPLIT_STRING | |
214 which checks range of STR in advance. */ | |
215 | |
216 split_non_ascii_string (str, len, charset, c1, c2) | |
217 register unsigned char *str, *c1, *c2; | |
218 register int len, *charset; | |
219 { | |
220 register unsigned int cs = *str++; | |
221 | |
222 if (cs == LEADING_CODE_COMPOSITION) | |
223 { | |
224 int cmpchar_id = str_cmpchar_id (str - 1, len); | |
225 | |
226 if (cmpchar_id < 0) | |
227 return -1; | |
228 *charset = cs, *c1 = cmpchar_id >> 7, *c2 = cmpchar_id & 0x7F; | |
229 } | |
230 else if ((cs < LEADING_CODE_PRIVATE_11 || (cs = *str++) >= 0xA0) | |
231 && CHARSET_DEFINED_P (cs)) | |
232 { | |
233 *charset = cs; | |
234 if (*str < 0xA0) | |
235 return -1; | |
236 *c1 = (*str++) & 0x7F; | |
237 if (CHARSET_DIMENSION (cs) == 2) | |
238 { | |
239 if (*str < 0xA0) | |
240 return -1; | |
241 *c2 = (*str++) & 0x7F; | |
242 } | |
243 } | |
244 else | |
245 return -1; | |
246 return 0; | |
247 } | |
248 | |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
249 /* Return a character unified with C (or a character made of CHARSET, |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
250 C1, and C2) in unification table TABLE. If no unification is found |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
251 in TABLE, return C. */ |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
252 unify_char (table, c, charset, c1, c2) |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
253 Lisp_Object table; |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
254 int c, charset, c1, c2; |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
255 { |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
256 Lisp_Object ch; |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
257 int alt_charset, alt_c1, alt_c2, dimension; |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
258 |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
259 if (c < 0) c = MAKE_CHAR (charset, c1, c2); |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
260 if (!CHAR_TABLE_P (table) |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
261 || (ch = Faref (table, make_number (c)), !INTEGERP (ch)) |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
262 || XINT (ch) < 0) |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
263 return c; |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
264 |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
265 SPLIT_CHAR (XFASTINT (ch), alt_charset, alt_c1, alt_c2); |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
266 dimension = CHARSET_DIMENSION (alt_charset); |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
267 if (dimension == 1 && alt_c1 > 0 || dimension == 2 && alt_c2 > 0) |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
268 /* CH is not a generic character, just return it. */ |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
269 return XFASTINT (ch); |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
270 |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
271 /* Since CH is a generic character, we must return a specific |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
272 charater which has the same position codes as C from CH. */ |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
273 if (charset < 0) |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
274 SPLIT_CHAR (c, charset, c1, c2); |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
275 if (dimension != CHARSET_DIMENSION (charset)) |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
276 /* We can't make such a character because of dimension mismatch. */ |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
277 return c; |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
278 return MAKE_CHAR (alt_charset, c1, c2); |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
279 } |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
280 |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
281 #define DEFAULT_NONASCII_INSERT_OFFSET 0x800 |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
282 |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
283 /* Convert the unibyte character C to multibyte |
20890
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
284 based on Vnonascii_translate_table or nonascii_insert_offset. |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
285 Note that copy_text in insdel.c has similar code. */ |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
286 |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
287 int |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
288 unibyte_char_to_multibyte (c) |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
289 int c; |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
290 { |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
291 if (c >= 0200 && c < 0400) |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
292 { |
20890
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
293 if (! NILP (Vnonascii_translate_table)) |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
294 c = XINT (Faref (Vnonascii_translate_table, make_number (c))); |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
295 else if (nonascii_insert_offset > 0) |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
296 c += nonascii_insert_offset; |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
297 else |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
298 c += DEFAULT_NONASCII_INSERT_OFFSET; |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
299 } |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
300 return c; |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
301 } |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
302 |
17052 | 303 /* Update the table Vcharset_table with the given arguments (see the |
304 document of `define-charset' for the meaning of each argument). | |
305 Several other table contents are also updated. The caller should | |
306 check the validity of CHARSET-ID and the remaining arguments in | |
307 advance. */ | |
308 | |
309 void | |
310 update_charset_table (charset_id, dimension, chars, width, direction, | |
311 iso_final_char, iso_graphic_plane, | |
312 short_name, long_name, description) | |
313 Lisp_Object charset_id, dimension, chars, width, direction; | |
314 Lisp_Object iso_final_char, iso_graphic_plane; | |
315 Lisp_Object short_name, long_name, description; | |
316 { | |
317 int charset = XINT (charset_id); | |
318 int bytes; | |
319 unsigned char leading_code_base, leading_code_ext; | |
320 | |
17322
a7d9b8e167ca
(non_ascii_char_to_string, update_charset_table,
Kenichi Handa <handa@m17n.org>
parents:
17186
diff
changeset
|
321 if (NILP (CHARSET_TABLE_ENTRY (charset))) |
a7d9b8e167ca
(non_ascii_char_to_string, update_charset_table,
Kenichi Handa <handa@m17n.org>
parents:
17186
diff
changeset
|
322 CHARSET_TABLE_ENTRY (charset) |
a7d9b8e167ca
(non_ascii_char_to_string, update_charset_table,
Kenichi Handa <handa@m17n.org>
parents:
17186
diff
changeset
|
323 = Fmake_vector (make_number (CHARSET_MAX_IDX), Qnil); |
17052 | 324 |
325 /* Get byte length of multibyte form, base leading-code, and | |
326 extended leading-code of the charset. See the comment under the | |
327 title "GENERAL NOTE on CHARACTER SET (CHARSET)" in charset.h. */ | |
328 bytes = XINT (dimension); | |
329 if (charset < MIN_CHARSET_PRIVATE_DIMENSION1) | |
330 { | |
331 /* Official charset, it doesn't have an extended leading-code. */ | |
332 if (charset != CHARSET_ASCII) | |
333 bytes += 1; /* For a base leading-code. */ | |
334 leading_code_base = charset; | |
335 leading_code_ext = 0; | |
336 } | |
337 else | |
338 { | |
339 /* Private charset. */ | |
340 bytes += 2; /* For base and extended leading-codes. */ | |
341 leading_code_base | |
342 = (charset < LEADING_CODE_EXT_12 | |
343 ? LEADING_CODE_PRIVATE_11 | |
344 : (charset < LEADING_CODE_EXT_21 | |
345 ? LEADING_CODE_PRIVATE_12 | |
346 : (charset < LEADING_CODE_EXT_22 | |
347 ? LEADING_CODE_PRIVATE_21 | |
348 : LEADING_CODE_PRIVATE_22))); | |
349 leading_code_ext = charset; | |
350 } | |
351 | |
352 CHARSET_TABLE_INFO (charset, CHARSET_ID_IDX) = charset_id; | |
353 CHARSET_TABLE_INFO (charset, CHARSET_BYTES_IDX) = make_number (bytes); | |
354 CHARSET_TABLE_INFO (charset, CHARSET_DIMENSION_IDX) = dimension; | |
355 CHARSET_TABLE_INFO (charset, CHARSET_CHARS_IDX) = chars; | |
356 CHARSET_TABLE_INFO (charset, CHARSET_WIDTH_IDX) = width; | |
357 CHARSET_TABLE_INFO (charset, CHARSET_DIRECTION_IDX) = direction; | |
358 CHARSET_TABLE_INFO (charset, CHARSET_LEADING_CODE_BASE_IDX) | |
359 = make_number (leading_code_base); | |
360 CHARSET_TABLE_INFO (charset, CHARSET_LEADING_CODE_EXT_IDX) | |
361 = make_number (leading_code_ext); | |
362 CHARSET_TABLE_INFO (charset, CHARSET_ISO_FINAL_CHAR_IDX) = iso_final_char; | |
363 CHARSET_TABLE_INFO (charset, CHARSET_ISO_GRAPHIC_PLANE_IDX) | |
364 = iso_graphic_plane; | |
365 CHARSET_TABLE_INFO (charset, CHARSET_SHORT_NAME_IDX) = short_name; | |
366 CHARSET_TABLE_INFO (charset, CHARSET_LONG_NAME_IDX) = long_name; | |
367 CHARSET_TABLE_INFO (charset, CHARSET_DESCRIPTION_IDX) = description; | |
368 CHARSET_TABLE_INFO (charset, CHARSET_PLIST_IDX) = Qnil; | |
369 | |
370 { | |
371 /* If we have already defined a charset which has the same | |
372 DIMENSION, CHARS and ISO-FINAL-CHAR but the different | |
373 DIRECTION, we must update the entry REVERSE-CHARSET of both | |
374 charsets. If there's no such charset, the value of the entry | |
375 is set to nil. */ | |
376 int i; | |
377 | |
17186
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
378 for (i = 0; i <= MAX_CHARSET; i++) |
17052 | 379 if (!NILP (CHARSET_TABLE_ENTRY (i))) |
380 { | |
381 if (CHARSET_DIMENSION (i) == XINT (dimension) | |
382 && CHARSET_CHARS (i) == XINT (chars) | |
383 && CHARSET_ISO_FINAL_CHAR (i) == XINT (iso_final_char) | |
384 && CHARSET_DIRECTION (i) != XINT (direction)) | |
385 { | |
386 CHARSET_TABLE_INFO (charset, CHARSET_REVERSE_CHARSET_IDX) | |
387 = make_number (i); | |
388 CHARSET_TABLE_INFO (i, CHARSET_REVERSE_CHARSET_IDX) = charset_id; | |
389 break; | |
390 } | |
391 } | |
17186
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
392 if (i > MAX_CHARSET) |
17052 | 393 /* No such a charset. */ |
394 CHARSET_TABLE_INFO (charset, CHARSET_REVERSE_CHARSET_IDX) | |
395 = make_number (-1); | |
396 } | |
397 | |
398 if (charset != CHARSET_ASCII | |
399 && charset < MIN_CHARSET_PRIVATE_DIMENSION1) | |
400 { | |
401 /* Update tables bytes_by_char_head and width_by_char_head. */ | |
402 bytes_by_char_head[leading_code_base] = bytes; | |
403 width_by_char_head[leading_code_base] = XINT (width); | |
404 | |
405 /* Update table emacs_code_class. */ | |
406 emacs_code_class[charset] = (bytes == 2 | |
407 ? EMACS_leading_code_2 | |
408 : (bytes == 3 | |
409 ? EMACS_leading_code_3 | |
410 : EMACS_leading_code_4)); | |
411 } | |
412 | |
413 /* Update table iso_charset_table. */ | |
414 if (ISO_CHARSET_TABLE (dimension, chars, iso_final_char) < 0) | |
415 ISO_CHARSET_TABLE (dimension, chars, iso_final_char) = charset; | |
416 } | |
417 | |
418 #ifdef emacs | |
419 | |
420 /* Return charset id of CHARSET_SYMBOL, or return -1 if CHARSET_SYMBOL | |
421 is invalid. */ | |
422 int | |
423 get_charset_id (charset_symbol) | |
424 Lisp_Object charset_symbol; | |
425 { | |
426 Lisp_Object val; | |
427 int charset; | |
428 | |
429 return ((SYMBOLP (charset_symbol) | |
430 && (val = Fget (charset_symbol, Qcharset), VECTORP (val)) | |
431 && (charset = XINT (XVECTOR (val)->contents[CHARSET_ID_IDX]), | |
432 CHARSET_VALID_P (charset))) | |
433 ? charset : -1); | |
434 } | |
435 | |
436 /* Return an identification number for a new private charset of | |
437 DIMENSION and WIDTH. If there's no more room for the new charset, | |
438 return 0. */ | |
439 Lisp_Object | |
440 get_new_private_charset_id (dimension, width) | |
441 int dimension, width; | |
442 { | |
443 int charset, from, to; | |
444 | |
445 if (dimension == 1) | |
446 { | |
447 if (width == 1) | |
448 from = LEADING_CODE_EXT_11, to = LEADING_CODE_EXT_12; | |
449 else | |
450 from = LEADING_CODE_EXT_12, to = LEADING_CODE_EXT_21; | |
451 } | |
452 else | |
453 { | |
454 if (width == 1) | |
455 from = LEADING_CODE_EXT_21, to = LEADING_CODE_EXT_22; | |
456 else | |
20720
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
457 from = LEADING_CODE_EXT_22, to = LEADING_CODE_EXT_MAX + 1; |
17052 | 458 } |
459 | |
460 for (charset = from; charset < to; charset++) | |
461 if (!CHARSET_DEFINED_P (charset)) break; | |
462 | |
463 return make_number (charset < to ? charset : 0); | |
464 } | |
465 | |
466 DEFUN ("define-charset", Fdefine_charset, Sdefine_charset, 3, 3, 0, | |
467 "Define CHARSET-ID as the identification number of CHARSET with INFO-VECTOR.\n\ | |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
468 If CHARSET-ID is nil, it is decided automatically, which means CHARSET is\n\ |
17052 | 469 treated as a private charset.\n\ |
470 INFO-VECTOR is a vector of the format:\n\ | |
471 [DIMENSION CHARS WIDTH DIRECTION ISO-FINAL-CHAR ISO-GRAPHIC-PLANE\n\ | |
472 SHORT-NAME LONG-NAME DESCRIPTION]\n\ | |
473 The meanings of each elements is as follows:\n\ | |
474 DIMENSION (integer) is the number of bytes to represent a character: 1 or 2.\n\ | |
475 CHARS (integer) is the number of characters in a dimension: 94 or 96.\n\ | |
476 WIDTH (integer) is the number of columns a character in the charset\n\ | |
477 occupies on the screen: one of 0, 1, and 2.\n\ | |
478 \n\ | |
479 DIRECTION (integer) is the rendering direction of characters in the\n\ | |
480 charset when rendering. If 0, render from right to left, else\n\ | |
481 render from left to right.\n\ | |
482 \n\ | |
483 ISO-FINAL-CHAR (character) is the final character of the\n\ | |
484 corresponding ISO 2022 charset.\n\ | |
485 \n\ | |
486 ISO-GRAPHIC-PLANE (integer) is the graphic plane to be invoked\n\ | |
487 while encoding to variants of ISO 2022 coding system, one of the\n\ | |
488 following: 0/graphic-plane-left(GL), 1/graphic-plane-right(GR).\n\ | |
489 \n\ | |
490 SHORT-NAME (string) is the short name to refer to the charset.\n\ | |
491 \n\ | |
492 LONG-NAME (string) is the long name to refer to the charset.\n\ | |
493 \n\ | |
494 DESCRIPTION (string) is the description string of the charset.") | |
495 (charset_id, charset_symbol, info_vector) | |
496 Lisp_Object charset_id, charset_symbol, info_vector; | |
497 { | |
498 Lisp_Object *vec; | |
499 | |
500 if (!NILP (charset_id)) | |
501 CHECK_NUMBER (charset_id, 0); | |
502 CHECK_SYMBOL (charset_symbol, 1); | |
503 CHECK_VECTOR (info_vector, 2); | |
504 | |
505 if (! NILP (charset_id)) | |
506 { | |
507 if (! CHARSET_VALID_P (XINT (charset_id))) | |
508 error ("Invalid CHARSET: %d", XINT (charset_id)); | |
509 else if (CHARSET_DEFINED_P (XINT (charset_id))) | |
510 error ("Already defined charset: %d", XINT (charset_id)); | |
511 } | |
512 | |
513 vec = XVECTOR (info_vector)->contents; | |
514 if (XVECTOR (info_vector)->size != 9 | |
515 || !INTEGERP (vec[0]) || !(XINT (vec[0]) == 1 || XINT (vec[0]) == 2) | |
516 || !INTEGERP (vec[1]) || !(XINT (vec[1]) == 94 || XINT (vec[1]) == 96) | |
517 || !INTEGERP (vec[2]) || !(XINT (vec[2]) == 1 || XINT (vec[2]) == 2) | |
518 || !INTEGERP (vec[3]) || !(XINT (vec[3]) == 0 || XINT (vec[3]) == 1) | |
519 || !INTEGERP (vec[4]) || !(XINT (vec[4]) >= '0' && XINT (vec[4]) <= '~') | |
520 || !INTEGERP (vec[5]) || !(XINT (vec[5]) == 0 || XINT (vec[5]) == 1) | |
521 || !STRINGP (vec[6]) | |
522 || !STRINGP (vec[7]) | |
523 || !STRINGP (vec[8])) | |
524 error ("Invalid info-vector argument for defining charset %s", | |
525 XSYMBOL (charset_symbol)->name->data); | |
526 | |
527 if (NILP (charset_id)) | |
528 { | |
529 charset_id = get_new_private_charset_id (XINT (vec[0]), XINT (vec[2])); | |
530 if (XINT (charset_id) == 0) | |
531 error ("There's no room for a new private charset %s", | |
532 XSYMBOL (charset_symbol)->name->data); | |
533 } | |
534 | |
535 update_charset_table (charset_id, vec[0], vec[1], vec[2], vec[3], | |
536 vec[4], vec[5], vec[6], vec[7], vec[8]); | |
17322
a7d9b8e167ca
(non_ascii_char_to_string, update_charset_table,
Kenichi Handa <handa@m17n.org>
parents:
17186
diff
changeset
|
537 Fput (charset_symbol, Qcharset, CHARSET_TABLE_ENTRY (XINT (charset_id))); |
17052 | 538 CHARSET_SYMBOL (XINT (charset_id)) = charset_symbol; |
539 Vcharset_list = Fcons (charset_symbol, Vcharset_list); | |
540 return Qnil; | |
541 } | |
542 | |
20435
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
543 DEFUN ("get-unused-iso-final-char", Fget_unused_iso_final_char, |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
544 Sget_unused_iso_final_char, 2, 2, 0, |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
545 "Return an unsed ISO's final char for a charset of DIMENISION and CHARS.\n\ |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
546 DIMENSION is the number of bytes to represent a character: 1 or 2.\n\ |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
547 CHARS is the number of characters in a dimension: 94 or 96.\n\ |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
548 \n\ |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
549 This final char is for private use, thus the range is `0' (48) .. `?' (63).\n\ |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
550 If there's no unused final char for the specified kind of charset,\n\ |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
551 return nil.") |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
552 (dimension, chars) |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
553 Lisp_Object dimension, chars; |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
554 { |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
555 int final_char; |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
556 |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
557 CHECK_NUMBER (dimension, 0); |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
558 CHECK_NUMBER (chars, 1); |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
559 if (XINT (dimension) != 1 && XINT (dimension) != 2) |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
560 error ("Invalid charset dimension %d, it should be 1 or 2", |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
561 XINT (dimension)); |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
562 if (XINT (chars) != 94 && XINT (chars) != 96) |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
563 error ("Invalid charset chars %d, it should be 94 or 96", |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
564 XINT (chars)); |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
565 for (final_char = '0'; final_char <= '?'; final_char++) |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
566 { |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
567 if (ISO_CHARSET_TABLE (dimension, chars, make_number (final_char)) < 0) |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
568 break; |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
569 } |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
570 return (final_char <= '?' ? make_number (final_char) : Qnil); |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
571 } |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
572 |
17052 | 573 DEFUN ("declare-equiv-charset", Fdeclare_equiv_charset, Sdeclare_equiv_charset, |
574 4, 4, 0, | |
575 "Declare a charset of DIMENSION, CHARS, FINAL-CHAR is the same as CHARSET.\n\ | |
576 CHARSET should be defined by `defined-charset' in advance.") | |
577 (dimension, chars, final_char, charset_symbol) | |
578 Lisp_Object dimension, chars, final_char, charset_symbol; | |
579 { | |
580 int charset; | |
581 | |
582 CHECK_NUMBER (dimension, 0); | |
583 CHECK_NUMBER (chars, 1); | |
584 CHECK_NUMBER (final_char, 2); | |
585 CHECK_SYMBOL (charset_symbol, 3); | |
586 | |
587 if (XINT (dimension) != 1 && XINT (dimension) != 2) | |
588 error ("Invalid DIMENSION %d, it should be 1 or 2", XINT (dimension)); | |
589 if (XINT (chars) != 94 && XINT (chars) != 96) | |
590 error ("Invalid CHARS %d, it should be 94 or 96", XINT (chars)); | |
591 if (XINT (final_char) < '0' || XFASTINT (final_char) > '~') | |
592 error ("Invalid FINAL-CHAR %c, it should be `0'..`~'", XINT (chars)); | |
593 if ((charset = get_charset_id (charset_symbol)) < 0) | |
594 error ("Invalid charset %s", XSYMBOL (charset_symbol)->name->data); | |
595 | |
596 ISO_CHARSET_TABLE (dimension, chars, final_char) = charset; | |
597 return Qnil; | |
598 } | |
599 | |
600 /* Return number of different charsets in STR of length LEN. In | |
601 addition, for each found charset N, CHARSETS[N] is set 1. The | |
18003
ac148c939dec
(Ffind_charset_string): The variable CHARSETS is
Kenichi Handa <handa@m17n.org>
parents:
17880
diff
changeset
|
602 caller should allocate CHARSETS (MAX_CHARSET + 1 elements) in advance. |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
603 It may lookup a unification table TABLE if supplied. */ |
17052 | 604 |
605 int | |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
606 find_charset_in_str (str, len, charsets, table) |
17880
06f58d8a59ba
(Ffind_charset_region): Change the declaration of
Kenichi Handa <handa@m17n.org>
parents:
17863
diff
changeset
|
607 unsigned char *str; |
06f58d8a59ba
(Ffind_charset_region): Change the declaration of
Kenichi Handa <handa@m17n.org>
parents:
17863
diff
changeset
|
608 int len, *charsets; |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
609 Lisp_Object table; |
17052 | 610 { |
20228
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
611 register int num = 0, c; |
17052 | 612 |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
613 if (! CHAR_TABLE_P (table)) |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
614 table = Qnil; |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
615 |
17052 | 616 while (len > 0) |
617 { | |
19983
a62008636710
(find_charset_in_str): Return also charsets in
Kenichi Handa <handa@m17n.org>
parents:
19444
diff
changeset
|
618 int bytes, charset; |
20228
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
619 c = *str; |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
620 |
20228
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
621 if (c == LEADING_CODE_COMPOSITION) |
19983
a62008636710
(find_charset_in_str): Return also charsets in
Kenichi Handa <handa@m17n.org>
parents:
19444
diff
changeset
|
622 { |
20228
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
623 int cmpchar_id = str_cmpchar_id (str, len); |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
624 GLYPH *glyph; |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
625 |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
626 if (cmpchar_id > 0) |
19983
a62008636710
(find_charset_in_str): Return also charsets in
Kenichi Handa <handa@m17n.org>
parents:
19444
diff
changeset
|
627 { |
20228
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
628 struct cmpchar_info *cmpcharp = cmpchar_table[cmpchar_id]; |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
629 int i; |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
630 |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
631 for (i = 0; i < cmpcharp->glyph_len; i++) |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
632 { |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
633 c = cmpcharp->glyph[i]; |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
634 if (!NILP (table)) |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
635 { |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
636 if ((c = unify_char (table, c, 0, 0, 0)) < 0) |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
637 c = cmpcharp->glyph[i]; |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
638 } |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
639 if ((charset = CHAR_CHARSET (c)) < 0) |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
640 charset = CHARSET_ASCII; |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
641 if (!charsets[charset]) |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
642 { |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
643 charsets[charset] = 1; |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
644 num += 1; |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
645 } |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
646 } |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
647 str += cmpcharp->len; |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
648 len -= cmpcharp->len; |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
649 continue; |
19983
a62008636710
(find_charset_in_str): Return also charsets in
Kenichi Handa <handa@m17n.org>
parents:
19444
diff
changeset
|
650 } |
20228
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
651 |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
652 charset = CHARSET_ASCII; |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
653 bytes = 1; |
19983
a62008636710
(find_charset_in_str): Return also charsets in
Kenichi Handa <handa@m17n.org>
parents:
19444
diff
changeset
|
654 } |
a62008636710
(find_charset_in_str): Return also charsets in
Kenichi Handa <handa@m17n.org>
parents:
19444
diff
changeset
|
655 else |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
656 { |
20228
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
657 c = STRING_CHAR_AND_LENGTH (str, len, bytes); |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
658 if (! NILP (table)) |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
659 { |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
660 int c1 = unify_char (table, c, 0, 0, 0); |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
661 if (c1 >= 0) |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
662 c = c1; |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
663 } |
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
664 charset = CHAR_CHARSET (c); |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
665 } |
17052 | 666 |
667 if (!charsets[charset]) | |
668 { | |
669 charsets[charset] = 1; | |
670 num += 1; | |
671 } | |
672 str += bytes; | |
673 len -= bytes; | |
674 } | |
675 return num; | |
676 } | |
677 | |
678 DEFUN ("find-charset-region", Ffind_charset_region, Sfind_charset_region, | |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
679 2, 3, 0, |
17052 | 680 "Return a list of charsets in the region between BEG and END.\n\ |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
681 BEG and END are buffer positions.\n\ |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
682 Optional arg TABLE if non-nil is a unification table to look up.") |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
683 (beg, end, table) |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
684 Lisp_Object beg, end, table; |
17052 | 685 { |
17880
06f58d8a59ba
(Ffind_charset_region): Change the declaration of
Kenichi Handa <handa@m17n.org>
parents:
17863
diff
changeset
|
686 int charsets[MAX_CHARSET + 1]; |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
687 int from, from_byte, to, stop, stop_byte, i; |
17052 | 688 Lisp_Object val; |
689 | |
690 validate_region (&beg, &end); | |
691 from = XFASTINT (beg); | |
692 stop = to = XFASTINT (end); | |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
693 |
17052 | 694 if (from < GPT && GPT < to) |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
695 { |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
696 stop = GPT; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
697 stop_byte = GPT_BYTE; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
698 } |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
699 else |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
700 stop_byte = CHAR_TO_BYTE (stop); |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
701 |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
702 from_byte = CHAR_TO_BYTE (from); |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
703 |
17880
06f58d8a59ba
(Ffind_charset_region): Change the declaration of
Kenichi Handa <handa@m17n.org>
parents:
17863
diff
changeset
|
704 bzero (charsets, (MAX_CHARSET + 1) * sizeof (int)); |
17052 | 705 while (1) |
706 { | |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
707 find_charset_in_str (BYTE_POS_ADDR (from_byte), stop_byte - from_byte, |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
708 charsets, table); |
17052 | 709 if (stop < to) |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
710 { |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
711 from = stop, from_byte = stop_byte; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
712 stop = to, stop_byte = CHAR_TO_BYTE (stop); |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
713 } |
17052 | 714 else |
715 break; | |
716 } | |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
717 |
17052 | 718 val = Qnil; |
17186
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
719 for (i = MAX_CHARSET; i >= 0; i--) |
17052 | 720 if (charsets[i]) |
721 val = Fcons (CHARSET_SYMBOL (i), val); | |
722 return val; | |
723 } | |
724 | |
725 DEFUN ("find-charset-string", Ffind_charset_string, Sfind_charset_string, | |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
726 1, 2, 0, |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
727 "Return a list of charsets in STR.\n\ |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
728 Optional arg TABLE if non-nil is a unification table to look up.") |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
729 (str, table) |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
730 Lisp_Object str, table; |
17052 | 731 { |
18003
ac148c939dec
(Ffind_charset_string): The variable CHARSETS is
Kenichi Handa <handa@m17n.org>
parents:
17880
diff
changeset
|
732 int charsets[MAX_CHARSET + 1]; |
17052 | 733 int i; |
734 Lisp_Object val; | |
735 | |
736 CHECK_STRING (str, 0); | |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
737 |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
738 if (! STRING_MULTIBYTE (str)) |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
739 return Qnil; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
740 |
18003
ac148c939dec
(Ffind_charset_string): The variable CHARSETS is
Kenichi Handa <handa@m17n.org>
parents:
17880
diff
changeset
|
741 bzero (charsets, (MAX_CHARSET + 1) * sizeof (int)); |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
742 find_charset_in_str (XSTRING (str)->data, XSTRING (str)->size_byte, |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
743 charsets, table); |
17052 | 744 val = Qnil; |
17186
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
745 for (i = MAX_CHARSET; i >= 0; i--) |
17052 | 746 if (charsets[i]) |
747 val = Fcons (CHARSET_SYMBOL (i), val); | |
748 return val; | |
749 } | |
750 | |
751 DEFUN ("make-char-internal", Fmake_char_internal, Smake_char_internal, 1, 3, 0, | |
17186
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
752 "") |
17052 | 753 (charset, code1, code2) |
754 Lisp_Object charset, code1, code2; | |
755 { | |
756 CHECK_NUMBER (charset, 0); | |
757 | |
758 if (NILP (code1)) | |
759 XSETFASTINT (code1, 0); | |
760 else | |
761 CHECK_NUMBER (code1, 1); | |
762 if (NILP (code2)) | |
763 XSETFASTINT (code2, 0); | |
764 else | |
765 CHECK_NUMBER (code2, 2); | |
766 | |
767 if (!CHARSET_DEFINED_P (XINT (charset))) | |
768 error ("Invalid charset: %d", XINT (charset)); | |
769 | |
770 return make_number (MAKE_CHAR (XINT (charset), XINT (code1), XINT (code2))); | |
771 } | |
772 | |
773 DEFUN ("split-char", Fsplit_char, Ssplit_char, 1, 1, 0, | |
774 "Return list of charset and one or two position-codes of CHAR.") | |
775 (ch) | |
776 Lisp_Object ch; | |
777 { | |
778 Lisp_Object val; | |
17322
a7d9b8e167ca
(non_ascii_char_to_string, update_charset_table,
Kenichi Handa <handa@m17n.org>
parents:
17186
diff
changeset
|
779 int charset, c1, c2; |
17052 | 780 |
781 CHECK_NUMBER (ch, 0); | |
782 SPLIT_CHAR (XFASTINT (ch), charset, c1, c2); | |
17322
a7d9b8e167ca
(non_ascii_char_to_string, update_charset_table,
Kenichi Handa <handa@m17n.org>
parents:
17186
diff
changeset
|
783 return (c2 >= 0 |
17052 | 784 ? Fcons (CHARSET_SYMBOL (charset), |
785 Fcons (make_number (c1), Fcons (make_number (c2), Qnil))) | |
786 : Fcons (CHARSET_SYMBOL (charset), Fcons (make_number (c1), Qnil))); | |
787 } | |
788 | |
789 DEFUN ("char-charset", Fchar_charset, Schar_charset, 1, 1, 0, | |
790 "Return charset of CHAR.") | |
791 (ch) | |
792 Lisp_Object ch; | |
793 { | |
794 CHECK_NUMBER (ch, 0); | |
795 | |
796 return CHARSET_SYMBOL (CHAR_CHARSET (XINT (ch))); | |
797 } | |
798 | |
799 DEFUN ("iso-charset", Fiso_charset, Siso_charset, 3, 3, 0, | |
20833
cf404f800d2c
(Fiso_charset): Doc-string modified.
Kenichi Handa <handa@m17n.org>
parents:
20720
diff
changeset
|
800 "Return charset of ISO's specification DIMENSION, CHARS, and FINAL-CHAR.\n\ |
cf404f800d2c
(Fiso_charset): Doc-string modified.
Kenichi Handa <handa@m17n.org>
parents:
20720
diff
changeset
|
801 \n\ |
cf404f800d2c
(Fiso_charset): Doc-string modified.
Kenichi Handa <handa@m17n.org>
parents:
20720
diff
changeset
|
802 ISO 2022's designation sequence (escape sequence) distinguishes charsets\n\ |
cf404f800d2c
(Fiso_charset): Doc-string modified.
Kenichi Handa <handa@m17n.org>
parents:
20720
diff
changeset
|
803 by their DIMENSION, CHARS, and FINAL-CHAR,\n\ |
cf404f800d2c
(Fiso_charset): Doc-string modified.
Kenichi Handa <handa@m17n.org>
parents:
20720
diff
changeset
|
804 where as Emacs distinguishes them by charset symbol.\n\ |
cf404f800d2c
(Fiso_charset): Doc-string modified.
Kenichi Handa <handa@m17n.org>
parents:
20720
diff
changeset
|
805 See the documentation of the function `charset-info' for the meanings of\n\ |
cf404f800d2c
(Fiso_charset): Doc-string modified.
Kenichi Handa <handa@m17n.org>
parents:
20720
diff
changeset
|
806 DIMENSION, CHARS, and FINAL-CHAR.") |
17052 | 807 (dimension, chars, final_char) |
808 Lisp_Object dimension, chars, final_char; | |
809 { | |
810 int charset; | |
811 | |
812 CHECK_NUMBER (dimension, 0); | |
813 CHECK_NUMBER (chars, 1); | |
814 CHECK_NUMBER (final_char, 2); | |
815 | |
816 if ((charset = ISO_CHARSET_TABLE (dimension, chars, final_char)) < 0) | |
817 return Qnil; | |
818 return CHARSET_SYMBOL (charset); | |
819 } | |
820 | |
20152
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
821 /* If GENERICP is nonzero, return nonzero iff C is a valid normal or |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
822 generic character. If GENERICP is zero, return nonzero iff C is a |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
823 valid normal character. Do not call this function directly, |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
824 instead use macro CHAR_VALID_P. */ |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
825 int |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
826 char_valid_p (c, genericp) |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
827 int c, genericp; |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
828 { |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
829 int charset, c1, c2; |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
830 |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
831 if (c < 0) |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
832 return 0; |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
833 if (SINGLE_BYTE_CHAR_P (c)) |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
834 return 1; |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
835 SPLIT_NON_ASCII_CHAR (c, charset, c1, c2); |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
836 if (!CHARSET_VALID_P (charset)) |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
837 return 0; |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
838 return (c < MIN_CHAR_COMPOSITION |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
839 ? ((c & CHAR_FIELD1_MASK) /* i.e. dimension of C is two. */ |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
840 ? (genericp && c1 == 0 && c2 == 0 |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
841 || c1 >= 32 && c2 >= 32) |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
842 : (genericp && c1 == 0 |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
843 || c1 >= 32)) |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
844 : c < MIN_CHAR_COMPOSITION + n_cmpchars); |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
845 } |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
846 |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
847 DEFUN ("char-valid-p", Fchar_valid_p, Schar_valid_p, 1, 2, 0, |
20636
5ab6701a2b4b
(Fchar_valid_p): Fix bare newlines in doc string.
Dave Love <fx@gnu.org>
parents:
20614
diff
changeset
|
848 "Return t if OBJECT is a valid normal character.\n\ |
5ab6701a2b4b
(Fchar_valid_p): Fix bare newlines in doc string.
Dave Love <fx@gnu.org>
parents:
20614
diff
changeset
|
849 If optional arg GENERICP is non-nil, also return t if OBJECT is\n\ |
20152
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
850 a valid generic character.") |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
851 (object, genericp) |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
852 Lisp_Object object, genericp; |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
853 { |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
854 if (! NATNUMP (object)) |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
855 return Qnil; |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
856 return (CHAR_VALID_P (XFASTINT (object), !NILP (genericp)) ? Qt : Qnil); |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
857 } |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
858 |
17052 | 859 DEFUN ("char-bytes", Fchar_bytes, Schar_bytes, 1, 1, 0, |
860 "Return byte length of multi-byte form of CHAR.") | |
861 (ch) | |
862 Lisp_Object ch; | |
863 { | |
864 Lisp_Object val; | |
865 int bytes; | |
866 | |
867 CHECK_NUMBER (ch, 0); | |
868 if (COMPOSITE_CHAR_P (XFASTINT (ch))) | |
869 { | |
870 unsigned int id = COMPOSITE_CHAR_ID (XFASTINT (ch)); | |
871 | |
872 bytes = (id < n_cmpchars ? cmpchar_table[id]->len : 1); | |
873 } | |
874 else | |
875 { | |
876 int charset = CHAR_CHARSET (XFASTINT (ch)); | |
877 | |
878 bytes = CHARSET_DEFINED_P (charset) ? CHARSET_BYTES (charset) : 1; | |
879 } | |
880 | |
881 XSETFASTINT (val, bytes); | |
882 return val; | |
883 } | |
884 | |
885 /* Return the width of character of which multi-byte form starts with | |
886 C. The width is measured by how many columns occupied on the | |
887 screen when displayed in the current buffer. */ | |
888 | |
889 #define ONE_BYTE_CHAR_WIDTH(c) \ | |
890 (c < 0x20 \ | |
891 ? (c == '\t' \ | |
17366
f7809ff2c65f
(ONE_BYTE_CHAR_WIDTH, Fconcat_chars): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17322
diff
changeset
|
892 ? XFASTINT (current_buffer->tab_width) \ |
17052 | 893 : (c == '\n' ? 0 : (NILP (current_buffer->ctl_arrow) ? 4 : 2))) \ |
894 : (c < 0x7f \ | |
895 ? 1 \ | |
896 : (c == 0x7F \ | |
897 ? (NILP (current_buffer->ctl_arrow) ? 4 : 2) \ | |
898 : ((! NILP (current_buffer->enable_multibyte_characters) \ | |
899 && BASE_LEADING_CODE_P (c)) \ | |
900 ? WIDTH_BY_CHAR_HEAD (c) \ | |
901 : 4)))) \ | |
902 | |
903 | |
904 DEFUN ("char-width", Fchar_width, Schar_width, 1, 1, 0, | |
905 "Return width of CHAR when displayed in the current buffer.\n\ | |
906 The width is measured by how many columns it occupies on the screen.") | |
907 (ch) | |
908 Lisp_Object ch; | |
909 { | |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
910 Lisp_Object val, disp; |
17052 | 911 int c; |
18537
6a726658dfa9
(Fchar_width): Check if the current buffer has display
Kenichi Handa <handa@m17n.org>
parents:
18341
diff
changeset
|
912 struct Lisp_Char_Table *dp = buffer_display_table (); |
17052 | 913 |
914 CHECK_NUMBER (ch, 0); | |
915 | |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
916 c = XINT (ch); |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
917 |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
918 /* Get the way the display table would display it. */ |
18537
6a726658dfa9
(Fchar_width): Check if the current buffer has display
Kenichi Handa <handa@m17n.org>
parents:
18341
diff
changeset
|
919 disp = dp ? DISP_CHAR_VECTOR (dp, c) : Qnil; |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
920 |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
921 if (VECTORP (disp)) |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
922 XSETINT (val, XVECTOR (disp)->size); |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
923 else if (SINGLE_BYTE_CHAR_P (c)) |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
924 XSETINT (val, ONE_BYTE_CHAR_WIDTH (c)); |
17052 | 925 else if (COMPOSITE_CHAR_P (c)) |
926 { | |
927 int id = COMPOSITE_CHAR_ID (XFASTINT (ch)); | |
928 XSETFASTINT (val, (id < n_cmpchars ? cmpchar_table[id]->width : 0)); | |
929 } | |
930 else | |
931 { | |
932 int charset = CHAR_CHARSET (c); | |
933 | |
934 XSETFASTINT (val, CHARSET_WIDTH (charset)); | |
935 } | |
936 return val; | |
937 } | |
938 | |
939 /* Return width of string STR of length LEN when displayed in the | |
940 current buffer. The width is measured by how many columns it | |
941 occupies on the screen. */ | |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
942 |
17052 | 943 int |
944 strwidth (str, len) | |
945 unsigned char *str; | |
946 int len; | |
947 { | |
948 unsigned char *endp = str + len; | |
949 int width = 0; | |
20362
67bcb068070c
(strwidth): Remove extra argument to buffer_display_table.
Kenichi Handa <handa@m17n.org>
parents:
20228
diff
changeset
|
950 struct Lisp_Char_Table *dp = buffer_display_table (); |
17052 | 951 |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
952 while (str < endp) |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
953 { |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
954 if (*str == LEADING_CODE_COMPOSITION) |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
955 { |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
956 int id = str_cmpchar_id (str, endp - str); |
17052 | 957 |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
958 if (id < 0) |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
959 { |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
960 width += 4; |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
961 str++; |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
962 } |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
963 else |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
964 { |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
965 width += cmpchar_table[id]->width; |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
966 str += cmpchar_table[id]->len; |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
967 } |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
968 } |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
969 else |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
970 { |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
971 Lisp_Object disp; |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
972 int thiswidth; |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
973 int c = STRING_CHAR (str, endp - str); |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
974 |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
975 /* Get the way the display table would display it. */ |
17863
bc8774c7999b
(strwidth): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17843
diff
changeset
|
976 if (dp) |
bc8774c7999b
(strwidth): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17843
diff
changeset
|
977 disp = DISP_CHAR_VECTOR (dp, c); |
bc8774c7999b
(strwidth): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17843
diff
changeset
|
978 else |
bc8774c7999b
(strwidth): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17843
diff
changeset
|
979 disp = Qnil; |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
980 |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
981 if (VECTORP (disp)) |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
982 thiswidth = XVECTOR (disp)->size; |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
983 else |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
984 thiswidth = ONE_BYTE_CHAR_WIDTH (*str); |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
985 |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
986 width += thiswidth; |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
987 str += BYTES_BY_CHAR_HEAD (*str); |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
988 } |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
989 } |
17052 | 990 return width; |
991 } | |
992 | |
993 DEFUN ("string-width", Fstring_width, Sstring_width, 1, 1, 0, | |
994 "Return width of STRING when displayed in the current buffer.\n\ | |
995 Width is measured by how many columns it occupies on the screen.\n\ | |
19384 | 996 When calculating width of a multibyte character in STRING,\n\ |
997 only the base leading-code is considered; the validity of\n\ | |
998 the following bytes is not checked.") | |
17052 | 999 (str) |
1000 Lisp_Object str; | |
1001 { | |
1002 Lisp_Object val; | |
1003 | |
1004 CHECK_STRING (str, 0); | |
1005 XSETFASTINT (val, strwidth (XSTRING (str)->data, XSTRING (str)->size)); | |
1006 return val; | |
1007 } | |
1008 | |
1009 DEFUN ("char-direction", Fchar_direction, Schar_direction, 1, 1, 0, | |
1010 "Return the direction of CHAR.\n\ | |
1011 The returned value is 0 for left-to-right and 1 for right-to-left.") | |
1012 (ch) | |
1013 Lisp_Object ch; | |
1014 { | |
1015 int charset; | |
1016 | |
1017 CHECK_NUMBER (ch, 0); | |
1018 charset = CHAR_CHARSET (XFASTINT (ch)); | |
1019 if (!CHARSET_DEFINED_P (charset)) | |
1020 error ("Invalid character: %d", XINT (ch)); | |
1021 return CHARSET_TABLE_INFO (charset, CHARSET_DIRECTION_IDX); | |
1022 } | |
1023 | |
19415
309b9a0d8a45
(Fchars_in_region): Renamed form Fcount_chars_region.
Kenichi Handa <handa@m17n.org>
parents:
19384
diff
changeset
|
1024 DEFUN ("chars-in-region", Fchars_in_region, Schars_in_region, 2, 2, 0, |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1025 "Return number of characters between BEG and END.") |
19384 | 1026 (beg, end) |
1027 Lisp_Object beg, end; | |
1028 { | |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1029 int from, to; |
19384 | 1030 |
1031 from = min (XFASTINT (beg), XFASTINT (end)); | |
19444
752afe97eaa4
(Fchars_in_region): Fix gap handling.
Richard M. Stallman <rms@gnu.org>
parents:
19415
diff
changeset
|
1032 to = max (XFASTINT (beg), XFASTINT (end)); |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1033 |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1034 return to - from; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1035 } |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1036 |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1037 /* Return the number of characters in the NBYTES bytes at PTR. |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1038 This works by looking at the contents and checking for multibyte sequences. |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1039 However, if the current buffer has enable-multibyte-characters = nil, |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1040 we treat each byte as a character. */ |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1041 |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1042 int |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1043 chars_in_text (ptr, nbytes) |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1044 unsigned char *ptr; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1045 int nbytes; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1046 { |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1047 unsigned char *endp; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1048 int chars; |
19384 | 1049 |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1050 /* current_buffer is null at early stages of Emacs initialization. */ |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1051 if (current_buffer == 0 |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1052 || NILP (current_buffer->enable_multibyte_characters)) |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1053 return nbytes; |
20188
d4ad4463384d
(Fchars_in_string): Pay attention to
Kenichi Handa <handa@m17n.org>
parents:
20152
diff
changeset
|
1054 |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1055 endp = ptr + nbytes; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1056 chars = 0; |
19384 | 1057 |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1058 while (ptr < endp) |
19384 | 1059 { |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1060 if (*ptr == LEADING_CODE_COMPOSITION) |
19384 | 1061 { |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1062 ptr++; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1063 while (ptr < endp && ! CHAR_HEAD_P (*ptr)) ptr++; |
19384 | 1064 } |
1065 else | |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1066 ptr += BYTES_BY_CHAR_HEAD (*ptr); |
19384 | 1067 chars++; |
1068 } | |
1069 | |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1070 return chars; |
19384 | 1071 } |
1072 | |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1073 /* Return the number of characters in the NBYTES bytes at PTR. |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1074 This works by looking at the contents and checking for multibyte sequences. |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1075 It ignores enable-multibyte-characters. */ |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1076 |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1077 int |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1078 multibyte_chars_in_text (ptr, nbytes) |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1079 unsigned char *ptr; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1080 int nbytes; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1081 { |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1082 unsigned char *endp; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1083 int chars; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1084 |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1085 endp = ptr + nbytes; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1086 chars = 0; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1087 |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1088 while (ptr < endp) |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1089 { |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1090 if (*ptr == LEADING_CODE_COMPOSITION) |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1091 { |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1092 ptr++; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1093 while (ptr < endp && ! CHAR_HEAD_P (*ptr)) ptr++; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1094 } |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1095 else |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1096 ptr += BYTES_BY_CHAR_HEAD (*ptr); |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1097 chars++; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1098 } |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1099 |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1100 return chars; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1101 } |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1102 |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1103 DEFUN ("string", Fstring, Sstring, 1, MANY, 0, |
17052 | 1104 "Concatenate all the argument characters and make the result a string.") |
17366
f7809ff2c65f
(ONE_BYTE_CHAR_WIDTH, Fconcat_chars): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17322
diff
changeset
|
1105 (n, args) |
f7809ff2c65f
(ONE_BYTE_CHAR_WIDTH, Fconcat_chars): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17322
diff
changeset
|
1106 int n; |
17052 | 1107 Lisp_Object *args; |
1108 { | |
17366
f7809ff2c65f
(ONE_BYTE_CHAR_WIDTH, Fconcat_chars): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17322
diff
changeset
|
1109 int i; |
17052 | 1110 unsigned char *buf |
17834
e154b943bbba
(non_ascii_char_to_string): Signal error if the
Kenichi Handa <handa@m17n.org>
parents:
17818
diff
changeset
|
1111 = (unsigned char *) alloca (MAX_LENGTH_OF_MULTI_BYTE_FORM * n); |
17052 | 1112 unsigned char *p = buf; |
1113 Lisp_Object val; | |
1114 | |
1115 for (i = 0; i < n; i++) | |
1116 { | |
1117 int c, len; | |
1118 unsigned char *str; | |
1119 | |
1120 if (!INTEGERP (args[i])) | |
20720
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
1121 CHECK_NUMBER (args[i], 0); |
17052 | 1122 c = XINT (args[i]); |
1123 len = CHAR_STRING (c, p, str); | |
1124 if (p != str) | |
1125 /* C is a composite character. */ | |
1126 bcopy (str, p, len); | |
1127 p += len; | |
1128 } | |
1129 | |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1130 val = make_multibyte_string (buf, n, p - buf); |
17052 | 1131 return val; |
1132 } | |
1133 | |
1134 #endif /* emacs */ | |
1135 | |
1136 /*** Composite characters staffs ***/ | |
1137 | |
1138 /* Each composite character is identified by CMPCHAR-ID which is | |
1139 assigned when Emacs needs the character code of the composite | |
1140 character (e.g. when displaying it on the screen). See the | |
1141 document "GENERAL NOTE on COMPOSITE CHARACTER" in `charset.h' how a | |
1142 composite character is represented in Emacs. */ | |
1143 | |
1144 /* If `static' is defined, it means that it is defined to null string. */ | |
1145 #ifndef static | |
1146 /* The following function is copied from lread.c. */ | |
1147 static int | |
1148 hash_string (ptr, len) | |
1149 unsigned char *ptr; | |
1150 int len; | |
1151 { | |
1152 register unsigned char *p = ptr; | |
1153 register unsigned char *end = p + len; | |
1154 register unsigned char c; | |
1155 register int hash = 0; | |
1156 | |
1157 while (p != end) | |
1158 { | |
1159 c = *p++; | |
1160 if (c >= 0140) c -= 40; | |
1161 hash = ((hash<<3) + (hash>>28) + c); | |
1162 } | |
1163 return hash & 07777777777; | |
1164 } | |
1165 #endif | |
1166 | |
1167 #define CMPCHAR_HASH_TABLE_SIZE 0xFFF | |
1168 | |
1169 static int *cmpchar_hash_table[CMPCHAR_HASH_TABLE_SIZE]; | |
1170 | |
1171 /* Each element of `cmpchar_hash_table' is a pointer to an array of | |
1172 integer, where the 1st element is the size of the array, the 2nd | |
1173 element is how many elements are actually used in the array, and | |
1174 the remaining elements are CMPCHAR-IDs of composite characters of | |
1175 the same hash value. */ | |
1176 #define CMPCHAR_HASH_SIZE(table) table[0] | |
1177 #define CMPCHAR_HASH_USED(table) table[1] | |
1178 #define CMPCHAR_HASH_CMPCHAR_ID(table, i) table[i] | |
1179 | |
1180 /* Return CMPCHAR-ID of the composite character in STR of the length | |
1181 LEN. If the composite character has not yet been registered, | |
1182 register it in `cmpchar_table' and assign new CMPCHAR-ID. This | |
1183 is the sole function for assigning CMPCHAR-ID. */ | |
1184 int | |
1185 str_cmpchar_id (str, len) | |
1186 unsigned char *str; | |
1187 int len; | |
1188 { | |
1189 int hash_idx, *hashp; | |
1190 unsigned char *buf; | |
1191 int embedded_rule; /* 1 if composition rule is embedded. */ | |
1192 int chars; /* number of components. */ | |
1193 int i; | |
1194 struct cmpchar_info *cmpcharp; | |
1195 | |
1196 if (len < 5) | |
1197 /* Any composite char have at least 3-byte length. */ | |
1198 return -1; | |
1199 | |
1200 /* The second byte 0xFF means compostion rule is embedded. */ | |
1201 embedded_rule = (str[1] == 0xFF); | |
1202 | |
1203 /* At first, get the actual length of the composite character. */ | |
1204 { | |
1205 unsigned char *p, *endp = str + 1, *lastp = str + len; | |
1206 int bytes; | |
1207 | |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1208 while (endp < lastp && ! CHAR_HEAD_P (*endp)) endp++; |
17052 | 1209 chars = 0; |
1210 p = str + 1 + embedded_rule; | |
1211 while (p < endp) | |
1212 { | |
1213 /* No need of checking if *P is 0xA0 because | |
1214 BYTES_BY_CHAR_HEAD (0x80) surely returns 2. */ | |
1215 p += (bytes = BYTES_BY_CHAR_HEAD (*p - 0x20) + embedded_rule); | |
1216 chars++; | |
1217 } | |
1218 len = (p -= embedded_rule) - str; | |
1219 if (p > endp) | |
1220 len -= - bytes, chars--; | |
1221 | |
1222 if (chars < 2 || chars > MAX_COMPONENT_COUNT) | |
1223 /* Invalid number of components. */ | |
1224 return -1; | |
1225 } | |
1226 hash_idx = hash_string (str, len) % CMPCHAR_HASH_TABLE_SIZE; | |
1227 hashp = cmpchar_hash_table[hash_idx]; | |
1228 | |
1229 /* Then, look into the hash table. */ | |
1230 if (hashp != NULL) | |
1231 /* Find the correct one among composite characters of the same | |
1232 hash value. */ | |
1233 for (i = 2; i < CMPCHAR_HASH_USED (hashp); i++) | |
1234 { | |
1235 cmpcharp = cmpchar_table[CMPCHAR_HASH_CMPCHAR_ID (hashp, i)]; | |
1236 if (len == cmpcharp->len | |
1237 && ! bcmp (str, cmpcharp->data, len)) | |
1238 return CMPCHAR_HASH_CMPCHAR_ID (hashp, i); | |
1239 } | |
1240 | |
1241 /* We have to register the composite character in cmpchar_table. */ | |
17186
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
1242 if (n_cmpchars > (CHAR_FIELD2_MASK | CHAR_FIELD3_MASK)) |
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
1243 /* No, we have no more room for a new composite character. */ |
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
1244 return -1; |
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
1245 |
17052 | 1246 /* Make the entry in hash table. */ |
1247 if (hashp == NULL) | |
1248 { | |
1249 /* Make a table for 8 composite characters initially. */ | |
1250 hashp = (cmpchar_hash_table[hash_idx] | |
1251 = (int *) xmalloc (sizeof (int) * (2 + 8))); | |
1252 CMPCHAR_HASH_SIZE (hashp) = 10; | |
1253 CMPCHAR_HASH_USED (hashp) = 2; | |
1254 } | |
1255 else if (CMPCHAR_HASH_USED (hashp) >= CMPCHAR_HASH_SIZE (hashp)) | |
1256 { | |
1257 CMPCHAR_HASH_SIZE (hashp) += 8; | |
1258 hashp = (cmpchar_hash_table[hash_idx] | |
1259 = (int *) xrealloc (hashp, | |
1260 sizeof (int) * CMPCHAR_HASH_SIZE (hashp))); | |
1261 } | |
1262 CMPCHAR_HASH_CMPCHAR_ID (hashp, CMPCHAR_HASH_USED (hashp)) = n_cmpchars; | |
1263 CMPCHAR_HASH_USED (hashp)++; | |
1264 | |
1265 /* Set information of the composite character in cmpchar_table. */ | |
1266 if (cmpchar_table_size == 0) | |
1267 { | |
1268 /* This is the first composite character to be registered. */ | |
1269 cmpchar_table_size = 256; | |
1270 cmpchar_table | |
1271 = (struct cmpchar_info **) xmalloc (sizeof (cmpchar_table[0]) | |
1272 * cmpchar_table_size); | |
1273 } | |
1274 else if (cmpchar_table_size <= n_cmpchars) | |
1275 { | |
1276 cmpchar_table_size += 256; | |
1277 cmpchar_table | |
1278 = (struct cmpchar_info **) xrealloc (cmpchar_table, | |
1279 sizeof (cmpchar_table[0]) | |
1280 * cmpchar_table_size); | |
1281 } | |
1282 | |
1283 cmpcharp = (struct cmpchar_info *) xmalloc (sizeof (struct cmpchar_info)); | |
1284 | |
1285 cmpcharp->len = len; | |
1286 cmpcharp->data = (unsigned char *) xmalloc (len + 1); | |
1287 bcopy (str, cmpcharp->data, len); | |
1288 cmpcharp->data[len] = 0; | |
1289 cmpcharp->glyph_len = chars; | |
1290 cmpcharp->glyph = (GLYPH *) xmalloc (sizeof (GLYPH) * chars); | |
1291 if (embedded_rule) | |
1292 { | |
1293 cmpcharp->cmp_rule = (unsigned char *) xmalloc (chars); | |
1294 cmpcharp->col_offset = (float *) xmalloc (sizeof (float) * chars); | |
1295 } | |
1296 else | |
1297 { | |
1298 cmpcharp->cmp_rule = NULL; | |
1299 cmpcharp->col_offset = NULL; | |
1300 } | |
1301 | |
1302 /* Setup GLYPH data and composition rules (if any) so as not to make | |
1303 them every time on displaying. */ | |
1304 { | |
1305 unsigned char *bufp; | |
1306 int width; | |
1307 float leftmost = 0.0, rightmost = 1.0; | |
1308 | |
1309 if (embedded_rule) | |
1310 /* At first, col_offset[N] is set to relative to col_offset[0]. */ | |
1311 cmpcharp->col_offset[0] = 0; | |
1312 | |
1313 for (i = 0, bufp = cmpcharp->data + 1; i < chars; i++) | |
1314 { | |
1315 if (embedded_rule) | |
1316 cmpcharp->cmp_rule[i] = *bufp++; | |
1317 | |
1318 if (*bufp == 0xA0) /* This is an ASCII character. */ | |
1319 { | |
1320 cmpcharp->glyph[i] = FAST_MAKE_GLYPH ((*++bufp & 0x7F), 0); | |
1321 width = 1; | |
1322 bufp++; | |
1323 } | |
1324 else /* Multibyte character. */ | |
1325 { | |
1326 /* Make `bufp' point normal multi-byte form temporally. */ | |
1327 *bufp -= 0x20; | |
1328 cmpcharp->glyph[i] | |
1329 = FAST_MAKE_GLYPH (string_to_non_ascii_char (bufp, 4, 0), 0); | |
1330 width = WIDTH_BY_CHAR_HEAD (*bufp); | |
1331 *bufp += 0x20; | |
1332 bufp += BYTES_BY_CHAR_HEAD (*bufp - 0x20); | |
1333 } | |
1334 | |
1335 if (embedded_rule && i > 0) | |
1336 { | |
1337 /* Reference points (global_ref and new_ref) are | |
1338 encoded as below: | |
1339 | |
1340 0--1--2 -- ascent | |
1341 | | | |
1342 | | | |
1343 | 4 -+--- center | |
1344 -- 3 5 -- baseline | |
1345 | | | |
1346 6--7--8 -- descent | |
1347 | |
1348 Now, we calculate the column offset of the new glyph | |
1349 from the left edge of the first glyph. This can avoid | |
1350 the same calculation everytime displaying this | |
1351 composite character. */ | |
1352 | |
1353 /* Reference points of global glyph and new glyph. */ | |
1354 int global_ref = (cmpcharp->cmp_rule[i] - 0xA0) / 9; | |
1355 int new_ref = (cmpcharp->cmp_rule[i] - 0xA0) % 9; | |
1356 /* Column offset relative to the first glyph. */ | |
1357 float left = (leftmost | |
1358 + (global_ref % 3) * (rightmost - leftmost) / 2.0 | |
1359 - (new_ref % 3) * width / 2.0); | |
1360 | |
1361 cmpcharp->col_offset[i] = left; | |
1362 if (left < leftmost) | |
1363 leftmost = left; | |
1364 if (left + width > rightmost) | |
1365 rightmost = left + width; | |
1366 } | |
1367 else | |
1368 { | |
1369 if (width > rightmost) | |
1370 rightmost = width; | |
1371 } | |
1372 } | |
1373 if (embedded_rule) | |
1374 { | |
1375 /* Now col_offset[N] are relative to the left edge of the | |
1376 first component. Make them relative to the left edge of | |
1377 overall glyph. */ | |
1378 for (i = 0; i < chars; i++) | |
1379 cmpcharp->col_offset[i] -= leftmost; | |
1380 /* Make rightmost holds width of overall glyph. */ | |
1381 rightmost -= leftmost; | |
1382 } | |
1383 | |
1384 cmpcharp->width = rightmost; | |
1385 if (cmpcharp->width < rightmost) | |
1386 /* To get a ceiling integer value. */ | |
1387 cmpcharp->width++; | |
1388 } | |
1389 | |
1390 cmpchar_table[n_cmpchars] = cmpcharp; | |
1391 | |
1392 return n_cmpchars++; | |
1393 } | |
1394 | |
1395 /* Return the Nth element of the composite character C. */ | |
1396 int | |
1397 cmpchar_component (c, n) | |
1398 unsigned int c, n; | |
1399 { | |
1400 int id = COMPOSITE_CHAR_ID (c); | |
1401 | |
1402 if (id >= n_cmpchars /* C is not a valid composite character. */ | |
1403 || n >= cmpchar_table[id]->glyph_len) /* No such component. */ | |
1404 return -1; | |
1405 /* No face data is stored in glyph code. */ | |
1406 return ((int) (cmpchar_table[id]->glyph[n])); | |
1407 } | |
1408 | |
1409 DEFUN ("cmpcharp", Fcmpcharp, Scmpcharp, 1, 1, 0, | |
1410 "T if CHAR is a composite character.") | |
1411 (ch) | |
1412 Lisp_Object ch; | |
1413 { | |
1414 CHECK_NUMBER (ch, 0); | |
1415 return (COMPOSITE_CHAR_P (XINT (ch)) ? Qt : Qnil); | |
1416 } | |
1417 | |
1418 DEFUN ("composite-char-component", Fcmpchar_component, Scmpchar_component, | |
1419 2, 2, 0, | |
1420 "Return the IDXth component character of composite character CHARACTER.") | |
1421 (character, idx) | |
1422 Lisp_Object character, idx; | |
1423 { | |
1424 int c; | |
1425 | |
1426 CHECK_NUMBER (character, 0); | |
1427 CHECK_NUMBER (idx, 1); | |
1428 | |
1429 if ((c = cmpchar_component (XINT (character), XINT (idx))) < 0) | |
1430 args_out_of_range (character, idx); | |
1431 | |
1432 return make_number (c); | |
1433 } | |
1434 | |
1435 DEFUN ("composite-char-composition-rule", Fcmpchar_cmp_rule, Scmpchar_cmp_rule, | |
1436 2, 2, 0, | |
17121
f8e2cd94c274
(Fcmpchar_cmp_rule): Escape newlines in docstring.
Kenichi Handa <handa@m17n.org>
parents:
17071
diff
changeset
|
1437 "Return the Nth composition rule embedded in composite character CHARACTER.\n\ |
f8e2cd94c274
(Fcmpchar_cmp_rule): Escape newlines in docstring.
Kenichi Handa <handa@m17n.org>
parents:
17071
diff
changeset
|
1438 The returned rule is for composing the Nth component\n\ |
f8e2cd94c274
(Fcmpchar_cmp_rule): Escape newlines in docstring.
Kenichi Handa <handa@m17n.org>
parents:
17071
diff
changeset
|
1439 on the (N-1)th component. If N is 0, the returned value is always 255.") |
f8e2cd94c274
(Fcmpchar_cmp_rule): Escape newlines in docstring.
Kenichi Handa <handa@m17n.org>
parents:
17071
diff
changeset
|
1440 (character, n) |
f8e2cd94c274
(Fcmpchar_cmp_rule): Escape newlines in docstring.
Kenichi Handa <handa@m17n.org>
parents:
17071
diff
changeset
|
1441 Lisp_Object character, n; |
17052 | 1442 { |
1443 int id, i; | |
1444 | |
1445 CHECK_NUMBER (character, 0); | |
17121
f8e2cd94c274
(Fcmpchar_cmp_rule): Escape newlines in docstring.
Kenichi Handa <handa@m17n.org>
parents:
17071
diff
changeset
|
1446 CHECK_NUMBER (n, 1); |
17052 | 1447 |
1448 id = COMPOSITE_CHAR_ID (XINT (character)); | |
1449 if (id < 0 || id >= n_cmpchars) | |
1450 error ("Invalid composite character: %d", XINT (character)); | |
17121
f8e2cd94c274
(Fcmpchar_cmp_rule): Escape newlines in docstring.
Kenichi Handa <handa@m17n.org>
parents:
17071
diff
changeset
|
1451 i = XINT (n); |
17052 | 1452 if (i > cmpchar_table[id]->glyph_len) |
17121
f8e2cd94c274
(Fcmpchar_cmp_rule): Escape newlines in docstring.
Kenichi Handa <handa@m17n.org>
parents:
17071
diff
changeset
|
1453 args_out_of_range (character, n); |
17052 | 1454 |
1455 return make_number (cmpchar_table[id]->cmp_rule[i]); | |
1456 } | |
1457 | |
1458 DEFUN ("composite-char-composition-rule-p", Fcmpchar_cmp_rule_p, | |
1459 Scmpchar_cmp_rule_p, 1, 1, 0, | |
1460 "Return non-nil if composite character CHARACTER contains a embedded rule.") | |
1461 (character) | |
1462 Lisp_Object character; | |
1463 { | |
1464 int id; | |
1465 | |
1466 CHECK_NUMBER (character, 0); | |
1467 id = COMPOSITE_CHAR_ID (XINT (character)); | |
1468 if (id < 0 || id >= n_cmpchars) | |
1469 error ("Invalid composite character: %d", XINT (character)); | |
1470 | |
1471 return (cmpchar_table[id]->cmp_rule ? Qt : Qnil); | |
1472 } | |
1473 | |
1474 DEFUN ("composite-char-component-count", Fcmpchar_cmp_count, | |
1475 Scmpchar_cmp_count, 1, 1, 0, | |
1476 "Return number of compoents of composite character CHARACTER.") | |
1477 (character) | |
1478 Lisp_Object character; | |
1479 { | |
1480 int id; | |
1481 | |
1482 CHECK_NUMBER (character, 0); | |
1483 id = COMPOSITE_CHAR_ID (XINT (character)); | |
1484 if (id < 0 || id >= n_cmpchars) | |
1485 error ("Invalid composite character: %d", XINT (character)); | |
1486 | |
1487 return (make_number (cmpchar_table[id]->glyph_len)); | |
1488 } | |
1489 | |
1490 DEFUN ("compose-string", Fcompose_string, Scompose_string, | |
1491 1, 1, 0, | |
1492 "Return one char string composed from all characters in STRING.") | |
1493 (str) | |
1494 Lisp_Object str; | |
1495 { | |
1496 unsigned char buf[MAX_LENGTH_OF_MULTI_BYTE_FORM], *p, *pend, *ptemp; | |
1497 int len, i; | |
1498 | |
1499 CHECK_STRING (str, 0); | |
1500 | |
1501 buf[0] = LEADING_CODE_COMPOSITION; | |
1502 p = XSTRING (str)->data; | |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1503 pend = p + XSTRING (str)->size_byte; |
17052 | 1504 i = 1; |
1505 while (p < pend) | |
1506 { | |
1507 if (*p < 0x20 || *p == 127) /* control code */ | |
1508 error ("Invalid component character: %d", *p); | |
1509 else if (*p < 0x80) /* ASCII */ | |
1510 { | |
1511 if (i + 2 >= MAX_LENGTH_OF_MULTI_BYTE_FORM) | |
1512 error ("Too long string to be composed: %s", XSTRING (str)->data); | |
1513 /* Prepend an ASCII charset indicator 0xA0, set MSB of the | |
1514 code itself. */ | |
1515 buf[i++] = 0xA0; | |
1516 buf[i++] = *p++ + 0x80; | |
1517 } | |
1518 else if (*p == LEADING_CODE_COMPOSITION) /* composite char */ | |
1519 { | |
1520 /* Already composed. Eliminate the heading | |
1521 LEADING_CODE_COMPOSITION, keep the remaining bytes | |
1522 unchanged. */ | |
1523 p++; | |
1524 ptemp = p; | |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1525 while (! CHAR_HEAD_P (*p)) p++; |
17052 | 1526 if (i + (p - ptemp) >= MAX_LENGTH_OF_MULTI_BYTE_FORM) |
1527 error ("Too long string to be composed: %s", XSTRING (str)->data); | |
1528 bcopy (ptemp, buf + i, p - ptemp); | |
1529 i += p - ptemp; | |
1530 } | |
1531 else /* multibyte char */ | |
1532 { | |
1533 /* Add 0x20 to the base leading-code, keep the remaining | |
1534 bytes unchanged. */ | |
1535 len = BYTES_BY_CHAR_HEAD (*p); | |
1536 if (i + len >= MAX_LENGTH_OF_MULTI_BYTE_FORM) | |
1537 error ("Too long string to be composed: %s", XSTRING (str)->data); | |
1538 bcopy (p, buf + i, len); | |
1539 buf[i] += 0x20; | |
1540 p += len, i += len; | |
1541 } | |
1542 } | |
1543 | |
1544 if (i < 5) | |
1545 /* STR contains only one character, which can't be composed. */ | |
1546 error ("Too short string to be composed: %s", XSTRING (str)->data); | |
1547 | |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1548 return make_multibyte_string (buf, 1, i); |
17052 | 1549 } |
1550 | |
1551 | |
1552 charset_id_internal (charset_name) | |
1553 char *charset_name; | |
1554 { | |
1555 Lisp_Object val = Fget (intern (charset_name), Qcharset); | |
1556 | |
1557 if (!VECTORP (val)) | |
1558 error ("Charset %s is not defined", charset_name); | |
1559 | |
1560 return (XINT (XVECTOR (val)->contents[0])); | |
1561 } | |
1562 | |
1563 DEFUN ("setup-special-charsets", Fsetup_special_charsets, | |
1564 Ssetup_special_charsets, 0, 0, 0, "Internal use only.") | |
1565 () | |
1566 { | |
1567 charset_latin_iso8859_1 = charset_id_internal ("latin-iso8859-1"); | |
1568 charset_jisx0208_1978 = charset_id_internal ("japanese-jisx0208-1978"); | |
1569 charset_jisx0208 = charset_id_internal ("japanese-jisx0208"); | |
1570 charset_katakana_jisx0201 = charset_id_internal ("katakana-jisx0201"); | |
1571 charset_latin_jisx0201 = charset_id_internal ("latin-jisx0201"); | |
1572 charset_big5_1 = charset_id_internal ("chinese-big5-1"); | |
1573 charset_big5_2 = charset_id_internal ("chinese-big5-2"); | |
1574 return Qnil; | |
1575 } | |
1576 | |
1577 init_charset_once () | |
1578 { | |
1579 int i, j, k; | |
1580 | |
1581 staticpro (&Vcharset_table); | |
1582 staticpro (&Vcharset_symbol_table); | |
1583 | |
1584 /* This has to be done here, before we call Fmake_char_table. */ | |
1585 Qcharset_table = intern ("charset-table"); | |
1586 staticpro (&Qcharset_table); | |
1587 | |
1588 /* Intern this now in case it isn't already done. | |
1589 Setting this variable twice is harmless. | |
1590 But don't staticpro it here--that is done in alloc.c. */ | |
1591 Qchar_table_extra_slots = intern ("char-table-extra-slots"); | |
1592 | |
1593 /* Now we are ready to set up this property, so we can | |
1594 create the charset table. */ | |
1595 Fput (Qcharset_table, Qchar_table_extra_slots, make_number (0)); | |
1596 Vcharset_table = Fmake_char_table (Qcharset_table, Qnil); | |
1597 | |
17186
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
1598 Vcharset_symbol_table = Fmake_vector (make_number (MAX_CHARSET + 1), Qnil); |
17052 | 1599 |
1600 /* Setup tables. */ | |
1601 for (i = 0; i < 2; i++) | |
1602 for (j = 0; j < 2; j++) | |
1603 for (k = 0; k < 128; k++) | |
1604 iso_charset_table [i][j][k] = -1; | |
1605 | |
1606 bzero (cmpchar_hash_table, sizeof cmpchar_hash_table); | |
1607 cmpchar_table_size = n_cmpchars = 0; | |
1608 | |
1609 for (i = 0; i < 256; i++) | |
1610 BYTES_BY_CHAR_HEAD (i) = 1; | |
1611 BYTES_BY_CHAR_HEAD (LEADING_CODE_PRIVATE_11) = 3; | |
1612 BYTES_BY_CHAR_HEAD (LEADING_CODE_PRIVATE_12) = 3; | |
1613 BYTES_BY_CHAR_HEAD (LEADING_CODE_PRIVATE_21) = 4; | |
1614 BYTES_BY_CHAR_HEAD (LEADING_CODE_PRIVATE_22) = 4; | |
1615 /* The following doesn't reflect the actual bytes, but just to tell | |
1616 that it is a start of a multibyte character. */ | |
1617 BYTES_BY_CHAR_HEAD (LEADING_CODE_COMPOSITION) = 2; | |
1618 | |
1619 for (i = 0; i < 128; i++) | |
1620 WIDTH_BY_CHAR_HEAD (i) = 1; | |
1621 for (; i < 256; i++) | |
1622 WIDTH_BY_CHAR_HEAD (i) = 4; | |
1623 WIDTH_BY_CHAR_HEAD (LEADING_CODE_PRIVATE_11) = 1; | |
1624 WIDTH_BY_CHAR_HEAD (LEADING_CODE_PRIVATE_12) = 2; | |
1625 WIDTH_BY_CHAR_HEAD (LEADING_CODE_PRIVATE_21) = 1; | |
1626 WIDTH_BY_CHAR_HEAD (LEADING_CODE_PRIVATE_22) = 2; | |
1627 } | |
1628 | |
1629 #ifdef emacs | |
1630 | |
1631 syms_of_charset () | |
1632 { | |
1633 Qascii = intern ("ascii"); | |
1634 staticpro (&Qascii); | |
1635 | |
1636 Qcharset = intern ("charset"); | |
1637 staticpro (&Qcharset); | |
1638 | |
1639 /* Define ASCII charset now. */ | |
1640 update_charset_table (make_number (CHARSET_ASCII), | |
1641 make_number (1), make_number (94), | |
1642 make_number (1), | |
1643 make_number (0), | |
1644 make_number ('B'), | |
1645 make_number (0), | |
1646 build_string ("ASCII"), | |
1647 build_string ("ASCII"), | |
1648 build_string ("ASCII (ISO646 IRV)")); | |
1649 CHARSET_SYMBOL (CHARSET_ASCII) = Qascii; | |
1650 Fput (Qascii, Qcharset, CHARSET_TABLE_ENTRY (CHARSET_ASCII)); | |
1651 | |
1652 Qcomposition = intern ("composition"); | |
1653 staticpro (&Qcomposition); | |
1654 CHARSET_SYMBOL (CHARSET_COMPOSITION) = Qcomposition; | |
1655 | |
1656 defsubr (&Sdefine_charset); | |
20435
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
1657 defsubr (&Sget_unused_iso_final_char); |
17052 | 1658 defsubr (&Sdeclare_equiv_charset); |
1659 defsubr (&Sfind_charset_region); | |
1660 defsubr (&Sfind_charset_string); | |
1661 defsubr (&Smake_char_internal); | |
1662 defsubr (&Ssplit_char); | |
1663 defsubr (&Schar_charset); | |
1664 defsubr (&Siso_charset); | |
20152
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1665 defsubr (&Schar_valid_p); |
17052 | 1666 defsubr (&Schar_bytes); |
1667 defsubr (&Schar_width); | |
1668 defsubr (&Sstring_width); | |
1669 defsubr (&Schar_direction); | |
19415
309b9a0d8a45
(Fchars_in_region): Renamed form Fcount_chars_region.
Kenichi Handa <handa@m17n.org>
parents:
19384
diff
changeset
|
1670 defsubr (&Schars_in_region); |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1671 defsubr (&Sstring); |
17052 | 1672 defsubr (&Scmpcharp); |
1673 defsubr (&Scmpchar_component); | |
1674 defsubr (&Scmpchar_cmp_rule); | |
1675 defsubr (&Scmpchar_cmp_rule_p); | |
1676 defsubr (&Scmpchar_cmp_count); | |
1677 defsubr (&Scompose_string); | |
1678 defsubr (&Ssetup_special_charsets); | |
1679 | |
1680 DEFVAR_LISP ("charset-list", &Vcharset_list, | |
1681 "List of charsets ever defined."); | |
1682 Vcharset_list = Fcons (Qascii, Qnil); | |
1683 | |
20720
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
1684 DEFVAR_LISP ("character-unification-table-vector", |
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
1685 &Vcharacter_unification_table_vector, |
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
1686 "Vector of cons cell of a symbol and unification table ever defined.\n\ |
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
1687 An ID of a unification table is an index of this vector."); |
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
1688 Vcharacter_unification_table_vector = Fmake_vector (make_number (16), Qnil); |
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
1689 |
17052 | 1690 DEFVAR_INT ("leading-code-composition", &leading_code_composition, |
1691 "Leading-code of composite characters."); | |
1692 leading_code_composition = LEADING_CODE_COMPOSITION; | |
1693 | |
1694 DEFVAR_INT ("leading-code-private-11", &leading_code_private_11, | |
1695 "Leading-code of private TYPE9N charset of column-width 1."); | |
1696 leading_code_private_11 = LEADING_CODE_PRIVATE_11; | |
1697 | |
1698 DEFVAR_INT ("leading-code-private-12", &leading_code_private_12, | |
1699 "Leading-code of private TYPE9N charset of column-width 2."); | |
1700 leading_code_private_12 = LEADING_CODE_PRIVATE_12; | |
1701 | |
1702 DEFVAR_INT ("leading-code-private-21", &leading_code_private_21, | |
1703 "Leading-code of private TYPE9Nx9N charset of column-width 1."); | |
1704 leading_code_private_21 = LEADING_CODE_PRIVATE_21; | |
1705 | |
1706 DEFVAR_INT ("leading-code-private-22", &leading_code_private_22, | |
1707 "Leading-code of private TYPE9Nx9N charset of column-width 2."); | |
1708 leading_code_private_22 = LEADING_CODE_PRIVATE_22; | |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
1709 |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
1710 DEFVAR_INT ("nonascii-insert-offset", &nonascii_insert_offset, |
20890
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1711 "Offset for converting non-ASCII unibyte codes 0200...0377 to multibyte.\n\ |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1712 This is used for converting unibyte text to multibyte,\n\ |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1713 and for inserting character codes specified by number.\n\n\ |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1714 Conversion is performed only when multibyte characters are enabled,\n\ |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1715 and it serves to convert a Latin-1 or similar 8-bit character code\n\ |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1716 to the corresponding Emacs character code.\n\ |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1717 If `nonascii-translate-table' is non-nil, it overrides this variable."); |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
1718 nonascii_insert_offset = 0; |
20720
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
1719 |
20890
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1720 DEFVAR_LISP ("nonascii-translate-table", &Vnonascii_translate_table, |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1721 "Translate table for converting non-ASCII unibyte codes to multibyte.\n\ |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1722 This is used for converting unibyte text to multibyte,\n\ |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1723 and for inserting character codes specified by number.\n\n\ |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1724 Conversion is performed only when multibyte characters are enabled,\n\ |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1725 and it serves to convert a Latin-1 or similar 8-bit character code\n\ |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1726 to the corresponding Emacs character code.\n\n\ |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1727 If this is nil, `nonascii-insert-offset' is used instead."); |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1728 Vnonascii_translate_table = Qnil; |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1729 |
20720
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
1730 DEFVAR_INT ("min-composite-char", &min_composite_char, |
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
1731 "Minimum character code of a composite character."); |
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
1732 min_composite_char = MIN_CHAR_COMPOSITION; |
17052 | 1733 } |
1734 | |
1735 #endif /* emacs */ |