Mercurial > emacs
annotate lisp/composite.el @ 89892:a2109a2c25d5
Sync to HEAD.
(emacs_mule_char): Check invalid code more regidly.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Mon, 12 Apr 2004 23:17:27 +0000 |
parents | eee9d99444cc |
children | df801f738c09 |
rev | line source |
---|---|
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37232
diff
changeset
|
1 ;;; composite.el --- support character composition |
26880 | 2 |
3 ;; Copyright (C) 1999 Electrotechnical Laboratory, JAPAN. | |
4 ;; Licensed to the Free Software Foundation. | |
5 | |
6 ;; Keywords: mule, multilingual, character composition | |
7 | |
8 ;; This file is part of GNU Emacs. | |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
12 ;; the Free Software Foundation; either version 2, or (at your option) | |
13 ;; any later version. | |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
23 ;; Boston, MA 02111-1307, USA. | |
24 | |
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37232
diff
changeset
|
25 ;;; Commentary: |
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37232
diff
changeset
|
26 |
26880 | 27 ;;; Code: |
28 | |
29 (defconst reference-point-alist | |
30 '((tl . 0) (tc . 1) (tr . 2) | |
31 (Bl . 3) (Bc . 4) (Br . 5) | |
32 (bl . 6) (bc . 7) (br . 8) | |
33 (cl . 9) (cc . 10) (cr . 11) | |
34 (top-left . 0) (top-center . 1) (top-right . 2) | |
35 (base-left . 3) (base-center . 4) (base-right . 5) | |
36 (bottom-left . 6) (bottom-center . 7) (bottom-right . 8) | |
37 (center-left . 9) (center-center . 10) (center-right . 11) | |
38 ;; For backward compatibility... | |
39 (ml . 3) (mc . 10) (mr . 5) | |
40 (mid-left . 3) (mid-center . 10) (mid-right . 5)) | |
41 "Alist of symbols vs integer codes of glyph reference points. | |
42 A glyph reference point symbol is to be used to specify a composition | |
89497 | 43 rule in COMPONENTS argument to such functions as `compose-region'. |
26880 | 44 |
45 Meanings of glyph reference point codes are as follows: | |
46 | |
47 0----1----2 <---- ascent 0:tl or top-left | |
48 | | 1:tc or top-center | |
49 | | 2:tr or top-right | |
50 | | 3:Bl or base-left 9:cl or center-left | |
51 9 10 11 <---- center 4:Bc or base-center 10:cc or center-center | |
52 | | 5:Br or base-right 11:cr or center-right | |
53 --3----4----5-- <-- baseline 6:bl or bottom-left | |
54 | | 7:bc or bottom-center | |
55 6----7----8 <---- descent 8:br or bottom-right | |
56 | |
57 Glyph reference point symbols are to be used to specify composition | |
58 rule of the form \(GLOBAL-REF-POINT . NEW-REF-POINT), where | |
59 GLOBAL-REF-POINT is a reference point in the overall glyphs already | |
60 composed, and NEW-REF-POINT is a reference point in the new glyph to | |
61 be added. | |
62 | |
63 For instance, if GLOBAL-REF-POINT is `br' (bottom-right) and | |
37232
cebd635be09b
(reference-point-alist): Doc fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35075
diff
changeset
|
64 NEW-REF-POINT is `tc' (top-center), the overall glyph is updated as |
26880 | 65 follows (the point `*' corresponds to both reference points): |
66 | |
67 +-------+--+ <--- new ascent | |
68 | | | | |
69 | global| | | |
70 | glyph | | | |
71 -- | | |-- <--- baseline \(doesn't change) | |
72 +----+--*--+ | |
73 | | new | | |
74 | |glyph| | |
75 +----+-----+ <--- new descent | |
89722
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
76 |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
77 A composition rule may have the form \(GLOBAL-REF-POINT |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
78 NEW-REF-POINT XOFF YOFF), where XOFF and YOFF specifies how much |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
79 to shift NEW-REF-POINT from GLOBAL-REF-POINT. In this case, XOFF |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
80 and YOFF are integers in the range -100..100 representing the |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
81 shifting percentage against the font size.") |
26880 | 82 |
83 ;; Encode composition rule RULE into an integer value. RULE is a cons | |
84 ;; of global and new reference point symbols. | |
85 ;; This must be compatible with C macro COMPOSITION_ENCODE_RULE | |
86 ;; defined in composite.h. | |
87 | |
88 (defun encode-composition-rule (rule) | |
89 (if (and (integerp rule) (< rule 144)) | |
90 ;; Already encoded. | |
91 rule | |
89722
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
92 (if (consp rule) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
93 (let ((gref (car rule)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
94 (nref (cdr rule)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
95 xoff yoff) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
96 (if (consp nref) ; (GREF NREF XOFF YOFF) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
97 (progn |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
98 (setq xoff (nth 1 nref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
99 yoff (nth 2 nref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
100 nref (car nref)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
101 (or (and (>= xoff -100) (<= xoff 100) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
102 (>= yoff -100) (<= yoff 100)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
103 (error "Invalid compostion rule: %s" rule)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
104 (setq xoff (+ xoff 128) yoff (+ yoff 128))) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
105 ;; (GREF . NREF) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
106 (setq xoff 0 yoff 0)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
107 (or (integerp gref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
108 (setq gref (cdr (assq gref reference-point-alist)))) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
109 (or (integerp nref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
110 (setq nref (cdr (assq nref reference-point-alist)))) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
111 (or (and (>= gref 0) (< gref 12) (>= nref 0) (< nref 12)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
112 (error "Invalid composition rule: %S" rule)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
113 (logior (lsh xoff 16) (lsh yoff 8) (+ (* gref 12) nref))) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
114 (error "Invalid composition rule: %S" rule)))) |
26880 | 115 |
116 ;; Decode encoded composition rule RULE-CODE. The value is a cons of | |
117 ;; global and new reference point symbols. | |
118 ;; This must be compatible with C macro COMPOSITION_DECODE_RULE | |
119 ;; defined in composite.h. | |
120 | |
121 (defun decode-composition-rule (rule-code) | |
89722
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
122 (or (and (natnump rule-code) (< rule-code #x1000000)) |
26880 | 123 (error "Invalid encoded composition rule: %S" rule-code)) |
89722
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
124 (let ((xoff (lsh rule-code -16)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
125 (yoff (logand (lsh rule-code -8) #xFF)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
126 gref nref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
127 (setq rule-code (logand rule-code #xFF) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
128 gref (car (rassq (/ rule-code 12) reference-point-alist)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
129 nref (car (rassq (% rule-code 12) reference-point-alist))) |
26880 | 130 (or (and gref (symbolp gref) nref (symbolp nref)) |
131 (error "Invalid composition rule code: %S" rule-code)) | |
89722
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
132 (if (and (= xoff 0) (= yoff 0)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
133 (cons gref nref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
134 (setq xoff (- xoff 128) yoff (- yoff 128)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
135 (list gref xoff yoff nref)))) |
26880 | 136 |
137 ;; Encode composition rules in composition components COMPONENTS. The | |
138 ;; value is a copy of COMPONENTS, where composition rules (cons of | |
139 ;; global and new glyph reference point symbols) are replaced with | |
140 ;; encoded composition rules. Optional 2nd argument NOCOPY non-nil | |
141 ;; means don't make a copy but modify COMPONENTS directly. | |
142 | |
143 (defun encode-composition-components (components &optional nocopy) | |
144 (or nocopy | |
145 (setq components (copy-sequence components))) | |
146 (if (vectorp components) | |
147 (let ((len (length components)) | |
148 (i 1)) | |
149 (while (< i len) | |
150 (aset components i | |
151 (encode-composition-rule (aref components i))) | |
152 (setq i (+ i 2)))) | |
153 (let ((tail (cdr components))) | |
154 (while tail | |
155 (setcar tail | |
156 (encode-composition-rule (car tail))) | |
157 (setq tail (nthcdr 2 tail))))) | |
158 components) | |
159 | |
160 ;; Decode composition rule codes in composition components COMPONENTS. | |
161 ;; The value is a copy of COMPONENTS, where composition rule codes are | |
162 ;; replaced with composition rules (cons of global and new glyph | |
163 ;; reference point symbols). Optional 2nd argument NOCOPY non-nil | |
164 ;; means don't make a copy but modify COMPONENTS directly. | |
165 ;; It is assumed that COMPONENTS is a vector and is for rule-base | |
166 ;; composition, thus (2N+1)th elements are rule codes. | |
167 | |
168 (defun decode-composition-components (components &optional nocopy) | |
169 (or nocopy | |
170 (setq components (copy-sequence components))) | |
171 (let ((len (length components)) | |
172 (i 1)) | |
173 (while (< i len) | |
174 (aset components i | |
175 (decode-composition-rule (aref components i))) | |
176 (setq i (+ i 2)))) | |
177 components) | |
178 | |
179 (defun compose-region (start end &optional components modification-func) | |
180 "Compose characters in the current region. | |
181 | |
46963 | 182 Characters are composed relatively, i.e. composed by overstricking or |
183 stacking depending on ascent, descent and other properties. | |
184 | |
26880 | 185 When called from a program, expects these four arguments. |
186 | |
187 First two arguments START and END are positions (integers or markers) | |
188 specifying the region. | |
189 | |
89497 | 190 Optional 3rd argument COMPONENTS, if non-nil, is a character, a string |
191 or a vector or list of integers and rules. | |
26880 | 192 |
193 If it is a character, it is an alternate character to display instead | |
194 of the text in the region. | |
195 | |
196 If it is a string, the elements are alternate characters. | |
197 | |
198 If it is a vector or list, it is a sequence of alternate characters and | |
199 composition rules, where (2N)th elements are characters and (2N+1)th | |
200 elements are composition rules to specify how to compose (2N+2)th | |
201 elements with previously composed N glyphs. | |
202 | |
203 A composition rule is a cons of global and new glyph reference point | |
204 symbols. See the documentation of `reference-point-alist' for more | |
205 detail. | |
206 | |
207 Optional 4th argument MODIFICATION-FUNC is a function to call to | |
208 adjust the composition when it gets invalid because of a change of | |
209 text in the composition." | |
210 (interactive "r") | |
211 (let ((modified-p (buffer-modified-p)) | |
212 (buffer-read-only nil)) | |
213 (if (or (vectorp components) (listp components)) | |
214 (setq components (encode-composition-components components))) | |
215 (compose-region-internal start end components modification-func) | |
216 (set-buffer-modified-p modified-p))) | |
217 | |
218 (defun decompose-region (start end) | |
219 "Decompose text in the current region. | |
220 | |
221 When called from a program, expects two arguments, | |
222 positions (integers or markers) specifying the region." | |
223 (interactive "r") | |
224 (let ((modified-p (buffer-modified-p)) | |
225 (buffer-read-only nil)) | |
226 (remove-text-properties start end '(composition nil)) | |
227 (set-buffer-modified-p modified-p))) | |
228 | |
229 (defun compose-string (string &optional start end components modification-func) | |
230 "Compose characters in string STRING. | |
231 | |
88808 | 232 The return value is STRING with the `composition' property put on all |
26880 | 233 the characters in it. |
234 | |
235 Optional 2nd and 3rd arguments START and END specify the range of | |
88808 | 236 STRING to be composed. They default to the beginning and the end of |
26880 | 237 STRING respectively. |
238 | |
239 Optional 4th argument COMPONENTS, if non-nil, is a character or a | |
240 sequence (vector, list, or string) of integers. See the function | |
241 `compose-region' for more detail. | |
242 | |
243 Optional 5th argument MODIFICATION-FUNC is a function to call to | |
244 adjust the composition when it gets invalid because of a change of | |
245 text in the composition." | |
246 (if (or (vectorp components) (listp components)) | |
247 (setq components (encode-composition-components components))) | |
248 (or start (setq start 0)) | |
249 (or end (setq end (length string))) | |
250 (compose-string-internal string start end components modification-func) | |
251 string) | |
252 | |
253 (defun decompose-string (string) | |
254 "Return STRING where `composition' property is removed." | |
255 (remove-text-properties 0 (length string) '(composition nil) string) | |
256 string) | |
257 | |
258 (defun compose-chars (&rest args) | |
259 "Return a string from arguments in which all characters are composed. | |
260 For relative composition, arguments are characters. | |
261 For rule-based composition, Mth \(where M is odd) arguments are | |
262 characters, and Nth \(where N is even) arguments are composition rules. | |
263 A composition rule is a cons of glyph reference points of the form | |
264 \(GLOBAL-REF-POINT . NEW-REF-POINT). See the documentation of | |
265 `reference-point-alist' for more detail." | |
266 (let (str components) | |
267 (if (consp (car (cdr args))) | |
268 ;; Rule-base composition. | |
269 (let ((len (length args)) | |
270 (tail (encode-composition-components args 'nocopy))) | |
271 | |
272 (while tail | |
273 (setq str (cons (car tail) str)) | |
274 (setq tail (nthcdr 2 tail))) | |
275 (setq str (concat (nreverse str)) | |
276 components args)) | |
277 ;; Relative composition. | |
278 (setq str (concat args))) | |
279 (compose-string-internal str 0 (length str) components))) | |
280 | |
281 (defun find-composition (pos &optional limit string detail-p) | |
282 "Return information about a composition at or nearest to buffer position POS. | |
283 | |
284 If the character at POS has `composition' property, the value is a list | |
285 of FROM, TO, and VALID-P. | |
286 | |
287 FROM and TO specify the range of text that has the same `composition' | |
288 property, VALID-P is non-nil if and only if this composition is valid. | |
289 | |
290 If there's no composition at POS, and the optional 2nd argument LIMIT | |
291 is non-nil, search for a composition toward LIMIT. | |
292 | |
293 If no composition is found, return nil. | |
294 | |
295 Optional 3rd argument STRING, if non-nil, is a string to look for a | |
296 composition in; nil means the current buffer. | |
297 | |
298 If a valid composition is found and the optional 4th argument DETAIL-P | |
299 is non-nil, the return value is a list of FROM, TO, COMPONENTS, | |
300 RELATIVE-P, MOD-FUNC, and WIDTH. | |
301 | |
302 COMPONENTS is a vector of integers, the meaning depends on RELATIVE-P. | |
303 | |
304 RELATIVE-P is t if the composition method is relative, else nil. | |
305 | |
306 If RELATIVE-P is t, COMPONENTS is a vector of characters to be | |
307 composed. If RELATIVE-P is nil, COMPONENTS is a vector of characters | |
308 and composition rules as described in `compose-region'. | |
309 | |
310 MOD-FUNC is a modification function of the composition. | |
311 | |
312 WIDTH is a number of columns the composition occupies on the screen." | |
313 (let ((result (find-composition-internal pos limit string detail-p))) | |
314 (if (and detail-p result (nth 2 result) (not (nth 3 result))) | |
315 ;; This is a valid rule-base composition. | |
316 (decode-composition-components (nth 2 result) 'nocopy)) | |
317 result)) | |
318 | |
319 | |
33244
59edd748e69a
(composition-function-table): Variable declaration
Kenichi Handa <handa@m17n.org>
parents:
30485
diff
changeset
|
320 (defun compose-chars-after (pos &optional limit object) |
26880 | 321 "Compose characters in current buffer after position POS. |
322 | |
323 It looks up the char-table `composition-function-table' (which see) by | |
324 a character after POS. If non-nil value is found, the format of the | |
325 value should be an alist of PATTERNs vs FUNCs, where PATTERNs are | |
326 regular expressions and FUNCs are functions. If the text after POS | |
327 matches one of PATTERNs, call the corresponding FUNC with three | |
328 arguments POS, TO, and PATTERN, where TO is the end position of text | |
329 matching PATTERN, and return what FUNC returns. Otherwise, return | |
330 nil. | |
331 | |
332 FUNC is responsible for composing the text properly. The return value | |
333 is: | |
334 nil -- if no characters were composed. | |
335 CHARS (integer) -- if CHARS characters were composed. | |
336 | |
337 Optional 2nd arg LIMIT, if non-nil, limits the matching of text. | |
338 | |
33244
59edd748e69a
(composition-function-table): Variable declaration
Kenichi Handa <handa@m17n.org>
parents:
30485
diff
changeset
|
339 Optional 3rd arg OBJECT, if non-nil, is a string that contains the |
89497 | 340 text to compose. In that case, POS and LIMIT index into the string. |
33244
59edd748e69a
(composition-function-table): Variable declaration
Kenichi Handa <handa@m17n.org>
parents:
30485
diff
changeset
|
341 |
26880 | 342 This function is the default value of `compose-chars-after-function'." |
343 (let ((tail (aref composition-function-table (char-after pos))) | |
344 pattern func result) | |
345 (when tail | |
30485
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
346 (save-match-data |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
347 (save-excursion |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49512
diff
changeset
|
348 (while (and tail (not func)) |
30485
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
349 (setq pattern (car (car tail)) |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
350 func (cdr (car tail))) |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
351 (goto-char pos) |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
352 (if (if limit |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
353 (and (re-search-forward pattern limit t) |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
354 (= (match-beginning 0) pos)) |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
355 (looking-at pattern)) |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
356 (setq result (funcall func pos (match-end 0) pattern nil)) |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
357 (setq func nil tail (cdr tail))))))) |
26880 | 358 result)) |
359 | |
360 (defun compose-last-chars (args) | |
361 "Compose last characters. | |
35075
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
362 The argument is a parameterized event of the form |
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
363 \(compose-last-chars N COMPONENTS), |
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
364 where N is the number of characters before point to compose, |
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
365 COMPONENTS, if non-nil, is the same as the argument to `compose-region' |
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
366 \(which see). If it is nil, `compose-chars-after' is called, |
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
367 and that function find a proper rule to compose the target characters. |
26880 | 368 This function is intended to be used from input methods. |
369 The global keymap binds special event `compose-last-chars' to this | |
35075
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
370 function. Input method may generate an event (compose-last-chars N COMPONENTS) |
26880 | 371 after a sequence character events." |
372 (interactive "e") | |
373 (let ((chars (nth 1 args))) | |
374 (if (and (numberp chars) | |
375 (>= (- (point) (point-min)) chars)) | |
35075
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
376 (if (nth 2 args) |
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
377 (compose-region (- (point) chars) (point) (nth 2 args)) |
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
378 (compose-chars-after (- (point) chars) (point)))))) |
26880 | 379 |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
380 (global-set-key [compose-last-chars] 'compose-last-chars) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
381 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
382 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
383 ;;; Automatic character composition. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
384 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
385 (defvar composition-function-table |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
386 (make-char-table nil) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
387 "Char table of functions for automatic character composition. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
388 For each character that has to be composed automatically with |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
389 preceding and/or following characters, this char table contains |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
390 a function to call to compose that character. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
391 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
392 Each function is called with two arguments, POS and STRING. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
393 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
394 If STRING is nil, POS is a position in the current buffer, and the |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
395 function has to compose a character at POS with surrounding characters |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
396 in the current buffer. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
397 |
89497 | 398 Otherwise, STRING is a string, and POS is an index into the string. In |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
399 this case, the function has to compose a character at POS with |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
400 surrounding characters in the string. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
401 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
402 See also the command `toggle-auto-composition'.") |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
403 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
404 ;; Copied from font-lock.el. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
405 (eval-when-compile |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
406 ;; Borrowed from lazy-lock.el. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
407 ;; We use this to preserve or protect things when modifying text properties. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
408 (defmacro save-buffer-state (varlist &rest body) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
409 "Bind variables according to VARLIST and eval BODY restoring buffer state." |
89307 | 410 `(let* ,(append varlist |
411 '((modified (buffer-modified-p)) (buffer-undo-list t) | |
412 (inhibit-read-only t) (inhibit-point-motion-hooks t) | |
413 (inhibit-modification-hooks t) | |
414 deactivate-mark buffer-file-name buffer-file-truename)) | |
415 ,@body | |
416 (unless modified | |
417 (restore-buffer-modified-p nil)))) | |
89497 | 418 ;; Fixme: This makes bootstrapping fail with this error. |
89307 | 419 ;; Symbol's function definition is void: eval-defun |
420 ;;(def-edebug-spec save-buffer-state let) | |
421 ) | |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
422 |
89651
65f1f8091f15
(auto-compose-chars): Don't do unnecessary save-exclusion and
Kenichi Handa <handa@m17n.org>
parents:
89608
diff
changeset
|
423 (put 'save-buffer-state 'lisp-indent-function 1) |
65f1f8091f15
(auto-compose-chars): Don't do unnecessary save-exclusion and
Kenichi Handa <handa@m17n.org>
parents:
89608
diff
changeset
|
424 |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
425 (defun auto-compose-chars (pos string) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
426 "Compose characters after the buffer position POS. |
89497 | 427 If STRING is non-nil, it is a string, and POS is an index into the string. |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
428 In that case, compose characters in the string. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
429 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
430 This function is the default value of `auto-composition-function' (which see)." |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
431 (save-buffer-state nil |
89659
91f056b94e70
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89651
diff
changeset
|
432 (save-excursion |
91f056b94e70
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89651
diff
changeset
|
433 (save-match-data |
91f056b94e70
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89651
diff
changeset
|
434 (let ((start pos) |
91f056b94e70
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89651
diff
changeset
|
435 (limit (if string (length string) (point-max))) |
91f056b94e70
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89651
diff
changeset
|
436 ch func newpos) |
91f056b94e70
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89651
diff
changeset
|
437 (setq limit (or (text-property-any pos limit 'auto-composed t string) |
89664
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
438 limit) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
439 pos (catch 'tag |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
440 (if string |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
441 (while (< pos limit) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
442 (setq ch (aref string pos)) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
443 (if (= ch ?\n) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
444 (throw 'tag (1+ pos))) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
445 (setq func (aref composition-function-table ch)) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
446 (if (and (functionp func) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
447 (setq newpos (funcall func pos string)) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
448 (> newpos pos)) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
449 (setq pos newpos) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
450 (setq pos (1+ pos)))) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
451 (while (< pos limit) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
452 (setq ch (char-after pos)) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
453 (if (= ch ?\n) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
454 (throw 'tag (1+ pos))) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
455 (setq func (aref composition-function-table ch)) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
456 (if (and (functionp func) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
457 (setq newpos (funcall func pos string)) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
458 (> newpos pos)) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
459 (setq pos newpos) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
460 (setq pos (1+ pos))))) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
461 limit)) |
89659
91f056b94e70
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89651
diff
changeset
|
462 (put-text-property start pos 'auto-composed t string)))))) |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
463 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
464 (setq auto-composition-function 'auto-compose-chars) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
465 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
466 (defun toggle-auto-composition (&optional arg) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
467 "Change whether automatic character composition is enabled in this buffer. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
468 With arg, enable it iff arg is positive." |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
469 (interactive "P") |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
470 (let ((enable (if (null arg) (not auto-composition-function) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
471 (> (prefix-numeric-value arg) 0)))) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
472 (if enable |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
473 (kill-local-variable 'auto-composition-function) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
474 (make-local-variable 'auto-composition-function) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
475 (setq auto-composition-function nil) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
476 (save-buffer-state nil |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
477 (save-restriction |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
478 (widen) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
479 (decompose-region (point-min) (point-max))))) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
480 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
481 (save-buffer-state nil |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
482 (save-restriction |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
483 (widen) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
484 (put-text-property (point-min) (point-max) 'auto-composed nil))))) |
89528
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
485 |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
486 (defun auto-compose-region (from to) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
487 "Force automatic character composition on the region FROM and TO." |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
488 (save-excursion |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
489 (if (get-text-property from 'auto-composed) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
490 (setq from (next-single-property-change from 'auto-composed nil to))) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
491 (goto-char from) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
492 (let ((modified-p (buffer-modified-p)) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
493 (inhibit-read-only '(composition auto-composed)) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
494 (stop (next-single-property-change (point) 'auto-composed nil to))) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
495 (while (< (point) to) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
496 (if (= (point) stop) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
497 (progn |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
498 (goto-char (next-single-property-change (point) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
499 'auto-composed nil to)) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
500 (setq stop (next-single-property-change (point) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
501 'auto-composed nil to))) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
502 (let ((func (aref composition-function-table (following-char))) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
503 (pos (point))) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
504 (if (functionp func) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
505 (goto-char (funcall func (point) nil))) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
506 (if (<= (point) pos) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
507 (forward-char 1))))) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
508 (put-text-property from to 'auto-composed t) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
509 (set-buffer-modified-p modified-p)))) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
510 |
26880 | 511 |
512 ;;; The following codes are only for backward compatibility with Emacs | |
46045
c74a601c84b3
(decompose-composite-char): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
38414
diff
changeset
|
513 ;;; 20.4 and earlier. |
26880 | 514 |
515 (defun decompose-composite-char (char &optional type with-composition-rule) | |
516 "Convert CHAR to string. | |
517 | |
518 If optional 2nd arg TYPE is non-nil, it is `string', `list', or | |
49512
6a0305153436
(decompose-composite-char): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
46963
diff
changeset
|
519 `vector'. In this case, CHAR is converted to string, list of CHAR, or |
6a0305153436
(decompose-composite-char): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
46963
diff
changeset
|
520 vector of CHAR respectively. |
6a0305153436
(decompose-composite-char): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
46963
diff
changeset
|
521 Optional 3rd arg WITH-COMPOSITION-RULE is ignored." |
26880 | 522 (cond ((or (null type) (eq type 'string)) (char-to-string char)) |
523 ((eq type 'list) (list char)) | |
524 (t (vector char)))) | |
525 | |
29521
4ad26302d559
(decompose-composite-char): Declare it as obsolete.
Kenichi Handa <handa@m17n.org>
parents:
26880
diff
changeset
|
526 (make-obsolete 'decompose-composite-char 'char-to-string "21.1") |
4ad26302d559
(decompose-composite-char): Declare it as obsolete.
Kenichi Handa <handa@m17n.org>
parents:
26880
diff
changeset
|
527 |
26880 | 528 |
529 ;;; composite.el ends here |