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