Mercurial > emacs
annotate src/composite.c @ 94981:e01e37b8203e
(Fnew_fontset): Call font_unparse_xlfd with 256-byte
buffer. Check the return value of it.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Thu, 15 May 2008 00:41:26 +0000 |
parents | 8971ddf55736 |
children | b38a7de9af46 |
rev | line source |
---|---|
26848 | 1 /* Composite sequence support. |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
67658
diff
changeset
|
2 Copyright (C) 2001, 2002, 2003, 2004, 2005, |
79759 | 3 2006, 2007, 2008 Free Software Foundation, Inc. |
4 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 | |
67658 | 5 National Institute of Advanced Industrial Science and Technology (AIST) |
6 Registration Number H14PRO021 | |
90405
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
7 Copyright (C) 2003, 2006 |
88366
97f11940f06a
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41001
diff
changeset
|
8 National Institute of Advanced Industrial Science and Technology (AIST) |
97f11940f06a
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41001
diff
changeset
|
9 Registration Number H13PRO009 |
26848 | 10 |
11 This file is part of GNU Emacs. | |
12 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94922
diff
changeset
|
13 GNU Emacs is free software: you can redistribute it and/or modify |
26848 | 14 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:
94922
diff
changeset
|
15 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:
94922
diff
changeset
|
16 (at your option) any later version. |
26848 | 17 |
18 GNU Emacs is distributed in the hope that it will be useful, | |
19 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 GNU General Public License for more details. | |
22 | |
23 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:
94922
diff
changeset
|
24 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
26848 | 25 |
26 #include <config.h> | |
27 #include "lisp.h" | |
28 #include "buffer.h" | |
88366
97f11940f06a
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41001
diff
changeset
|
29 #include "character.h" |
26848 | 30 #include "intervals.h" |
31 | |
32 /* Emacs uses special text property `composition' to support character | |
33 composition. A sequence of characters that have the same (i.e. eq) | |
34 `composition' property value is treated as a single composite | |
35 sequence (we call it just `composition' here after). Characters in | |
36 a composition are all composed somehow on the screen. | |
37 | |
38 The property value has this form when the composition is made: | |
39 ((LENGTH . COMPONENTS) . MODIFICATION-FUNC) | |
40 then turns to this form: | |
41 (COMPOSITION-ID . (LENGTH COMPONENTS-VEC . MODIFICATION-FUNC)) | |
42 when the composition is registered in composition_hash_table and | |
43 composition_table. These rather peculiar structures were designed | |
44 to make it easy to distinguish them quickly (we can do that by | |
45 checking only the first element) and to extract LENGTH (from the | |
46 former form) and COMPOSITION-ID (from the latter form). | |
47 | |
48 We register a composition when it is displayed, or when the width | |
49 is required (for instance, to calculate columns). | |
50 | |
51 LENGTH -- Length of the composition. This information is used to | |
52 check the validity of the composition. | |
53 | |
54 COMPONENTS -- Character, string, vector, list, or nil. | |
55 | |
56 If it is nil, characters in the text are composed relatively | |
57 according to their metrics in font glyphs. | |
58 | |
59 If it is a character or a string, the character or characters | |
60 in the string are composed relatively. | |
61 | |
62 If it is a vector or list of integers, the element is a | |
63 character or an encoded composition rule. The characters are | |
64 composed according to the rules. (2N)th elements are | |
65 characters to be composed and (2N+1)th elements are | |
66 composition rules to tell how to compose (2N+2)th element with | |
67 the previously composed 2N glyphs. | |
68 | |
69 COMPONENTS-VEC -- Vector of integers. In relative composition, the | |
70 elements are characters to be composed. In rule-base | |
71 composition, the elements are characters or encoded | |
72 composition rules. | |
73 | |
74 MODIFICATION-FUNC -- If non nil, it is a function to call when the | |
75 composition gets invalid after a modification in a buffer. If | |
76 it is nil, a function in `composition-function-table' of the | |
77 first character in the sequence is called. | |
78 | |
79 COMPOSITION-ID --Identification number of the composition. It is | |
80 used as an index to composition_table for the composition. | |
81 | |
82 When Emacs has to display a composition or has to know its | |
83 displaying width, the function get_composition_id is called. It | |
84 returns COMPOSITION-ID so that the caller can access the | |
85 information about the composition through composition_table. If a | |
86 COMPOSITION-ID has not yet been assigned to the composition, | |
87 get_composition_id checks the validity of `composition' property, | |
88 and, if valid, assigns a new ID, registers the information in | |
89 composition_hash_table and composition_table, and changes the form | |
90 of the property value. If the property is invalid, return -1 | |
91 without changing the property value. | |
92 | |
93 We use two tables to keep information about composition; | |
94 composition_hash_table and composition_table. | |
95 | |
96 The former is a hash table in which keys are COMPONENTS-VECs and | |
97 values are the corresponding COMPOSITION-IDs. This hash table is | |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
98 weak, but as each key (COMPONENTS-VEC) is also kept as a value of the |
26848 | 99 `composition' property, it won't be collected as garbage until all |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
100 bits of text that have the same COMPONENTS-VEC are deleted. |
26848 | 101 |
102 The latter is a table of pointers to `struct composition' indexed | |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
103 by COMPOSITION-ID. This structure keeps the other information (see |
26848 | 104 composite.h). |
105 | |
106 In general, a text property holds information about individual | |
107 characters. But, a `composition' property holds information about | |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
108 a sequence of characters (in this sense, it is like the `intangible' |
26848 | 109 property). That means that we should not share the property value |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
110 in adjacent compositions -- we can't distinguish them if they have the |
26848 | 111 same property. So, after any changes, we call |
112 `update_compositions' and change a property of one of adjacent | |
113 compositions to a copy of it. This function also runs a proper | |
114 composition modification function to make a composition that gets | |
115 invalid by the change valid again. | |
116 | |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
117 As the value of the `composition' property holds information about a |
26848 | 118 specific range of text, the value gets invalid if we change the |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
119 text in the range. We treat the `composition' property as always |
26848 | 120 rear-nonsticky (currently by setting default-text-properties to |
121 (rear-nonsticky (composition))) and we never make properties of | |
122 adjacent compositions identical. Thus, any such changes make the | |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
123 range just shorter. So, we can check the validity of the `composition' |
26848 | 124 property by comparing LENGTH information with the actual length of |
125 the composition. | |
126 | |
127 */ | |
128 | |
129 | |
130 Lisp_Object Qcomposition; | |
131 | |
132 /* Table of pointers to the structure `composition' indexed by | |
133 COMPOSITION-ID. This structure is for storing information about | |
134 each composition except for COMPONENTS-VEC. */ | |
135 struct composition **composition_table; | |
136 | |
137 /* The current size of `composition_table'. */ | |
138 static int composition_table_size; | |
139 | |
140 /* Number of compositions currently made. */ | |
141 int n_compositions; | |
142 | |
143 /* Hash table for compositions. The key is COMPONENTS-VEC of | |
144 `composition' property. The value is the corresponding | |
145 COMPOSITION-ID. */ | |
146 Lisp_Object composition_hash_table; | |
147 | |
148 /* Function to call to adjust composition. */ | |
149 Lisp_Object Vcompose_chars_after_function; | |
150 | |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
151 Lisp_Object Qauto_composed; |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
152 Lisp_Object Vauto_composition_function; |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
153 Lisp_Object Qauto_composition_function; |
33240
aaa42106f0da
(Vcomposition_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
30171
diff
changeset
|
154 |
89546
c380df3cc4df
(Fremove_list_of_text_properties): Declare.
Dave Love <fx@gnu.org>
parents:
89509
diff
changeset
|
155 EXFUN (Fremove_list_of_text_properties, 4); |
33240
aaa42106f0da
(Vcomposition_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
30171
diff
changeset
|
156 |
26848 | 157 /* Temporary variable used in macros COMPOSITION_XXX. */ |
158 Lisp_Object composition_temp; | |
90405
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
159 |
26848 | 160 |
161 /* Return COMPOSITION-ID of a composition at buffer position | |
162 CHARPOS/BYTEPOS and length NCHARS. The `composition' property of | |
163 the sequence is PROP. STRING, if non-nil, is a string that | |
164 contains the composition instead of the current buffer. | |
165 | |
166 If the composition is invalid, return -1. */ | |
167 | |
168 int | |
169 get_composition_id (charpos, bytepos, nchars, prop, string) | |
170 int charpos, bytepos, nchars; | |
171 Lisp_Object prop, string; | |
172 { | |
173 Lisp_Object id, length, components, key, *key_contents; | |
174 int glyph_len; | |
175 struct Lisp_Hash_Table *hash_table = XHASH_TABLE (composition_hash_table); | |
176 int hash_index; | |
177 unsigned hash_code; | |
178 struct composition *cmp; | |
179 int i, ch; | |
180 | |
181 /* PROP should be | |
182 Form-A: ((LENGTH . COMPONENTS) . MODIFICATION-FUNC) | |
183 or | |
184 Form-B: (COMPOSITION-ID . (LENGTH COMPONENTS-VEC . MODIFICATION-FUNC)) | |
185 */ | |
186 if (nchars == 0 || !CONSP (prop)) | |
187 goto invalid_composition; | |
188 | |
189 id = XCAR (prop); | |
190 if (INTEGERP (id)) | |
191 { | |
192 /* PROP should be Form-B. */ | |
193 if (XINT (id) < 0 || XINT (id) >= n_compositions) | |
194 goto invalid_composition; | |
195 return XINT (id); | |
196 } | |
197 | |
198 /* PROP should be Form-A. | |
199 Thus, ID should be (LENGTH . COMPONENTS). */ | |
200 if (!CONSP (id)) | |
201 goto invalid_composition; | |
202 length = XCAR (id); | |
203 if (!INTEGERP (length) || XINT (length) != nchars) | |
204 goto invalid_composition; | |
205 | |
206 components = XCDR (id); | |
207 | |
208 /* Check if the same composition has already been registered or not | |
209 by consulting composition_hash_table. The key for this table is | |
210 COMPONENTS (converted to a vector COMPONENTS-VEC) or, if it is | |
211 nil, vector of characters in the composition range. */ | |
212 if (INTEGERP (components)) | |
213 key = Fmake_vector (make_number (1), components); | |
214 else if (STRINGP (components) || CONSP (components)) | |
215 key = Fvconcat (1, &components); | |
216 else if (VECTORP (components)) | |
217 key = components; | |
218 else if (NILP (components)) | |
219 { | |
220 key = Fmake_vector (make_number (nchars), Qnil); | |
221 if (STRINGP (string)) | |
222 for (i = 0; i < nchars; i++) | |
223 { | |
224 FETCH_STRING_CHAR_ADVANCE (ch, string, charpos, bytepos); | |
225 XVECTOR (key)->contents[i] = make_number (ch); | |
226 } | |
227 else | |
228 for (i = 0; i < nchars; i++) | |
229 { | |
230 FETCH_CHAR_ADVANCE (ch, charpos, bytepos); | |
231 XVECTOR (key)->contents[i] = make_number (ch); | |
232 } | |
233 } | |
234 else | |
235 goto invalid_composition; | |
236 | |
237 hash_index = hash_lookup (hash_table, key, &hash_code); | |
238 if (hash_index >= 0) | |
239 { | |
240 /* We have already registered the same composition. Change PROP | |
241 from Form-A above to Form-B while replacing COMPONENTS with | |
242 COMPONENTS-VEC stored in the hash table. We can directly | |
243 modify the cons cell of PROP because it is not shared. */ | |
244 key = HASH_KEY (hash_table, hash_index); | |
245 id = HASH_VALUE (hash_table, hash_index); | |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39046
diff
changeset
|
246 XSETCAR (prop, id); |
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39046
diff
changeset
|
247 XSETCDR (prop, Fcons (make_number (nchars), Fcons (key, XCDR (prop)))); |
26848 | 248 return XINT (id); |
249 } | |
250 | |
251 /* This composition is a new one. We must register it. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49136
diff
changeset
|
252 |
26848 | 253 /* Check if we have sufficient memory to store this information. */ |
254 if (composition_table_size == 0) | |
255 { | |
256 composition_table_size = 256; | |
257 composition_table | |
258 = (struct composition **) xmalloc (sizeof (composition_table[0]) | |
259 * composition_table_size); | |
260 } | |
261 else if (composition_table_size <= n_compositions) | |
262 { | |
263 composition_table_size += 256; | |
264 composition_table | |
265 = (struct composition **) xrealloc (composition_table, | |
266 sizeof (composition_table[0]) | |
267 * composition_table_size); | |
268 } | |
269 | |
270 key_contents = XVECTOR (key)->contents; | |
271 | |
272 /* Check if the contents of COMPONENTS are valid if COMPONENTS is a | |
273 vector or a list. It should be a sequence of: | |
274 char1 rule1 char2 rule2 char3 ... ruleN charN+1 */ | |
90405
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
275 |
94922
181a3677061e
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92028
diff
changeset
|
276 if (VECTORP (components) |
90405
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
277 && ASIZE (components) >= 2 |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
278 && VECTORP (AREF (components, 0))) |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
279 { |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
280 /* COMPONENTS is a glyph-string. */ |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
281 int len = ASIZE (key); |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
282 |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
283 for (i = 1; i < len; i++) |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
284 if (! VECTORP (AREF (key, i))) |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
285 goto invalid_composition; |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
286 } |
94922
181a3677061e
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92028
diff
changeset
|
287 else if (VECTORP (components) || CONSP (components)) |
26848 | 288 { |
289 int len = XVECTOR (key)->size; | |
290 | |
291 /* The number of elements should be odd. */ | |
292 if ((len % 2) == 0) | |
293 goto invalid_composition; | |
294 /* All elements should be integers (character or encoded | |
295 composition rule). */ | |
296 for (i = 0; i < len; i++) | |
297 { | |
298 if (!INTEGERP (key_contents[i])) | |
299 goto invalid_composition; | |
300 } | |
301 } | |
302 | |
303 /* Change PROP from Form-A above to Form-B. We can directly modify | |
304 the cons cell of PROP because it is not shared. */ | |
305 XSETFASTINT (id, n_compositions); | |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39046
diff
changeset
|
306 XSETCAR (prop, id); |
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39046
diff
changeset
|
307 XSETCDR (prop, Fcons (make_number (nchars), Fcons (key, XCDR (prop)))); |
26848 | 308 |
309 /* Register the composition in composition_hash_table. */ | |
310 hash_index = hash_put (hash_table, key, id, hash_code); | |
311 | |
312 /* Register the composition in composition_table. */ | |
313 cmp = (struct composition *) xmalloc (sizeof (struct composition)); | |
314 | |
315 cmp->method = (NILP (components) | |
316 ? COMPOSITION_RELATIVE | |
317 : ((INTEGERP (components) || STRINGP (components)) | |
318 ? COMPOSITION_WITH_ALTCHARS | |
319 : COMPOSITION_WITH_RULE_ALTCHARS)); | |
90405
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
320 if (cmp->method == COMPOSITION_WITH_RULE_ALTCHARS |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
321 && VECTORP (components) |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
322 && ! INTEGERP (AREF (components, 0))) |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
323 cmp->method = COMPOSITION_WITH_GLYPH_STRING; |
26848 | 324 cmp->hash_index = hash_index; |
325 glyph_len = (cmp->method == COMPOSITION_WITH_RULE_ALTCHARS | |
326 ? (XVECTOR (key)->size + 1) / 2 | |
327 : XVECTOR (key)->size); | |
328 cmp->glyph_len = glyph_len; | |
329 cmp->offsets = (short *) xmalloc (sizeof (short) * glyph_len * 2); | |
330 cmp->font = NULL; | |
331 | |
94922
181a3677061e
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92028
diff
changeset
|
332 /* Calculate the width of overall glyphs of the composition. */ |
90405
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
333 if (cmp->method == COMPOSITION_WITH_GLYPH_STRING) |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
334 { |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
335 cmp->width = 1; /* Should be fixed later. */ |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
336 cmp->glyph_len--; |
3dc2ea167caf
(get_composition_id) [USE_FONT_BACKEND]: If
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
337 } |
94922
181a3677061e
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92028
diff
changeset
|
338 else if (cmp->method != COMPOSITION_WITH_RULE_ALTCHARS) |
26848 | 339 { |
340 /* Relative composition. */ | |
341 cmp->width = 0; | |
342 for (i = 0; i < glyph_len; i++) | |
343 { | |
344 int this_width; | |
345 ch = XINT (key_contents[i]); | |
346 this_width = CHAR_WIDTH (ch); | |
347 if (cmp->width < this_width) | |
348 cmp->width = this_width; | |
349 } | |
350 } | |
351 else | |
352 { | |
353 /* Rule-base composition. */ | |
354 float leftmost = 0.0, rightmost; | |
355 | |
356 ch = XINT (key_contents[0]); | |
90618
b7ce72709298
(get_composition_id): Pay attention to TAB
Kenichi Handa <handa@m17n.org>
parents:
90405
diff
changeset
|
357 rightmost = ch != '\t' ? CHAR_WIDTH (ch) : 1; |
26848 | 358 |
359 for (i = 1; i < glyph_len; i += 2) | |
360 { | |
89726
2660b0974edb
(get_composition_id): Handle xoff and yoff in a
Kenichi Handa <handa@m17n.org>
parents:
89706
diff
changeset
|
361 int rule, gref, nref, xoff, yoff; |
26848 | 362 int this_width; |
363 float this_left; | |
364 | |
365 rule = XINT (key_contents[i]); | |
366 ch = XINT (key_contents[i + 1]); | |
90618
b7ce72709298
(get_composition_id): Pay attention to TAB
Kenichi Handa <handa@m17n.org>
parents:
90405
diff
changeset
|
367 this_width = ch != '\t' ? CHAR_WIDTH (ch) : 1; |
26848 | 368 |
369 /* A composition rule is specified by an integer value | |
370 that encodes global and new reference points (GREF and | |
371 NREF). GREF and NREF are specified by numbers as | |
372 below: | |
373 0---1---2 -- ascent | |
374 | | | |
375 | | | |
376 | | | |
377 9--10--11 -- center | |
378 | | | |
379 ---3---4---5--- baseline | |
380 | | | |
381 6---7---8 -- descent | |
382 */ | |
89726
2660b0974edb
(get_composition_id): Handle xoff and yoff in a
Kenichi Handa <handa@m17n.org>
parents:
89706
diff
changeset
|
383 COMPOSITION_DECODE_RULE (rule, gref, nref, xoff, yoff); |
26848 | 384 this_left = (leftmost |
385 + (gref % 3) * (rightmost - leftmost) / 2.0 | |
386 - (nref % 3) * this_width / 2.0); | |
387 | |
388 if (this_left < leftmost) | |
389 leftmost = this_left; | |
390 if (this_left + this_width > rightmost) | |
391 rightmost = this_left + this_width; | |
392 } | |
393 | |
394 cmp->width = rightmost - leftmost; | |
395 if (cmp->width < (rightmost - leftmost)) | |
396 /* To get a ceiling integer value. */ | |
397 cmp->width++; | |
398 } | |
399 | |
400 composition_table[n_compositions] = cmp; | |
401 | |
402 return n_compositions++; | |
403 | |
404 invalid_composition: | |
405 /* Would it be better to remove this `composition' property? */ | |
406 return -1; | |
407 } | |
408 | |
409 | |
410 /* Find a composition at or nearest to position POS of OBJECT (buffer | |
411 or string). | |
412 | |
413 OBJECT defaults to the current buffer. If there's a composition at | |
414 POS, set *START and *END to the start and end of the sequence, | |
415 *PROP to the `composition' property, and return 1. | |
416 | |
417 If there's no composition at POS and LIMIT is negative, return 0. | |
418 | |
419 Otherwise, search for a composition forward (LIMIT > POS) or | |
420 backward (LIMIT < POS). In this case, LIMIT bounds the search. | |
421 | |
422 If a composition is found, set *START, *END, and *PROP as above, | |
423 and return 1, else return 0. | |
424 | |
425 This doesn't check the validity of composition. */ | |
426 | |
427 int | |
428 find_composition (pos, limit, start, end, prop, object) | |
89509
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
429 int pos, limit; |
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
430 EMACS_INT *start, *end; |
26848 | 431 Lisp_Object *prop, object; |
432 { | |
433 Lisp_Object val; | |
434 | |
435 if (get_property_and_range (pos, Qcomposition, prop, start, end, object)) | |
436 return 1; | |
437 | |
438 if (limit < 0 || limit == pos) | |
439 return 0; | |
440 | |
441 if (limit > pos) /* search forward */ | |
34933
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
442 { |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
443 val = Fnext_single_property_change (make_number (pos), Qcomposition, |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
444 object, make_number (limit)); |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
445 pos = XINT (val); |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
446 if (pos == limit) |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
447 return 0; |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
448 } |
26848 | 449 else /* search backward */ |
34933
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
450 { |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
451 if (get_property_and_range (pos - 1, Qcomposition, prop, start, end, |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
452 object)) |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
453 return 1; |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
454 val = Fprevious_single_property_change (make_number (pos), Qcomposition, |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
455 object, make_number (limit)); |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
456 pos = XINT (val); |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
457 if (pos == limit) |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
458 return 0; |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
459 pos--; |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
460 } |
26848 | 461 get_property_and_range (pos, Qcomposition, prop, start, end, object); |
462 return 1; | |
463 } | |
464 | |
465 /* Run a proper function to adjust the composition sitting between | |
466 FROM and TO with property PROP. */ | |
467 | |
468 static void | |
469 run_composition_function (from, to, prop) | |
470 int from, to; | |
471 Lisp_Object prop; | |
472 { | |
34958
e3133339e30c
(run_composition_function): Remove unused variable
Eli Zaretskii <eliz@gnu.org>
parents:
34933
diff
changeset
|
473 Lisp_Object func; |
89509
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
474 EMACS_INT start, end; |
26848 | 475 |
476 func = COMPOSITION_MODIFICATION_FUNC (prop); | |
477 /* If an invalid composition precedes or follows, try to make them | |
478 valid too. */ | |
479 if (from > BEGV | |
480 && find_composition (from - 1, -1, &start, &end, &prop, Qnil) | |
481 && !COMPOSITION_VALID_P (start, end, prop)) | |
482 from = start; | |
483 if (to < ZV | |
484 && find_composition (to, -1, &start, &end, &prop, Qnil) | |
485 && !COMPOSITION_VALID_P (start, end, prop)) | |
486 to = end; | |
46940 | 487 if (!NILP (Ffboundp (func))) |
26848 | 488 call2 (func, make_number (from), make_number (to)); |
489 } | |
490 | |
491 /* Make invalid compositions adjacent to or inside FROM and TO valid. | |
492 CHECK_MASK is bitwise `or' of mask bits defined by macros | |
493 CHECK_XXX (see the comment in composite.h). | |
494 | |
89361
1dd4e6b8509a
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
89340
diff
changeset
|
495 It also resets the text-property `auto-composed' to a proper region |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
496 so that automatic character composition works correctly later while |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
497 displaying the region. |
89483 | 498 |
26848 | 499 This function is called when a buffer text is changed. If the |
500 change is deletion, FROM == TO. Otherwise, FROM < TO. */ | |
501 | |
502 void | |
503 update_compositions (from, to, check_mask) | |
89509
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
504 EMACS_INT from, to; |
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
505 int check_mask; |
26848 | 506 { |
34958
e3133339e30c
(run_composition_function): Remove unused variable
Eli Zaretskii <eliz@gnu.org>
parents:
34933
diff
changeset
|
507 Lisp_Object prop; |
89509
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
508 EMACS_INT start, end; |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
509 /* The beginning and end of the region to set the property |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
510 `auto-composed' to nil. */ |
89509
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
511 EMACS_INT min_pos = from, max_pos = to; |
26848 | 512 |
39046
a61b3d907098
(update_compositions): Do nothing if
Gerd Moellmann <gerd@gnu.org>
parents:
38116
diff
changeset
|
513 if (inhibit_modification_hooks) |
a61b3d907098
(update_compositions): Do nothing if
Gerd Moellmann <gerd@gnu.org>
parents:
38116
diff
changeset
|
514 return; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49136
diff
changeset
|
515 |
28581
151b7ae3b21f
(update_compositions): If FROM and TO is not in a
Kenichi Handa <handa@m17n.org>
parents:
28472
diff
changeset
|
516 /* If FROM and TO are not in a valid range, do nothing. */ |
151b7ae3b21f
(update_compositions): If FROM and TO is not in a
Kenichi Handa <handa@m17n.org>
parents:
28472
diff
changeset
|
517 if (! (BEGV <= from && from <= to && to <= ZV)) |
151b7ae3b21f
(update_compositions): If FROM and TO is not in a
Kenichi Handa <handa@m17n.org>
parents:
28472
diff
changeset
|
518 return; |
151b7ae3b21f
(update_compositions): If FROM and TO is not in a
Kenichi Handa <handa@m17n.org>
parents:
28472
diff
changeset
|
519 |
26848 | 520 if (check_mask & CHECK_HEAD) |
521 { | |
522 /* FROM should be at composition boundary. But, insertion or | |
523 deletion will make two compositions adjacent and | |
524 indistinguishable when they have same (eq) property. To | |
525 avoid it, in such a case, we change the property of the | |
526 latter to the copy of it. */ | |
527 if (from > BEGV | |
78011
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
528 && find_composition (from - 1, -1, &start, &end, &prop, Qnil) |
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
529 && COMPOSITION_VALID_P (start, end, prop)) |
26848 | 530 { |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
531 min_pos = start; |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
532 if (end > to) |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
533 max_pos = end; |
26848 | 534 if (from < end) |
535 Fput_text_property (make_number (from), make_number (end), | |
536 Qcomposition, | |
537 Fcons (XCAR (prop), XCDR (prop)), Qnil); | |
538 run_composition_function (start, end, prop); | |
539 from = end; | |
540 } | |
37242
029c8c1b451d
(update_compositions) <check_mask & CHECK_HEAD>: Fix
Dave Love <fx@gnu.org>
parents:
34958
diff
changeset
|
541 else if (from < ZV |
78011
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
542 && find_composition (from, -1, &start, &from, &prop, Qnil) |
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
543 && COMPOSITION_VALID_P (start, from, prop)) |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
544 { |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
545 if (from > to) |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
546 max_pos = from; |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
547 run_composition_function (start, from, prop); |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
548 } |
26848 | 549 } |
550 | |
551 if (check_mask & CHECK_INSIDE) | |
552 { | |
553 /* In this case, we are sure that (check & CHECK_TAIL) is also | |
554 nonzero. Thus, here we should check only compositions before | |
555 (to - 1). */ | |
556 while (from < to - 1 | |
557 && find_composition (from, to, &start, &from, &prop, Qnil) | |
78011
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
558 && COMPOSITION_VALID_P (start, from, prop) |
26848 | 559 && from < to - 1) |
560 run_composition_function (start, from, prop); | |
561 } | |
562 | |
563 if (check_mask & CHECK_TAIL) | |
564 { | |
565 if (from < to | |
78011
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
566 && find_composition (to - 1, -1, &start, &end, &prop, Qnil) |
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
567 && COMPOSITION_VALID_P (start, end, prop)) |
26848 | 568 { |
569 /* TO should be also at composition boundary. But, | |
570 insertion or deletion will make two compositions adjacent | |
571 and indistinguishable when they have same (eq) property. | |
572 To avoid it, in such a case, we change the property of | |
573 the former to the copy of it. */ | |
574 if (to < end) | |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
575 { |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
576 Fput_text_property (make_number (start), make_number (to), |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
577 Qcomposition, |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
578 Fcons (XCAR (prop), XCDR (prop)), Qnil); |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
579 max_pos = end; |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
580 } |
26848 | 581 run_composition_function (start, end, prop); |
582 } | |
583 else if (to < ZV | |
78011
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
584 && find_composition (to, -1, &start, &end, &prop, Qnil) |
f6d5dccc38c9
(update_compositions): Check validity of compositions.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
585 && COMPOSITION_VALID_P (start, end, prop)) |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
586 { |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
587 run_composition_function (start, end, prop); |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
588 max_pos = end; |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
589 } |
26848 | 590 } |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
591 if (min_pos < max_pos) |
89633
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
592 { |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
593 int count = SPECPDL_INDEX (); |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
594 |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
595 specbind (Qinhibit_read_only, Qt); |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
596 specbind (Qinhibit_modification_hooks, Qt); |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
597 specbind (Qinhibit_point_motion_hooks, Qt); |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
598 Fremove_list_of_text_properties (make_number (min_pos), |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
599 make_number (max_pos), |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
600 Fcons (Qauto_composed, Qnil), Qnil); |
40b05b530518
(update_compositions): Bind inhibit-read-only, etc
Kenichi Handa <handa@m17n.org>
parents:
89546
diff
changeset
|
601 unbind_to (count, Qnil); |
26848 | 602 } |
603 } | |
604 | |
30022
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
605 |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
606 /* Modify composition property values in LIST destructively. LIST is |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
607 a list as returned from text_property_list. Change values to the |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
608 top-level copies of them so that none of them are `eq'. */ |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
609 |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
610 void |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
611 make_composition_value_copy (list) |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
612 Lisp_Object list; |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
613 { |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
614 Lisp_Object plist, val; |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
615 |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
616 for (; CONSP (list); list = XCDR (list)) |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
617 { |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
618 plist = XCAR (XCDR (XCDR (XCAR (list)))); |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
619 while (CONSP (plist) && CONSP (XCDR (plist))) |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
620 { |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
621 if (EQ (XCAR (plist), Qcomposition) |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
622 && (val = XCAR (XCDR (plist)), CONSP (val))) |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39046
diff
changeset
|
623 XSETCAR (XCDR (plist), Fcons (XCAR (val), XCDR (val))); |
30022
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
624 plist = XCDR (XCDR (plist)); |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
625 } |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
626 } |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
627 } |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
628 |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
629 |
26848 | 630 /* Make text in the region between START and END a composition that |
631 has COMPONENTS and MODIFICATION-FUNC. | |
632 | |
633 If STRING is non-nil, then operate on characters contained between | |
634 indices START and END in STRING. */ | |
635 | |
636 void | |
637 compose_text (start, end, components, modification_func, string) | |
638 int start, end; | |
639 Lisp_Object components, modification_func, string; | |
640 { | |
641 Lisp_Object prop; | |
642 | |
643 prop = Fcons (Fcons (make_number (end - start), components), | |
644 modification_func); | |
645 Fput_text_property (make_number (start), make_number (end), | |
646 Qcomposition, prop, string); | |
647 } | |
648 | |
649 /* Emacs Lisp APIs. */ | |
650 | |
651 DEFUN ("compose-region-internal", Fcompose_region_internal, | |
652 Scompose_region_internal, 2, 4, 0, | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
653 doc: /* Internal use only. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
654 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
655 Compose text in the region between START and END. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
656 Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC |
47275
49ac77cddafb
(Fcompose_region_internal, Fcompose_string_internal): Fix spacing.
Juanma Barranquero <lekktu@gmail.com>
parents:
46940
diff
changeset
|
657 for the composition. See `compose-region' for more detail. */) |
64574
5c90d9a42573
(Fcompose_region_internal, Fcompose_string_internal):
Juanma Barranquero <lekktu@gmail.com>
parents:
64084
diff
changeset
|
658 (start, end, components, modification_func) |
5c90d9a42573
(Fcompose_region_internal, Fcompose_string_internal):
Juanma Barranquero <lekktu@gmail.com>
parents:
64084
diff
changeset
|
659 Lisp_Object start, end, components, modification_func; |
26848 | 660 { |
661 validate_region (&start, &end); | |
662 if (!NILP (components) | |
663 && !INTEGERP (components) | |
664 && !CONSP (components) | |
665 && !STRINGP (components)) | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
666 CHECK_VECTOR (components); |
26848 | 667 |
64574
5c90d9a42573
(Fcompose_region_internal, Fcompose_string_internal):
Juanma Barranquero <lekktu@gmail.com>
parents:
64084
diff
changeset
|
668 compose_text (XINT (start), XINT (end), components, modification_func, Qnil); |
26848 | 669 return Qnil; |
670 } | |
671 | |
672 DEFUN ("compose-string-internal", Fcompose_string_internal, | |
673 Scompose_string_internal, 3, 5, 0, | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
674 doc: /* Internal use only. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
675 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
676 Compose text between indices START and END of STRING. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
677 Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC |
47275
49ac77cddafb
(Fcompose_region_internal, Fcompose_string_internal): Fix spacing.
Juanma Barranquero <lekktu@gmail.com>
parents:
46940
diff
changeset
|
678 for the composition. See `compose-string' for more detail. */) |
64574
5c90d9a42573
(Fcompose_region_internal, Fcompose_string_internal):
Juanma Barranquero <lekktu@gmail.com>
parents:
64084
diff
changeset
|
679 (string, start, end, components, modification_func) |
5c90d9a42573
(Fcompose_region_internal, Fcompose_string_internal):
Juanma Barranquero <lekktu@gmail.com>
parents:
64084
diff
changeset
|
680 Lisp_Object string, start, end, components, modification_func; |
26848 | 681 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
682 CHECK_STRING (string); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
683 CHECK_NUMBER (start); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
684 CHECK_NUMBER (end); |
26848 | 685 |
686 if (XINT (start) < 0 || | |
687 XINT (start) > XINT (end) | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
688 || XINT (end) > SCHARS (string)) |
26848 | 689 args_out_of_range (start, end); |
690 | |
64574
5c90d9a42573
(Fcompose_region_internal, Fcompose_string_internal):
Juanma Barranquero <lekktu@gmail.com>
parents:
64084
diff
changeset
|
691 compose_text (XINT (start), XINT (end), components, modification_func, string); |
26848 | 692 return string; |
693 } | |
694 | |
695 DEFUN ("find-composition-internal", Ffind_composition_internal, | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49136
diff
changeset
|
696 Sfind_composition_internal, 4, 4, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
697 doc: /* Internal use only. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
698 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
699 Return information about composition at or nearest to position POS. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
700 See `find-composition' for more detail. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
701 (pos, limit, string, detail_p) |
26848 | 702 Lisp_Object pos, limit, string, detail_p; |
703 { | |
704 Lisp_Object prop, tail; | |
89509
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
705 EMACS_INT start, end; |
26848 | 706 int id; |
707 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
708 CHECK_NUMBER_COERCE_MARKER (pos); |
26848 | 709 start = XINT (pos); |
710 if (!NILP (limit)) | |
711 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
712 CHECK_NUMBER_COERCE_MARKER (limit); |
26848 | 713 end = XINT (limit); |
714 } | |
715 else | |
716 end = -1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49136
diff
changeset
|
717 |
26848 | 718 if (!NILP (string)) |
38097
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
719 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
720 CHECK_STRING (string); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
721 if (XINT (pos) < 0 || XINT (pos) > SCHARS (string)) |
38097
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
722 args_out_of_range (string, pos); |
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
723 } |
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
724 else |
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
725 { |
38116
a85b9df3dffb
(Ffind_composition_internal): Accept ZV
Gerd Moellmann <gerd@gnu.org>
parents:
38098
diff
changeset
|
726 if (XINT (pos) < BEGV || XINT (pos) > ZV) |
38097
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
727 args_out_of_range (Fcurrent_buffer (), pos); |
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
728 } |
26848 | 729 |
730 if (!find_composition (start, end, &start, &end, &prop, string)) | |
731 return Qnil; | |
732 if (!COMPOSITION_VALID_P (start, end, prop)) | |
733 return Fcons (make_number (start), Fcons (make_number (end), | |
734 Fcons (Qnil, Qnil))); | |
735 if (NILP (detail_p)) | |
736 return Fcons (make_number (start), Fcons (make_number (end), | |
737 Fcons (Qt, Qnil))); | |
738 | |
739 if (COMPOSITION_REGISTERD_P (prop)) | |
740 id = COMPOSITION_ID (prop); | |
741 else | |
742 { | |
743 int start_byte = (NILP (string) | |
744 ? CHAR_TO_BYTE (start) | |
745 : string_char_to_byte (string, start)); | |
746 id = get_composition_id (start, start_byte, end - start, prop, string); | |
747 } | |
748 | |
749 if (id >= 0) | |
750 { | |
751 Lisp_Object components, relative_p, mod_func; | |
752 enum composition_method method = COMPOSITION_METHOD (prop); | |
753 int width = composition_table[id]->width; | |
754 | |
755 components = Fcopy_sequence (COMPOSITION_COMPONENTS (prop)); | |
756 relative_p = (method == COMPOSITION_WITH_RULE_ALTCHARS | |
757 ? Qnil : Qt); | |
758 mod_func = COMPOSITION_MODIFICATION_FUNC (prop); | |
759 tail = Fcons (components, | |
760 Fcons (relative_p, | |
761 Fcons (mod_func, | |
762 Fcons (make_number (width), Qnil)))); | |
763 } | |
764 else | |
765 tail = Qnil; | |
766 | |
767 return Fcons (make_number (start), Fcons (make_number (end), tail)); | |
768 } | |
769 | |
770 | |
771 void | |
772 syms_of_composite () | |
773 { | |
774 Qcomposition = intern ("composition"); | |
775 staticpro (&Qcomposition); | |
776 | |
777 /* Make a hash table for composition. */ | |
778 { | |
28472
bae9218986ac
* composite.c (run_composite_function): Use NILP when checking for nil.
Ken Raeburn <raeburn@raeburn.org>
parents:
26848
diff
changeset
|
779 Lisp_Object args[6]; |
26848 | 780 extern Lisp_Object QCsize; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49136
diff
changeset
|
781 |
26848 | 782 args[0] = QCtest; |
783 args[1] = Qequal; | |
784 args[2] = QCweakness; | |
53316 | 785 /* We used to make the hash table weak so that unreferenced |
92028 | 786 compositions can be garbage-collected. But, usually once |
53316 | 787 created compositions are repeatedly used in an Emacs session, |
788 and thus it's not worth to save memory in such a way. So, we | |
789 make the table not weak. */ | |
53221
94ae4d74b7e0
(syms_of_composite): Don't make the compostion hash table week.
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
790 args[3] = Qnil; |
26848 | 791 args[4] = QCsize; |
792 args[5] = make_number (311); | |
28472
bae9218986ac
* composite.c (run_composite_function): Use NILP when checking for nil.
Ken Raeburn <raeburn@raeburn.org>
parents:
26848
diff
changeset
|
793 composition_hash_table = Fmake_hash_table (6, args); |
26848 | 794 staticpro (&composition_hash_table); |
795 } | |
796 | |
797 /* Text property `composition' should be nonsticky by default. */ | |
798 Vtext_property_default_nonsticky | |
799 = Fcons (Fcons (Qcomposition, Qt), Vtext_property_default_nonsticky); | |
800 | |
801 DEFVAR_LISP ("compose-chars-after-function", &Vcompose_chars_after_function, | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
802 doc: /* Function to adjust composition of buffer text. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
803 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
804 The function is called with three arguments FROM, TO, and OBJECT. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
805 FROM and TO specify the range of text of which composition should be |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
806 adjusted. OBJECT, if non-nil, is a string that contains the text. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
807 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
808 This function is called after a text with `composition' property is |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
809 inserted or deleted to keep `composition' property of buffer text |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
810 valid. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
811 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
812 The default value is the function `compose-chars-after'. */); |
26848 | 813 Vcompose_chars_after_function = intern ("compose-chars-after"); |
814 | |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
815 Qauto_composed = intern ("auto-composed"); |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
816 staticpro (&Qauto_composed); |
33240
aaa42106f0da
(Vcomposition_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
30171
diff
changeset
|
817 |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
818 Qauto_composition_function = intern ("auto-composition-function"); |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
819 staticpro (&Qauto_composition_function); |
33240
aaa42106f0da
(Vcomposition_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
30171
diff
changeset
|
820 |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
821 DEFVAR_LISP ("auto-composition-function", &Vauto_composition_function, |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
822 doc: /* Function to call to compose characters automatically. |
91287
ac1b29b04053
(syms_of_composite): Fix docstring of
Kenichi Handa <handa@m17n.org>
parents:
91132
diff
changeset
|
823 The function is called from the display routine with four arguments, |
ac1b29b04053
(syms_of_composite): Fix docstring of
Kenichi Handa <handa@m17n.org>
parents:
91132
diff
changeset
|
824 FROM, TO, WINDOW, and STRING. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
825 |
91287
ac1b29b04053
(syms_of_composite): Fix docstring of
Kenichi Handa <handa@m17n.org>
parents:
91132
diff
changeset
|
826 If STRING is nil, the function must compose characters in the region |
ac1b29b04053
(syms_of_composite): Fix docstring of
Kenichi Handa <handa@m17n.org>
parents:
91132
diff
changeset
|
827 between FROM and TO in the current buffer. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
828 |
91287
ac1b29b04053
(syms_of_composite): Fix docstring of
Kenichi Handa <handa@m17n.org>
parents:
91132
diff
changeset
|
829 Otherwise, STRING is a string, and FROM and TO are indices into the |
ac1b29b04053
(syms_of_composite): Fix docstring of
Kenichi Handa <handa@m17n.org>
parents:
91132
diff
changeset
|
830 string. In this case, the function must compose characters in the |
ac1b29b04053
(syms_of_composite): Fix docstring of
Kenichi Handa <handa@m17n.org>
parents:
91132
diff
changeset
|
831 string. */); |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
832 Vauto_composition_function = Qnil; |
33240
aaa42106f0da
(Vcomposition_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
30171
diff
changeset
|
833 |
26848 | 834 defsubr (&Scompose_region_internal); |
835 defsubr (&Scompose_string_internal); | |
836 defsubr (&Sfind_composition_internal); | |
837 } | |
52401 | 838 |
839 /* arch-tag: 79cefaf8-ca48-4eed-97e5-d5afb290d272 | |
840 (do not change this comment) */ |