Mercurial > emacs
annotate src/composite.c @ 89628:16559d69b325
(private-char-area-1-min)
(private-char-area-1-max, private-char-area-2-min)
(private-char-area-2-max, emacs-mule-charset-table): New
variables.
(convert-define-charset-argument): New function.
(define-charset): Handle the old calling style. Update
emacs-mule-charset-table.
(make-char-internal): New function.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Mon, 17 Nov 2003 03:57:03 +0000 |
parents | c380df3cc4df |
children | 40b05b530518 |
rev | line source |
---|---|
26848 | 1 /* Composite sequence support. |
2 Copyright (C) 1999 Electrotechnical Laboratory, JAPAN. | |
89483 | 3 Licensed to the Free Software Foundation. |
38098 | 4 Copyright (C) 2001 Free Software Foundation, Inc. |
89483 | 5 Copyright (C) 2003 |
88366
97f11940f06a
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41001
diff
changeset
|
6 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
|
7 Registration Number H13PRO009 |
26848 | 8 |
9 This file is part of GNU Emacs. | |
10 | |
11 GNU Emacs is free software; you can redistribute it and/or modify | |
12 it under the terms of the GNU General Public License as published by | |
13 the Free Software Foundation; either version 2, or (at your option) | |
14 any later version. | |
15 | |
16 GNU Emacs is distributed in the hope that it will be useful, | |
17 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 GNU General Public License for more details. | |
20 | |
21 You should have received a copy of the GNU General Public License | |
22 along with GNU Emacs; see the file COPYING. If not, write to | |
23 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
24 Boston, MA 02111-1307, USA. */ | |
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 | |
89361
1dd4e6b8509a
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
89340
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 |
89361
1dd4e6b8509a
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
89340
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 | |
89361
1dd4e6b8509a
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
89340
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 | |
89361
1dd4e6b8509a
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
89340
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 |
89361
1dd4e6b8509a
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
89340
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 | |
89361
1dd4e6b8509a
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
89340
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 |
89361
1dd4e6b8509a
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
89340
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 | |
89361
1dd4e6b8509a
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
89340
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); |
c380df3cc4df
(Fremove_list_of_text_properties): Declare.
Dave Love <fx@gnu.org>
parents:
89509
diff
changeset
|
156 |
26848 | 157 /* Temporary variable used in macros COMPOSITION_XXX. */ |
158 Lisp_Object composition_temp; | |
159 | |
160 /* Return COMPOSITION-ID of a composition at buffer position | |
161 CHARPOS/BYTEPOS and length NCHARS. The `composition' property of | |
162 the sequence is PROP. STRING, if non-nil, is a string that | |
163 contains the composition instead of the current buffer. | |
164 | |
165 If the composition is invalid, return -1. */ | |
166 | |
167 int | |
168 get_composition_id (charpos, bytepos, nchars, prop, string) | |
169 int charpos, bytepos, nchars; | |
170 Lisp_Object prop, string; | |
171 { | |
172 Lisp_Object id, length, components, key, *key_contents; | |
173 int glyph_len; | |
174 struct Lisp_Hash_Table *hash_table = XHASH_TABLE (composition_hash_table); | |
175 int hash_index; | |
176 unsigned hash_code; | |
177 struct composition *cmp; | |
178 int i, ch; | |
179 | |
180 /* PROP should be | |
181 Form-A: ((LENGTH . COMPONENTS) . MODIFICATION-FUNC) | |
182 or | |
183 Form-B: (COMPOSITION-ID . (LENGTH COMPONENTS-VEC . MODIFICATION-FUNC)) | |
184 */ | |
185 if (nchars == 0 || !CONSP (prop)) | |
186 goto invalid_composition; | |
187 | |
188 id = XCAR (prop); | |
189 if (INTEGERP (id)) | |
190 { | |
191 /* PROP should be Form-B. */ | |
192 if (XINT (id) < 0 || XINT (id) >= n_compositions) | |
193 goto invalid_composition; | |
194 return XINT (id); | |
195 } | |
196 | |
197 /* PROP should be Form-A. | |
198 Thus, ID should be (LENGTH . COMPONENTS). */ | |
199 if (!CONSP (id)) | |
200 goto invalid_composition; | |
201 length = XCAR (id); | |
202 if (!INTEGERP (length) || XINT (length) != nchars) | |
203 goto invalid_composition; | |
204 | |
205 components = XCDR (id); | |
206 | |
207 /* Check if the same composition has already been registered or not | |
208 by consulting composition_hash_table. The key for this table is | |
209 COMPONENTS (converted to a vector COMPONENTS-VEC) or, if it is | |
210 nil, vector of characters in the composition range. */ | |
211 if (INTEGERP (components)) | |
212 key = Fmake_vector (make_number (1), components); | |
213 else if (STRINGP (components) || CONSP (components)) | |
214 key = Fvconcat (1, &components); | |
215 else if (VECTORP (components)) | |
216 key = components; | |
217 else if (NILP (components)) | |
218 { | |
219 key = Fmake_vector (make_number (nchars), Qnil); | |
220 if (STRINGP (string)) | |
221 for (i = 0; i < nchars; i++) | |
222 { | |
223 FETCH_STRING_CHAR_ADVANCE (ch, string, charpos, bytepos); | |
224 XVECTOR (key)->contents[i] = make_number (ch); | |
225 } | |
226 else | |
227 for (i = 0; i < nchars; i++) | |
228 { | |
229 FETCH_CHAR_ADVANCE (ch, charpos, bytepos); | |
230 XVECTOR (key)->contents[i] = make_number (ch); | |
231 } | |
232 } | |
233 else | |
234 goto invalid_composition; | |
235 | |
236 hash_index = hash_lookup (hash_table, key, &hash_code); | |
237 if (hash_index >= 0) | |
238 { | |
239 /* We have already registered the same composition. Change PROP | |
240 from Form-A above to Form-B while replacing COMPONENTS with | |
241 COMPONENTS-VEC stored in the hash table. We can directly | |
242 modify the cons cell of PROP because it is not shared. */ | |
243 key = HASH_KEY (hash_table, hash_index); | |
244 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
|
245 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
|
246 XSETCDR (prop, Fcons (make_number (nchars), Fcons (key, XCDR (prop)))); |
26848 | 247 return XINT (id); |
248 } | |
249 | |
250 /* This composition is a new one. We must register it. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49136
diff
changeset
|
251 |
26848 | 252 /* Check if we have sufficient memory to store this information. */ |
253 if (composition_table_size == 0) | |
254 { | |
255 composition_table_size = 256; | |
256 composition_table | |
257 = (struct composition **) xmalloc (sizeof (composition_table[0]) | |
258 * composition_table_size); | |
259 } | |
260 else if (composition_table_size <= n_compositions) | |
261 { | |
262 composition_table_size += 256; | |
263 composition_table | |
264 = (struct composition **) xrealloc (composition_table, | |
265 sizeof (composition_table[0]) | |
266 * composition_table_size); | |
267 } | |
268 | |
269 key_contents = XVECTOR (key)->contents; | |
270 | |
271 /* Check if the contents of COMPONENTS are valid if COMPONENTS is a | |
272 vector or a list. It should be a sequence of: | |
273 char1 rule1 char2 rule2 char3 ... ruleN charN+1 */ | |
274 if (VECTORP (components) || CONSP (components)) | |
275 { | |
276 int len = XVECTOR (key)->size; | |
277 | |
278 /* The number of elements should be odd. */ | |
279 if ((len % 2) == 0) | |
280 goto invalid_composition; | |
281 /* All elements should be integers (character or encoded | |
282 composition rule). */ | |
283 for (i = 0; i < len; i++) | |
284 { | |
285 if (!INTEGERP (key_contents[i])) | |
286 goto invalid_composition; | |
287 } | |
288 } | |
289 | |
290 /* Change PROP from Form-A above to Form-B. We can directly modify | |
291 the cons cell of PROP because it is not shared. */ | |
292 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
|
293 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
|
294 XSETCDR (prop, Fcons (make_number (nchars), Fcons (key, XCDR (prop)))); |
26848 | 295 |
296 /* Register the composition in composition_hash_table. */ | |
297 hash_index = hash_put (hash_table, key, id, hash_code); | |
298 | |
299 /* Register the composition in composition_table. */ | |
300 cmp = (struct composition *) xmalloc (sizeof (struct composition)); | |
301 | |
302 cmp->method = (NILP (components) | |
303 ? COMPOSITION_RELATIVE | |
304 : ((INTEGERP (components) || STRINGP (components)) | |
305 ? COMPOSITION_WITH_ALTCHARS | |
306 : COMPOSITION_WITH_RULE_ALTCHARS)); | |
307 cmp->hash_index = hash_index; | |
308 glyph_len = (cmp->method == COMPOSITION_WITH_RULE_ALTCHARS | |
309 ? (XVECTOR (key)->size + 1) / 2 | |
310 : XVECTOR (key)->size); | |
311 cmp->glyph_len = glyph_len; | |
312 cmp->offsets = (short *) xmalloc (sizeof (short) * glyph_len * 2); | |
313 cmp->font = NULL; | |
314 | |
315 /* Calculate the width of overall glyphs of the composition. */ | |
316 if (cmp->method != COMPOSITION_WITH_RULE_ALTCHARS) | |
317 { | |
318 /* Relative composition. */ | |
319 cmp->width = 0; | |
320 for (i = 0; i < glyph_len; i++) | |
321 { | |
322 int this_width; | |
323 ch = XINT (key_contents[i]); | |
324 this_width = CHAR_WIDTH (ch); | |
325 if (cmp->width < this_width) | |
326 cmp->width = this_width; | |
327 } | |
328 } | |
329 else | |
330 { | |
331 /* Rule-base composition. */ | |
332 float leftmost = 0.0, rightmost; | |
333 | |
334 ch = XINT (key_contents[0]); | |
335 rightmost = CHAR_WIDTH (ch); | |
336 | |
337 for (i = 1; i < glyph_len; i += 2) | |
338 { | |
339 int rule, gref, nref; | |
340 int this_width; | |
341 float this_left; | |
342 | |
343 rule = XINT (key_contents[i]); | |
344 ch = XINT (key_contents[i + 1]); | |
345 this_width = CHAR_WIDTH (ch); | |
346 | |
347 /* A composition rule is specified by an integer value | |
348 that encodes global and new reference points (GREF and | |
349 NREF). GREF and NREF are specified by numbers as | |
350 below: | |
351 0---1---2 -- ascent | |
352 | | | |
353 | | | |
354 | | | |
355 9--10--11 -- center | |
356 | | | |
357 ---3---4---5--- baseline | |
358 | | | |
359 6---7---8 -- descent | |
360 */ | |
361 COMPOSITION_DECODE_RULE (rule, gref, nref); | |
362 this_left = (leftmost | |
363 + (gref % 3) * (rightmost - leftmost) / 2.0 | |
364 - (nref % 3) * this_width / 2.0); | |
365 | |
366 if (this_left < leftmost) | |
367 leftmost = this_left; | |
368 if (this_left + this_width > rightmost) | |
369 rightmost = this_left + this_width; | |
370 } | |
371 | |
372 cmp->width = rightmost - leftmost; | |
373 if (cmp->width < (rightmost - leftmost)) | |
374 /* To get a ceiling integer value. */ | |
375 cmp->width++; | |
376 } | |
377 | |
378 composition_table[n_compositions] = cmp; | |
379 | |
380 return n_compositions++; | |
381 | |
382 invalid_composition: | |
383 /* Would it be better to remove this `composition' property? */ | |
384 return -1; | |
385 } | |
386 | |
387 | |
388 /* Find a composition at or nearest to position POS of OBJECT (buffer | |
389 or string). | |
390 | |
391 OBJECT defaults to the current buffer. If there's a composition at | |
392 POS, set *START and *END to the start and end of the sequence, | |
393 *PROP to the `composition' property, and return 1. | |
394 | |
395 If there's no composition at POS and LIMIT is negative, return 0. | |
396 | |
397 Otherwise, search for a composition forward (LIMIT > POS) or | |
398 backward (LIMIT < POS). In this case, LIMIT bounds the search. | |
399 | |
400 If a composition is found, set *START, *END, and *PROP as above, | |
401 and return 1, else return 0. | |
402 | |
403 This doesn't check the validity of composition. */ | |
404 | |
405 int | |
406 find_composition (pos, limit, start, end, prop, object) | |
89509
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
407 int pos, limit; |
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
408 EMACS_INT *start, *end; |
26848 | 409 Lisp_Object *prop, object; |
410 { | |
411 Lisp_Object val; | |
412 | |
413 if (get_property_and_range (pos, Qcomposition, prop, start, end, object)) | |
414 return 1; | |
415 | |
416 if (limit < 0 || limit == pos) | |
417 return 0; | |
418 | |
419 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
|
420 { |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
421 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
|
422 object, make_number (limit)); |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
423 pos = XINT (val); |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
424 if (pos == limit) |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
425 return 0; |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
426 } |
26848 | 427 else /* search backward */ |
34933
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
428 { |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
429 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
|
430 object)) |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
431 return 1; |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
432 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
|
433 object, make_number (limit)); |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
434 pos = XINT (val); |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
435 if (pos == limit) |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
436 return 0; |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
437 pos--; |
414310d24f52
(find_composition): Fix a code for searching a composition backward.
Kenichi Handa <handa@m17n.org>
parents:
34241
diff
changeset
|
438 } |
26848 | 439 get_property_and_range (pos, Qcomposition, prop, start, end, object); |
440 return 1; | |
441 } | |
442 | |
443 /* Run a proper function to adjust the composition sitting between | |
444 FROM and TO with property PROP. */ | |
445 | |
446 static void | |
447 run_composition_function (from, to, prop) | |
448 int from, to; | |
449 Lisp_Object prop; | |
450 { | |
34958
e3133339e30c
(run_composition_function): Remove unused variable
Eli Zaretskii <eliz@gnu.org>
parents:
34933
diff
changeset
|
451 Lisp_Object func; |
89509
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
452 EMACS_INT start, end; |
26848 | 453 |
454 func = COMPOSITION_MODIFICATION_FUNC (prop); | |
455 /* If an invalid composition precedes or follows, try to make them | |
456 valid too. */ | |
457 if (from > BEGV | |
458 && find_composition (from - 1, -1, &start, &end, &prop, Qnil) | |
459 && !COMPOSITION_VALID_P (start, end, prop)) | |
460 from = start; | |
461 if (to < ZV | |
462 && find_composition (to, -1, &start, &end, &prop, Qnil) | |
463 && !COMPOSITION_VALID_P (start, end, prop)) | |
464 to = end; | |
46940 | 465 if (!NILP (Ffboundp (func))) |
26848 | 466 call2 (func, make_number (from), make_number (to)); |
467 } | |
468 | |
469 /* Make invalid compositions adjacent to or inside FROM and TO valid. | |
470 CHECK_MASK is bitwise `or' of mask bits defined by macros | |
471 CHECK_XXX (see the comment in composite.h). | |
472 | |
89361
1dd4e6b8509a
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
89340
diff
changeset
|
473 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
|
474 so that automatic character composition works correctly later while |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
475 displaying the region. |
89483 | 476 |
26848 | 477 This function is called when a buffer text is changed. If the |
478 change is deletion, FROM == TO. Otherwise, FROM < TO. */ | |
479 | |
480 void | |
481 update_compositions (from, to, check_mask) | |
89509
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
482 EMACS_INT from, to; |
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
483 int check_mask; |
26848 | 484 { |
34958
e3133339e30c
(run_composition_function): Remove unused variable
Eli Zaretskii <eliz@gnu.org>
parents:
34933
diff
changeset
|
485 Lisp_Object prop; |
89509
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
486 EMACS_INT start, end; |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
487 /* The beginning and end of the region to set the property |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
488 `auto-composed' to nil. */ |
89509
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
489 EMACS_INT min_pos = from, max_pos = to; |
26848 | 490 |
39046
a61b3d907098
(update_compositions): Do nothing if
Gerd Moellmann <gerd@gnu.org>
parents:
38116
diff
changeset
|
491 if (inhibit_modification_hooks) |
a61b3d907098
(update_compositions): Do nothing if
Gerd Moellmann <gerd@gnu.org>
parents:
38116
diff
changeset
|
492 return; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49136
diff
changeset
|
493 |
28581
151b7ae3b21f
(update_compositions): If FROM and TO is not in a
Kenichi Handa <handa@m17n.org>
parents:
28472
diff
changeset
|
494 /* 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
|
495 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
|
496 return; |
151b7ae3b21f
(update_compositions): If FROM and TO is not in a
Kenichi Handa <handa@m17n.org>
parents:
28472
diff
changeset
|
497 |
26848 | 498 if (check_mask & CHECK_HEAD) |
499 { | |
500 /* FROM should be at composition boundary. But, insertion or | |
501 deletion will make two compositions adjacent and | |
502 indistinguishable when they have same (eq) property. To | |
503 avoid it, in such a case, we change the property of the | |
504 latter to the copy of it. */ | |
505 if (from > BEGV | |
506 && find_composition (from - 1, -1, &start, &end, &prop, Qnil)) | |
507 { | |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
508 min_pos = start; |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
509 if (end > to) |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
510 max_pos = end; |
26848 | 511 if (from < end) |
512 Fput_text_property (make_number (from), make_number (end), | |
513 Qcomposition, | |
514 Fcons (XCAR (prop), XCDR (prop)), Qnil); | |
515 run_composition_function (start, end, prop); | |
516 from = end; | |
517 } | |
37242
029c8c1b451d
(update_compositions) <check_mask & CHECK_HEAD>: Fix
Dave Love <fx@gnu.org>
parents:
34958
diff
changeset
|
518 else if (from < ZV |
26848 | 519 && find_composition (from, -1, &start, &from, &prop, Qnil)) |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
520 { |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
521 if (from > to) |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
522 max_pos = from; |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
523 run_composition_function (start, from, prop); |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
524 } |
26848 | 525 } |
526 | |
527 if (check_mask & CHECK_INSIDE) | |
528 { | |
529 /* In this case, we are sure that (check & CHECK_TAIL) is also | |
530 nonzero. Thus, here we should check only compositions before | |
531 (to - 1). */ | |
532 while (from < to - 1 | |
533 && find_composition (from, to, &start, &from, &prop, Qnil) | |
534 && from < to - 1) | |
535 run_composition_function (start, from, prop); | |
536 } | |
537 | |
538 if (check_mask & CHECK_TAIL) | |
539 { | |
540 if (from < to | |
541 && find_composition (to - 1, -1, &start, &end, &prop, Qnil)) | |
542 { | |
543 /* TO should be also at composition boundary. But, | |
544 insertion or deletion will make two compositions adjacent | |
545 and indistinguishable when they have same (eq) property. | |
546 To avoid it, in such a case, we change the property of | |
547 the former to the copy of it. */ | |
548 if (to < end) | |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
549 { |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
550 Fput_text_property (make_number (start), make_number (to), |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
551 Qcomposition, |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
552 Fcons (XCAR (prop), XCDR (prop)), Qnil); |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
553 max_pos = end; |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
554 } |
26848 | 555 run_composition_function (start, end, prop); |
556 } | |
557 else if (to < ZV | |
558 && find_composition (to, -1, &start, &end, &prop, Qnil)) | |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
559 { |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
560 run_composition_function (start, end, prop); |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
561 max_pos = end; |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
562 } |
26848 | 563 } |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
564 if (min_pos < max_pos) |
89483 | 565 Fremove_list_of_text_properties (make_number (min_pos), |
566 make_number (max_pos), | |
567 Fcons (Qauto_composed, Qnil), Qnil); | |
26848 | 568 } |
569 | |
30022
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
570 |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
571 /* 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
|
572 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
|
573 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
|
574 |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
575 void |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
576 make_composition_value_copy (list) |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
577 Lisp_Object list; |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
578 { |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
579 Lisp_Object plist, val; |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
580 |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
581 for (; CONSP (list); list = XCDR (list)) |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
582 { |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
583 plist = XCAR (XCDR (XCDR (XCAR (list)))); |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
584 while (CONSP (plist) && CONSP (XCDR (plist))) |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
585 { |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
586 if (EQ (XCAR (plist), Qcomposition) |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
587 && (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
|
588 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
|
589 plist = XCDR (XCDR (plist)); |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
590 } |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
591 } |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
592 } |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
593 |
6a52904a743b
(make_composition_value_copy): New function.
Kenichi Handa <handa@m17n.org>
parents:
28581
diff
changeset
|
594 |
26848 | 595 /* Make text in the region between START and END a composition that |
596 has COMPONENTS and MODIFICATION-FUNC. | |
597 | |
598 If STRING is non-nil, then operate on characters contained between | |
599 indices START and END in STRING. */ | |
600 | |
601 void | |
602 compose_text (start, end, components, modification_func, string) | |
603 int start, end; | |
604 Lisp_Object components, modification_func, string; | |
605 { | |
606 Lisp_Object prop; | |
607 | |
608 prop = Fcons (Fcons (make_number (end - start), components), | |
609 modification_func); | |
610 Fput_text_property (make_number (start), make_number (end), | |
611 Qcomposition, prop, string); | |
612 } | |
613 | |
614 /* Emacs Lisp APIs. */ | |
615 | |
616 DEFUN ("compose-region-internal", Fcompose_region_internal, | |
617 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
|
618 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
|
619 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
620 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
|
621 Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC |
89361
1dd4e6b8509a
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
89340
diff
changeset
|
622 for the composition. See `compose-region' for more detail. */) |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
623 (start, end, components, mod_func) |
26848 | 624 Lisp_Object start, end, components, mod_func; |
625 { | |
626 validate_region (&start, &end); | |
627 if (!NILP (components) | |
628 && !INTEGERP (components) | |
629 && !CONSP (components) | |
630 && !STRINGP (components)) | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
631 CHECK_VECTOR (components); |
26848 | 632 |
633 compose_text (XINT (start), XINT (end), components, mod_func, Qnil); | |
634 return Qnil; | |
635 } | |
636 | |
637 DEFUN ("compose-string-internal", Fcompose_string_internal, | |
638 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
|
639 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
|
640 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
641 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
|
642 Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC |
89361
1dd4e6b8509a
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
89340
diff
changeset
|
643 for the composition. See `compose-string' for more detail. */) |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
644 (string, start, end, components, mod_func) |
26848 | 645 Lisp_Object string, start, end, components, mod_func; |
646 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
647 CHECK_STRING (string); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
648 CHECK_NUMBER (start); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
649 CHECK_NUMBER (end); |
26848 | 650 |
651 if (XINT (start) < 0 || | |
652 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
|
653 || XINT (end) > SCHARS (string)) |
26848 | 654 args_out_of_range (start, end); |
655 | |
656 compose_text (XINT (start), XINT (end), components, mod_func, string); | |
657 return string; | |
658 } | |
659 | |
660 DEFUN ("find-composition-internal", Ffind_composition_internal, | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49136
diff
changeset
|
661 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
|
662 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
|
663 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
664 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
|
665 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
|
666 (pos, limit, string, detail_p) |
26848 | 667 Lisp_Object pos, limit, string, detail_p; |
668 { | |
669 Lisp_Object prop, tail; | |
89509
3c9d2f9bf6bb
(find_composition, run_composition_function)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
670 EMACS_INT start, end; |
26848 | 671 int id; |
672 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
673 CHECK_NUMBER_COERCE_MARKER (pos); |
26848 | 674 start = XINT (pos); |
675 if (!NILP (limit)) | |
676 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
677 CHECK_NUMBER_COERCE_MARKER (limit); |
26848 | 678 end = XINT (limit); |
679 } | |
680 else | |
681 end = -1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49136
diff
changeset
|
682 |
26848 | 683 if (!NILP (string)) |
38097
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
684 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
685 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
|
686 if (XINT (pos) < 0 || XINT (pos) > SCHARS (string)) |
38097
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
687 args_out_of_range (string, pos); |
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
688 } |
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
689 else |
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
690 { |
38116
a85b9df3dffb
(Ffind_composition_internal): Accept ZV
Gerd Moellmann <gerd@gnu.org>
parents:
38098
diff
changeset
|
691 if (XINT (pos) < BEGV || XINT (pos) > ZV) |
38097
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
692 args_out_of_range (Fcurrent_buffer (), pos); |
8757fe98656e
(Ffind_composition_internal): Check POS
Gerd Moellmann <gerd@gnu.org>
parents:
37242
diff
changeset
|
693 } |
26848 | 694 |
695 if (!find_composition (start, end, &start, &end, &prop, string)) | |
696 return Qnil; | |
697 if (!COMPOSITION_VALID_P (start, end, prop)) | |
698 return Fcons (make_number (start), Fcons (make_number (end), | |
699 Fcons (Qnil, Qnil))); | |
700 if (NILP (detail_p)) | |
701 return Fcons (make_number (start), Fcons (make_number (end), | |
702 Fcons (Qt, Qnil))); | |
703 | |
704 if (COMPOSITION_REGISTERD_P (prop)) | |
705 id = COMPOSITION_ID (prop); | |
706 else | |
707 { | |
708 int start_byte = (NILP (string) | |
709 ? CHAR_TO_BYTE (start) | |
710 : string_char_to_byte (string, start)); | |
711 id = get_composition_id (start, start_byte, end - start, prop, string); | |
712 } | |
713 | |
714 if (id >= 0) | |
715 { | |
716 Lisp_Object components, relative_p, mod_func; | |
717 enum composition_method method = COMPOSITION_METHOD (prop); | |
718 int width = composition_table[id]->width; | |
719 | |
720 components = Fcopy_sequence (COMPOSITION_COMPONENTS (prop)); | |
721 relative_p = (method == COMPOSITION_WITH_RULE_ALTCHARS | |
722 ? Qnil : Qt); | |
723 mod_func = COMPOSITION_MODIFICATION_FUNC (prop); | |
724 tail = Fcons (components, | |
725 Fcons (relative_p, | |
726 Fcons (mod_func, | |
727 Fcons (make_number (width), Qnil)))); | |
728 } | |
729 else | |
730 tail = Qnil; | |
731 | |
732 return Fcons (make_number (start), Fcons (make_number (end), tail)); | |
733 } | |
734 | |
735 | |
736 void | |
737 syms_of_composite () | |
738 { | |
739 Qcomposition = intern ("composition"); | |
740 staticpro (&Qcomposition); | |
741 | |
742 /* Make a hash table for composition. */ | |
743 { | |
28472
bae9218986ac
* composite.c (run_composite_function): Use NILP when checking for nil.
Ken Raeburn <raeburn@raeburn.org>
parents:
26848
diff
changeset
|
744 Lisp_Object args[6]; |
26848 | 745 extern Lisp_Object QCsize; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49136
diff
changeset
|
746 |
26848 | 747 args[0] = QCtest; |
748 args[1] = Qequal; | |
749 args[2] = QCweakness; | |
49136
6a4a30f1c2cb
(syms_of_composite): Make composition_hash_table
Dave Love <fx@gnu.org>
parents:
48318
diff
changeset
|
750 args[3] = Qt; |
26848 | 751 args[4] = QCsize; |
752 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
|
753 composition_hash_table = Fmake_hash_table (6, args); |
26848 | 754 staticpro (&composition_hash_table); |
755 } | |
756 | |
757 /* Text property `composition' should be nonsticky by default. */ | |
758 Vtext_property_default_nonsticky | |
759 = Fcons (Fcons (Qcomposition, Qt), Vtext_property_default_nonsticky); | |
760 | |
761 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
|
762 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
|
763 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
764 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
|
765 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
|
766 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
|
767 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
768 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
|
769 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
|
770 valid. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
771 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
772 The default value is the function `compose-chars-after'. */); |
26848 | 773 Vcompose_chars_after_function = intern ("compose-chars-after"); |
774 | |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
775 Qauto_composed = intern ("auto-composed"); |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
776 staticpro (&Qauto_composed); |
33240
aaa42106f0da
(Vcomposition_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
30171
diff
changeset
|
777 |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
778 Qauto_composition_function = intern ("auto-composition-function"); |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
779 staticpro (&Qauto_composition_function); |
33240
aaa42106f0da
(Vcomposition_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
30171
diff
changeset
|
780 |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
781 DEFVAR_LISP ("auto-composition-function", &Vauto_composition_function, |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
782 doc: /* Function to call to compose characters automatically. |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
783 The function is called from the display routine with two arguments, |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
784 POS and STRING. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
785 |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
786 If STRING is nil, the function must compose characters following POS |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
787 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
|
788 |
89283
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
789 Otherwise, STRING is a string, and POS is an index to the string. In |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
790 this case, the function must compose characters following POS in |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
791 the string. */); |
6ed290fbc678
(Vcomposition_function_table,
Kenichi Handa <handa@m17n.org>
parents:
88929
diff
changeset
|
792 Vauto_composition_function = Qnil; |
33240
aaa42106f0da
(Vcomposition_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
30171
diff
changeset
|
793 |
26848 | 794 defsubr (&Scompose_region_internal); |
795 defsubr (&Scompose_string_internal); | |
796 defsubr (&Sfind_composition_internal); | |
797 } |