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