Mercurial > emacs
annotate src/character.c @ 111520:895379d32da9
ChangeLog fixes.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 12 Nov 2010 19:33:24 -0800 |
parents | 515d80e174ba |
children | 417b1e4d63cd |
rev | line source |
---|---|
88363 | 1 /* Basic character support. |
2 Copyright (C) 1995, 1997, 1998, 2001 Electrotechnical Laboratory, JAPAN. | |
89483 | 3 Licensed to the Free Software Foundation. |
106815 | 4 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
91443
541da5d81b14
Update copyright years and GPL version.
Glenn Morris <rgm@gnu.org>
parents:
90942
diff
changeset
|
5 Free Software Foundation, Inc. |
106815 | 6 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
88363 | 7 National Institute of Advanced Industrial Science and Technology (AIST) |
8 Registration Number H13PRO009 | |
9 | |
10 This file is part of GNU Emacs. | |
11 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94146
diff
changeset
|
12 GNU Emacs is free software: you can redistribute it and/or modify |
88363 | 13 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94146
diff
changeset
|
14 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94146
diff
changeset
|
15 (at your option) any later version. |
88363 | 16 |
17 GNU Emacs is distributed in the hope that it will be useful, | |
18 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 GNU General Public License for more details. | |
21 | |
22 You should have received a copy of the GNU General Public License | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94146
diff
changeset
|
23 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
88363 | 24 |
25 /* At first, see the document in `character.h' to understand the code | |
26 in this file. */ | |
27 | |
28 #ifdef emacs | |
29 #include <config.h> | |
30 #endif | |
31 | |
32 #include <stdio.h> | |
33 | |
34 #ifdef emacs | |
35 | |
36 #include <sys/types.h> | |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105661
diff
changeset
|
37 #include <setjmp.h> |
88363 | 38 #include "lisp.h" |
39 #include "character.h" | |
40 #include "buffer.h" | |
41 #include "charset.h" | |
42 #include "composite.h" | |
43 #include "disptab.h" | |
44 | |
45 #else /* not emacs */ | |
46 | |
47 #include "mulelib.h" | |
48 | |
49 #endif /* emacs */ | |
50 | |
51 Lisp_Object Qcharacterp; | |
52 | |
53 /* Vector of translation table ever defined. | |
54 ID of a translation table is used to index this vector. */ | |
55 Lisp_Object Vtranslation_table_vector; | |
56 | |
57 /* A char-table for characters which may invoke auto-filling. */ | |
58 Lisp_Object Vauto_fill_chars; | |
59 | |
60 Lisp_Object Qauto_fill_chars; | |
61 | |
89888 | 62 /* Char-table of information about which character to unify to which |
99482
e228d5755549
(Vchar_unify_table): Comment added.
Kenichi Handa <handa@m17n.org>
parents:
99475
diff
changeset
|
63 Unicode character. Mainly used by the macro MAYBE_UNIFY_CHAR. */ |
88363 | 64 Lisp_Object Vchar_unify_table; |
65 | |
66 /* A char-table. An element is non-nil iff the corresponding | |
67 character has a printable glyph. */ | |
68 Lisp_Object Vprintable_chars; | |
69 | |
70 /* A char-table. An elemnent is a column-width of the corresponding | |
71 character. */ | |
72 Lisp_Object Vchar_width_table; | |
73 | |
74 /* A char-table. An element is a symbol indicating the direction | |
75 property of corresponding character. */ | |
76 Lisp_Object Vchar_direction_table; | |
77 | |
89020
b0277093a5f2
(_fetch_multibyte_char_len): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88990
diff
changeset
|
78 /* Variable used locally in the macro FETCH_MULTIBYTE_CHAR. */ |
88363 | 79 unsigned char *_fetch_multibyte_char_p; |
80 | |
88913
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
81 /* Char table of scripts. */ |
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
82 Lisp_Object Vchar_script_table; |
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
83 |
90403
81f1bbab281f
(Vscript_representative_chars): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90256
diff
changeset
|
84 /* Alist of scripts vs representative characters. */ |
81f1bbab281f
(Vscript_representative_chars): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90256
diff
changeset
|
85 Lisp_Object Vscript_representative_chars; |
81f1bbab281f
(Vscript_representative_chars): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90256
diff
changeset
|
86 |
88913
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
87 static Lisp_Object Qchar_script_table; |
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
88 |
97816
9999d9194509
(Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
96501
diff
changeset
|
89 Lisp_Object Vunicode_category_table; |
88363 | 90 |
91 | |
92483
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
92 /* If character code C has modifier masks, reflect them to the |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
93 character code if possible. Return the resulting code. */ |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
94 |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
95 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
96 char_resolve_modifier_mask (int c) |
92483
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
97 { |
92494
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
98 /* A non-ASCII character can't reflect modifier bits to the code. */ |
92483
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
99 if (! ASCII_CHAR_P ((c & ~CHAR_MODIFIER_MASK))) |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
100 return c; |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
101 |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
102 /* For Meta, Shift, and Control modifiers, we need special care. */ |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
103 if (c & CHAR_SHIFT) |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
104 { |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
105 /* Shift modifier is valid only with [A-Za-z]. */ |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
106 if ((c & 0377) >= 'A' && (c & 0377) <= 'Z') |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
107 c &= ~CHAR_SHIFT; |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
108 else if ((c & 0377) >= 'a' && (c & 0377) <= 'z') |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
109 c = (c & ~CHAR_SHIFT) - ('a' - 'A'); |
92499
88d1a8b0752e
(char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
92494
diff
changeset
|
110 /* Shift modifier for control characters and SPC is ignored. */ |
88d1a8b0752e
(char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
92494
diff
changeset
|
111 else if ((c & ~CHAR_MODIFIER_MASK) <= 0x20) |
92494
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
112 c &= ~CHAR_SHIFT; |
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
113 } |
92483
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
114 if (c & CHAR_CTL) |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
115 { |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
116 /* Simulate the code in lread.c. */ |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
117 /* Allow `\C- ' and `\C-?'. */ |
92499
88d1a8b0752e
(char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
92494
diff
changeset
|
118 if ((c & 0377) == ' ') |
88d1a8b0752e
(char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
92494
diff
changeset
|
119 c &= ~0177 & ~ CHAR_CTL; |
88d1a8b0752e
(char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
92494
diff
changeset
|
120 else if ((c & 0377) == '?') |
88d1a8b0752e
(char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
92494
diff
changeset
|
121 c = 0177 | (c & ~0177 & ~CHAR_CTL); |
92483
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
122 /* ASCII control chars are made from letters (both cases), |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
123 as well as the non-letters within 0100...0137. */ |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
124 else if ((c & 0137) >= 0101 && (c & 0137) <= 0132) |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
125 c &= (037 | (~0177 & ~CHAR_CTL)); |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
126 else if ((c & 0177) >= 0100 && (c & 0177) <= 0137) |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
127 c &= (037 | (~0177 & ~CHAR_CTL)); |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
128 } |
105688
dfb23d6b0762
(char_resolve_modifier_mask): Don't resolve meta to the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105669
diff
changeset
|
129 #if 0 /* This is outside the scope of this function. (bug#4751) */ |
92499
88d1a8b0752e
(char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
92494
diff
changeset
|
130 if (c & CHAR_META) |
88d1a8b0752e
(char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
92494
diff
changeset
|
131 { |
88d1a8b0752e
(char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
92494
diff
changeset
|
132 /* Move the meta bit to the right place for a string. */ |
88d1a8b0752e
(char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
92494
diff
changeset
|
133 c = (c & ~CHAR_META) | 0x80; |
88d1a8b0752e
(char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
92494
diff
changeset
|
134 } |
105688
dfb23d6b0762
(char_resolve_modifier_mask): Don't resolve meta to the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105669
diff
changeset
|
135 #endif |
92483
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
136 |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
137 return c; |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
138 } |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
139 |
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
140 |
89888 | 141 /* Store multibyte form of character C at P. If C has modifier bits, |
142 handle them appropriately. */ | |
143 | |
88363 | 144 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
145 char_string (unsigned int c, unsigned char *p) |
88363 | 146 { |
147 int bytes; | |
148 | |
89181
be75d5934738
(char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents:
89054
diff
changeset
|
149 if (c & CHAR_MODIFIER_MASK) |
be75d5934738
(char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents:
89054
diff
changeset
|
150 { |
92483
95fab6416567
(char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents:
91807
diff
changeset
|
151 c = (unsigned) char_resolve_modifier_mask ((int) c); |
89181
be75d5934738
(char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents:
89054
diff
changeset
|
152 /* If C still has any modifier bits, just ignore it. */ |
be75d5934738
(char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents:
89054
diff
changeset
|
153 c &= ~CHAR_MODIFIER_MASK; |
be75d5934738
(char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents:
89054
diff
changeset
|
154 } |
be75d5934738
(char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents:
89054
diff
changeset
|
155 |
88363 | 156 MAYBE_UNIFY_CHAR (c); |
157 | |
89181
be75d5934738
(char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents:
89054
diff
changeset
|
158 if (c <= MAX_3_BYTE_CHAR) |
88363 | 159 { |
160 bytes = CHAR_STRING (c, p); | |
161 } | |
162 else if (c <= MAX_4_BYTE_CHAR) | |
163 { | |
164 p[0] = (0xF0 | (c >> 18)); | |
165 p[1] = (0x80 | ((c >> 12) & 0x3F)); | |
166 p[2] = (0x80 | ((c >> 6) & 0x3F)); | |
167 p[3] = (0x80 | (c & 0x3F)); | |
168 bytes = 4; | |
169 } | |
89181
be75d5934738
(char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents:
89054
diff
changeset
|
170 else if (c <= MAX_5_BYTE_CHAR) |
88363 | 171 { |
172 p[0] = 0xF8; | |
173 p[1] = (0x80 | ((c >> 18) & 0x0F)); | |
174 p[2] = (0x80 | ((c >> 12) & 0x3F)); | |
175 p[3] = (0x80 | ((c >> 6) & 0x3F)); | |
176 p[4] = (0x80 | (c & 0x3F)); | |
177 bytes = 5; | |
178 } | |
90797
b74794d7f11a
(char_string): Type of arg C changed to unsigned.
Kenichi Handa <handa@m17n.org>
parents:
90761
diff
changeset
|
179 else if (c <= MAX_CHAR) |
89181
be75d5934738
(char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents:
89054
diff
changeset
|
180 { |
be75d5934738
(char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents:
89054
diff
changeset
|
181 c = CHAR_TO_BYTE8 (c); |
be75d5934738
(char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents:
89054
diff
changeset
|
182 bytes = BYTE8_STRING (c, p); |
be75d5934738
(char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents:
89054
diff
changeset
|
183 } |
90797
b74794d7f11a
(char_string): Type of arg C changed to unsigned.
Kenichi Handa <handa@m17n.org>
parents:
90761
diff
changeset
|
184 else |
b74794d7f11a
(char_string): Type of arg C changed to unsigned.
Kenichi Handa <handa@m17n.org>
parents:
90761
diff
changeset
|
185 error ("Invalid character: %d", c); |
88427
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
186 |
88363 | 187 return bytes; |
188 } | |
189 | |
190 | |
89888 | 191 /* Return a character whose multibyte form is at P. Set LEN is not |
192 NULL, it must be a pointer to integer. In that case, set *LEN to | |
193 the byte length of the multibyte form. If ADVANCED is not NULL, is | |
194 must be a pointer to unsigned char. In that case, set *ADVANCED to | |
195 the ending address (i.e. the starting address of the next | |
196 character) of the multibyte form. */ | |
197 | |
88363 | 198 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
199 string_char (const unsigned char *p, const unsigned char **advanced, int *len) |
88363 | 200 { |
88427
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
201 int c; |
88878
a0ae1a5876c7
(Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88853
diff
changeset
|
202 const unsigned char *saved_p = p; |
88363 | 203 |
204 if (*p < 0x80 || ! (*p & 0x20) || ! (*p & 0x10)) | |
205 { | |
206 c = STRING_CHAR_ADVANCE (p); | |
207 } | |
208 else if (! (*p & 0x08)) | |
209 { | |
210 c = ((((p)[0] & 0xF) << 18) | |
211 | (((p)[1] & 0x3F) << 12) | |
212 | (((p)[2] & 0x3F) << 6) | |
213 | ((p)[3] & 0x3F)); | |
214 p += 4; | |
215 } | |
216 else | |
217 { | |
218 c = ((((p)[1] & 0x3F) << 18) | |
219 | (((p)[2] & 0x3F) << 12) | |
220 | (((p)[3] & 0x3F) << 6) | |
221 | ((p)[4] & 0x3F)); | |
222 p += 5; | |
223 } | |
224 | |
225 MAYBE_UNIFY_CHAR (c); | |
226 | |
227 if (len) | |
228 *len = p - saved_p; | |
229 if (advanced) | |
230 *advanced = p; | |
231 return c; | |
232 } | |
233 | |
234 | |
235 /* Translate character C by translation table TABLE. If C is | |
236 negative, translate a character specified by CHARSET and CODE. If | |
237 no translation is found in TABLE, return the untranslated | |
89757
482c15940000
(translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents:
89538
diff
changeset
|
238 character. If TABLE is a list, elements are char tables. In this |
482c15940000
(translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents:
89538
diff
changeset
|
239 case, translace C by all tables. */ |
88363 | 240 |
241 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
242 translate_char (Lisp_Object table, int c) |
88363 | 243 { |
89757
482c15940000
(translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents:
89538
diff
changeset
|
244 if (CHAR_TABLE_P (table)) |
482c15940000
(translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents:
89538
diff
changeset
|
245 { |
482c15940000
(translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents:
89538
diff
changeset
|
246 Lisp_Object ch; |
88363 | 247 |
89757
482c15940000
(translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents:
89538
diff
changeset
|
248 ch = CHAR_TABLE_REF (table, c); |
482c15940000
(translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents:
89538
diff
changeset
|
249 if (CHARACTERP (ch)) |
482c15940000
(translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents:
89538
diff
changeset
|
250 c = XINT (ch); |
482c15940000
(translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents:
89538
diff
changeset
|
251 } |
482c15940000
(translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents:
89538
diff
changeset
|
252 else |
482c15940000
(translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents:
89538
diff
changeset
|
253 { |
482c15940000
(translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents:
89538
diff
changeset
|
254 for (; CONSP (table); table = XCDR (table)) |
482c15940000
(translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents:
89538
diff
changeset
|
255 c = translate_char (XCAR (table), c); |
482c15940000
(translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents:
89538
diff
changeset
|
256 } |
482c15940000
(translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents:
89538
diff
changeset
|
257 return c; |
88363 | 258 } |
259 | |
103740
1896419e9422
(unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
101818
diff
changeset
|
260 /* Convert ASCII or 8-bit character C to unibyte. If C is none of |
1896419e9422
(unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
101818
diff
changeset
|
261 them, return (C & 0xFF). |
88363 | 262 |
263 The argument REV_TBL is now ignored. It will be removed in the | |
264 future. */ | |
265 | |
266 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
267 multibyte_char_to_unibyte (int c, Lisp_Object rev_tbl) |
88363 | 268 { |
103740
1896419e9422
(unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
101818
diff
changeset
|
269 if (c < 0x80) |
1896419e9422
(unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
101818
diff
changeset
|
270 return c; |
89054
8a6da305ac40
(unibyte_to_multibyte_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
89029
diff
changeset
|
271 if (CHAR_BYTE8_P (c)) |
8a6da305ac40
(unibyte_to_multibyte_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
89029
diff
changeset
|
272 return CHAR_TO_BYTE8 (c); |
103740
1896419e9422
(unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
101818
diff
changeset
|
273 return (c & 0xFF); |
88363 | 274 } |
275 | |
90761
2951f3d44eba
(multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents:
90424
diff
changeset
|
276 /* Like multibyte_char_to_unibyte, but return -1 if C is not supported |
2951f3d44eba
(multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents:
90424
diff
changeset
|
277 by charset_unibyte. */ |
2951f3d44eba
(multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents:
90424
diff
changeset
|
278 |
2951f3d44eba
(multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents:
90424
diff
changeset
|
279 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
280 multibyte_char_to_unibyte_safe (int c) |
90761
2951f3d44eba
(multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents:
90424
diff
changeset
|
281 { |
103740
1896419e9422
(unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
101818
diff
changeset
|
282 if (c < 0x80) |
1896419e9422
(unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
101818
diff
changeset
|
283 return c; |
90761
2951f3d44eba
(multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents:
90424
diff
changeset
|
284 if (CHAR_BYTE8_P (c)) |
2951f3d44eba
(multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents:
90424
diff
changeset
|
285 return CHAR_TO_BYTE8 (c); |
103740
1896419e9422
(unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
101818
diff
changeset
|
286 return -1; |
90761
2951f3d44eba
(multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents:
90424
diff
changeset
|
287 } |
88363 | 288 |
289 DEFUN ("characterp", Fcharacterp, Scharacterp, 1, 2, 0, | |
290 doc: /* Return non-nil if OBJECT is a character. */) | |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
291 (Lisp_Object object, Lisp_Object ignore) |
88363 | 292 { |
293 return (CHARACTERP (object) ? Qt : Qnil); | |
294 } | |
295 | |
296 DEFUN ("max-char", Fmax_char, Smax_char, 0, 0, 0, | |
297 doc: /* Return the character of the maximum code. */) | |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
298 (void) |
88363 | 299 { |
300 return make_number (MAX_CHAR); | |
301 } | |
302 | |
303 DEFUN ("unibyte-char-to-multibyte", Funibyte_char_to_multibyte, | |
304 Sunibyte_char_to_multibyte, 1, 1, 0, | |
94146
096ad76b9ccf
(Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94114
diff
changeset
|
305 doc: /* Convert the byte CH to multibyte character. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
306 (Lisp_Object ch) |
88363 | 307 { |
308 int c; | |
309 | |
310 CHECK_CHARACTER (ch); | |
311 c = XFASTINT (ch); | |
103740
1896419e9422
(unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
101818
diff
changeset
|
312 if (c >= 0x100) |
1896419e9422
(unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
101818
diff
changeset
|
313 error ("Not a unibyte character: %d", c); |
105661
bac26aa40069
Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103740
diff
changeset
|
314 MAKE_CHAR_MULTIBYTE (c); |
88363 | 315 return make_number (c); |
316 } | |
317 | |
318 DEFUN ("multibyte-char-to-unibyte", Fmultibyte_char_to_unibyte, | |
319 Smultibyte_char_to_unibyte, 1, 1, 0, | |
94146
096ad76b9ccf
(Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94114
diff
changeset
|
320 doc: /* Convert the multibyte character CH to a byte. |
096ad76b9ccf
(Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94114
diff
changeset
|
321 If the multibyte character does not represent a byte, return -1. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
322 (Lisp_Object ch) |
88363 | 323 { |
94146
096ad76b9ccf
(Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94114
diff
changeset
|
324 int cm; |
88363 | 325 |
326 CHECK_CHARACTER (ch); | |
94146
096ad76b9ccf
(Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94114
diff
changeset
|
327 cm = XFASTINT (ch); |
096ad76b9ccf
(Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94114
diff
changeset
|
328 if (cm < 256) |
096ad76b9ccf
(Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94114
diff
changeset
|
329 /* Can't distinguish a byte read from a unibyte buffer from |
096ad76b9ccf
(Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94114
diff
changeset
|
330 a latin1 char, so let's let it slide. */ |
096ad76b9ccf
(Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94114
diff
changeset
|
331 return ch; |
096ad76b9ccf
(Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94114
diff
changeset
|
332 else |
096ad76b9ccf
(Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94114
diff
changeset
|
333 { |
95856
f13a77e0e34f
* character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
334 int cu = CHAR_TO_BYTE_SAFE (cm); |
94146
096ad76b9ccf
(Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94114
diff
changeset
|
335 return make_number (cu); |
096ad76b9ccf
(Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94114
diff
changeset
|
336 } |
88363 | 337 } |
338 | |
339 DEFUN ("char-width", Fchar_width, Schar_width, 1, 1, 0, | |
340 doc: /* Return width of CHAR when displayed in the current buffer. | |
341 The width is measured by how many columns it occupies on the screen. | |
94114
327f7207ff7e
(Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents:
92499
diff
changeset
|
342 Tab is taken to occupy `tab-width' columns. |
327f7207ff7e
(Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents:
92499
diff
changeset
|
343 usage: (char-width CHAR) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
344 (Lisp_Object ch) |
88363 | 345 { |
346 Lisp_Object disp; | |
347 int c, width; | |
348 struct Lisp_Char_Table *dp = buffer_display_table (); | |
349 | |
350 CHECK_CHARACTER (ch); | |
351 c = XINT (ch); | |
352 | |
353 /* Get the way the display table would display it. */ | |
354 disp = dp ? DISP_CHAR_VECTOR (dp, c) : Qnil; | |
355 | |
356 if (VECTORP (disp)) | |
357 width = ASIZE (disp); | |
358 else | |
359 width = CHAR_WIDTH (c); | |
360 | |
361 return make_number (width); | |
362 } | |
363 | |
364 /* Return width of string STR of length LEN when displayed in the | |
365 current buffer. The width is measured by how many columns it | |
366 occupies on the screen. If PRECISION > 0, return the width of | |
367 longest substring that doesn't exceed PRECISION, and set number of | |
368 characters and bytes of the substring in *NCHARS and *NBYTES | |
369 respectively. */ | |
370 | |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
371 EMACS_INT |
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
372 c_string_width (const unsigned char *str, EMACS_INT len, int precision, |
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
373 EMACS_INT *nchars, EMACS_INT *nbytes) |
88363 | 374 { |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
375 EMACS_INT i = 0, i_byte = 0; |
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
376 EMACS_INT width = 0; |
88363 | 377 struct Lisp_Char_Table *dp = buffer_display_table (); |
378 | |
379 while (i_byte < len) | |
380 { | |
381 int bytes, thiswidth; | |
382 Lisp_Object val; | |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
383 int c = STRING_CHAR_AND_LENGTH (str + i_byte, bytes); |
88363 | 384 |
385 if (dp) | |
386 { | |
387 val = DISP_CHAR_VECTOR (dp, c); | |
388 if (VECTORP (val)) | |
389 thiswidth = XVECTOR (val)->size; | |
390 else | |
391 thiswidth = CHAR_WIDTH (c); | |
392 } | |
393 else | |
394 { | |
395 thiswidth = CHAR_WIDTH (c); | |
396 } | |
397 | |
398 if (precision > 0 | |
399 && (width + thiswidth > precision)) | |
400 { | |
401 *nchars = i; | |
402 *nbytes = i_byte; | |
403 return width; | |
404 } | |
405 i++; | |
406 i_byte += bytes; | |
407 width += thiswidth; | |
408 } | |
409 | |
410 if (precision > 0) | |
411 { | |
412 *nchars = i; | |
413 *nbytes = i_byte; | |
414 } | |
415 | |
416 return width; | |
417 } | |
418 | |
88427
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
419 /* Return width of string STR of length LEN when displayed in the |
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
420 current buffer. The width is measured by how many columns it |
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
421 occupies on the screen. */ |
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
422 |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
423 EMACS_INT |
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
424 strwidth (const unsigned char *str, EMACS_INT len) |
88427
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
425 { |
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
426 return c_string_width (str, len, -1, NULL, NULL); |
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
427 } |
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
428 |
88363 | 429 /* Return width of Lisp string STRING when displayed in the current |
430 buffer. The width is measured by how many columns it occupies on | |
431 the screen while paying attention to compositions. If PRECISION > | |
432 0, return the width of longest substring that doesn't exceed | |
433 PRECISION, and set number of characters and bytes of the substring | |
434 in *NCHARS and *NBYTES respectively. */ | |
435 | |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
436 EMACS_INT |
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
437 lisp_string_width (Lisp_Object string, int precision, |
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
438 EMACS_INT *nchars, EMACS_INT *nbytes) |
88363 | 439 { |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
440 EMACS_INT len = SCHARS (string); |
90256
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
441 /* This set multibyte to 0 even if STRING is multibyte when it |
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
442 contains only ascii and eight-bit-graphic, but that's |
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
443 intentional. */ |
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
444 int multibyte = len < SBYTES (string); |
89483 | 445 unsigned char *str = SDATA (string); |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
446 EMACS_INT i = 0, i_byte = 0; |
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
447 EMACS_INT width = 0; |
88363 | 448 struct Lisp_Char_Table *dp = buffer_display_table (); |
449 | |
450 while (i < len) | |
451 { | |
452 int chars, bytes, thiswidth; | |
453 Lisp_Object val; | |
454 int cmp_id; | |
89511
bae1254b8517
(lisp_string_width): Make ignore and end EMACS_INT.
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
455 EMACS_INT ignore, end; |
88363 | 456 |
457 if (find_composition (i, -1, &ignore, &end, &val, string) | |
458 && ((cmp_id = get_composition_id (i, i_byte, end - i, val, string)) | |
459 >= 0)) | |
460 { | |
461 thiswidth = composition_table[cmp_id]->width; | |
462 chars = end - i; | |
463 bytes = string_char_to_byte (string, end) - i_byte; | |
464 } | |
465 else | |
466 { | |
90256
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
467 int c; |
88363 | 468 |
90256
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
469 if (multibyte) |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
470 c = STRING_CHAR_AND_LENGTH (str + i_byte, bytes); |
90256
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
471 else |
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
472 c = str[i_byte], bytes = 1; |
88363 | 473 chars = 1; |
90256
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
474 if (dp) |
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
475 { |
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
476 val = DISP_CHAR_VECTOR (dp, c); |
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
477 if (VECTORP (val)) |
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
478 thiswidth = XVECTOR (val)->size; |
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
479 else |
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
480 thiswidth = CHAR_WIDTH (c); |
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
481 } |
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
482 else |
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
483 { |
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
484 thiswidth = CHAR_WIDTH (c); |
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
485 } |
88363 | 486 } |
487 | |
488 if (precision > 0 | |
489 && (width + thiswidth > precision)) | |
490 { | |
491 *nchars = i; | |
492 *nbytes = i_byte; | |
493 return width; | |
494 } | |
495 i += chars; | |
496 i_byte += bytes; | |
497 width += thiswidth; | |
498 } | |
499 | |
500 if (precision > 0) | |
501 { | |
502 *nchars = i; | |
503 *nbytes = i_byte; | |
504 } | |
505 | |
506 return width; | |
507 } | |
508 | |
509 DEFUN ("string-width", Fstring_width, Sstring_width, 1, 1, 0, | |
510 doc: /* Return width of STRING when displayed in the current buffer. | |
511 Width is measured by how many columns it occupies on the screen. | |
512 When calculating width of a multibyte character in STRING, | |
513 only the base leading-code is considered; the validity of | |
514 the following bytes is not checked. Tabs in STRING are always | |
94114
327f7207ff7e
(Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents:
92499
diff
changeset
|
515 taken to occupy `tab-width' columns. |
327f7207ff7e
(Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents:
92499
diff
changeset
|
516 usage: (string-width STRING) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
517 (Lisp_Object str) |
88363 | 518 { |
519 Lisp_Object val; | |
520 | |
521 CHECK_STRING (str); | |
522 XSETFASTINT (val, lisp_string_width (str, -1, NULL, NULL)); | |
523 return val; | |
524 } | |
525 | |
526 DEFUN ("char-direction", Fchar_direction, Schar_direction, 1, 1, 0, | |
527 doc: /* Return the direction of CHAR. | |
94114
327f7207ff7e
(Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents:
92499
diff
changeset
|
528 The returned value is 0 for left-to-right and 1 for right-to-left. |
327f7207ff7e
(Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents:
92499
diff
changeset
|
529 usage: (char-direction CHAR) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
530 (Lisp_Object ch) |
88363 | 531 { |
532 int c; | |
533 | |
534 CHECK_CHARACTER (ch); | |
535 c = XINT (ch); | |
536 return CHAR_TABLE_REF (Vchar_direction_table, c); | |
537 } | |
538 | |
539 /* Return the number of characters in the NBYTES bytes at PTR. | |
540 This works by looking at the contents and checking for multibyte | |
541 sequences while assuming that there's no invalid sequence. | |
542 However, if the current buffer has enable-multibyte-characters = | |
543 nil, we treat each byte as a character. */ | |
544 | |
91807
507bcfb4342c
* coding.c (coding_set_destination): Use BEG_BYTE rather than hardcoding 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91443
diff
changeset
|
545 EMACS_INT |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
546 chars_in_text (const unsigned char *ptr, EMACS_INT nbytes) |
88363 | 547 { |
548 /* current_buffer is null at early stages of Emacs initialization. */ | |
549 if (current_buffer == 0 | |
550 || NILP (current_buffer->enable_multibyte_characters)) | |
551 return nbytes; | |
552 | |
553 return multibyte_chars_in_text (ptr, nbytes); | |
554 } | |
555 | |
556 /* Return the number of characters in the NBYTES bytes at PTR. | |
557 This works by looking at the contents and checking for multibyte | |
558 sequences while assuming that there's no invalid sequence. It | |
559 ignores enable-multibyte-characters. */ | |
560 | |
91807
507bcfb4342c
* coding.c (coding_set_destination): Use BEG_BYTE rather than hardcoding 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91443
diff
changeset
|
561 EMACS_INT |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
562 multibyte_chars_in_text (const unsigned char *ptr, EMACS_INT nbytes) |
88363 | 563 { |
89483 | 564 const unsigned char *endp = ptr + nbytes; |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
565 EMACS_INT chars = 0; |
88363 | 566 |
567 while (ptr < endp) | |
568 { | |
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
569 EMACS_INT len = MULTIBYTE_LENGTH (ptr, endp); |
88363 | 570 |
571 if (len == 0) | |
572 abort (); | |
573 ptr += len; | |
574 chars++; | |
575 } | |
576 | |
577 return chars; | |
578 } | |
579 | |
580 /* Parse unibyte text at STR of LEN bytes as a multibyte text, count | |
581 characters and bytes in it, and store them in *NCHARS and *NBYTES | |
582 respectively. On counting bytes, pay attention to that 8-bit | |
583 characters not constructing a valid multibyte sequence are | |
584 represented by 2-byte in a multibyte text. */ | |
585 | |
586 void | |
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
587 parse_str_as_multibyte (const unsigned char *str, EMACS_INT len, |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
588 EMACS_INT *nchars, EMACS_INT *nbytes) |
88363 | 589 { |
89483 | 590 const unsigned char *endp = str + len; |
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
591 EMACS_INT n, chars = 0, bytes = 0; |
88363 | 592 |
593 if (len >= MAX_MULTIBYTE_LENGTH) | |
594 { | |
89483 | 595 const unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH; |
88363 | 596 while (str < adjusted_endp) |
597 { | |
107314
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
598 if (! CHAR_BYTE8_HEAD_P (*str) |
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
599 && (n = MULTIBYTE_LENGTH_NO_CHECK (str)) > 0) |
88363 | 600 str += n, bytes += n; |
601 else | |
602 str++, bytes += 2; | |
603 chars++; | |
604 } | |
605 } | |
606 while (str < endp) | |
607 { | |
107314
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
608 if (! CHAR_BYTE8_HEAD_P (*str) |
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
609 && (n = MULTIBYTE_LENGTH (str, endp)) > 0) |
88363 | 610 str += n, bytes += n; |
611 else | |
612 str++, bytes += 2; | |
613 chars++; | |
614 } | |
615 | |
616 *nchars = chars; | |
617 *nbytes = bytes; | |
618 return; | |
619 } | |
620 | |
621 /* Arrange unibyte text at STR of NBYTES bytes as a multibyte text. | |
622 It actually converts only such 8-bit characters that don't contruct | |
623 a multibyte sequence to multibyte forms of Latin-1 characters. If | |
624 NCHARS is nonzero, set *NCHARS to the number of characters in the | |
625 text. It is assured that we can use LEN bytes at STR as a work | |
626 area and that is enough. Return the number of bytes of the | |
627 resulting text. */ | |
628 | |
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
629 EMACS_INT |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
630 str_as_multibyte (unsigned char *str, EMACS_INT len, EMACS_INT nbytes, |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
631 EMACS_INT *nchars) |
88363 | 632 { |
633 unsigned char *p = str, *endp = str + nbytes; | |
634 unsigned char *to; | |
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
635 EMACS_INT chars = 0; |
88363 | 636 int n; |
637 | |
638 if (nbytes >= MAX_MULTIBYTE_LENGTH) | |
639 { | |
640 unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH; | |
641 while (p < adjusted_endp | |
107314
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
642 && ! CHAR_BYTE8_HEAD_P (*p) |
88363 | 643 && (n = MULTIBYTE_LENGTH_NO_CHECK (p)) > 0) |
644 p += n, chars++; | |
645 } | |
107314
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
646 while (p < endp |
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
647 && ! CHAR_BYTE8_HEAD_P (*p) |
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
648 && (n = MULTIBYTE_LENGTH (p, endp)) > 0) |
88363 | 649 p += n, chars++; |
650 if (nchars) | |
651 *nchars = chars; | |
652 if (p == endp) | |
653 return nbytes; | |
654 | |
655 to = p; | |
656 nbytes = endp - p; | |
657 endp = str + len; | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
658 memmove (endp - nbytes, p, nbytes); |
88363 | 659 p = endp - nbytes; |
660 | |
661 if (nbytes >= MAX_MULTIBYTE_LENGTH) | |
662 { | |
663 unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH; | |
664 while (p < adjusted_endp) | |
665 { | |
107314
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
666 if (! CHAR_BYTE8_HEAD_P (*p) |
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
667 && (n = MULTIBYTE_LENGTH_NO_CHECK (p)) > 0) |
88363 | 668 { |
669 while (n--) | |
670 *to++ = *p++; | |
671 } | |
672 else | |
673 { | |
674 int c = *p++; | |
675 c = BYTE8_TO_CHAR (c); | |
676 to += CHAR_STRING (c, to); | |
677 } | |
678 } | |
679 chars++; | |
680 } | |
681 while (p < endp) | |
682 { | |
107314
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
683 if (! CHAR_BYTE8_HEAD_P (*p) |
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
684 && (n = MULTIBYTE_LENGTH (p, endp)) > 0) |
88363 | 685 { |
686 while (n--) | |
687 *to++ = *p++; | |
89483 | 688 } |
88363 | 689 else |
690 { | |
691 int c = *p++; | |
692 c = BYTE8_TO_CHAR (c); | |
693 to += CHAR_STRING (c, to); | |
694 } | |
695 chars++; | |
696 } | |
697 if (nchars) | |
698 *nchars = chars; | |
699 return (to - str); | |
700 } | |
701 | |
702 /* Parse unibyte string at STR of LEN bytes, and return the number of | |
703 bytes it may ocupy when converted to multibyte string by | |
704 `str_to_multibyte'. */ | |
705 | |
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
706 EMACS_INT |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
707 parse_str_to_multibyte (const unsigned char *str, EMACS_INT len) |
88363 | 708 { |
109555
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109179
diff
changeset
|
709 const unsigned char *endp = str + len; |
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
710 EMACS_INT bytes; |
88363 | 711 |
712 for (bytes = 0; str < endp; str++) | |
713 bytes += (*str < 0x80) ? 1 : 2; | |
714 return bytes; | |
715 } | |
716 | |
717 | |
718 /* Convert unibyte text at STR of NBYTES bytes to a multibyte text | |
719 that contains the same single-byte characters. It actually | |
720 converts all 8-bit characters to multibyte forms. It is assured | |
721 that we can use LEN bytes at STR as a work area and that is | |
722 enough. */ | |
723 | |
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
724 EMACS_INT |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
725 str_to_multibyte (unsigned char *str, EMACS_INT len, EMACS_INT bytes) |
88363 | 726 { |
727 unsigned char *p = str, *endp = str + bytes; | |
728 unsigned char *to; | |
729 | |
730 while (p < endp && *p < 0x80) p++; | |
731 if (p == endp) | |
732 return bytes; | |
733 to = p; | |
734 bytes = endp - p; | |
735 endp = str + len; | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
736 memmove (endp - bytes, p, bytes); |
88363 | 737 p = endp - bytes; |
89483 | 738 while (p < endp) |
88363 | 739 { |
740 int c = *p++; | |
741 | |
742 if (c >= 0x80) | |
743 c = BYTE8_TO_CHAR (c); | |
744 to += CHAR_STRING (c, to); | |
745 } | |
746 return (to - str); | |
747 } | |
748 | |
749 /* Arrange multibyte text at STR of LEN bytes as a unibyte text. It | |
750 actually converts characters in the range 0x80..0xFF to | |
751 unibyte. */ | |
752 | |
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
753 EMACS_INT |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
754 str_as_unibyte (unsigned char *str, EMACS_INT bytes) |
88363 | 755 { |
88878
a0ae1a5876c7
(Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88853
diff
changeset
|
756 const unsigned char *p = str, *endp = str + bytes; |
a0ae1a5876c7
(Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88853
diff
changeset
|
757 unsigned char *to; |
88363 | 758 int c, len; |
759 | |
760 while (p < endp) | |
761 { | |
762 c = *p; | |
763 len = BYTES_BY_CHAR_HEAD (c); | |
764 if (CHAR_BYTE8_HEAD_P (c)) | |
765 break; | |
766 p += len; | |
767 } | |
88878
a0ae1a5876c7
(Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88853
diff
changeset
|
768 to = str + (p - str); |
89483 | 769 while (p < endp) |
88363 | 770 { |
771 c = *p; | |
772 len = BYTES_BY_CHAR_HEAD (c); | |
773 if (CHAR_BYTE8_HEAD_P (c)) | |
774 { | |
775 c = STRING_CHAR_ADVANCE (p); | |
776 *to++ = CHAR_TO_BYTE8 (c); | |
777 } | |
778 else | |
779 { | |
780 while (len--) *to++ = *p++; | |
781 } | |
782 } | |
783 return (to - str); | |
784 } | |
785 | |
96249
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
786 /* Convert eight-bit chars in SRC (in multibyte form) to the |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
787 corresponding byte and store in DST. CHARS is the number of |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
788 characters in SRC. The value is the number of bytes stored in DST. |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
789 Usually, the value is the same as CHARS, but is less than it if SRC |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
790 contains a non-ASCII, non-eight-bit characater. If ACCEPT_LATIN_1 |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
791 is nonzero, a Latin-1 character is accepted and converted to a byte |
96501
919775e9f3bf
(str_to_unibyte): Modify the comment.
Kenichi Handa <handa@m17n.org>
parents:
96249
diff
changeset
|
792 of that character code. |
919775e9f3bf
(str_to_unibyte): Modify the comment.
Kenichi Handa <handa@m17n.org>
parents:
96249
diff
changeset
|
793 Note: Currently the arg ACCEPT_LATIN_1 is not used. */ |
96249
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
794 |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
795 EMACS_INT |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
796 str_to_unibyte (const unsigned char *src, unsigned char *dst, EMACS_INT chars, int accept_latin_1) |
96249
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
797 { |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
798 EMACS_INT i; |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
799 |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
800 for (i = 0; i < chars; i++) |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
801 { |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
802 int c = STRING_CHAR_ADVANCE (src); |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
803 |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
804 if (CHAR_BYTE8_P (c)) |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
805 c = CHAR_TO_BYTE8 (c); |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
806 else if (! ASCII_CHAR_P (c) |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
807 && (! accept_latin_1 || c >= 0x100)) |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
808 return i; |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
809 *dst++ = c; |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
810 } |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
811 return i; |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
812 } |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
813 |
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
814 |
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
815 EMACS_INT |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
816 string_count_byte8 (Lisp_Object string) |
88363 | 817 { |
818 int multibyte = STRING_MULTIBYTE (string); | |
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
819 EMACS_INT nbytes = SBYTES (string); |
89483 | 820 unsigned char *p = SDATA (string); |
88363 | 821 unsigned char *pend = p + nbytes; |
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
822 EMACS_INT count = 0; |
88363 | 823 int c, len; |
824 | |
825 if (multibyte) | |
826 while (p < pend) | |
827 { | |
828 c = *p; | |
829 len = BYTES_BY_CHAR_HEAD (c); | |
830 | |
831 if (CHAR_BYTE8_HEAD_P (c)) | |
832 count++; | |
833 p += len; | |
834 } | |
835 else | |
836 while (p < pend) | |
837 { | |
838 if (*p++ >= 0x80) | |
839 count++; | |
840 } | |
841 return count; | |
842 } | |
843 | |
844 | |
845 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
846 string_escape_byte8 (Lisp_Object string) |
88363 | 847 { |
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
848 EMACS_INT nchars = SCHARS (string); |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
849 EMACS_INT nbytes = SBYTES (string); |
88363 | 850 int multibyte = STRING_MULTIBYTE (string); |
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
851 EMACS_INT byte8_count; |
88878
a0ae1a5876c7
(Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88853
diff
changeset
|
852 const unsigned char *src, *src_end; |
a0ae1a5876c7
(Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88853
diff
changeset
|
853 unsigned char *dst; |
88363 | 854 Lisp_Object val; |
855 int c, len; | |
856 | |
857 if (multibyte && nchars == nbytes) | |
858 return string; | |
859 | |
860 byte8_count = string_count_byte8 (string); | |
861 | |
862 if (byte8_count == 0) | |
863 return string; | |
864 | |
865 if (multibyte) | |
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
866 { |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
867 if ((MOST_POSITIVE_FIXNUM - nchars) / 3 < byte8_count |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
868 || (MOST_POSITIVE_FIXNUM - nbytes) / 2 < byte8_count) |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
869 error ("Maximum string size exceeded"); |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
870 |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
871 /* Convert 2-byte sequence of byte8 chars to 4-byte octal. */ |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
872 val = make_uninit_multibyte_string (nchars + byte8_count * 3, |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
873 nbytes + byte8_count * 2); |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
874 } |
88363 | 875 else |
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
876 { |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
877 if ((MOST_POSITIVE_FIXNUM - nchars) / 3 < byte8_count) |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
878 error ("Maximum string size exceeded"); |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
879 /* Convert 1-byte sequence of byte8 chars to 4-byte octal. */ |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
880 val = make_uninit_string (nbytes + byte8_count * 3); |
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
881 } |
88363 | 882 |
89483 | 883 src = SDATA (string); |
88363 | 884 src_end = src + nbytes; |
89483 | 885 dst = SDATA (val); |
88363 | 886 if (multibyte) |
887 while (src < src_end) | |
888 { | |
889 c = *src; | |
890 len = BYTES_BY_CHAR_HEAD (c); | |
891 | |
892 if (CHAR_BYTE8_HEAD_P (c)) | |
893 { | |
894 c = STRING_CHAR_ADVANCE (src); | |
895 c = CHAR_TO_BYTE8 (c); | |
88427
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
896 sprintf ((char *) dst, "\\%03o", c); |
88363 | 897 dst += 4; |
898 } | |
899 else | |
900 while (len--) *dst++ = *src++; | |
901 } | |
902 else | |
903 while (src < src_end) | |
904 { | |
905 c = *src++; | |
906 if (c >= 0x80) | |
907 { | |
88427
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
908 sprintf ((char *) dst, "\\%03o", c); |
88363 | 909 dst += 4; |
910 } | |
911 else | |
912 *dst++ = c; | |
913 } | |
914 return val; | |
915 } | |
916 | |
917 | |
89483 | 918 DEFUN ("string", Fstring, Sstring, 0, MANY, 0, |
88363 | 919 doc: /* |
88640 | 920 Concatenate all the argument characters and make the result a string. |
921 usage: (string &rest CHARACTERS) */) | |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
922 (int n, Lisp_Object *args) |
88363 | 923 { |
108650
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
924 int i, c; |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
925 unsigned char *buf, *p; |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
926 Lisp_Object str; |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
927 USE_SAFE_ALLOCA; |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
928 |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
929 SAFE_ALLOCA (buf, unsigned char *, MAX_MULTIBYTE_LENGTH * n); |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
930 p = buf; |
88363 | 931 |
932 for (i = 0; i < n; i++) | |
933 { | |
934 CHECK_CHARACTER (args[i]); | |
935 c = XINT (args[i]); | |
936 p += CHAR_STRING (c, p); | |
937 } | |
938 | |
108650
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
939 str = make_string_from_bytes ((char *) buf, n, p - buf); |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
940 SAFE_FREE (); |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
941 return str; |
88363 | 942 } |
943 | |
90841
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
944 DEFUN ("unibyte-string", Funibyte_string, Sunibyte_string, 0, MANY, 0, |
90942
ba60bd18bc0b
(Funibyte_string): Add "usage: ..." to the docstring.
Kenichi Handa <handa@m17n.org>
parents:
90841
diff
changeset
|
945 doc: /* Concatenate all the argument bytes and make the result a unibyte string. |
ba60bd18bc0b
(Funibyte_string): Add "usage: ..." to the docstring.
Kenichi Handa <handa@m17n.org>
parents:
90841
diff
changeset
|
946 usage: (unibyte-string &rest BYTES) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
947 (int n, Lisp_Object *args) |
90841
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
948 { |
108650
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
949 int i, c; |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
950 unsigned char *buf, *p; |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
951 Lisp_Object str; |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
952 USE_SAFE_ALLOCA; |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
953 |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
954 SAFE_ALLOCA (buf, unsigned char *, n); |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
955 p = buf; |
90841
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
956 |
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
957 for (i = 0; i < n; i++) |
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
958 { |
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
959 CHECK_NATNUM (args[i]); |
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
960 c = XFASTINT (args[i]); |
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
961 if (c >= 256) |
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
962 args_out_of_range_3 (args[i], make_number (0), make_number (255)); |
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
963 *p++ = c; |
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
964 } |
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
965 |
108650
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
966 str = make_string_from_bytes ((char *) buf, n, p - buf); |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
967 SAFE_FREE (); |
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
968 return str; |
90841
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
969 } |
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
970 |
98380
c3d306455ee9
(Fchar_resolve_modifiers): Rewrite Elisp function
Martin Rudalics <rudalics@gmx.at>
parents:
97907
diff
changeset
|
971 DEFUN ("char-resolve-modifiers", Fchar_resolve_modifiers, |
92494
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
972 Schar_resolve_modifiers, 1, 1, 0, |
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
973 doc: /* Resolve modifiers in the character CHAR. |
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
974 The value is a character with modifiers resolved into the character |
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
975 code. Unresolved modifiers are kept in the value. |
98380
c3d306455ee9
(Fchar_resolve_modifiers): Rewrite Elisp function
Martin Rudalics <rudalics@gmx.at>
parents:
97907
diff
changeset
|
976 usage: (char-resolve-modifiers CHAR) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
977 (Lisp_Object character) |
92494
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
978 { |
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
979 int c; |
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
980 |
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
981 CHECK_NUMBER (character); |
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
982 c = XINT (character); |
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
983 return make_number (char_resolve_modifier_mask (c)); |
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
984 } |
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
985 |
99453
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
986 DEFUN ("get-byte", Fget_byte, Sget_byte, 0, 2, 0, |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
987 doc: /* Return a byte value of a character at point. |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
988 Optional 1st arg POSITION, if non-nil, is a position of a character to get |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
989 a byte value. |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
990 Optional 2nd arg STRING, if non-nil, is a string of which first |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
991 character is a target to get a byte value. In this case, POSITION, if |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
992 non-nil, is an index of a target character in the string. |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
993 |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
994 If the current buffer (or STRING) is multibyte, and the target |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
995 character is not ASCII nor 8-bit character, an error is signalled. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
996 (Lisp_Object position, Lisp_Object string) |
99453
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
997 { |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
998 int c; |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
999 EMACS_INT pos; |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1000 unsigned char *p; |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1001 |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1002 if (NILP (string)) |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1003 { |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1004 if (NILP (position)) |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1005 { |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1006 p = PT_ADDR; |
101818
86b3f8ddbaee
* character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents:
101805
diff
changeset
|
1007 } |
99453
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1008 else |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1009 { |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1010 CHECK_NUMBER_COERCE_MARKER (position); |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1011 if (XINT (position) < BEGV || XINT (position) >= ZV) |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1012 args_out_of_range_3 (position, make_number (BEGV), make_number (ZV)); |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1013 pos = XFASTINT (position); |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1014 p = CHAR_POS_ADDR (pos); |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1015 } |
99475
98e08333a580
(Fget_byte): Fix and make it faster for unibyte target.
Kenichi Handa <handa@m17n.org>
parents:
99453
diff
changeset
|
1016 if (NILP (current_buffer->enable_multibyte_characters)) |
98e08333a580
(Fget_byte): Fix and make it faster for unibyte target.
Kenichi Handa <handa@m17n.org>
parents:
99453
diff
changeset
|
1017 return make_number (*p); |
99453
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1018 } |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1019 else |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1020 { |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1021 CHECK_STRING (string); |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1022 if (NILP (position)) |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1023 { |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1024 p = SDATA (string); |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1025 } |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1026 else |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1027 { |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1028 CHECK_NATNUM (position); |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1029 if (XINT (position) >= SCHARS (string)) |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1030 args_out_of_range (string, position); |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1031 pos = XFASTINT (position); |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1032 p = SDATA (string) + string_char_to_byte (string, pos); |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1033 } |
99475
98e08333a580
(Fget_byte): Fix and make it faster for unibyte target.
Kenichi Handa <handa@m17n.org>
parents:
99453
diff
changeset
|
1034 if (! STRING_MULTIBYTE (string)) |
98e08333a580
(Fget_byte): Fix and make it faster for unibyte target.
Kenichi Handa <handa@m17n.org>
parents:
99453
diff
changeset
|
1035 return make_number (*p); |
99453
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1036 } |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
1037 c = STRING_CHAR (p); |
99453
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1038 if (CHAR_BYTE8_P (c)) |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1039 c = CHAR_TO_BYTE8 (c); |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1040 else if (! ASCII_CHAR_P (c)) |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1041 error ("Not an ASCII nor an 8-bit character: %d", c); |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1042 return make_number (c); |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1043 } |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1044 |
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1045 |
88363 | 1046 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
1047 init_character_once (void) |
88363 | 1048 { |
1049 } | |
1050 | |
1051 #ifdef emacs | |
1052 | |
1053 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
1054 syms_of_character (void) |
88363 | 1055 { |
1056 DEFSYM (Qcharacterp, "characterp"); | |
1057 DEFSYM (Qauto_fill_chars, "auto-fill-chars"); | |
1058 | |
1059 staticpro (&Vchar_unify_table); | |
1060 Vchar_unify_table = Qnil; | |
1061 | |
1062 defsubr (&Smax_char); | |
1063 defsubr (&Scharacterp); | |
1064 defsubr (&Sunibyte_char_to_multibyte); | |
1065 defsubr (&Smultibyte_char_to_unibyte); | |
1066 defsubr (&Schar_width); | |
1067 defsubr (&Sstring_width); | |
1068 defsubr (&Schar_direction); | |
1069 defsubr (&Sstring); | |
90841
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
1070 defsubr (&Sunibyte_string); |
92494
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
1071 defsubr (&Schar_resolve_modifiers); |
99453
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1072 defsubr (&Sget_byte); |
88363 | 1073 |
1074 DEFVAR_LISP ("translation-table-vector", &Vtranslation_table_vector, | |
1075 doc: /* | |
88926
f026b7e4fc61
(syms_of_character) <translation-table-vector>: Doc
Dave Love <fx@gnu.org>
parents:
88913
diff
changeset
|
1076 Vector recording all translation tables ever defined. |
f026b7e4fc61
(syms_of_character) <translation-table-vector>: Doc
Dave Love <fx@gnu.org>
parents:
88913
diff
changeset
|
1077 Each element is a pair (SYMBOL . TABLE) relating the table to the |
f026b7e4fc61
(syms_of_character) <translation-table-vector>: Doc
Dave Love <fx@gnu.org>
parents:
88913
diff
changeset
|
1078 symbol naming it. The ID of a translation table is an index into this vector. */); |
88363 | 1079 Vtranslation_table_vector = Fmake_vector (make_number (16), Qnil); |
1080 | |
1081 DEFVAR_LISP ("auto-fill-chars", &Vauto_fill_chars, | |
1082 doc: /* | |
1083 A char-table for characters which invoke auto-filling. | |
1084 Such characters have value t in this table. */); | |
1085 Vauto_fill_chars = Fmake_char_table (Qauto_fill_chars, Qnil); | |
88853
503c60238368
(syms_of_character): Fix CHAR_TABLE_SET call.
Dave Love <fx@gnu.org>
parents:
88743
diff
changeset
|
1086 CHAR_TABLE_SET (Vauto_fill_chars, ' ', Qt); |
503c60238368
(syms_of_character): Fix CHAR_TABLE_SET call.
Dave Love <fx@gnu.org>
parents:
88743
diff
changeset
|
1087 CHAR_TABLE_SET (Vauto_fill_chars, '\n', Qt); |
88363 | 1088 |
1089 DEFVAR_LISP ("char-width-table", &Vchar_width_table, | |
1090 doc: /* | |
1091 A char-table for width (columns) of each character. */); | |
1092 Vchar_width_table = Fmake_char_table (Qnil, make_number (1)); | |
88743
4570f1a4c391
(syms_of_character): Setup Vchar_width_table for
Kenichi Handa <handa@m17n.org>
parents:
88716
diff
changeset
|
1093 char_table_set_range (Vchar_width_table, 0x80, 0x9F, make_number (4)); |
4570f1a4c391
(syms_of_character): Setup Vchar_width_table for
Kenichi Handa <handa@m17n.org>
parents:
88716
diff
changeset
|
1094 char_table_set_range (Vchar_width_table, MAX_5_BYTE_CHAR + 1, MAX_CHAR, |
4570f1a4c391
(syms_of_character): Setup Vchar_width_table for
Kenichi Handa <handa@m17n.org>
parents:
88716
diff
changeset
|
1095 make_number (4)); |
88363 | 1096 |
1097 DEFVAR_LISP ("char-direction-table", &Vchar_direction_table, | |
1098 doc: /* A char-table for direction of each character. */); | |
1099 Vchar_direction_table = Fmake_char_table (Qnil, make_number (1)); | |
1100 | |
1101 DEFVAR_LISP ("printable-chars", &Vprintable_chars, | |
1102 doc: /* A char-table for each printable character. */); | |
88716
f617b1bf301b
(syms_of_character): Set the default value of
Kenichi Handa <handa@m17n.org>
parents:
88640
diff
changeset
|
1103 Vprintable_chars = Fmake_char_table (Qnil, Qnil); |
89029
ad8f56efa7c6
(syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents:
89020
diff
changeset
|
1104 Fset_char_table_range (Vprintable_chars, |
ad8f56efa7c6
(syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents:
89020
diff
changeset
|
1105 Fcons (make_number (32), make_number (126)), Qt); |
ad8f56efa7c6
(syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents:
89020
diff
changeset
|
1106 Fset_char_table_range (Vprintable_chars, |
ad8f56efa7c6
(syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents:
89020
diff
changeset
|
1107 Fcons (make_number (160), |
ad8f56efa7c6
(syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents:
89020
diff
changeset
|
1108 make_number (MAX_5_BYTE_CHAR)), Qt); |
88878
a0ae1a5876c7
(Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88853
diff
changeset
|
1109 |
88913
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1110 DEFVAR_LISP ("char-script-table", &Vchar_script_table, |
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1111 doc: /* Char table of script symbols. |
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1112 It has one extra slot whose value is a list of script symbols. */); |
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1113 |
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1114 /* Intern this now in case it isn't already done. |
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1115 Setting this variable twice is harmless. |
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1116 But don't staticpro it here--that is done in alloc.c. */ |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105688
diff
changeset
|
1117 Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots"); |
88913
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1118 DEFSYM (Qchar_script_table, "char-script-table"); |
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1119 Fput (Qchar_script_table, Qchar_table_extra_slots, make_number (1)); |
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1120 Vchar_script_table = Fmake_char_table (Qchar_script_table, Qnil); |
90403
81f1bbab281f
(Vscript_representative_chars): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90256
diff
changeset
|
1121 |
81f1bbab281f
(Vscript_representative_chars): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90256
diff
changeset
|
1122 DEFVAR_LISP ("script-representative-chars", &Vscript_representative_chars, |
97907
3a2d65dc9abc
(syms_of_character): Docstring of script-representative-chars fixed.
Kenichi Handa <handa@m17n.org>
parents:
97816
diff
changeset
|
1123 doc: /* Alist of scripts vs the representative characters. |
101805
b416b80570f8
(Vscript_representative_chars): Docstring modified.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1124 Each element is a cons (SCRIPT . CHARS). |
101818
86b3f8ddbaee
* character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents:
101805
diff
changeset
|
1125 SCRIPT is a symbol representing a script or a subgroup of a script. |
97907
3a2d65dc9abc
(syms_of_character): Docstring of script-representative-chars fixed.
Kenichi Handa <handa@m17n.org>
parents:
97816
diff
changeset
|
1126 CHARS is a list or a vector of characters. |
99079
ffe8b1e92732
* character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents:
98380
diff
changeset
|
1127 If it is a list, all characters in the list are necessary for supporting SCRIPT. |
97907
3a2d65dc9abc
(syms_of_character): Docstring of script-representative-chars fixed.
Kenichi Handa <handa@m17n.org>
parents:
97816
diff
changeset
|
1128 If it is a vector, one of the characters in the vector is necessary. |
3a2d65dc9abc
(syms_of_character): Docstring of script-representative-chars fixed.
Kenichi Handa <handa@m17n.org>
parents:
97816
diff
changeset
|
1129 This variable is used to find a font for a specific script. */); |
90403
81f1bbab281f
(Vscript_representative_chars): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90256
diff
changeset
|
1130 Vscript_representative_chars = Qnil; |
97816
9999d9194509
(Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
96501
diff
changeset
|
1131 |
9999d9194509
(Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
96501
diff
changeset
|
1132 DEFVAR_LISP ("unicode-category-table", &Vunicode_category_table, |
9999d9194509
(Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
96501
diff
changeset
|
1133 doc: /* Char table of Unicode's "General Category". |
99079
ffe8b1e92732
* character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents:
98380
diff
changeset
|
1134 All Unicode characters have one of the following values (symbol): |
ffe8b1e92732
* character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents:
98380
diff
changeset
|
1135 Lu, Ll, Lt, Lm, Lo, Mn, Mc, Me, Nd, Nl, No, Pc, Pd, Ps, Pe, Pi, Pf, Po, |
97816
9999d9194509
(Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
96501
diff
changeset
|
1136 Sm, Sc, Sk, So, Zs, Zl, Zp, Cc, Cf, Cs, Co, Cn |
9999d9194509
(Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
96501
diff
changeset
|
1137 See The Unicode Standard for the meaning of those values. */); |
9999d9194509
(Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
96501
diff
changeset
|
1138 /* The correct char-table is setup in characters.el. */ |
9999d9194509
(Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
96501
diff
changeset
|
1139 Vunicode_category_table = Qnil; |
88363 | 1140 } |
1141 | |
1142 #endif /* emacs */ | |
89911 | 1143 |
1144 /* arch-tag: b6665960-3c3d-4184-85cd-af4318197999 | |
1145 (do not change this comment) */ |