Mercurial > emacs
annotate lisp/composite.el @ 100267:c851df8e004e
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-id.el (org-id-locations-file): Wrap file name with
`convert-standard-filename'.
(org-id-files): New variable.
(org-id-use-hash): New option.
(org-id-update-id-locations): Also search in all files current
listed in `org-id-files'. Convert the resulting alist to a hash
if the user customation says so.
(org-id-locations-save): Handle he case if `org-id-locations' is a
hash.
(org-id-locations-load): Convert the alist to a hash.
(org-id-add-location): Handle the hast case.
(kill-emacs-hook): Make sure id locations are saved when Emacs is
exited.
(org-id-hash-to-alist, org-id-alist-to-hash)
(org-id-paste-tracker): New functions.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-goto-calendar): Remove duplicate let
bindings of calendar variables.
* org-table.el (org-table-find-row-type): Renamed from
`org-find-row-type'.
(org-table-rewrite-old-row-references): Renamed from
`org-rewrite-old-row-references'.
(org-table-shift-refpart): Renamed from `org-shift-refpart'.
(org-table-cleanup-narrow-column-properties): Renamed from
`org-cleanup-narrow-column-properties'.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-find-row-type): New arguments DESC and CLINE,
for better error messages.
(org-table-get-descriptor-line): Supply the new arguments to
`org-find-row-type'.
(org-table-error-on-row-ref-crossing-hline): New option.
* org.el (org-target-link-regexp): Make buffer-local.
(org-move-subtree-down): Fix bug with trees at beginning of
buffer.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-faces.el (org-set-tag-faces): New function.
(org-tags-special-faces-re): New variable.
* org.el (org-font-lock-add-tag-faces, org-get-tag-face): New functions.
* org-faces.el (org-tag-faces): New option.
(org-tag): Mention `org-tag-faces' in the docstring.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-html-style-default): Implement new
quoting.
* org-jsinfo.el (org-infojs-template): Implement new quoting.
* org-w3m.el (w3m-minor-mode-hook): Also add the special copy
command to the `w3m-minor-mode-map'.
* org-archive.el (org-archive-to-archive-sibling): Protect
`this-command' to avoid appending kills during archiving.
* org-exp.el (org-export-with-priority): New variable.
(org-export-add-options-to-plist): Use `org-export-plist-vars'
instead of internal list of strings and properties.
(org-print-icalendar-entries): Retrieve the location property with
inheritance.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-with-todo-keywords): New option.
(org-export-plist-vars): Include also the keys for the #+OPTIONS
line.
(org-default-export-plist, org-export-add-options-to-plist)
(org-export-as-ascii, org-export-as-html): Use the new structure
of `org-export-plist-vars'.
* org.el (org-map-entries): Return all values.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-matcher-time): Recognize more special values.
* org-gnus.el (fboundp): Fix defvaralias for XEmacs.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-tags-exclude-from-inheritance): New option.
(org-tag-inherit-p, org-remove-uniherited-tags): Respect
`org-tags-exclude-from-inheritance'.
* org-agenda.el (org-agenda-show-inherited-tags): New option.
(org-format-agenda-item): Add inherited tags to the agenda line
string, and make sure that properties are kept when downcasing the
tags list.
(org-agenda-add-inherited-tags): New function.
(org-downcase-keep-props): New function.
* org.el (org-scan-tags): Mark inherited tags with a text
property.
(org-get-tags-at): Mark inherited tags with a text property.
(org-add-prop-inherited): New function.
* org-agenda.el (org-agenda-add-inherited-tags): New function.
(org-agenda-show-inherited-tags): New option.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-modules): Add org-w3m to the default modules.
* org-table.el (orgtbl-self-insert-command): Make S-SPC work in
orgtbl-mode.
(orgtabl-create-or-convert-from-region): New command.
* org-exp.el (org-export-as-ascii): Remove the handling of
targets.
(org-export-ascii-preprocess): Handle targets already in this
function.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-timer.el (org-timer-start-time): Define this variable.
(org-timer-item): Make argument optional.
* org-list.el (org-insert-item): Automatically insert a timer item
if the current list is a timer list.
* org-timer.el: New file.
* org-publish.el (org-publish-org-index): Only exclude the index
file in the main directory from being added to the site-map.
(org-publish-get-project-from-filename): If the current project is
a component, start publishing from the parent project.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (orgtbl-ret): Fix RET at beginning-of-buffer.
* org-publish.el (org-publish-org-index): Improve removal of
temporary buffers.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Sun, 07 Dec 2008 18:36:02 +0000 |
parents | e3d5c2e9ec89 |
children | 79c848cc0c06 |
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 |
79721 | 3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
4 ;; 2008 | |
67658 | 5 ;; National Institute of Advanced Industrial Science and Technology (AIST) |
6 ;; Registration Number H14PRO021 | |
26880 | 7 |
8 ;; Keywords: mule, multilingual, character composition | |
9 | |
10 ;; This file is part of GNU Emacs. | |
11 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92026
diff
changeset
|
12 ;; GNU Emacs is free software: you can redistribute it and/or modify |
26880 | 13 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92026
diff
changeset
|
14 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92026
diff
changeset
|
15 ;; (at your option) any later version. |
26880 | 16 |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92026
diff
changeset
|
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
26880 | 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 | |
56985
5eac7cd6d213
(encode-composition-rule): Add autoload cooky.
Kenichi Handa <handa@m17n.org>
parents:
54433
diff
changeset
|
84 ;;;###autoload |
26880 | 85 (defun encode-composition-rule (rule) |
56985
5eac7cd6d213
(encode-composition-rule): Add autoload cooky.
Kenichi Handa <handa@m17n.org>
parents:
54433
diff
changeset
|
86 "Encode composition rule RULE into an integer value. |
5eac7cd6d213
(encode-composition-rule): Add autoload cooky.
Kenichi Handa <handa@m17n.org>
parents:
54433
diff
changeset
|
87 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
|
88 \(see `reference-point-alist')." |
56985
5eac7cd6d213
(encode-composition-rule): Add autoload cooky.
Kenichi Handa <handa@m17n.org>
parents:
54433
diff
changeset
|
89 |
5eac7cd6d213
(encode-composition-rule): Add autoload cooky.
Kenichi Handa <handa@m17n.org>
parents:
54433
diff
changeset
|
90 ;; 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
|
91 ;; defined in composite.h. |
5eac7cd6d213
(encode-composition-rule): Add autoload cooky.
Kenichi Handa <handa@m17n.org>
parents:
54433
diff
changeset
|
92 |
26880 | 93 (if (and (integerp rule) (< rule 144)) |
94 ;; Already encoded. | |
95 rule | |
89722
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
96 (if (consp rule) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
97 (let ((gref (car rule)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
98 (nref (cdr rule)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
99 xoff yoff) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
100 (if (consp nref) ; (GREF NREF XOFF YOFF) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
101 (progn |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
102 (setq xoff (nth 1 nref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
103 yoff (nth 2 nref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
104 nref (car nref)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
105 (or (and (>= xoff -100) (<= xoff 100) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
106 (>= yoff -100) (<= yoff 100)) |
92026
4ad14ee0d40a
(encode-composition-rule): Fix typo in error message.
Glenn Morris <rgm@gnu.org>
parents:
92000
diff
changeset
|
107 (error "Invalid composition rule: %s" rule)) |
89722
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
108 (setq xoff (+ xoff 128) yoff (+ yoff 128))) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
109 ;; (GREF . NREF) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
110 (setq xoff 0 yoff 0)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
111 (or (integerp gref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
112 (setq gref (cdr (assq gref reference-point-alist)))) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
113 (or (integerp nref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
114 (setq nref (cdr (assq nref reference-point-alist)))) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
115 (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
|
116 (error "Invalid composition rule: %S" rule)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
117 (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
|
118 (error "Invalid composition rule: %S" rule)))) |
26880 | 119 |
120 ;; Decode encoded composition rule RULE-CODE. The value is a cons of | |
121 ;; global and new reference point symbols. | |
122 ;; This must be compatible with C macro COMPOSITION_DECODE_RULE | |
123 ;; defined in composite.h. | |
124 | |
125 (defun decode-composition-rule (rule-code) | |
89722
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
126 (or (and (natnump rule-code) (< rule-code #x1000000)) |
26880 | 127 (error "Invalid encoded composition rule: %S" rule-code)) |
89722
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
128 (let ((xoff (lsh rule-code -16)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
129 (yoff (logand (lsh rule-code -8) #xFF)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
130 gref nref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
131 (setq rule-code (logand rule-code #xFF) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
132 gref (car (rassq (/ rule-code 12) reference-point-alist)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
133 nref (car (rassq (% rule-code 12) reference-point-alist))) |
26880 | 134 (or (and gref (symbolp gref) nref (symbolp nref)) |
135 (error "Invalid composition rule code: %S" rule-code)) | |
89722
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
136 (if (and (= xoff 0) (= yoff 0)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
137 (cons gref nref) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
138 (setq xoff (- xoff 128) yoff (- yoff 128)) |
eee9d99444cc
(reference-point-alist): Doc fixed.
Kenichi Handa <handa@m17n.org>
parents:
89664
diff
changeset
|
139 (list gref xoff yoff nref)))) |
26880 | 140 |
141 ;; Encode composition rules in composition components COMPONENTS. The | |
142 ;; value is a copy of COMPONENTS, where composition rules (cons of | |
143 ;; global and new glyph reference point symbols) are replaced with | |
144 ;; encoded composition rules. Optional 2nd argument NOCOPY non-nil | |
145 ;; means don't make a copy but modify COMPONENTS directly. | |
146 | |
147 (defun encode-composition-components (components &optional nocopy) | |
148 (or nocopy | |
149 (setq components (copy-sequence components))) | |
150 (if (vectorp components) | |
151 (let ((len (length components)) | |
152 (i 1)) | |
153 (while (< i len) | |
154 (aset components i | |
155 (encode-composition-rule (aref components i))) | |
156 (setq i (+ i 2)))) | |
157 (let ((tail (cdr components))) | |
158 (while tail | |
159 (setcar tail | |
160 (encode-composition-rule (car tail))) | |
161 (setq tail (nthcdr 2 tail))))) | |
162 components) | |
163 | |
164 ;; Decode composition rule codes in composition components COMPONENTS. | |
165 ;; The value is a copy of COMPONENTS, where composition rule codes are | |
166 ;; replaced with composition rules (cons of global and new glyph | |
167 ;; reference point symbols). Optional 2nd argument NOCOPY non-nil | |
168 ;; means don't make a copy but modify COMPONENTS directly. | |
169 ;; It is assumed that COMPONENTS is a vector and is for rule-base | |
170 ;; composition, thus (2N+1)th elements are rule codes. | |
171 | |
172 (defun decode-composition-components (components &optional nocopy) | |
173 (or nocopy | |
174 (setq components (copy-sequence components))) | |
175 (let ((len (length components)) | |
176 (i 1)) | |
177 (while (< i len) | |
178 (aset components i | |
179 (decode-composition-rule (aref components i))) | |
180 (setq i (+ i 2)))) | |
181 components) | |
182 | |
183 (defun compose-region (start end &optional components modification-func) | |
184 "Compose characters in the current region. | |
185 | |
46963 | 186 Characters are composed relatively, i.e. composed by overstricking or |
187 stacking depending on ascent, descent and other properties. | |
188 | |
26880 | 189 When called from a program, expects these four arguments. |
190 | |
191 First two arguments START and END are positions (integers or markers) | |
192 specifying the region. | |
193 | |
89497 | 194 Optional 3rd argument COMPONENTS, if non-nil, is a character, a string |
195 or a vector or list of integers and rules. | |
26880 | 196 |
197 If it is a character, it is an alternate character to display instead | |
198 of the text in the region. | |
199 | |
96418
3dff73218ec3
(compose-region): Mention the special handling of TAB.
Kenichi Handa <handa@m17n.org>
parents:
96324
diff
changeset
|
200 If it is a string, the elements are alternate characters. In |
3dff73218ec3
(compose-region): Mention the special handling of TAB.
Kenichi Handa <handa@m17n.org>
parents:
96324
diff
changeset
|
201 this case, TAB element has a special meaning. If the first |
3dff73218ec3
(compose-region): Mention the special handling of TAB.
Kenichi Handa <handa@m17n.org>
parents:
96324
diff
changeset
|
202 characer is TAB, the glyphs are displayed with left padding space |
3dff73218ec3
(compose-region): Mention the special handling of TAB.
Kenichi Handa <handa@m17n.org>
parents:
96324
diff
changeset
|
203 so that no pixel overlaps with the previous column. If the last |
3dff73218ec3
(compose-region): Mention the special handling of TAB.
Kenichi Handa <handa@m17n.org>
parents:
96324
diff
changeset
|
204 character is TAB, the glyphs are displayed with rigth padding |
3dff73218ec3
(compose-region): Mention the special handling of TAB.
Kenichi Handa <handa@m17n.org>
parents:
96324
diff
changeset
|
205 space so that no pixel overlaps with the following column. |
26880 | 206 |
207 If it is a vector or list, it is a sequence of alternate characters and | |
208 composition rules, where (2N)th elements are characters and (2N+1)th | |
209 elements are composition rules to specify how to compose (2N+2)th | |
210 elements with previously composed N glyphs. | |
211 | |
212 A composition rule is a cons of global and new glyph reference point | |
213 symbols. See the documentation of `reference-point-alist' for more | |
214 detail. | |
215 | |
216 Optional 4th argument MODIFICATION-FUNC is a function to call to | |
217 adjust the composition when it gets invalid because of a change of | |
218 text in the composition." | |
219 (interactive "r") | |
220 (let ((modified-p (buffer-modified-p)) | |
81073
12cb550b10e4
(compose-region, decompose-region):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
221 (inhibit-read-only t)) |
26880 | 222 (if (or (vectorp components) (listp components)) |
223 (setq components (encode-composition-components components))) | |
224 (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
|
225 (restore-buffer-modified-p modified-p))) |
26880 | 226 |
227 (defun decompose-region (start end) | |
228 "Decompose text in the current region. | |
229 | |
230 When called from a program, expects two arguments, | |
231 positions (integers or markers) specifying the region." | |
232 (interactive "r") | |
233 (let ((modified-p (buffer-modified-p)) | |
81073
12cb550b10e4
(compose-region, decompose-region):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
234 (inhibit-read-only t)) |
26880 | 235 (remove-text-properties start end '(composition nil)) |
81073
12cb550b10e4
(compose-region, decompose-region):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
236 (restore-buffer-modified-p modified-p))) |
26880 | 237 |
238 (defun compose-string (string &optional start end components modification-func) | |
239 "Compose characters in string STRING. | |
240 | |
88808 | 241 The return value is STRING with the `composition' property put on all |
26880 | 242 the characters in it. |
243 | |
244 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
|
245 STRING to be composed. They default to the beginning and the end of |
26880 | 246 STRING respectively. |
247 | |
248 Optional 4th argument COMPONENTS, if non-nil, is a character or a | |
249 sequence (vector, list, or string) of integers. See the function | |
250 `compose-region' for more detail. | |
251 | |
252 Optional 5th argument MODIFICATION-FUNC is a function to call to | |
253 adjust the composition when it gets invalid because of a change of | |
254 text in the composition." | |
255 (if (or (vectorp components) (listp components)) | |
256 (setq components (encode-composition-components components))) | |
257 (or start (setq start 0)) | |
258 (or end (setq end (length string))) | |
259 (compose-string-internal string start end components modification-func) | |
260 string) | |
261 | |
262 (defun decompose-string (string) | |
263 "Return STRING where `composition' property is removed." | |
264 (remove-text-properties 0 (length string) '(composition nil) string) | |
265 string) | |
266 | |
267 (defun compose-chars (&rest args) | |
268 "Return a string from arguments in which all characters are composed. | |
269 For relative composition, arguments are characters. | |
270 For rule-based composition, Mth \(where M is odd) arguments are | |
271 characters, and Nth \(where N is even) arguments are composition rules. | |
272 A composition rule is a cons of glyph reference points of the form | |
273 \(GLOBAL-REF-POINT . NEW-REF-POINT). See the documentation of | |
274 `reference-point-alist' for more detail." | |
275 (let (str components) | |
276 (if (consp (car (cdr args))) | |
277 ;; Rule-base composition. | |
278 (let ((len (length args)) | |
279 (tail (encode-composition-components args 'nocopy))) | |
280 | |
281 (while tail | |
282 (setq str (cons (car tail) str)) | |
283 (setq tail (nthcdr 2 tail))) | |
284 (setq str (concat (nreverse str)) | |
285 components args)) | |
286 ;; Relative composition. | |
287 (setq str (concat args))) | |
288 (compose-string-internal str 0 (length str) components))) | |
289 | |
290 (defun find-composition (pos &optional limit string detail-p) | |
291 "Return information about a composition at or nearest to buffer position POS. | |
292 | |
293 If the character at POS has `composition' property, the value is a list | |
294 of FROM, TO, and VALID-P. | |
295 | |
296 FROM and TO specify the range of text that has the same `composition' | |
97985
26069577e76b
(find-composition): Mention about the automatic
Kenichi Handa <handa@m17n.org>
parents:
97836
diff
changeset
|
297 property, VALID-P is t if this composition is valid, and nil if not. |
26880 | 298 |
299 If there's no composition at POS, and the optional 2nd argument LIMIT | |
300 is non-nil, search for a composition toward LIMIT. | |
301 | |
302 If no composition is found, return nil. | |
303 | |
304 Optional 3rd argument STRING, if non-nil, is a string to look for a | |
305 composition in; nil means the current buffer. | |
306 | |
307 If a valid composition is found and the optional 4th argument DETAIL-P | |
308 is non-nil, the return value is a list of FROM, TO, COMPONENTS, | |
309 RELATIVE-P, MOD-FUNC, and WIDTH. | |
310 | |
311 COMPONENTS is a vector of integers, the meaning depends on RELATIVE-P. | |
312 | |
313 RELATIVE-P is t if the composition method is relative, else nil. | |
314 | |
315 If RELATIVE-P is t, COMPONENTS is a vector of characters to be | |
316 composed. If RELATIVE-P is nil, COMPONENTS is a vector of characters | |
317 and composition rules as described in `compose-region'. | |
318 | |
319 MOD-FUNC is a modification function of the composition. | |
320 | |
97985
26069577e76b
(find-composition): Mention about the automatic
Kenichi Handa <handa@m17n.org>
parents:
97836
diff
changeset
|
321 WIDTH is a number of columns the composition occupies on the screen. |
26069577e76b
(find-composition): Mention about the automatic
Kenichi Handa <handa@m17n.org>
parents:
97836
diff
changeset
|
322 |
26069577e76b
(find-composition): Mention about the automatic
Kenichi Handa <handa@m17n.org>
parents:
97836
diff
changeset
|
323 When Automatic Compostion mode is on, this function also finds a |
26069577e76b
(find-composition): Mention about the automatic
Kenichi Handa <handa@m17n.org>
parents:
97836
diff
changeset
|
324 chunk of text that is automatically composed. If such a chunk is |
26069577e76b
(find-composition): Mention about the automatic
Kenichi Handa <handa@m17n.org>
parents:
97836
diff
changeset
|
325 found closer to POS than the position that has `composition' |
26069577e76b
(find-composition): Mention about the automatic
Kenichi Handa <handa@m17n.org>
parents:
97836
diff
changeset
|
326 property, the value is a list of FROM, TO, and a glyph gstring |
26069577e76b
(find-composition): Mention about the automatic
Kenichi Handa <handa@m17n.org>
parents:
97836
diff
changeset
|
327 the specify how the chunk is composed. See the function |
26069577e76b
(find-composition): Mention about the automatic
Kenichi Handa <handa@m17n.org>
parents:
97836
diff
changeset
|
328 `composition-get-gstring' for the format of the glyph string." |
26880 | 329 (let ((result (find-composition-internal pos limit string detail-p))) |
97985
26069577e76b
(find-composition): Mention about the automatic
Kenichi Handa <handa@m17n.org>
parents:
97836
diff
changeset
|
330 (if (and detail-p (> (length result) 3) (nth 2 result) (not (nth 3 result))) |
26880 | 331 ;; This is a valid rule-base composition. |
332 (decode-composition-components (nth 2 result) 'nocopy)) | |
333 result)) | |
334 | |
335 | |
33244
59edd748e69a
(composition-function-table): Variable declaration
Kenichi Handa <handa@m17n.org>
parents:
30485
diff
changeset
|
336 (defun compose-chars-after (pos &optional limit object) |
26880 | 337 "Compose characters in current buffer after position POS. |
338 | |
92000
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
339 It looks up the char-table `composition-function-table' (which |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
340 see) by a character at POS, and compose characters after POS |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
341 according to the contents of `composition-function-table'. |
26880 | 342 |
92000
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
343 Optional 2nd arg LIMIT, if non-nil, limits characters to compose. |
26880 | 344 |
33244
59edd748e69a
(composition-function-table): Variable declaration
Kenichi Handa <handa@m17n.org>
parents:
30485
diff
changeset
|
345 Optional 3rd arg OBJECT, if non-nil, is a string that contains the |
89497 | 346 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
|
347 |
26880 | 348 This function is the default value of `compose-chars-after-function'." |
349 (let ((tail (aref composition-function-table (char-after pos))) | |
92000
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
350 (font-obj (and (display-multi-font-p) |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
351 (and (not (stringp object)) |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
352 (font-at pos (selected-window))))) |
26880 | 353 pattern func result) |
92000
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
354 (or limit |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
355 (setq limit (if (stringp object) (length object) (point-max)))) |
94955
e22dd2392947
(compose-chars-after): Assume that WINDOW is always non-nil.
Kenichi Handa <handa@m17n.org>
parents:
94734
diff
changeset
|
356 (when (and font-obj tail) |
30485
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
357 (save-match-data |
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
358 (save-excursion |
92000
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
359 (while tail |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
360 (if (functionp (car tail)) |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
361 (setq pattern nil func (car tail)) |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
362 (setq pattern (car (car tail)) |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
363 func (cdr (car tail)))) |
30485
5551289a9329
(compose-chars-after): Preserve match data.
Kenichi Handa <handa@m17n.org>
parents:
29551
diff
changeset
|
364 (goto-char pos) |
92000
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
365 (if pattern |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
366 (if (and (if (stringp object) |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
367 (eq (string-match pattern object) 0) |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
368 (looking-at pattern)) |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
369 (<= (match-end 0) limit)) |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
370 (setq result |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
371 (funcall func pos (match-end 0) font-obj object))) |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
372 (setq result (funcall func pos limit font-obj object))) |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
373 (if result (setq tail nil)))))) |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
374 result)) |
26880 | 375 |
376 (defun compose-last-chars (args) | |
377 "Compose last characters. | |
35075
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
378 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
|
379 \(compose-last-chars N COMPONENTS), |
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
380 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
|
381 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
|
382 \(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
|
383 and that function finds a proper rule to compose the target characters. |
26880 | 384 This function is intended to be used from input methods. |
385 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
|
386 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
|
387 after a sequence of character events." |
26880 | 388 (interactive "e") |
389 (let ((chars (nth 1 args))) | |
390 (if (and (numberp chars) | |
391 (>= (- (point) (point-min)) chars)) | |
35075
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
392 (if (nth 2 args) |
f49c90fa95d7
(compose-last-chars): New argument COMPONENTS. It
Kenichi Handa <handa@m17n.org>
parents:
33244
diff
changeset
|
393 (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
|
394 (compose-chars-after (- (point) chars) (point)))))) |
26880 | 395 |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
396 (global-set-key [compose-last-chars] 'compose-last-chars) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
397 |
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 ;;; Automatic character composition. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
400 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
401 ;; Copied from font-lock.el. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
402 (eval-when-compile |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
403 ;; Borrowed from lazy-lock.el. |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
404 ;; 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
|
405 (defmacro save-buffer-state (varlist &rest body) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
406 "Bind variables according to VARLIST and eval BODY restoring buffer state." |
89307 | 407 `(let* ,(append varlist |
408 '((modified (buffer-modified-p)) (buffer-undo-list t) | |
409 (inhibit-read-only t) (inhibit-point-motion-hooks t) | |
410 (inhibit-modification-hooks t) | |
411 deactivate-mark buffer-file-name buffer-file-truename)) | |
412 ,@body | |
413 (unless modified | |
414 (restore-buffer-modified-p nil)))) | |
89497 | 415 ;; Fixme: This makes bootstrapping fail with this error. |
89307 | 416 ;; Symbol's function definition is void: eval-defun |
417 ;;(def-edebug-spec save-buffer-state let) | |
418 ) | |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
419 |
89651
65f1f8091f15
(auto-compose-chars): Don't do unnecessary save-exclusion and
Kenichi Handa <handa@m17n.org>
parents:
89608
diff
changeset
|
420 (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
|
421 |
97836
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
422 ;; These macros must match with C macros LGSTRING_XXX and LGLYPH_XXX in font.h |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
423 (defsubst lgstring-header (gstring) (aref gstring 0)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
424 (defsubst lgstring-set-header (gstring header) (aset gstring 0 header)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
425 (defsubst lgstring-font (gstring) (aref (lgstring-header gstring) 0)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
426 (defsubst lgstring-char (gstring i) (aref (lgstring-header gstring) (1+ i))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
427 (defsubst lgstring-char-len (gstring) (1- (length (lgstring-header gstring)))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
428 (defsubst lgstring-shaped-p (gstring) (aref gstring 1)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
429 (defsubst lgstring-set-id (gstring id) (aset gstring 1 id)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
430 (defsubst lgstring-glyph (gstring i) (aref gstring (+ i 2))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
431 (defsubst lgstring-glyph-len (gstring) (- (length gstring) 2)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
432 (defsubst lgstring-set-glyph (gstring i glyph) (aset gstring (+ i 2) glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
433 |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
434 (defsubst lglyph-from (glyph) (aref glyph 0)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
435 (defsubst lglyph-to (glyph) (aref glyph 1)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
436 (defsubst lglyph-char (glyph) (aref glyph 2)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
437 (defsubst lglyph-code (glyph) (aref glyph 3)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
438 (defsubst lglyph-width (glyph) (aref glyph 4)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
439 (defsubst lglyph-lbearing (glyph) (aref glyph 5)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
440 (defsubst lglyph-rbearing (glyph) (aref glyph 6)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
441 (defsubst lglyph-ascent (glyph) (aref glyph 7)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
442 (defsubst lglyph-descent (glyph) (aref glyph 8)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
443 (defsubst lglyph-adjustment (glyph) (aref glyph 9)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
444 |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
445 (defsubst lglyph-set-from-to (glyph from to) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
446 (progn (aset glyph 0 from) (aset glyph 1 to))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
447 (defsubst lglyph-set-char (glyph char) (aset glyph 2 char)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
448 (defsubst lglyph-set-width (glyph width) (aset glyph 4 width)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
449 (defsubst lglyph-set-adjustment (glyph &optional xoff yoff wadjust) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
450 (aset glyph 9 (vector (or xoff 0) (or yoff 0) (or wadjust 0)))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
451 |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
452 (defsubst lglyph-copy (glyph) (copy-sequence glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
453 |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
454 (defun lgstring-insert-glyph (gstring idx glyph) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
455 (let ((nglyphs (lgstring-glyph-len gstring)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
456 (i idx) g) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
457 (while (and (< i nglyphs) (setq g (lgstring-glyph gstring i))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
458 (setq i (1+ i))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
459 (if (= i nglyphs) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
460 (setq gstring (vconcat gstring (vector glyph))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
461 (if (< (1+ i) nglyphs) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
462 (lgstring-set-glyph gstring (1+ i) nil))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
463 (while (> i idx) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
464 (lgstring-set-glyph gstring i (lgstring-glyph gstring (1- i))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
465 (setq i (1- i))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
466 (lgstring-set-glyph gstring i glyph) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
467 gstring)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
468 |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
469 (defun compose-glyph-string (gstring from to) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
470 (let ((glyph (lgstring-glyph gstring from)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
471 from-pos to-pos |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
472 ascent descent lbearing rbearing) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
473 (setq from-pos (lglyph-from glyph) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
474 to-pos (lglyph-to (lgstring-glyph gstring (1- to)))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
475 (lglyph-set-from-to glyph from-pos to-pos) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
476 (setq from (1+ from)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
477 (while (and (< from to) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
478 (setq glyph (lgstring-glyph gstring from))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
479 (lglyph-set-from-to glyph from-pos to-pos) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
480 (let ((xoff (if (<= (lglyph-rbearing glyph) 0) 0 |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
481 (- (lglyph-width glyph))))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
482 (lglyph-set-adjustment glyph xoff 0 0)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
483 (setq from (1+ from))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
484 gstring)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
485 |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
486 (defun compose-glyph-string-relative (gstring from to &optional gap) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
487 (let ((font-object (lgstring-font gstring)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
488 (glyph (lgstring-glyph gstring from)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
489 from-pos to-pos |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
490 ascent descent lbearing rbearing) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
491 (if gap |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
492 (setq gap (floor (* (font-get font-object :size) gap))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
493 (setq gap 0)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
494 (setq from-pos (lglyph-from glyph) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
495 to-pos (lglyph-to (lgstring-glyph gstring (1- to))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
496 ascent (lglyph-ascent glyph) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
497 descent (lglyph-descent glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
498 (lglyph-set-from-to glyph from-pos to-pos) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
499 (setq from (1+ from)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
500 (while (< from to) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
501 (setq glyph (lgstring-glyph gstring from)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
502 (lglyph-set-from-to glyph from-pos to-pos) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
503 (let ((this-ascent (lglyph-ascent glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
504 (this-descent (lglyph-descent glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
505 xoff yoff wadjust) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
506 (setq xoff (if (<= (lglyph-rbearing glyph) 0) 0 |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
507 (- (lglyph-width glyph)))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
508 (if (> this-ascent 0) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
509 (if (< this-descent 0) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
510 (setq yoff (- 0 ascent gap this-descent) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
511 ascent (+ ascent gap this-ascent this-descent)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
512 (setq yoff 0)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
513 (setq yoff (+ descent gap this-ascent) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
514 descent (+ descent gap this-ascent this-descent))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
515 (if (or (/= xoff 0) (/= yoff 0)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
516 (lglyph-set-adjustment glyph xoff yoff 0))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
517 (setq from (1+ from))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
518 gstring)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
519 |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
520 (defun compose-gstring-for-graphic (gstring) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
521 "Compose glyph-string GSTRING for graphic display. |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
522 Non-spacing characters are composed with the preceding base |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
523 character. If the preceding character is not a base character, |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
524 each non-spacing character is composed as a spacing character by |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
525 a padding space before and/or after the character. |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
526 |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
527 All non-spacing characters has this function in |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
528 `composition-function-table' unless overwritten." |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
529 (let* ((header (lgstring-header gstring)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
530 (nchars (lgstring-char-len gstring)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
531 (nglyphs (lgstring-glyph-len gstring)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
532 (glyph (lgstring-glyph gstring 0))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
533 (cond |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
534 ;; A non-spacing character not following a proper base character. |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
535 ((= nchars 1) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
536 (let ((lbearing (lglyph-lbearing glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
537 (rbearing (lglyph-rbearing glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
538 (width (lglyph-width glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
539 xoff wadjust) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
540 (if (< lbearing 0) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
541 (setq xoff (- lbearing)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
542 (setq xoff 0 lbearing 0)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
543 (if (< rbearing width) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
544 (setq rbearing width)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
545 (lglyph-set-adjustment glyph xoff 0 (- rbearing lbearing)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
546 gstring)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
547 |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
548 ;; This sequence doesn't start with a proper base character. |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
549 ((memq (get-char-code-property (lgstring-char gstring 0) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
550 'general-category) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
551 '(Mn Mc Me Zs Zl Zp Cc Cf Cs)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
552 nil) |
96301
66839d3799fe
(terminal-composition-base-character-p): New
Kenichi Handa <handa@m17n.org>
parents:
94955
diff
changeset
|
553 |
97836
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
554 ;; A base character and the following non-spacing characters. |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
555 (t |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
556 (let ((gstr (font-shape-gstring gstring))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
557 (if (and gstr |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
558 (> (lglyph-to (lgstring-glyph gstr 0)) 0)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
559 gstr |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
560 ;; The shaper of the font couldn't shape the gstring. |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
561 ;; Shape them according to canonical-combining-class. |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
562 (lgstring-set-id gstring nil) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
563 (let* ((width (lglyph-width glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
564 (ascent (lglyph-ascent glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
565 (descent (lglyph-descent glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
566 (rbearing (lglyph-rbearing glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
567 (lbearing (lglyph-lbearing glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
568 (center (/ (+ lbearing rbearing) 2)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
569 (gap (round (* (font-get (lgstring-font gstring) :size) 0.1))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
570 xoff yoff) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
571 (dotimes (i nchars) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
572 (setq glyph (lgstring-glyph gstring i)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
573 (when (> i 0) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
574 (let* ((class (get-char-code-property |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
575 (lglyph-char glyph) 'canonical-combining-class)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
576 (lb (lglyph-lbearing glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
577 (rb (lglyph-rbearing glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
578 (as (lglyph-ascent glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
579 (de (lglyph-descent glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
580 (ce (/ (+ lb rb) 2)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
581 xoff yoff) |
98122
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
582 (when (and class (>= class 200) (<= class 240)) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
583 (setq xoff 0 yoff 0) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
584 (cond |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
585 ((= class 200) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
586 (setq xoff (- lbearing ce) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
587 yoff (if (> as 0) 0 (+ descent as)))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
588 ((= class 202) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
589 (if (> as 0) (setq as 0)) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
590 (setq xoff (- center ce) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
591 yoff (if (> as 0) 0 (+ descent as)))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
592 ((= class 204) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
593 (if (> as 0) (setq as 0)) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
594 (setq xoff (- rbearing ce) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
595 yoff (if (> as 0) 0 (+ descent as)))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
596 ((= class 208) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
597 (setq xoff (- lbearing rb))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
598 ((= class 210) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
599 (setq xoff (- rbearing lb))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
600 ((= class 212) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
601 (setq xoff (- lbearing ce) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
602 yoff (if (>= de 0) 0 (- (- ascent) de)))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
603 ((= class 214) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
604 (setq xoff (- center ce) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
605 yoff (if (>= de 0) 0 (- (- ascent) de)))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
606 ((= class 216) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
607 (setq xoff (- rbearing ce) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
608 yoff (if (>= de 0) 0 (- (- ascent) de)))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
609 ((= class 218) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
610 (setq xoff (- lbearing ce) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
611 yoff (if (> as 0) 0 (+ descent as gap)))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
612 ((= class 220) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
613 (setq xoff (- center ce) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
614 yoff (if (> as 0) 0 (+ descent as gap)))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
615 ((= class 222) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
616 (setq xoff (- rbearing ce) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
617 yoff (if (> as 0) 0 (+ descent as gap)))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
618 ((= class 224) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
619 (setq xoff (- lbearing rb))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
620 ((= class 226) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
621 (setq xoff (- rbearing lb))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
622 ((= class 228) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
623 (setq xoff (- lbearing ce) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
624 yoff (if (>= de 0) 0 (- (- ascent) de gap)))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
625 ((= class 230) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
626 (setq xoff (- center ce) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
627 yoff (if (>= de 0) 0 (- (- ascent) de gap)))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
628 ((= class 232) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
629 (setq xoff (- rbearing ce) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
630 yoff (if (>= de 0) 0 (- (+ ascent de) gap))))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
631 (lglyph-set-adjustment glyph (- xoff width) yoff) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
632 (setq lb (+ lb xoff) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
633 rb (+ lb xoff) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
634 as (- as yoff) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
635 de (+ de yoff))) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
636 (if (< ascent as) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
637 (setq ascent as)) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
638 (if (< descent de) |
e3d5c2e9ec89
(compose-gstring-for-graphic): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
98069
diff
changeset
|
639 (setq descent de)))))) |
97836
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
640 (let ((i 0)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
641 (while (and (< i nglyphs) (setq glyph (lgstring-glyph gstring i))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
642 (lglyph-set-from-to glyph 0 (1- nchars)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
643 (setq i (1+ i)))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
644 gstring)))))) |
90637
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
645 |
98069
43a801a18b24
Compose combining characters only when it
Kenichi Handa <handa@m17n.org>
parents:
97994
diff
changeset
|
646 (let ((elt '(["[[:alpha:]]\\c^+" 1 compose-gstring-for-graphic] |
97836
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
647 [nil 0 compose-gstring-for-graphic]))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
648 (map-char-table |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
649 #'(lambda (key val) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
650 (if (= val 0) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
651 (set-char-table-range composition-function-table key elt))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
652 char-width-table)) |
90637
042336f13176
(terminal-composition-function): New function.
Kenichi Handa <handa@m17n.org>
parents:
90627
diff
changeset
|
653 |
97836
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
654 (defun compose-gstring-for-terminal (gstring) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
655 "Compose glyph string GSTRING for terminal display. |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
656 Non-spacing characters are composed with the preceding base |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
657 character. If the preceding character is not a base character, |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
658 each non-spacing character is composed as a spacing character by |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
659 a prepending a space before it." |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
660 (let* ((header (lgstring-header gstring)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
661 (nchars (lgstring-char-len gstring)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
662 (nglyphs (lgstring-glyph-len gstring)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
663 (i 0) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
664 glyph) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
665 (while (and (< i nglyphs) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
666 (setq glyph (lgstring-glyph gstring i))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
667 (if (= (lglyph-width glyph) 0) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
668 (progn |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
669 ;; Compose by prepending a space. |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
670 (setq gstring (lgstring-insert-glyph gstring i (lglyph-copy glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
671 nglyphs (lgstring-glyph-len gstring)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
672 (lglyph-set-char (lgstring-glyph gstring i) 32) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
673 (setq i (+ 2))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
674 (let ((from (lglyph-from glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
675 (to (lglyph-to glyph)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
676 (j (1+ i))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
677 (while (and (< j nglyphs) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
678 (setq glyph (lgstring-glyph gstring j)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
679 (= (lglyph-width glyph) 0)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
680 (setq to (lglyph-to glyph) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
681 j (1+ j))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
682 (while (< i j) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
683 (setq glyph (lgstring-glyph gstring i)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
684 (lglyph-set-from-to glyph from to) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
685 (setq i (1+ i)))))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
686 gstring)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
687 |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
688 |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
689 (defun auto-compose-chars (func from to font-object string) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
690 "Compose the characters at FROM by FUNC. |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
691 FUNC is called with one argument GSTRING which is built for characters |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
692 in the region FROM (inclusive) and TO (exclusive). |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
693 |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
694 If the character are composed on a graphic display, FONT-OBJECT |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
695 is a font to use. |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
696 |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
697 Otherwise, FONT-OBJECT is nil, and the fucntion |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
698 `compose-gstring-for-terminal' is used instead of FUNC. |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
699 |
91276
1d8d51129d26
(composition-function-table): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
91227
diff
changeset
|
700 If STRING is non-nil, it is a string, and FROM and TO are indices |
1d8d51129d26
(composition-function-table): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
91227
diff
changeset
|
701 into the string. In that case, compose characters in the string. |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
702 |
97836
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
703 The value is a gstring containing information for shaping the characters. |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
704 |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
705 This function is the default value of `auto-composition-function' (which see)." |
97836
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
706 (let ((gstring (composition-get-gstring from to font-object string))) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
707 (if (lgstring-shaped-p gstring) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
708 gstring |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
709 (or font-object |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
710 (setq func 'compose-gstring-for-terminal)) |
f5f400126c23
(composition-function-table): Declaration moved to
Kenichi Handa <handa@m17n.org>
parents:
96418
diff
changeset
|
711 (funcall func gstring)))) |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
712 |
90306
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
713 (make-variable-buffer-local 'auto-composition-function) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
714 |
90307
a2899387f787
(auto-composition-mode): Add autoload cookie.
Kenichi Handa <handa@m17n.org>
parents:
90306
diff
changeset
|
715 ;;;###autoload |
90306
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
716 (define-minor-mode auto-composition-mode |
92026
4ad14ee0d40a
(encode-composition-rule): Fix typo in error message.
Glenn Morris <rgm@gnu.org>
parents:
92000
diff
changeset
|
717 "Toggle Auto Composition mode. |
4ad14ee0d40a
(encode-composition-rule): Fix typo in error message.
Glenn Morris <rgm@gnu.org>
parents:
92000
diff
changeset
|
718 With ARG, turn Auto Composition mode off if and only if ARG is a non-positive |
4ad14ee0d40a
(encode-composition-rule): Fix typo in error message.
Glenn Morris <rgm@gnu.org>
parents:
92000
diff
changeset
|
719 number; if ARG is nil, toggle Auto Composition mode; anything else turns Auto |
4ad14ee0d40a
(encode-composition-rule): Fix typo in error message.
Glenn Morris <rgm@gnu.org>
parents:
92000
diff
changeset
|
720 Composition on. |
90306
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
721 |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
722 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
|
723 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
|
724 |
92026
4ad14ee0d40a
(encode-composition-rule): Fix typo in error message.
Glenn Morris <rgm@gnu.org>
parents:
92000
diff
changeset
|
725 You can use `global-auto-composition-mode' to turn on |
90306
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
726 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
|
727 nil nil nil |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
728 (if noninteractive |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
729 (setq auto-composition-mode nil)) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
730 (cond (auto-composition-mode |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
731 (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
|
732 (setq auto-composition-function 'auto-compose-chars)) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
733 (t |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
734 (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
|
735 (setq auto-composition-function nil))) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
736 (save-buffer-state nil |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
737 (save-restriction |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
738 (widen) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
739 (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
|
740 (decompose-region (point-min) (point-max))))) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
741 |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
742 (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
|
743 (save-buffer-state nil |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
744 (if (< start (point-min)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
745 (setq start (point-min))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
746 (if (> end (point-max)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
747 (setq end (point-max))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
748 (when (and auto-composition-mode (not memory-full)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
749 (let (func1 func2) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
750 (when (and (> start (point-min)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
751 (setq func2 (aref composition-function-table |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
752 (char-after (1- start)))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
753 (or (= start (point-max)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
754 (not (setq func1 (aref composition-function-table |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
755 (char-after start)))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
756 (eq func1 func2))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
757 (setq start (1- start) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
758 func1 func2) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
759 (while (eq func1 func2) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
760 (if (> start (point-min)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
761 (setq start (1- start) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
762 func2 (aref composition-function-table |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
763 (char-after start))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
764 (setq func2 nil)))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
765 (when (and (< end (point-max)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
766 (setq func2 (aref composition-function-table |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
767 (char-after end))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
768 (or (= end (point-min)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
769 (not (setq func1 (aref composition-function-table |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
770 (char-after (1- end))))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
771 (eq func1 func2))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
772 (setq end (1+ end) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
773 func1 func2) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
774 (while (eq func1 func2) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
775 (if (< end (point-max)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
776 (setq func2 (aref composition-function-table |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
777 (char-after end)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
778 end (1+ end)) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
779 (setq func2 nil)))) |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
780 (if (< start end) |
90612
e3f4e9ea5df6
(auto-composition-after-change): Remove
Kenichi Handa <handa@m17n.org>
parents:
90543
diff
changeset
|
781 (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
|
782 |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
783 (defun turn-on-auto-composition-if-enabled () |
90315
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
784 (if enable-multibyte-characters |
7ddbac913d1a
(auto-composition-after-change): Use
Kenichi Handa <handa@m17n.org>
parents:
90307
diff
changeset
|
785 (auto-composition-mode 1))) |
90306
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
786 |
90307
a2899387f787
(auto-composition-mode): Add autoload cookie.
Kenichi Handa <handa@m17n.org>
parents:
90306
diff
changeset
|
787 ;;;###autoload |
90306
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
788 (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
|
789 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
|
790 :extra-args (dummy) |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
791 :initialize 'custom-initialize-safe-default |
90627
f13e98b07b9c
(global-auto-composition-mode): Make the initial
Kenichi Handa <handa@m17n.org>
parents:
90612
diff
changeset
|
792 :init-value (not noninteractive) |
90306
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
793 :group 'auto-composition |
696f125c3c6a
(auto-composition-function): Make it buffer local.
Kenichi Handa <handa@m17n.org>
parents:
90261
diff
changeset
|
794 :version "23.1") |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
795 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
796 (defun toggle-auto-composition (&optional arg) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
797 "Change whether automatic character composition is enabled in this buffer. |
94734
6fbc8341e153
(toggle-auto-composition): Don't use `iff' in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
94678
diff
changeset
|
798 With arg, enable it if and only if arg is positive." |
89290
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
799 (interactive "P") |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
800 (let ((enable (if (null arg) (not auto-composition-function) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
801 (> (prefix-numeric-value arg) 0)))) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
802 (if enable |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
803 (kill-local-variable 'auto-composition-function) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
804 (make-local-variable 'auto-composition-function) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
805 (setq auto-composition-function nil) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
806 (save-buffer-state nil |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
807 (save-restriction |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
808 (widen) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
809 (decompose-region (point-min) (point-max))))) |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
810 |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
811 (save-buffer-state nil |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
812 (save-restriction |
adbc95471ef8
Remove all autoload cookies.
Kenichi Handa <handa@m17n.org>
parents:
88808
diff
changeset
|
813 (widen) |
90612
e3f4e9ea5df6
(auto-composition-after-change): Remove
Kenichi Handa <handa@m17n.org>
parents:
90543
diff
changeset
|
814 (remove-text-properties (point-min) (point-max) |
e3f4e9ea5df6
(auto-composition-after-change): Remove
Kenichi Handa <handa@m17n.org>
parents:
90543
diff
changeset
|
815 '(auto-composed nil)))))) |
89528
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
816 |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
817 (defun auto-compose-region (from to) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
818 "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
|
819 (save-excursion |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
820 (if (get-text-property from 'auto-composed) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
821 (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
|
822 (goto-char from) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
823 (let ((modified-p (buffer-modified-p)) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
824 (inhibit-read-only '(composition auto-composed)) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
825 (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
|
826 (while (< (point) to) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
827 (if (= (point) stop) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
828 (progn |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
829 (goto-char (next-single-property-change (point) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
830 'auto-composed nil to)) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
831 (setq stop (next-single-property-change (point) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
832 'auto-composed nil to))) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
833 (let ((func (aref composition-function-table (following-char))) |
92000
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
834 (font-obj (and (display-multi-font-p) |
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
835 (font-at (point) (selected-window)))) |
89528
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
836 (pos (point))) |
94955
e22dd2392947
(compose-chars-after): Assume that WINDOW is always non-nil.
Kenichi Handa <handa@m17n.org>
parents:
94734
diff
changeset
|
837 (if (and (functionp func) font-obj) |
92000
501d20267e59
(compose-chars-after): Fix arguments for a function
Kenichi Handa <handa@m17n.org>
parents:
91861
diff
changeset
|
838 (goto-char (funcall func (point) to font-obj nil))) |
89528
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
839 (if (<= (point) pos) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
840 (forward-char 1))))) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
841 (put-text-property from to 'auto-composed t) |
c75e3c6b608a
(auto-compose-region): New function.
Kenichi Handa <handa@m17n.org>
parents:
89497
diff
changeset
|
842 (set-buffer-modified-p modified-p)))) |
26880 | 843 |
844 | |
81073
12cb550b10e4
(compose-region, decompose-region):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
845 ;; The following codes are only for backward compatibility with Emacs |
12cb550b10e4
(compose-region, decompose-region):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
846 ;; 20.4 and earlier. |
26880 | 847 |
848 (defun decompose-composite-char (char &optional type with-composition-rule) | |
849 "Convert CHAR to string. | |
850 | |
851 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
|
852 `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
|
853 vector of CHAR respectively. |
6a0305153436
(decompose-composite-char): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
46963
diff
changeset
|
854 Optional 3rd arg WITH-COMPOSITION-RULE is ignored." |
26880 | 855 (cond ((or (null type) (eq type 'string)) (char-to-string char)) |
856 ((eq type 'list) (list char)) | |
857 (t (vector char)))) | |
858 | |
29521
4ad26302d559
(decompose-composite-char): Declare it as obsolete.
Kenichi Handa <handa@m17n.org>
parents:
26880
diff
changeset
|
859 (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
|
860 |
26880 | 861 |
52401 | 862 |
81073
12cb550b10e4
(compose-region, decompose-region):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
863 ;; arch-tag: ee703d77-1723-45d4-a31f-e9f0f867aa33 |
26880 | 864 ;;; composite.el ends here |