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