Mercurial > emacs
annotate src/character.c @ 110504:0fdd992ff057
Fix more uses of int instead of EMACS_INT.
xdisp.c (check_point_in_composition, reconsider_clip_changes):
Use EMACS_INT for buffer position variables and arguments.
composite.c (get_composition_id, find_composition)
(run_composition_function, compose_text)
(composition_gstring_width, autocmp_chars)
(composition_update_it, Ffind_composition_internal): Use EMACS_INT
for buffer positions and string length variables and arguments.
composite.h (get_composition_id, find_composition, compose_text)
(composition_gstring_width): Adjust prototypes.
editfns.c (Fformat): Use EMACS_INT for string size variables.
xdisp.c (store_mode_line_noprop, display_mode_element): Use
EMACS_INT for string positions.
intervals.c (get_property_and_range): Use EMACS_INT for buffer
position arguments.
intervals.h (get_property_and_range): Adjust prototype.
character.c (parse_str_as_multibyte, str_as_multibyte)
(parse_str_to_multibyte, str_to_multibyte, str_as_unibyte)
(string_count_byte8, string_escape_byte8, c_string_width)
(strwidth, lisp_string_width, multibyte_chars_in_text): Use
EMACS_INT for string length variables and arguments.
(string_escape_byte8): Protect against too long strings.
character.h (parse_str_as_multibyte, str_as_multibyte)
(parse_str_to_multibyte, str_to_multibyte, str_as_unibyte)
(c_string_width, strwidth, lisp_string_width): Adjust
prototypes.
lisp.h (check_point_in_composition): Adjust prototype.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Thu, 23 Sep 2010 10:32:38 -0400 |
| parents | fda36a325177 |
| children | 515d80e174ba |
| 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-bytes", Fchar_bytes, Schar_bytes, 1, 1, 0, | |
| 340 doc: /* Return 1 regardless of the argument CHAR. | |
|
94114
327f7207ff7e
(Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents:
92499
diff
changeset
|
341 This is now an obsolete function. We keep it just for backward compatibility. |
|
327f7207ff7e
(Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents:
92499
diff
changeset
|
342 usage: (char-bytes CHAR) */) |
|
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
343 (Lisp_Object ch) |
| 88363 | 344 { |
| 345 CHECK_CHARACTER (ch); | |
| 346 return make_number (1); | |
| 347 } | |
| 348 | |
| 349 DEFUN ("char-width", Fchar_width, Schar_width, 1, 1, 0, | |
| 350 doc: /* Return width of CHAR when displayed in the current buffer. | |
| 351 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
|
352 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
|
353 usage: (char-width CHAR) */) |
|
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
354 (Lisp_Object ch) |
| 88363 | 355 { |
| 356 Lisp_Object disp; | |
| 357 int c, width; | |
| 358 struct Lisp_Char_Table *dp = buffer_display_table (); | |
| 359 | |
| 360 CHECK_CHARACTER (ch); | |
| 361 c = XINT (ch); | |
| 362 | |
| 363 /* Get the way the display table would display it. */ | |
| 364 disp = dp ? DISP_CHAR_VECTOR (dp, c) : Qnil; | |
| 365 | |
| 366 if (VECTORP (disp)) | |
| 367 width = ASIZE (disp); | |
| 368 else | |
| 369 width = CHAR_WIDTH (c); | |
| 370 | |
| 371 return make_number (width); | |
| 372 } | |
| 373 | |
| 374 /* Return width of string STR of length LEN when displayed in the | |
| 375 current buffer. The width is measured by how many columns it | |
| 376 occupies on the screen. If PRECISION > 0, return the width of | |
| 377 longest substring that doesn't exceed PRECISION, and set number of | |
| 378 characters and bytes of the substring in *NCHARS and *NBYTES | |
| 379 respectively. */ | |
| 380 | |
|
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
381 EMACS_INT |
|
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
382 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
|
383 EMACS_INT *nchars, EMACS_INT *nbytes) |
| 88363 | 384 { |
|
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
385 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
|
386 EMACS_INT width = 0; |
| 88363 | 387 struct Lisp_Char_Table *dp = buffer_display_table (); |
| 388 | |
| 389 while (i_byte < len) | |
| 390 { | |
| 391 int bytes, thiswidth; | |
| 392 Lisp_Object val; | |
|
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
393 int c = STRING_CHAR_AND_LENGTH (str + i_byte, bytes); |
| 88363 | 394 |
| 395 if (dp) | |
| 396 { | |
| 397 val = DISP_CHAR_VECTOR (dp, c); | |
| 398 if (VECTORP (val)) | |
| 399 thiswidth = XVECTOR (val)->size; | |
| 400 else | |
| 401 thiswidth = CHAR_WIDTH (c); | |
| 402 } | |
| 403 else | |
| 404 { | |
| 405 thiswidth = CHAR_WIDTH (c); | |
| 406 } | |
| 407 | |
| 408 if (precision > 0 | |
| 409 && (width + thiswidth > precision)) | |
| 410 { | |
| 411 *nchars = i; | |
| 412 *nbytes = i_byte; | |
| 413 return width; | |
| 414 } | |
| 415 i++; | |
| 416 i_byte += bytes; | |
| 417 width += thiswidth; | |
| 418 } | |
| 419 | |
| 420 if (precision > 0) | |
| 421 { | |
| 422 *nchars = i; | |
| 423 *nbytes = i_byte; | |
| 424 } | |
| 425 | |
| 426 return width; | |
| 427 } | |
| 428 | |
|
88427
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
429 /* 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
|
430 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
|
431 occupies on the screen. */ |
|
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
432 |
|
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
433 EMACS_INT |
|
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
434 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
|
435 { |
|
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
436 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
|
437 } |
|
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
438 |
| 88363 | 439 /* Return width of Lisp string STRING when displayed in the current |
| 440 buffer. The width is measured by how many columns it occupies on | |
| 441 the screen while paying attention to compositions. If PRECISION > | |
| 442 0, return the width of longest substring that doesn't exceed | |
| 443 PRECISION, and set number of characters and bytes of the substring | |
| 444 in *NCHARS and *NBYTES respectively. */ | |
| 445 | |
|
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
446 EMACS_INT |
|
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
447 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
|
448 EMACS_INT *nchars, EMACS_INT *nbytes) |
| 88363 | 449 { |
|
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
450 EMACS_INT len = SCHARS (string); |
|
90256
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
451 /* 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
|
452 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
|
453 intentional. */ |
|
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
454 int multibyte = len < SBYTES (string); |
| 89483 | 455 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
|
456 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
|
457 EMACS_INT width = 0; |
| 88363 | 458 struct Lisp_Char_Table *dp = buffer_display_table (); |
| 459 | |
| 460 while (i < len) | |
| 461 { | |
| 462 int chars, bytes, thiswidth; | |
| 463 Lisp_Object val; | |
| 464 int cmp_id; | |
|
89511
bae1254b8517
(lisp_string_width): Make ignore and end EMACS_INT.
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
465 EMACS_INT ignore, end; |
| 88363 | 466 |
| 467 if (find_composition (i, -1, &ignore, &end, &val, string) | |
| 468 && ((cmp_id = get_composition_id (i, i_byte, end - i, val, string)) | |
| 469 >= 0)) | |
| 470 { | |
| 471 thiswidth = composition_table[cmp_id]->width; | |
| 472 chars = end - i; | |
| 473 bytes = string_char_to_byte (string, end) - i_byte; | |
| 474 } | |
| 475 else | |
| 476 { | |
|
90256
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
477 int c; |
| 88363 | 478 |
|
90256
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
479 if (multibyte) |
|
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
480 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
|
481 else |
|
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
482 c = str[i_byte], bytes = 1; |
| 88363 | 483 chars = 1; |
|
90256
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
484 if (dp) |
|
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
485 { |
|
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
486 val = DISP_CHAR_VECTOR (dp, c); |
|
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
487 if (VECTORP (val)) |
|
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
488 thiswidth = XVECTOR (val)->size; |
|
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
489 else |
|
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
490 thiswidth = CHAR_WIDTH (c); |
|
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
491 } |
|
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
492 else |
|
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
493 { |
|
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
494 thiswidth = CHAR_WIDTH (c); |
|
d4755c5aa57d
(lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents:
90159
diff
changeset
|
495 } |
| 88363 | 496 } |
| 497 | |
| 498 if (precision > 0 | |
| 499 && (width + thiswidth > precision)) | |
| 500 { | |
| 501 *nchars = i; | |
| 502 *nbytes = i_byte; | |
| 503 return width; | |
| 504 } | |
| 505 i += chars; | |
| 506 i_byte += bytes; | |
| 507 width += thiswidth; | |
| 508 } | |
| 509 | |
| 510 if (precision > 0) | |
| 511 { | |
| 512 *nchars = i; | |
| 513 *nbytes = i_byte; | |
| 514 } | |
| 515 | |
| 516 return width; | |
| 517 } | |
| 518 | |
| 519 DEFUN ("string-width", Fstring_width, Sstring_width, 1, 1, 0, | |
| 520 doc: /* Return width of STRING when displayed in the current buffer. | |
| 521 Width is measured by how many columns it occupies on the screen. | |
| 522 When calculating width of a multibyte character in STRING, | |
| 523 only the base leading-code is considered; the validity of | |
| 524 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
|
525 taken to occupy `tab-width' columns. |
|
327f7207ff7e
(Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents:
92499
diff
changeset
|
526 usage: (string-width STRING) */) |
|
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
527 (Lisp_Object str) |
| 88363 | 528 { |
| 529 Lisp_Object val; | |
| 530 | |
| 531 CHECK_STRING (str); | |
| 532 XSETFASTINT (val, lisp_string_width (str, -1, NULL, NULL)); | |
| 533 return val; | |
| 534 } | |
| 535 | |
| 536 DEFUN ("char-direction", Fchar_direction, Schar_direction, 1, 1, 0, | |
| 537 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
|
538 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
|
539 usage: (char-direction CHAR) */) |
|
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
540 (Lisp_Object ch) |
| 88363 | 541 { |
| 542 int c; | |
| 543 | |
| 544 CHECK_CHARACTER (ch); | |
| 545 c = XINT (ch); | |
| 546 return CHAR_TABLE_REF (Vchar_direction_table, c); | |
| 547 } | |
| 548 | |
| 549 /* Return the number of characters in the NBYTES bytes at PTR. | |
| 550 This works by looking at the contents and checking for multibyte | |
| 551 sequences while assuming that there's no invalid sequence. | |
| 552 However, if the current buffer has enable-multibyte-characters = | |
| 553 nil, we treat each byte as a character. */ | |
| 554 | |
|
91807
507bcfb4342c
* coding.c (coding_set_destination): Use BEG_BYTE rather than hardcoding 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91443
diff
changeset
|
555 EMACS_INT |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
556 chars_in_text (const unsigned char *ptr, EMACS_INT nbytes) |
| 88363 | 557 { |
| 558 /* current_buffer is null at early stages of Emacs initialization. */ | |
| 559 if (current_buffer == 0 | |
| 560 || NILP (current_buffer->enable_multibyte_characters)) | |
| 561 return nbytes; | |
| 562 | |
| 563 return multibyte_chars_in_text (ptr, nbytes); | |
| 564 } | |
| 565 | |
| 566 /* Return the number of characters in the NBYTES bytes at PTR. | |
| 567 This works by looking at the contents and checking for multibyte | |
| 568 sequences while assuming that there's no invalid sequence. It | |
| 569 ignores enable-multibyte-characters. */ | |
| 570 | |
|
91807
507bcfb4342c
* coding.c (coding_set_destination): Use BEG_BYTE rather than hardcoding 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91443
diff
changeset
|
571 EMACS_INT |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
572 multibyte_chars_in_text (const unsigned char *ptr, EMACS_INT nbytes) |
| 88363 | 573 { |
| 89483 | 574 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
|
575 EMACS_INT chars = 0; |
| 88363 | 576 |
| 577 while (ptr < endp) | |
| 578 { | |
|
110504
0fdd992ff057
Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
110503
diff
changeset
|
579 EMACS_INT len = MULTIBYTE_LENGTH (ptr, endp); |
| 88363 | 580 |
| 581 if (len == 0) | |
| 582 abort (); | |
| 583 ptr += len; | |
| 584 chars++; | |
| 585 } | |
| 586 | |
| 587 return chars; | |
| 588 } | |
| 589 | |
| 590 /* Parse unibyte text at STR of LEN bytes as a multibyte text, count | |
| 591 characters and bytes in it, and store them in *NCHARS and *NBYTES | |
| 592 respectively. On counting bytes, pay attention to that 8-bit | |
| 593 characters not constructing a valid multibyte sequence are | |
| 594 represented by 2-byte in a multibyte text. */ | |
| 595 | |
| 596 void | |
|
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
597 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
|
598 EMACS_INT *nchars, EMACS_INT *nbytes) |
| 88363 | 599 { |
| 89483 | 600 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
|
601 EMACS_INT n, chars = 0, bytes = 0; |
| 88363 | 602 |
| 603 if (len >= MAX_MULTIBYTE_LENGTH) | |
| 604 { | |
| 89483 | 605 const unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH; |
| 88363 | 606 while (str < adjusted_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_NO_CHECK (str)) > 0) |
| 88363 | 610 str += n, bytes += n; |
| 611 else | |
| 612 str++, bytes += 2; | |
| 613 chars++; | |
| 614 } | |
| 615 } | |
| 616 while (str < endp) | |
| 617 { | |
|
107314
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
618 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
|
619 && (n = MULTIBYTE_LENGTH (str, endp)) > 0) |
| 88363 | 620 str += n, bytes += n; |
| 621 else | |
| 622 str++, bytes += 2; | |
| 623 chars++; | |
| 624 } | |
| 625 | |
| 626 *nchars = chars; | |
| 627 *nbytes = bytes; | |
| 628 return; | |
| 629 } | |
| 630 | |
| 631 /* Arrange unibyte text at STR of NBYTES bytes as a multibyte text. | |
| 632 It actually converts only such 8-bit characters that don't contruct | |
| 633 a multibyte sequence to multibyte forms of Latin-1 characters. If | |
| 634 NCHARS is nonzero, set *NCHARS to the number of characters in the | |
| 635 text. It is assured that we can use LEN bytes at STR as a work | |
| 636 area and that is enough. Return the number of bytes of the | |
| 637 resulting text. */ | |
| 638 | |
|
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
639 EMACS_INT |
|
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
640 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
|
641 EMACS_INT *nchars) |
| 88363 | 642 { |
| 643 unsigned char *p = str, *endp = str + nbytes; | |
| 644 unsigned char *to; | |
|
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
645 EMACS_INT chars = 0; |
| 88363 | 646 int n; |
| 647 | |
| 648 if (nbytes >= MAX_MULTIBYTE_LENGTH) | |
| 649 { | |
| 650 unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH; | |
| 651 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
|
652 && ! CHAR_BYTE8_HEAD_P (*p) |
| 88363 | 653 && (n = MULTIBYTE_LENGTH_NO_CHECK (p)) > 0) |
| 654 p += n, chars++; | |
| 655 } | |
|
107314
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
656 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
|
657 && ! 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
|
658 && (n = MULTIBYTE_LENGTH (p, endp)) > 0) |
| 88363 | 659 p += n, chars++; |
| 660 if (nchars) | |
| 661 *nchars = chars; | |
| 662 if (p == endp) | |
| 663 return nbytes; | |
| 664 | |
| 665 to = p; | |
| 666 nbytes = endp - p; | |
| 667 endp = str + len; | |
|
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
668 memmove (endp - nbytes, p, nbytes); |
| 88363 | 669 p = endp - nbytes; |
| 670 | |
| 671 if (nbytes >= MAX_MULTIBYTE_LENGTH) | |
| 672 { | |
| 673 unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH; | |
| 674 while (p < adjusted_endp) | |
| 675 { | |
|
107314
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
676 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
|
677 && (n = MULTIBYTE_LENGTH_NO_CHECK (p)) > 0) |
| 88363 | 678 { |
| 679 while (n--) | |
| 680 *to++ = *p++; | |
| 681 } | |
| 682 else | |
| 683 { | |
| 684 int c = *p++; | |
| 685 c = BYTE8_TO_CHAR (c); | |
| 686 to += CHAR_STRING (c, to); | |
| 687 } | |
| 688 } | |
| 689 chars++; | |
| 690 } | |
| 691 while (p < endp) | |
| 692 { | |
|
107314
5e25c4602dd4
Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
106815
diff
changeset
|
693 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
|
694 && (n = MULTIBYTE_LENGTH (p, endp)) > 0) |
| 88363 | 695 { |
| 696 while (n--) | |
| 697 *to++ = *p++; | |
| 89483 | 698 } |
| 88363 | 699 else |
| 700 { | |
| 701 int c = *p++; | |
| 702 c = BYTE8_TO_CHAR (c); | |
| 703 to += CHAR_STRING (c, to); | |
| 704 } | |
| 705 chars++; | |
| 706 } | |
| 707 if (nchars) | |
| 708 *nchars = chars; | |
| 709 return (to - str); | |
| 710 } | |
| 711 | |
| 712 /* Parse unibyte string at STR of LEN bytes, and return the number of | |
| 713 bytes it may ocupy when converted to multibyte string by | |
| 714 `str_to_multibyte'. */ | |
| 715 | |
|
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
716 EMACS_INT |
|
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
717 parse_str_to_multibyte (const unsigned char *str, EMACS_INT len) |
| 88363 | 718 { |
|
109555
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109179
diff
changeset
|
719 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
|
720 EMACS_INT bytes; |
| 88363 | 721 |
| 722 for (bytes = 0; str < endp; str++) | |
| 723 bytes += (*str < 0x80) ? 1 : 2; | |
| 724 return bytes; | |
| 725 } | |
| 726 | |
| 727 | |
| 728 /* Convert unibyte text at STR of NBYTES bytes to a multibyte text | |
| 729 that contains the same single-byte characters. It actually | |
| 730 converts all 8-bit characters to multibyte forms. It is assured | |
| 731 that we can use LEN bytes at STR as a work area and that is | |
| 732 enough. */ | |
| 733 | |
|
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
734 EMACS_INT |
|
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
735 str_to_multibyte (unsigned char *str, EMACS_INT len, EMACS_INT bytes) |
| 88363 | 736 { |
| 737 unsigned char *p = str, *endp = str + bytes; | |
| 738 unsigned char *to; | |
| 739 | |
| 740 while (p < endp && *p < 0x80) p++; | |
| 741 if (p == endp) | |
| 742 return bytes; | |
| 743 to = p; | |
| 744 bytes = endp - p; | |
| 745 endp = str + len; | |
|
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
746 memmove (endp - bytes, p, bytes); |
| 88363 | 747 p = endp - bytes; |
| 89483 | 748 while (p < endp) |
| 88363 | 749 { |
| 750 int c = *p++; | |
| 751 | |
| 752 if (c >= 0x80) | |
| 753 c = BYTE8_TO_CHAR (c); | |
| 754 to += CHAR_STRING (c, to); | |
| 755 } | |
| 756 return (to - str); | |
| 757 } | |
| 758 | |
| 759 /* Arrange multibyte text at STR of LEN bytes as a unibyte text. It | |
| 760 actually converts characters in the range 0x80..0xFF to | |
| 761 unibyte. */ | |
| 762 | |
|
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
763 EMACS_INT |
|
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
764 str_as_unibyte (unsigned char *str, EMACS_INT bytes) |
| 88363 | 765 { |
|
88878
a0ae1a5876c7
(Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88853
diff
changeset
|
766 const unsigned char *p = str, *endp = str + bytes; |
|
a0ae1a5876c7
(Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88853
diff
changeset
|
767 unsigned char *to; |
| 88363 | 768 int c, len; |
| 769 | |
| 770 while (p < endp) | |
| 771 { | |
| 772 c = *p; | |
| 773 len = BYTES_BY_CHAR_HEAD (c); | |
| 774 if (CHAR_BYTE8_HEAD_P (c)) | |
| 775 break; | |
| 776 p += len; | |
| 777 } | |
|
88878
a0ae1a5876c7
(Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88853
diff
changeset
|
778 to = str + (p - str); |
| 89483 | 779 while (p < endp) |
| 88363 | 780 { |
| 781 c = *p; | |
| 782 len = BYTES_BY_CHAR_HEAD (c); | |
| 783 if (CHAR_BYTE8_HEAD_P (c)) | |
| 784 { | |
| 785 c = STRING_CHAR_ADVANCE (p); | |
| 786 *to++ = CHAR_TO_BYTE8 (c); | |
| 787 } | |
| 788 else | |
| 789 { | |
| 790 while (len--) *to++ = *p++; | |
| 791 } | |
| 792 } | |
| 793 return (to - str); | |
| 794 } | |
| 795 | |
|
96249
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
796 /* 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
|
797 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
|
798 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
|
799 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
|
800 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
|
801 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
|
802 of that character code. |
|
919775e9f3bf
(str_to_unibyte): Modify the comment.
Kenichi Handa <handa@m17n.org>
parents:
96249
diff
changeset
|
803 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
|
804 |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
805 EMACS_INT |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
806 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
|
807 { |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
808 EMACS_INT i; |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
809 |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
810 for (i = 0; i < chars; i++) |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
811 { |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
812 int c = STRING_CHAR_ADVANCE (src); |
|
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 if (CHAR_BYTE8_P (c)) |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
815 c = CHAR_TO_BYTE8 (c); |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
816 else if (! ASCII_CHAR_P (c) |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
817 && (! accept_latin_1 || c >= 0x100)) |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
818 return i; |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
819 *dst++ = c; |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
820 } |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
821 return i; |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
822 } |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
823 |
|
71c216bc3b71
(str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
95856
diff
changeset
|
824 |
|
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
825 EMACS_INT |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
826 string_count_byte8 (Lisp_Object string) |
| 88363 | 827 { |
| 828 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
|
829 EMACS_INT nbytes = SBYTES (string); |
| 89483 | 830 unsigned char *p = SDATA (string); |
| 88363 | 831 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
|
832 EMACS_INT count = 0; |
| 88363 | 833 int c, len; |
| 834 | |
| 835 if (multibyte) | |
| 836 while (p < pend) | |
| 837 { | |
| 838 c = *p; | |
| 839 len = BYTES_BY_CHAR_HEAD (c); | |
| 840 | |
| 841 if (CHAR_BYTE8_HEAD_P (c)) | |
| 842 count++; | |
| 843 p += len; | |
| 844 } | |
| 845 else | |
| 846 while (p < pend) | |
| 847 { | |
| 848 if (*p++ >= 0x80) | |
| 849 count++; | |
| 850 } | |
| 851 return count; | |
| 852 } | |
| 853 | |
| 854 | |
| 855 Lisp_Object | |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
856 string_escape_byte8 (Lisp_Object string) |
| 88363 | 857 { |
|
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
858 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
|
859 EMACS_INT nbytes = SBYTES (string); |
| 88363 | 860 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
|
861 EMACS_INT byte8_count; |
|
88878
a0ae1a5876c7
(Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88853
diff
changeset
|
862 const unsigned char *src, *src_end; |
|
a0ae1a5876c7
(Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88853
diff
changeset
|
863 unsigned char *dst; |
| 88363 | 864 Lisp_Object val; |
| 865 int c, len; | |
| 866 | |
| 867 if (multibyte && nchars == nbytes) | |
| 868 return string; | |
| 869 | |
| 870 byte8_count = string_count_byte8 (string); | |
| 871 | |
| 872 if (byte8_count == 0) | |
| 873 return string; | |
| 874 | |
| 875 if (multibyte) | |
|
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 || (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
|
879 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
|
880 |
|
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
881 /* 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
|
882 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
|
883 nbytes + byte8_count * 2); |
|
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
884 } |
| 88363 | 885 else |
|
110503
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
886 { |
|
fda36a325177
Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents:
109555
diff
changeset
|
887 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
|
888 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
|
889 /* 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
|
890 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
|
891 } |
| 88363 | 892 |
| 89483 | 893 src = SDATA (string); |
| 88363 | 894 src_end = src + nbytes; |
| 89483 | 895 dst = SDATA (val); |
| 88363 | 896 if (multibyte) |
| 897 while (src < src_end) | |
| 898 { | |
| 899 c = *src; | |
| 900 len = BYTES_BY_CHAR_HEAD (c); | |
| 901 | |
| 902 if (CHAR_BYTE8_HEAD_P (c)) | |
| 903 { | |
| 904 c = STRING_CHAR_ADVANCE (src); | |
| 905 c = CHAR_TO_BYTE8 (c); | |
|
88427
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
906 sprintf ((char *) dst, "\\%03o", c); |
| 88363 | 907 dst += 4; |
| 908 } | |
| 909 else | |
| 910 while (len--) *dst++ = *src++; | |
| 911 } | |
| 912 else | |
| 913 while (src < src_end) | |
| 914 { | |
| 915 c = *src++; | |
| 916 if (c >= 0x80) | |
| 917 { | |
|
88427
1a3aec316071
(c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88363
diff
changeset
|
918 sprintf ((char *) dst, "\\%03o", c); |
| 88363 | 919 dst += 4; |
| 920 } | |
| 921 else | |
| 922 *dst++ = c; | |
| 923 } | |
| 924 return val; | |
| 925 } | |
| 926 | |
| 927 | |
| 89483 | 928 DEFUN ("string", Fstring, Sstring, 0, MANY, 0, |
| 88363 | 929 doc: /* |
| 88640 | 930 Concatenate all the argument characters and make the result a string. |
| 931 usage: (string &rest CHARACTERS) */) | |
|
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
932 (int n, Lisp_Object *args) |
| 88363 | 933 { |
|
108650
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
934 int i, c; |
|
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
935 unsigned char *buf, *p; |
|
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
936 Lisp_Object str; |
|
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
937 USE_SAFE_ALLOCA; |
|
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
938 |
|
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
939 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
|
940 p = buf; |
| 88363 | 941 |
| 942 for (i = 0; i < n; i++) | |
| 943 { | |
| 944 CHECK_CHARACTER (args[i]); | |
| 945 c = XINT (args[i]); | |
| 946 p += CHAR_STRING (c, p); | |
| 947 } | |
| 948 | |
|
108650
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
949 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
|
950 SAFE_FREE (); |
|
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
951 return str; |
| 88363 | 952 } |
| 953 | |
|
90841
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
954 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
|
955 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
|
956 usage: (unibyte-string &rest BYTES) */) |
|
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
957 (int n, Lisp_Object *args) |
|
90841
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
958 { |
|
108650
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
959 int i, c; |
|
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
960 unsigned char *buf, *p; |
|
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
961 Lisp_Object str; |
|
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
962 USE_SAFE_ALLOCA; |
|
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
963 |
|
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
964 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
|
965 p = buf; |
|
90841
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
966 |
|
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
967 for (i = 0; i < n; i++) |
|
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
968 { |
|
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
969 CHECK_NATNUM (args[i]); |
|
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
970 c = XFASTINT (args[i]); |
|
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
971 if (c >= 256) |
|
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
972 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
|
973 *p++ = c; |
|
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
974 } |
|
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
975 |
|
108650
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
976 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
|
977 SAFE_FREE (); |
|
c3fda38a8b8b
* character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents:
107314
diff
changeset
|
978 return str; |
|
90841
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
979 } |
|
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
980 |
|
98380
c3d306455ee9
(Fchar_resolve_modifiers): Rewrite Elisp function
Martin Rudalics <rudalics@gmx.at>
parents:
97907
diff
changeset
|
981 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
|
982 Schar_resolve_modifiers, 1, 1, 0, |
|
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
983 doc: /* Resolve modifiers in the character CHAR. |
|
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
984 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
|
985 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
|
986 usage: (char-resolve-modifiers CHAR) */) |
|
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
987 (Lisp_Object character) |
|
92494
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
988 { |
|
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
989 int c; |
|
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
990 |
|
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
991 CHECK_NUMBER (character); |
|
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
992 c = XINT (character); |
|
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
993 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
|
994 } |
|
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
995 |
|
99453
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
996 DEFUN ("get-byte", Fget_byte, Sget_byte, 0, 2, 0, |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
997 doc: /* Return a byte value of a character at point. |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
998 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
|
999 a byte value. |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1000 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
|
1001 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
|
1002 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
|
1003 |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1004 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
|
1005 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
|
1006 (Lisp_Object position, Lisp_Object string) |
|
99453
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1007 { |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1008 int c; |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1009 EMACS_INT pos; |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1010 unsigned char *p; |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1011 |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1012 if (NILP (string)) |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1013 { |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1014 if (NILP (position)) |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1015 { |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1016 p = PT_ADDR; |
|
101818
86b3f8ddbaee
* character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents:
101805
diff
changeset
|
1017 } |
|
99453
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1018 else |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1019 { |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1020 CHECK_NUMBER_COERCE_MARKER (position); |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1021 if (XINT (position) < BEGV || XINT (position) >= ZV) |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1022 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
|
1023 pos = XFASTINT (position); |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1024 p = CHAR_POS_ADDR (pos); |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1025 } |
|
99475
98e08333a580
(Fget_byte): Fix and make it faster for unibyte target.
Kenichi Handa <handa@m17n.org>
parents:
99453
diff
changeset
|
1026 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
|
1027 return make_number (*p); |
|
99453
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1028 } |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1029 else |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1030 { |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1031 CHECK_STRING (string); |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1032 if (NILP (position)) |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1033 { |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1034 p = SDATA (string); |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1035 } |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1036 else |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1037 { |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1038 CHECK_NATNUM (position); |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1039 if (XINT (position) >= SCHARS (string)) |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1040 args_out_of_range (string, position); |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1041 pos = XFASTINT (position); |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1042 p = SDATA (string) + string_char_to_byte (string, pos); |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1043 } |
|
99475
98e08333a580
(Fget_byte): Fix and make it faster for unibyte target.
Kenichi Handa <handa@m17n.org>
parents:
99453
diff
changeset
|
1044 if (! STRING_MULTIBYTE (string)) |
|
98e08333a580
(Fget_byte): Fix and make it faster for unibyte target.
Kenichi Handa <handa@m17n.org>
parents:
99453
diff
changeset
|
1045 return make_number (*p); |
|
99453
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1046 } |
|
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
1047 c = STRING_CHAR (p); |
|
99453
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1048 if (CHAR_BYTE8_P (c)) |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1049 c = CHAR_TO_BYTE8 (c); |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1050 else if (! ASCII_CHAR_P (c)) |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1051 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
|
1052 return make_number (c); |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1053 } |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1054 |
|
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1055 |
| 88363 | 1056 void |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
1057 init_character_once (void) |
| 88363 | 1058 { |
| 1059 } | |
| 1060 | |
| 1061 #ifdef emacs | |
| 1062 | |
| 1063 void | |
|
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108650
diff
changeset
|
1064 syms_of_character (void) |
| 88363 | 1065 { |
| 1066 DEFSYM (Qcharacterp, "characterp"); | |
| 1067 DEFSYM (Qauto_fill_chars, "auto-fill-chars"); | |
| 1068 | |
| 1069 staticpro (&Vchar_unify_table); | |
| 1070 Vchar_unify_table = Qnil; | |
| 1071 | |
| 1072 defsubr (&Smax_char); | |
| 1073 defsubr (&Scharacterp); | |
| 1074 defsubr (&Sunibyte_char_to_multibyte); | |
| 1075 defsubr (&Smultibyte_char_to_unibyte); | |
| 1076 defsubr (&Schar_bytes); | |
| 1077 defsubr (&Schar_width); | |
| 1078 defsubr (&Sstring_width); | |
| 1079 defsubr (&Schar_direction); | |
| 1080 defsubr (&Sstring); | |
|
90841
fa02baec53ff
(Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents:
90797
diff
changeset
|
1081 defsubr (&Sunibyte_string); |
|
92494
b5a82292599c
(char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents:
92483
diff
changeset
|
1082 defsubr (&Schar_resolve_modifiers); |
|
99453
877b7365b646
(Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents:
99079
diff
changeset
|
1083 defsubr (&Sget_byte); |
| 88363 | 1084 |
| 1085 DEFVAR_LISP ("translation-table-vector", &Vtranslation_table_vector, | |
| 1086 doc: /* | |
|
88926
f026b7e4fc61
(syms_of_character) <translation-table-vector>: Doc
Dave Love <fx@gnu.org>
parents:
88913
diff
changeset
|
1087 Vector recording all translation tables ever defined. |
|
f026b7e4fc61
(syms_of_character) <translation-table-vector>: Doc
Dave Love <fx@gnu.org>
parents:
88913
diff
changeset
|
1088 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
|
1089 symbol naming it. The ID of a translation table is an index into this vector. */); |
| 88363 | 1090 Vtranslation_table_vector = Fmake_vector (make_number (16), Qnil); |
| 1091 | |
| 1092 DEFVAR_LISP ("auto-fill-chars", &Vauto_fill_chars, | |
| 1093 doc: /* | |
| 1094 A char-table for characters which invoke auto-filling. | |
| 1095 Such characters have value t in this table. */); | |
| 1096 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
|
1097 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
|
1098 CHAR_TABLE_SET (Vauto_fill_chars, '\n', Qt); |
| 88363 | 1099 |
| 1100 DEFVAR_LISP ("char-width-table", &Vchar_width_table, | |
| 1101 doc: /* | |
| 1102 A char-table for width (columns) of each character. */); | |
| 1103 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
|
1104 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
|
1105 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
|
1106 make_number (4)); |
| 88363 | 1107 |
| 1108 DEFVAR_LISP ("char-direction-table", &Vchar_direction_table, | |
| 1109 doc: /* A char-table for direction of each character. */); | |
| 1110 Vchar_direction_table = Fmake_char_table (Qnil, make_number (1)); | |
| 1111 | |
| 1112 DEFVAR_LISP ("printable-chars", &Vprintable_chars, | |
| 1113 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
|
1114 Vprintable_chars = Fmake_char_table (Qnil, Qnil); |
|
89029
ad8f56efa7c6
(syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents:
89020
diff
changeset
|
1115 Fset_char_table_range (Vprintable_chars, |
|
ad8f56efa7c6
(syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents:
89020
diff
changeset
|
1116 Fcons (make_number (32), make_number (126)), Qt); |
|
ad8f56efa7c6
(syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents:
89020
diff
changeset
|
1117 Fset_char_table_range (Vprintable_chars, |
|
ad8f56efa7c6
(syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents:
89020
diff
changeset
|
1118 Fcons (make_number (160), |
|
ad8f56efa7c6
(syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents:
89020
diff
changeset
|
1119 make_number (MAX_5_BYTE_CHAR)), Qt); |
|
88878
a0ae1a5876c7
(Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88853
diff
changeset
|
1120 |
|
88913
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1121 DEFVAR_LISP ("char-script-table", &Vchar_script_table, |
|
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1122 doc: /* Char table of script symbols. |
|
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1123 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
|
1124 |
|
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1125 /* 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
|
1126 Setting this variable twice is harmless. |
|
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1127 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
|
1128 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
|
1129 DEFSYM (Qchar_script_table, "char-script-table"); |
|
76074dea1258
(Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents:
88878
diff
changeset
|
1130 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
|
1131 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
|
1132 |
|
81f1bbab281f
(Vscript_representative_chars): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90256
diff
changeset
|
1133 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
|
1134 doc: /* Alist of scripts vs the representative characters. |
|
101805
b416b80570f8
(Vscript_representative_chars): Docstring modified.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
1135 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
|
1136 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
|
1137 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
|
1138 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
|
1139 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
|
1140 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
|
1141 Vscript_representative_chars = Qnil; |
|
97816
9999d9194509
(Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
96501
diff
changeset
|
1142 |
|
9999d9194509
(Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
96501
diff
changeset
|
1143 DEFVAR_LISP ("unicode-category-table", &Vunicode_category_table, |
|
9999d9194509
(Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
96501
diff
changeset
|
1144 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
|
1145 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
|
1146 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
|
1147 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
|
1148 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
|
1149 /* The correct char-table is setup in characters.el. */ |
|
9999d9194509
(Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
96501
diff
changeset
|
1150 Vunicode_category_table = Qnil; |
| 88363 | 1151 } |
| 1152 | |
| 1153 #endif /* emacs */ | |
| 89911 | 1154 |
| 1155 /* arch-tag: b6665960-3c3d-4184-85cd-af4318197999 | |
| 1156 (do not change this comment) */ |
