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