Mercurial > emacs
annotate lisp/composite.el @ 90692:d108d1785ea7
New version
author | Vinicius Jose Latorre <viniciusjl@ig.com.br> |
---|---|
date | Tue, 28 Nov 2006 21:00:22 +0000 |
parents | a85e3683b64f |
children | 6588c6259dfb |
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 |
67658 | 3 ;; Copyright (C) 1999, 2000 |
4 ;; National Institute of Advanced Industrial Science and Technology (AIST) | |
5 ;; Registration Number H14PRO021 | |
26880 | 6 |
7 ;; Keywords: mule, multilingual, character composition | |
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 the | |
64091 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
26880 | 25 |
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37232
diff
changeset
|
26 ;;; Commentary: |
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37232
diff
changeset
|
27 |
26880 | 28 ;;; Code: |
29 | |
30 (defconst reference-point-alist | |
31 '((tl . 0) (tc . 1) (tr . 2) | |
32 (Bl . 3) (Bc . 4) (Br . 5) | |
33 (bl . 6) (bc . 7) (br . 8) | |
34 (cl . 9) (cc . 10) (cr . 11) | |
35 (top-left . 0) (top-center . 1) (top-right . 2) | |
36 (base-left . 3) (base-center . 4) (base-right . 5) | |
37 (bottom-left . 6) (bottom-center . 7) (bottom-right . 8) | |
38 (center-left . 9) (center-center . 10) (center-right . 11) | |
39 ;; For backward compatibility... | |
40 (ml . 3) (mc . 10) (mr . 5) | |
41 (mid-left . 3) (mid-center . 10) (mid-right . 5)) | |
42 "Alist of symbols vs integer codes of glyph reference points. | |
43 A glyph reference point symbol is to be used to specify a composition | |
89497 | 44 rule in COMPONENTS argument to such functions as `compose-region'. |
26880 | 45 |
46 Meanings of glyph reference point codes are as follows: | |
47 | |
48 0----1----2 <---- ascent 0:tl or top-left | |
49 | | 1:tc or top-center | |
50 | | 2:tr or top-right | |
51 | | 3:Bl or base-left 9:cl or center-left | |
52 9 10 11 <---- center 4:Bc or base-center 10:cc or center-center | |
53 | | 5:Br or base-right 11:cr or center-right | |
54 --3----4----5-- <-- baseline 6:bl or bottom-left | |
55 | | 7:bc or bottom-center | |
56 6----7----8 <---- descent 8:br or bottom-right | |
57 | |
58 Glyph reference point symbols are to be used to specify composition | |
59 rule of the form \(GLOBAL-REF-POINT . NEW-REF-POINT), where | |
60 GLOBAL-REF-POINT is a reference point in the overall glyphs already | |
61 composed, and NEW-REF-POINT is a reference point in the new glyph to | |
62 be added. | |
63 | |
64 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
|
65 NEW-REF-POINT is `tc' (top-center), the overall glyph is updated as |
26880 | 66 follows (the point `*' corresponds to both reference points): |
67 | |
68 +-------+--+ <--- new ascent | |
69 | | | | |
70 | global| | | |
71 | glyph | | | |
72 -- | | |-- <--- baseline \(doesn't change) | |
73 +----+--*--+ | |
74 | | new | | |
75 | |glyph| | |
76 +----+-----+ <--- new descent | |
89722
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
77 |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
78 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
|
79 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
|
80 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
|
81 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
|
82 shifting percentage against the font size.") |
26880 | 83 |
84 | |
56985
5eac7cd6d213
(encode-composition-rule): Add autoload cooky.
Kenichi Handa <handa@m17n.org>
parents:
54433
diff
changeset
|
85 ;;;###autoload |
26880 | 86 (defun encode-composition-rule (rule) |
56985
5eac7cd6d213
(encode-composition-rule): Add autoload cooky.
Kenichi Handa <handa@m17n.org>
parents:
54433
diff
changeset
|
87 "Encode composition rule RULE into an integer value. |
5eac7cd6d213
(encode-composition-rule): Add autoload cooky.
Kenichi Handa <handa@m17n.org>
parents:
54433
diff
changeset
|
88 RULE is a cons of global and new reference point symbols |
64530
87bf9c446836
(compose-string, encode-composition-rule, compose-last-chars):
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
89 \(see `reference-point-alist')." |
56985
5eac7cd6d213
(encode-composition-rule): Add autoload cooky.
Kenichi Handa <handa@m17n.org>
parents:
54433
diff
changeset
|
90 |
5eac7cd6d213
(encode-composition-rule): Add autoload cooky.
Kenichi Handa <handa@m17n.org>
parents:
54433
diff
changeset
|
91 ;; This must be compatible with C macro COMPOSITION_ENCODE_RULE |
5eac7cd6d213
(encode-composition-rule): Add autoload cooky.
Kenichi Handa <handa@m17n.org>
parents:
54433
diff
changeset
|
92 ;; defined in composite.h. |
5eac7cd6d213
(encode-composition-rule): Add autoload cooky.
Kenichi Handa <handa@m17n.org>
parents:
54433
diff
changeset
|
93 |
26880 | 94 (if (and (integerp rule) (< rule 144)) |
95 ;; Already encoded. | |
96 rule | |
89722
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
97 (if (consp rule) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
98 (let ((gref (car rule)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
99 (nref (cdr rule)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
100 xoff yoff) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
101 (if (consp nref) ; (GREF NREF XOFF YOFF) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
102 (progn |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
103 (setq xoff (nth 1 nref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
104 yoff (nth 2 nref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
105 nref (car nref)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
106 (or (and (>= xoff -100) (<= xoff 100) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
107 (>= yoff -100) (<= yoff 100)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
108 (error "Invalid compostion rule: %s" rule)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
109 (setq xoff (+ xoff 128) yoff (+ yoff 128))) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
110 ;; (GREF . NREF) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
111 (setq xoff 0 yoff 0)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
112 (or (integerp gref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
113 (setq gref (cdr (assq gref reference-point-alist)))) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
114 (or (integerp nref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
115 (setq nref (cdr (assq nref reference-point-alist)))) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
116 (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
|
117 (error "Invalid composition rule: %S" rule)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
118 (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
|
119 (error "Invalid composition rule: %S" rule)))) |
26880 | 120 |
121 ;; Decode encoded composition rule RULE-CODE. The value is a cons of | |
122 ;; global and new reference point symbols. | |
123 ;; This must be compatible with C macro COMPOSITION_DECODE_RULE | |
124 ;; defined in composite.h. | |
125 | |
126 (defun decode-composition-rule (rule-code) | |
89722
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
127 (or (and (natnump rule-code) (< rule-code #x1000000)) |
26880 | 128 (error "Invalid encoded composition rule: %S" rule-code)) |
89722
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
129 (let ((xoff (lsh rule-code -16)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
130 (yoff (logand (lsh rule-code -8) #xFF)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
131 gref nref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
132 (setq rule-code (logand rule-code #xFF) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
133 gref (car (rassq (/ rule-code 12) reference-point-alist)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
134 nref (car (rassq (% rule-code 12) reference-point-alist))) |
26880 | 135 (or (and gref (symbolp gref) nref (symbolp nref)) |
136 (error "Invalid composition rule code: %S" rule-code)) | |
89722
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
137 (if (and (= xoff 0) (= yoff 0)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
138 (cons gref nref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
139 (setq xoff (- xoff 128) yoff (- yoff 128)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
140 (list gref xoff yoff nref)))) |
26880 | 141 |
142 ;; Encode composition rules in composition components COMPONENTS. The | |
143 ;; value is a copy of COMPONENTS, where composition rules (cons of | |
144 ;; global and new glyph reference point symbols) are replaced with | |
145 ;; encoded composition rules. Optional 2nd argument NOCOPY non-nil | |
146 ;; means don't make a copy but modify COMPONENTS directly. | |
147 | |
148 (defun encode-composition-components (components &optional nocopy) | |
149 (or nocopy | |
150 (setq components (copy-sequence components))) | |
151 (if (vectorp components) | |
152 (let ((len (length components)) | |
153 (i 1)) | |
154 (while (< i len) | |
155 (aset components i | |
156 (encode-composition-rule (aref components i))) | |
157 (setq i (+ i 2)))) | |
158 (let ((tail (cdr components))) | |
159 (while tail | |
160 (setcar tail | |
161 (encode-composition-rule (car tail))) | |
162 (setq tail (nthcdr 2 tail))))) | |
163 components) | |
164 | |
165 ;; Decode composition rule codes in composition components COMPONENTS. | |
166 ;; The value is a copy of COMPONENTS, where composition rule codes are | |
167 ;; replaced with composition rules (cons of global and new glyph | |
168 ;; reference point symbols). Optional 2nd argument NOCOPY non-nil | |
169 ;; means don't make a copy but modify COMPONENTS directly. | |
170 ;; It is assumed that COMPONENTS is a vector and is for rule-base | |
171 ;; composition, thus (2N+1)th elements are rule codes. | |
172 | |
173 (defun decode-composition-components (components &optional nocopy) | |
174 (or nocopy | |
175 (setq components (copy-sequence components))) | |
176 (let ((len (length components)) | |
177 (i 1)) | |
178 (while (< i len) | |
179 (aset components i | |
180 (decode-composition-rule (aref components i))) | |
181 (setq i (+ i 2)))) | |
182 components) | |
183 | |
184 (defun compose-region (start end &optional components modification-func) | |
185 "Compose characters in the current region. | |
186 | |
46963 | 187 Characters are composed relatively, i.e. composed by overstricking or |
188 stacking depending on ascent, descent and other properties. | |
189 | |
26880 | 190 When called from a program, expects these four arguments. |
191 | |
192 First two arguments START and END are positions (integers or markers) | |
193 specifying the region. | |
194 | |
89497 | 195 Optional 3rd argument COMPONENTS, if non-nil, is a character, a string |
196 or a vector or list of integers and rules. | |
26880 | 197 |
198 If it is a character, it is an alternate character to display instead | |
199 of the text in the region. | |
200 | |
201 If it is a string, the elements are alternate characters. | |
202 | |
203 If it is a vector or list, it is a sequence of alternate characters and | |
204 composition rules, where (2N)th elements are characters and (2N+1)th | |
205 elements are composition rules to specify how to compose (2N+2)th | |
206 elements with previously composed N glyphs. | |
207 | |
208 A composition rule is a cons of global and new glyph reference point | |
209 symbols. See the documentation of `reference-point-alist' for more | |
210 detail. | |
211 | |
212 Optional 4th argument MODIFICATION-FUNC is a function to call to | |
213 adjust the composition when it gets invalid because of a change of | |
214 text in the composition." | |
215 (interactive "r") | |
216 (let ((modified-p (buffer-modified-p)) | |
217 (buffer-read-only nil)) | |
218 (if (or (vectorp components) (listp components)) | |
219 (setq components (encode-composition-components components))) | |
220 (compose-region-internal start end components modification-func) | |
54433
a5520bf073bb
(compose-region): Use restore-buffer-modified-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
221 (restore-buffer-modified-p modified-p))) |
26880 | 222 |
223 (defun decompose-region (start end) | |
224 "Decompose text in the current region. | |
225 | |
226 When called from a program, expects two arguments, | |
227 positions (integers or markers) specifying the region." | |
228 (interactive "r") | |
229 (let ((modified-p (buffer-modified-p)) | |
230 (buffer-read-only nil)) | |
231 (remove-text-properties start end '(composition nil)) | |
232 (set-buffer-modified-p modified-p))) | |
233 | |
234 (defun compose-string (string &optional start end components modification-func) | |
235 "Compose characters in string STRING. | |
236 | |
88808 | 237 The return value is STRING with the `composition' property put on all |
26880 | 238 the characters in it. |
239 | |
240 Optional 2nd and 3rd arguments START and END specify the range of | |
64530
87bf9c446836
(compose-string, encode-composition-rule, compose-last-chars):
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
241 STRING to be composed. They default to the beginning and the end of |
26880 | 242 STRING respectively. |
243 | |
244 Optional 4th argument COMPONENTS, if non-nil, is a character or a | |
245 sequence (vector, list, or string) of integers. See the function | |
246 `compose-region' for more detail. | |
247 | |
248 Optional 5th argument MODIFICATION-FUNC is a function to call to | |
249 adjust the composition when it gets invalid because of a change of | |
250 text in the composition." | |
251 (if (or (vectorp components) (listp components)) | |
252 (setq components (encode-composition-components components))) | |
253 (or start (setq start 0)) | |
254 (or end (setq end (length string))) | |
255 (compose-string-internal string start end components modification-func) | |
256 string) | |
257 | |
258 (defun decompose-string (string) | |
259 "Return STRING where `composition' property is removed." | |
260 (remove-text-properties 0 (length string) '(composition nil) string) | |
261 string) | |
262 | |
263 (defun compose-chars (&rest args) | |
264 "Return a string from arguments in which all characters are composed. | |
265 For relative composition, arguments are characters. | |
266 For rule-based composition, Mth \(where M is odd) arguments are | |
267 characters, and Nth \(where N is even) arguments are composition rules. | |
268 A composition rule is a cons of glyph reference points of the form | |
269 \(GLOBAL-REF-POINT . NEW-REF-POINT). See the documentation of | |
270 `reference-point-alist' for more detail." | |
271 (let (str components) | |
272 (if (consp (car (cdr args))) | |
273 ;; Rule-base composition. | |
274 (let ((len (length args)) | |
275 (tail (encode-composition-components args 'nocopy))) | |
276 | |
277 (while tail | |
278 (setq str (cons (car tail) str)) | |
279 (setq tail (nthcdr 2 tail))) | |
280 (setq str (concat (nreverse str)) | |
281 components args)) | |
282 ;; Relative composition. | |
283 (setq str (concat args))) | |
284 (compose-string-internal str 0 (length str) components))) | |
285 | |
286 (defun find-composition (pos &optional limit string detail-p) | |
287 "Return information about a composition at or nearest to buffer position POS. | |
288 | |
289 If the character at POS has `composition' property, the value is a list | |
290 of FROM, TO, and VALID-P. | |
291 | |
292 FROM and TO specify the range of text that has the same `composition' | |
293 property, VALID-P is non-nil if and only if this composition is valid. | |
294 | |
295 If there's no composition at POS, and the optional 2nd argument LIMIT | |
296 is non-nil, search for a composition toward LIMIT. | |
297 | |
298 If no composition is found, return nil. | |
299 | |
300 Optional 3rd argument STRING, if non-nil, is a string to look for a | |
301 composition in; nil means the current buffer. | |
302 | |
303 If a valid composition is found and the optional 4th argument DETAIL-P | |
304 is non-nil, the return value is a list of FROM, TO, COMPONENTS, | |
305 RELATIVE-P, MOD-FUNC, and WIDTH. | |
306 | |
307 COMPONENTS is a vector of integers, the meaning depends on RELATIVE-P. | |
308 | |
309 RELATIVE-P is t if the composition method is relative, else nil. | |
310 | |
311 If RELATIVE-P is t, COMPONENTS is a vector of characters to be | |
312 composed. If RELATIVE-P is nil, COMPONENTS is a vector of characters | |
313 and composition rules as described in `compose-region'. | |
314 | |
315 MOD-FUNC is a modification function of the composition. | |
316 | |
317 WIDTH is a number of columns the composition occupies on the screen." | |
318 (let ((result (find-composition-internal pos limit string detail-p))) | |
319 (if (and detail-p result (nth 2 result) (not (nth 3 result))) | |
320 ;; This is a valid rule-base composition. | |
321 (decode-composition-components (nth 2 result) 'nocopy)) | |
322 result)) | |
323 | |
324 | |
33244
59edd748e69a
(composition-function-table): Variable declaration
Kenichi Handa <handa@m17n.org>
parents:
30485
diff
changeset
|
325 (defun compose-chars-after (pos &optional limit object) |
26880 | 326 "Compose characters in current buffer after position POS. |
327 | |
328 It looks up the char-table `composition-function-table' (which see) by | |
329 a character after POS. If non-nil value is found, the format of the | |
330 value should be an alist of PATTERNs vs FUNCs, where PATTERNs are | |
331 regular expressions and FUNCs are functions. If the text after POS | |
332 matches one of PATTERNs, call the corresponding FUNC with three | |
333 arguments POS, TO, and PATTERN, where TO is the end position of text | |
334 matching PATTERN, and return what FUNC returns. Otherwise, return | |
335 nil. | |
336 | |
337 FUNC is responsible for composing the text properly. The return value | |
338 is: | |
339 nil -- if no characters were composed. | |
340 CHARS (integer) -- if CHARS characters were composed. | |
341 | |
342 Optional 2nd arg LIMIT, if non-nil, limits the matching of text. | |
343 | |
33244
59edd748e69a
(composition-function-table): Variable declaration
Kenichi Handa <handa@m17n.org>
parents:
30485
diff
changeset
|
344 Optional 3rd arg OBJECT, if non-nil, is a string that contains the |
89497 | 345 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
|
346 |
26880 | 347 This function is the default value of `compose-chars-after-function'." |
348 (let ((tail (aref composition-function-table (char-after pos))) | |
349 pattern func result) | |
350 (when tail | |
30485
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
351 (save-match-data |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
352 (save-excursion |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49512
diff
changeset
|
353 (while (and tail (not func)) |
30485
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
354 (setq pattern (car (car tail)) |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
355 func (cdr (car tail))) |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
356 (goto-char pos) |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
357 (if (if limit |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
358 (and (re-search-forward pattern limit t) |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
359 (= (match-beginning 0) pos)) |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
360 (looking-at pattern)) |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
361 (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
|
362 (setq func nil tail (cdr tail))))))) |
26880 | 363 result)) |
364 | |
365 (defun compose-last-chars (args) | |
366 "Compose last characters. | |
35075
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
367 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
|
368 \(compose-last-chars N COMPONENTS), |
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
369 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
|
370 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
|
371 \(which see). If it is nil, `compose-chars-after' is called, |
64530
87bf9c446836
(compose-string, encode-composition-rule, compose-last-chars):
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
372 and that function finds a proper rule to compose the target characters. |
26880 | 373 This function is intended to be used from input methods. |
374 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
|
375 function. Input method may generate an event (compose-last-chars N COMPONENTS) |
64530
87bf9c446836
(compose-string, encode-composition-rule, compose-last-chars):
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
376 after a sequence of character events." |
26880 | 377 (interactive "e") |
378 (let ((chars (nth 1 args))) | |
379 (if (and (numberp chars) | |
380 (>= (- (point) (point-min)) chars)) | |
35075
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
381 (if (nth 2 args) |
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
382 (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
|
383 (compose-chars-after (- (point) chars) (point)))))) |
26880 | 384 |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
385 (global-set-key [compose-last-chars] 'compose-last-chars) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
386 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
387 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
388 ;;; Automatic character composition. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
389 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
390 (defvar composition-function-table |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
391 (make-char-table nil) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
392 "Char table of functions for automatic character composition. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
393 For each character that has to be composed automatically with |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
394 preceding and/or following characters, this char table contains |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
395 a function to call to compose that character. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
396 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
397 Each function is called with two arguments, POS and STRING. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
398 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
399 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
|
400 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
|
401 in the current buffer. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
402 |
89497 | 403 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
|
404 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
|
405 surrounding characters in the string. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
406 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
407 See also the command `toggle-auto-composition'.") |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
408 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
409 ;; Copied from font-lock.el. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
410 (eval-when-compile |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
411 ;; Borrowed from lazy-lock.el. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
412 ;; 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
|
413 (defmacro save-buffer-state (varlist &rest body) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
414 "Bind variables according to VARLIST and eval BODY restoring buffer state." |
89307 | 415 `(let* ,(append varlist |
416 '((modified (buffer-modified-p)) (buffer-undo-list t) | |
417 (inhibit-read-only t) (inhibit-point-motion-hooks t) | |
418 (inhibit-modification-hooks t) | |
419 deactivate-mark buffer-file-name buffer-file-truename)) | |
420 ,@body | |
421 (unless modified | |
422 (restore-buffer-modified-p nil)))) | |
89497 | 423 ;; Fixme: This makes bootstrapping fail with this error. |
89307 | 424 ;; Symbol's function definition is void: eval-defun |
425 ;;(def-edebug-spec save-buffer-state let) | |
426 ) | |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
427 |
89651
65f1f8091f15
(auto-compose-chars): Don't do unnecessary save-exclusion and
Kenichi Handa <handa@m17n.org>
parents:
89608
diff
changeset
|
428 (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
|
429 |
90656
a85e3683b64f
(terminal-composition-modification): New function.
Kenichi Handa <handa@m17n.org>
parents:
90637
diff
changeset
|
430 ;; This function is called when a composition created by |
a85e3683b64f
(terminal-composition-modification): New function.
Kenichi Handa <handa@m17n.org>
parents:
90637
diff
changeset
|
431 ;; terminal-composition-function is partially modified. |
a85e3683b64f
(terminal-composition-modification): New function.
Kenichi Handa <handa@m17n.org>
parents:
90637
diff
changeset
|
432 (defun terminal-composition-modification (from to) |
a85e3683b64f
(terminal-composition-modification): New function.
Kenichi Handa <handa@m17n.org>
parents:
90637
diff
changeset
|
433 (terminal-composition-function from)) |
a85e3683b64f
(terminal-composition-modification): New function.
Kenichi Handa <handa@m17n.org>
parents:
90637
diff
changeset
|
434 |
90637
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
435 (defun terminal-composition-function (pos &optional string) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
436 "General composition function used on terminal. |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
437 Non-spacing characters are composed with the preceding spacing |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
438 character. All non-spacing characters has this function in |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
439 `terminal-composition-function-table'." |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
440 (let ((from (1- pos)) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
441 ch) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
442 (if string |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
443 (length string) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
444 (setq pos (1+ pos)) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
445 (while (and (< pos (point-max)) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
446 (= (aref char-width-table (char-after pos)) 0)) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
447 (setq pos (1+ pos))) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
448 (if (and (>= from (point-min)) |
90656
a85e3683b64f
(terminal-composition-modification): New function.
Kenichi Handa <handa@m17n.org>
parents:
90637
diff
changeset
|
449 (= (aref (symbol-name (get-char-code-property |
a85e3683b64f
(terminal-composition-modification): New function.
Kenichi Handa <handa@m17n.org>
parents:
90637
diff
changeset
|
450 (char-after from) |
a85e3683b64f
(terminal-composition-modification): New function.
Kenichi Handa <handa@m17n.org>
parents:
90637
diff
changeset
|
451 'general-category)) 0) ?L)) |
90637
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
452 (compose-region from pos (buffer-substring from pos)) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
453 (compose-region (1+ from) pos |
90656
a85e3683b64f
(terminal-composition-modification): New function.
Kenichi Handa <handa@m17n.org>
parents:
90637
diff
changeset
|
454 (concat " " (buffer-substring (1+ from) pos)) |
a85e3683b64f
(terminal-composition-modification): New function.
Kenichi Handa <handa@m17n.org>
parents:
90637
diff
changeset
|
455 'terminal-composition-modification)) |
90637
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
456 pos))) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
457 |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
458 (defvar terminal-composition-function-table |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
459 (let ((table (make-char-table nil))) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
460 (map-char-table |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
461 #'(lambda (key val) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
462 (if (= val 0) (set-char-table-range table key |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
463 'terminal-composition-function))) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
464 char-width-table) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
465 table) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
466 "Char table of functions for automatic character composition on terminal. |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
467 This is like `composition-function-table' but used when Emacs is running |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
468 on a terminal.") |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
469 |
90543
4a80a8a200ba
(auto-compose-current-font): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90315
diff
changeset
|
470 (defvar auto-compose-current-font nil |
4a80a8a200ba
(auto-compose-current-font): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90315
diff
changeset
|
471 "The current font-object used for characters being composed automatically.") |
4a80a8a200ba
(auto-compose-current-font): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90315
diff
changeset
|
472 |
4a80a8a200ba
(auto-compose-current-font): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90315
diff
changeset
|
473 (defun auto-compose-chars (pos string font-object) |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
474 "Compose characters after the buffer position POS. |
89497 | 475 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
|
476 In that case, compose characters in the string. |
90543
4a80a8a200ba
(auto-compose-current-font): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90315
diff
changeset
|
477 FONT-OBJECT is a font selected for the character at POS. |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
478 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
479 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
|
480 (save-buffer-state nil |
89659
91f056b94e70
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89651
diff
changeset
|
481 (save-excursion |
91f056b94e70
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89651
diff
changeset
|
482 (save-match-data |
89907
df801f738c09
(auto-compose-chars): Execute the main code in
Kenichi Handa <handa@m17n.org>
parents:
89722
diff
changeset
|
483 (condition-case nil |
df801f738c09
(auto-compose-chars): Execute the main code in
Kenichi Handa <handa@m17n.org>
parents:
89722
diff
changeset
|
484 (let ((start pos) |
df801f738c09
(auto-compose-chars): Execute the main code in
Kenichi Handa <handa@m17n.org>
parents:
89722
diff
changeset
|
485 (limit (if string (length string) (point-max))) |
90543
4a80a8a200ba
(auto-compose-current-font): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90315
diff
changeset
|
486 (auto-compose-current-font font-object) |
90637
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
487 (table (if (display-graphic-p) |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
488 composition-function-table |
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
489 terminal-composition-function-table)) |
89907
df801f738c09
(auto-compose-chars): Execute the main code in
Kenichi Handa <handa@m17n.org>
parents:
89722
diff
changeset
|
490 ch func newpos) |
df801f738c09
(auto-compose-chars): Execute the main code in
Kenichi Handa <handa@m17n.org>
parents:
89722
diff
changeset
|
491 (setq limit |
df801f738c09
(auto-compose-chars): Execute the main code in
Kenichi Handa <handa@m17n.org>
parents:
89722
diff
changeset
|
492 (or (text-property-any pos limit 'auto-composed t string) |
df801f738c09
(auto-compose-chars): Execute the main code in
Kenichi Handa <handa@m17n.org>
parents:
89722
diff
changeset
|
493 limit) |
df801f738c09
(auto-compose-chars): Execute the main code in
Kenichi Handa <handa@m17n.org>
parents:
89722
diff
changeset
|
494 pos |
df801f738c09
(auto-compose-chars): Execute the main code in
Kenichi Handa <handa@m17n.org>
parents:
89722
diff
changeset
|
495 (catch 'tag |
89664
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
496 (if string |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
497 (while (< pos limit) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
498 (setq ch (aref string pos)) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
499 (if (= ch ?\n) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
500 (throw 'tag (1+ pos))) |
90637
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
501 (setq func (aref table ch)) |
89664
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
502 (if (and (functionp func) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
503 (setq newpos (funcall func pos string)) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
504 (> newpos pos)) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
505 (setq pos newpos) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
506 (setq pos (1+ pos)))) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
507 (while (< pos limit) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
508 (setq ch (char-after pos)) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
509 (if (= ch ?\n) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
510 (throw 'tag (1+ pos))) |
90637
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
511 (setq func (aref table ch)) |
89664
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
512 (if (and (functionp func) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
513 (setq newpos (funcall func pos string)) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
514 (> newpos pos)) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
515 (setq pos newpos) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
516 (setq pos (1+ pos))))) |
5548dd3d1a7c
(auto-compose-chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89659
diff
changeset
|
517 limit)) |
89907
df801f738c09
(auto-compose-chars): Execute the main code in
Kenichi Handa <handa@m17n.org>
parents:
89722
diff
changeset
|
518 (put-text-property start pos 'auto-composed t string)) |
df801f738c09
(auto-compose-chars): Execute the main code in
Kenichi Handa <handa@m17n.org>
parents:
89722
diff
changeset
|
519 (error nil)))))) |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
520 |
90306
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
521 (make-variable-buffer-local 'auto-composition-function) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
522 |
90307
a2899387f787
(auto-composition-mode): Add autoload cookie.
Kenichi Handa <handa@m17n.org>
parents:
90306
diff
changeset
|
523 ;;;###autoload |
90306
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
524 (define-minor-mode auto-composition-mode |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
525 "Toggle Auto Compostion mode. |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
526 With arg, turn Auto Compostion mode off if and only if arg is a non-positive |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
527 number; if arg is nil, toggle Auto Compostion mode; anything else turns Auto |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
528 Compostion on. |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
529 |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
530 When Auto Composition is enabled, text characters are automatically composed |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
531 by functions registered in `composition-function-table' (which see). |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
532 |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
533 You can use Global Auto Composition mode to automagically turn on |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
534 Auto Composition mode in all buffers (this is the default)." |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
535 nil nil nil |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
536 (if noninteractive |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
537 (setq auto-composition-mode nil)) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
538 (cond (auto-composition-mode |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
539 (add-hook 'after-change-functions 'auto-composition-after-change nil t) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
540 (setq auto-composition-function 'auto-compose-chars)) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
541 (t |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
542 (remove-hook 'after-change-functions 'auto-composition-after-change t) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
543 (setq auto-composition-function nil))) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
544 (save-buffer-state nil |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
545 (save-restriction |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
546 (widen) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
547 (remove-text-properties (point-min) (point-max) '(auto-composed nil)) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
548 (decompose-region (point-min) (point-max))))) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
549 |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
550 (defun auto-composition-after-change (start end old-len) |
90315
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
551 (save-buffer-state nil |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
552 (if (< start (point-min)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
553 (setq start (point-min))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
554 (if (> end (point-max)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
555 (setq end (point-max))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
556 (when (and auto-composition-mode (not memory-full)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
557 (let (func1 func2) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
558 (when (and (> start (point-min)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
559 (setq func2 (aref composition-function-table |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
560 (char-after (1- start)))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
561 (or (= start (point-max)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
562 (not (setq func1 (aref composition-function-table |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
563 (char-after start)))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
564 (eq func1 func2))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
565 (setq start (1- start) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
566 func1 func2) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
567 (while (eq func1 func2) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
568 (if (> start (point-min)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
569 (setq start (1- start) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
570 func2 (aref composition-function-table |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
571 (char-after start))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
572 (setq func2 nil)))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
573 (when (and (< end (point-max)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
574 (setq func2 (aref composition-function-table |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
575 (char-after end))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
576 (or (= end (point-min)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
577 (not (setq func1 (aref composition-function-table |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
578 (char-after (1- end))))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
579 (eq func1 func2))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
580 (setq end (1+ end) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
581 func1 func2) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
582 (while (eq func1 func2) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
583 (if (< end (point-max)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
584 (setq func2 (aref composition-function-table |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
585 (char-after end)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
586 end (1+ end)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
587 (setq func2 nil)))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
588 (if (< start end) |
90612
e3f4e9ea5df6
(auto-composition-after-change): Remove
Kenichi Handa <handa@m17n.org>
parents:
90543
diff
changeset
|
589 (remove-text-properties start end '(auto-composed nil))))))) |
90306
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
590 |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
591 (defun turn-on-auto-composition-if-enabled () |
90315
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
592 (if enable-multibyte-characters |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
593 (auto-composition-mode 1))) |
90306
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
594 |
90307
a2899387f787
(auto-composition-mode): Add autoload cookie.
Kenichi Handa <handa@m17n.org>
parents:
90306
diff
changeset
|
595 ;;;###autoload |
90306
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
596 (define-global-minor-mode global-auto-composition-mode |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
597 auto-composition-mode turn-on-auto-composition-if-enabled |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
598 :extra-args (dummy) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
599 :initialize 'custom-initialize-safe-default |
90627
f13e98b07b9c
(global-auto-composition-mode): Make the initial
Kenichi Handa <handa@m17n.org>
parents:
90612
diff
changeset
|
600 :init-value (not noninteractive) |
90306
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
601 :group 'auto-composition |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
602 :version "23.1") |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
603 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
604 (defun toggle-auto-composition (&optional arg) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
605 "Change whether automatic character composition is enabled in this buffer. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
606 With arg, enable it iff arg is positive." |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
607 (interactive "P") |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
608 (let ((enable (if (null arg) (not auto-composition-function) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
609 (> (prefix-numeric-value arg) 0)))) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
610 (if enable |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
611 (kill-local-variable 'auto-composition-function) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
612 (make-local-variable 'auto-composition-function) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
613 (setq auto-composition-function nil) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
614 (save-buffer-state nil |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
615 (save-restriction |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
616 (widen) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
617 (decompose-region (point-min) (point-max))))) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
618 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
619 (save-buffer-state nil |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
620 (save-restriction |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
621 (widen) |
90612
e3f4e9ea5df6
(auto-composition-after-change): Remove
Kenichi Handa <handa@m17n.org>
parents:
90543
diff
changeset
|
622 (remove-text-properties (point-min) (point-max) |
e3f4e9ea5df6
(auto-composition-after-change): Remove
Kenichi Handa <handa@m17n.org>
parents:
90543
diff
changeset
|
623 '(auto-composed nil)))))) |
89528
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
624 |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
625 (defun auto-compose-region (from to) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
626 "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
|
627 (save-excursion |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
628 (if (get-text-property from 'auto-composed) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
629 (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
|
630 (goto-char from) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
631 (let ((modified-p (buffer-modified-p)) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
632 (inhibit-read-only '(composition auto-composed)) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
633 (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
|
634 (while (< (point) to) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
635 (if (= (point) stop) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
636 (progn |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
637 (goto-char (next-single-property-change (point) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
638 'auto-composed nil to)) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
639 (setq stop (next-single-property-change (point) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
640 'auto-composed nil to))) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
641 (let ((func (aref composition-function-table (following-char))) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
642 (pos (point))) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
643 (if (functionp func) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
644 (goto-char (funcall func (point) nil))) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
645 (if (<= (point) pos) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
646 (forward-char 1))))) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
647 (put-text-property from to 'auto-composed t) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
648 (set-buffer-modified-p modified-p)))) |
26880 | 649 |
650 | |
651 ;;; 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
|
652 ;;; 20.4 and earlier. |
26880 | 653 |
654 (defun decompose-composite-char (char &optional type with-composition-rule) | |
655 "Convert CHAR to string. | |
656 | |
657 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
|
658 `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
|
659 vector of CHAR respectively. |
6a0305153436
(decompose-composite-char): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
46963
diff
changeset
|
660 Optional 3rd arg WITH-COMPOSITION-RULE is ignored." |
26880 | 661 (cond ((or (null type) (eq type 'string)) (char-to-string char)) |
662 ((eq type 'list) (list char)) | |
663 (t (vector char)))) | |
664 | |
29521
4ad26302d559
(decompose-composite-char): Declare it as obsolete.
Kenichi Handa <handa@m17n.org>
parents:
26880
diff
changeset
|
665 (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
|
666 |
26880 | 667 |
52401 | 668 |
669 ;;; arch-tag: ee703d77-1723-45d4-a31f-e9f0f867aa33 | |
26880 | 670 ;;; composite.el ends here |