2019-06-26 14:24:59 +00:00
|
|
|
|
;;; composite.el --- support character composition
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
2019-01-01 00:59:58 +00:00
|
|
|
|
;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
|
2013-11-27 08:21:19 +00:00
|
|
|
|
|
2008-01-07 02:45:14 +00:00
|
|
|
|
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
|
2011-01-02 23:50:46 +00:00
|
|
|
|
;; 2008, 2009, 2010, 2011
|
2005-12-19 07:04:44 +00:00
|
|
|
|
;; National Institute of Advanced Industrial Science and Technology (AIST)
|
|
|
|
|
;; Registration Number H14PRO021
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
2019-05-20 04:29:13 +00:00
|
|
|
|
;; Author: Kenichi Handa <handa@gnu.org>
|
2009-01-10 21:56:18 +00:00
|
|
|
|
;; (according to ack.texi)
|
1999-12-15 00:28:11 +00:00
|
|
|
|
;; Keywords: mule, multilingual, character composition
|
2010-08-29 16:17:13 +00:00
|
|
|
|
;; Package: emacs
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1999-12-15 00:28:11 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
2001-07-15 19:53:53 +00:00
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
1999-12-15 00:28:11 +00:00
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
(defconst reference-point-alist
|
|
|
|
|
'((tl . 0) (tc . 1) (tr . 2)
|
|
|
|
|
(Bl . 3) (Bc . 4) (Br . 5)
|
|
|
|
|
(bl . 6) (bc . 7) (br . 8)
|
|
|
|
|
(cl . 9) (cc . 10) (cr . 11)
|
|
|
|
|
(top-left . 0) (top-center . 1) (top-right . 2)
|
|
|
|
|
(base-left . 3) (base-center . 4) (base-right . 5)
|
|
|
|
|
(bottom-left . 6) (bottom-center . 7) (bottom-right . 8)
|
|
|
|
|
(center-left . 9) (center-center . 10) (center-right . 11)
|
|
|
|
|
;; For backward compatibility...
|
|
|
|
|
(ml . 3) (mc . 10) (mr . 5)
|
|
|
|
|
(mid-left . 3) (mid-center . 10) (mid-right . 5))
|
|
|
|
|
"Alist of symbols vs integer codes of glyph reference points.
|
|
|
|
|
A glyph reference point symbol is to be used to specify a composition
|
2003-09-11 09:24:56 +00:00
|
|
|
|
rule in COMPONENTS argument to such functions as `compose-region'.
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
2010-04-30 12:16:13 +00:00
|
|
|
|
The meaning of glyph reference point codes is as follows:
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
0----1----2 <---- ascent 0:tl or top-left
|
|
|
|
|
| | 1:tc or top-center
|
|
|
|
|
| | 2:tr or top-right
|
|
|
|
|
| | 3:Bl or base-left 9:cl or center-left
|
|
|
|
|
9 10 11 <---- center 4:Bc or base-center 10:cc or center-center
|
|
|
|
|
| | 5:Br or base-right 11:cr or center-right
|
|
|
|
|
--3----4----5-- <-- baseline 6:bl or bottom-left
|
|
|
|
|
| | 7:bc or bottom-center
|
|
|
|
|
6----7----8 <---- descent 8:br or bottom-right
|
|
|
|
|
|
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local.
* lisp/allout-widgets.el (allout-widgets-mode-off)
(allout-widgets-mode-on, allout-widgets-pre-command-business)
(allout-widgets-post-command-business)
(allout-widgets-after-copy-or-kill-function)
(allout-widgets-after-undo-function, allout-test-range-overlaps)
(allout-decorate-item-and-context)
(allout-graphics-modification-handler): Fix typos in docstrings.
(allout-get-or-create-parent-widget): Use `looking-at-p'.
* lisp/cmuscheme.el (scheme-start-file): Doc fix.
(inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings.
(scheme-input-filter): Use `string-match-p'.
* lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring.
* lisp/dired-x.el: Use Dired consistently in docstrings.
* lisp/dired.el: Use Dired consistently in docstrings.
(dired-readin, dired-mode): Use `setq-local'.
(dired-switches-alist): Make defvar-local.
(dired-buffers-for-dir): Use `zerop'.
(dired-safe-switches-p, dired-switches-escape-p)
(dired-insert-old-subdirs, dired-move-to-end-of-filename)
(dired-glob-regexp, dired-in-this-tree, dired-goto-file-1)
(dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check):
(dired-goto-next-nontrivial-file): Use `string-match-p'.
(dired-align-file, dired-insert-directory, dired-mark-files-in-region)
(dired-toggle-marks, dired-mark-files-containing-regexp)
(dired-mark-symlinks, dired-mark-directories, dired-mark-executables)
(dired-flag-auto-save-files, dired-flag-backup-files):
Use `looking-at-p'.
(dired-mark-files-regexp, dired-build-subdir-alist):
Use `string-match-p', `looking-at-p'.
* lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p)
(direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
|
|
|
|
Glyph reference point symbols are to be used to specify a composition
|
|
|
|
|
rule of the form (GLOBAL-REF-POINT . NEW-REF-POINT), where
|
1999-12-15 00:28:11 +00:00
|
|
|
|
GLOBAL-REF-POINT is a reference point in the overall glyphs already
|
|
|
|
|
composed, and NEW-REF-POINT is a reference point in the new glyph to
|
|
|
|
|
be added.
|
|
|
|
|
|
|
|
|
|
For instance, if GLOBAL-REF-POINT is `br' (bottom-right) and
|
2001-04-06 01:22:03 +00:00
|
|
|
|
NEW-REF-POINT is `tc' (top-center), the overall glyph is updated as
|
1999-12-15 00:28:11 +00:00
|
|
|
|
follows (the point `*' corresponds to both reference points):
|
|
|
|
|
|
|
|
|
|
+-------+--+ <--- new ascent
|
|
|
|
|
| | |
|
|
|
|
|
| global| |
|
|
|
|
|
| glyph | |
|
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local.
* lisp/allout-widgets.el (allout-widgets-mode-off)
(allout-widgets-mode-on, allout-widgets-pre-command-business)
(allout-widgets-post-command-business)
(allout-widgets-after-copy-or-kill-function)
(allout-widgets-after-undo-function, allout-test-range-overlaps)
(allout-decorate-item-and-context)
(allout-graphics-modification-handler): Fix typos in docstrings.
(allout-get-or-create-parent-widget): Use `looking-at-p'.
* lisp/cmuscheme.el (scheme-start-file): Doc fix.
(inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings.
(scheme-input-filter): Use `string-match-p'.
* lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring.
* lisp/dired-x.el: Use Dired consistently in docstrings.
* lisp/dired.el: Use Dired consistently in docstrings.
(dired-readin, dired-mode): Use `setq-local'.
(dired-switches-alist): Make defvar-local.
(dired-buffers-for-dir): Use `zerop'.
(dired-safe-switches-p, dired-switches-escape-p)
(dired-insert-old-subdirs, dired-move-to-end-of-filename)
(dired-glob-regexp, dired-in-this-tree, dired-goto-file-1)
(dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check):
(dired-goto-next-nontrivial-file): Use `string-match-p'.
(dired-align-file, dired-insert-directory, dired-mark-files-in-region)
(dired-toggle-marks, dired-mark-files-containing-regexp)
(dired-mark-symlinks, dired-mark-directories, dired-mark-executables)
(dired-flag-auto-save-files, dired-flag-backup-files):
Use `looking-at-p'.
(dired-mark-files-regexp, dired-build-subdir-alist):
Use `string-match-p', `looking-at-p'.
* lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p)
(direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
|
|
|
|
-- | | |-- <--- baseline (doesn't change)
|
1999-12-15 00:28:11 +00:00
|
|
|
|
+----+--*--+
|
|
|
|
|
| | new |
|
|
|
|
|
| |glyph|
|
|
|
|
|
+----+-----+ <--- new descent
|
2004-01-23 08:43:36 +00:00
|
|
|
|
|
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local.
* lisp/allout-widgets.el (allout-widgets-mode-off)
(allout-widgets-mode-on, allout-widgets-pre-command-business)
(allout-widgets-post-command-business)
(allout-widgets-after-copy-or-kill-function)
(allout-widgets-after-undo-function, allout-test-range-overlaps)
(allout-decorate-item-and-context)
(allout-graphics-modification-handler): Fix typos in docstrings.
(allout-get-or-create-parent-widget): Use `looking-at-p'.
* lisp/cmuscheme.el (scheme-start-file): Doc fix.
(inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings.
(scheme-input-filter): Use `string-match-p'.
* lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring.
* lisp/dired-x.el: Use Dired consistently in docstrings.
* lisp/dired.el: Use Dired consistently in docstrings.
(dired-readin, dired-mode): Use `setq-local'.
(dired-switches-alist): Make defvar-local.
(dired-buffers-for-dir): Use `zerop'.
(dired-safe-switches-p, dired-switches-escape-p)
(dired-insert-old-subdirs, dired-move-to-end-of-filename)
(dired-glob-regexp, dired-in-this-tree, dired-goto-file-1)
(dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check):
(dired-goto-next-nontrivial-file): Use `string-match-p'.
(dired-align-file, dired-insert-directory, dired-mark-files-in-region)
(dired-toggle-marks, dired-mark-files-containing-regexp)
(dired-mark-symlinks, dired-mark-directories, dired-mark-executables)
(dired-flag-auto-save-files, dired-flag-backup-files):
Use `looking-at-p'.
(dired-mark-files-regexp, dired-build-subdir-alist):
Use `string-match-p', `looking-at-p'.
* lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p)
(direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
|
|
|
|
A composition rule may have the form (GLOBAL-REF-POINT
|
2010-05-20 01:27:49 +00:00
|
|
|
|
NEW-REF-POINT XOFF YOFF), where XOFF and YOFF specify how much
|
2004-01-23 08:43:36 +00:00
|
|
|
|
to shift NEW-REF-POINT from GLOBAL-REF-POINT. In this case, XOFF
|
|
|
|
|
and YOFF are integers in the range -100..100 representing the
|
|
|
|
|
shifting percentage against the font size.")
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
|
2004-09-08 07:18:13 +00:00
|
|
|
|
;;;###autoload
|
1999-12-15 00:28:11 +00:00
|
|
|
|
(defun encode-composition-rule (rule)
|
2004-09-08 07:18:13 +00:00
|
|
|
|
"Encode composition rule RULE into an integer value.
|
|
|
|
|
RULE is a cons of global and new reference point symbols
|
2005-07-20 13:03:40 +00:00
|
|
|
|
\(see `reference-point-alist')."
|
2004-09-08 07:18:13 +00:00
|
|
|
|
|
|
|
|
|
;; This must be compatible with C macro COMPOSITION_ENCODE_RULE
|
|
|
|
|
;; defined in composite.h.
|
|
|
|
|
|
1999-12-15 00:28:11 +00:00
|
|
|
|
(if (and (integerp rule) (< rule 144))
|
|
|
|
|
;; Already encoded.
|
|
|
|
|
rule
|
2004-01-23 08:43:36 +00:00
|
|
|
|
(if (consp rule)
|
|
|
|
|
(let ((gref (car rule))
|
|
|
|
|
(nref (cdr rule))
|
|
|
|
|
xoff yoff)
|
|
|
|
|
(if (consp nref) ; (GREF NREF XOFF YOFF)
|
|
|
|
|
(progn
|
|
|
|
|
(setq xoff (nth 1 nref)
|
|
|
|
|
yoff (nth 2 nref)
|
|
|
|
|
nref (car nref))
|
|
|
|
|
(or (and (>= xoff -100) (<= xoff 100)
|
|
|
|
|
(>= yoff -100) (<= yoff 100))
|
2008-02-21 07:53:55 +00:00
|
|
|
|
(error "Invalid composition rule: %s" rule))
|
2004-01-23 08:43:36 +00:00
|
|
|
|
(setq xoff (+ xoff 128) yoff (+ yoff 128)))
|
|
|
|
|
;; (GREF . NREF)
|
|
|
|
|
(setq xoff 0 yoff 0))
|
|
|
|
|
(or (integerp gref)
|
|
|
|
|
(setq gref (cdr (assq gref reference-point-alist))))
|
|
|
|
|
(or (integerp nref)
|
|
|
|
|
(setq nref (cdr (assq nref reference-point-alist))))
|
|
|
|
|
(or (and (>= gref 0) (< gref 12) (>= nref 0) (< nref 12))
|
|
|
|
|
(error "Invalid composition rule: %S" rule))
|
Audit use of lsh and fix glitches
I audited use of lsh in the Lisp source code, and fixed the
glitches that I found. While I was at it, I replaced uses of lsh
with ash when either will do. Replacement is OK when either
argument is known to be nonnegative, or when only the low-order
bits of the result matter, and is a (minor) win since ash is a bit
more solid than lsh nowadays, and is a bit faster.
* lisp/calc/calc-ext.el (math-check-fixnum):
Prefer most-positive-fixnum to (lsh -1 -1).
* lisp/vc/vc-hg.el (vc-hg-state-fast): When testing fixnum width,
prefer (zerop (ash most-positive-fixnum -32)) to (zerop (lsh -1
32)) (Bug#32485#11).
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode):
Tighten sanity-check for bytecode overflow, by checking that the
result of (ash pc -8) is nonnegative. Formerly this check was not
needed since lsh was used and the number overflowed differently.
* lisp/net/dns.el (dns-write): Fix some obvious sign typos in
shift counts. Evidently this part of the code has never been
exercised.
* lisp/progmodes/hideif.el (hif-shiftleft, hif-shiftright):
* lisp/term/common-win.el (x-setup-function-keys):
Simplify.
* admin/unidata/unidata-gen.el, admin/unidata/uvs.el:
* doc/lispref/keymaps.texi, doc/lispref/syntax.texi:
* doc/misc/calc.texi, doc/misc/cl.texi, etc/NEWS.19:
* lisp/arc-mode.el, lisp/calc/calc-bin.el, lisp/calc/calc-comb.el:
* lisp/calc/calc-ext.el, lisp/calc/calc-math.el:
* lisp/cedet/semantic/wisent/comp.el, lisp/composite.el:
* lisp/disp-table.el, lisp/dos-fns.el, lisp/edmacro.el:
* lisp/emacs-lisp/bindat.el, lisp/emacs-lisp/byte-opt.el:
* lisp/emacs-lisp/bytecomp.el, lisp/emacs-lisp/cl-extra.el:
* lisp/erc/erc-dcc.el, lisp/facemenu.el, lisp/gnus/message.el:
* lisp/gnus/nndoc.el, lisp/gnus/nnmaildir.el, lisp/image.el:
* lisp/international/ccl.el, lisp/international/fontset.el:
* lisp/international/mule-cmds.el, lisp/international/mule.el:
* lisp/json.el, lisp/mail/binhex.el, lisp/mail/rmail.el:
* lisp/mail/uudecode.el, lisp/md4.el, lisp/net/dns.el:
* lisp/net/ntlm.el, lisp/net/sasl.el, lisp/net/socks.el:
* lisp/net/tramp.el, lisp/obsolete/levents.el:
* lisp/obsolete/pgg-parse.el, lisp/org/org.el:
* lisp/org/ox-publish.el, lisp/progmodes/cc-defs.el:
* lisp/progmodes/ebnf2ps.el, lisp/progmodes/hideif.el:
* lisp/ps-bdf.el, lisp/ps-print.el, lisp/simple.el:
* lisp/tar-mode.el, lisp/term/common-win.el:
* lisp/term/tty-colors.el, lisp/term/xterm.el, lisp/vc/vc-git.el:
* lisp/vc/vc-hg.el, lisp/x-dnd.el, test/src/data-tests.el:
Prefer ash to lsh when either will do.
2018-08-21 20:44:03 +00:00
|
|
|
|
(logior (ash xoff 16) (ash yoff 8) (+ (* gref 12) nref)))
|
2004-01-23 08:43:36 +00:00
|
|
|
|
(error "Invalid composition rule: %S" rule))))
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
;; Decode encoded composition rule RULE-CODE. The value is a cons of
|
|
|
|
|
;; global and new reference point symbols.
|
|
|
|
|
;; This must be compatible with C macro COMPOSITION_DECODE_RULE
|
|
|
|
|
;; defined in composite.h.
|
|
|
|
|
|
|
|
|
|
(defun decode-composition-rule (rule-code)
|
2004-01-23 08:43:36 +00:00
|
|
|
|
(or (and (natnump rule-code) (< rule-code #x1000000))
|
1999-12-15 00:28:11 +00:00
|
|
|
|
(error "Invalid encoded composition rule: %S" rule-code))
|
Audit use of lsh and fix glitches
I audited use of lsh in the Lisp source code, and fixed the
glitches that I found. While I was at it, I replaced uses of lsh
with ash when either will do. Replacement is OK when either
argument is known to be nonnegative, or when only the low-order
bits of the result matter, and is a (minor) win since ash is a bit
more solid than lsh nowadays, and is a bit faster.
* lisp/calc/calc-ext.el (math-check-fixnum):
Prefer most-positive-fixnum to (lsh -1 -1).
* lisp/vc/vc-hg.el (vc-hg-state-fast): When testing fixnum width,
prefer (zerop (ash most-positive-fixnum -32)) to (zerop (lsh -1
32)) (Bug#32485#11).
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode):
Tighten sanity-check for bytecode overflow, by checking that the
result of (ash pc -8) is nonnegative. Formerly this check was not
needed since lsh was used and the number overflowed differently.
* lisp/net/dns.el (dns-write): Fix some obvious sign typos in
shift counts. Evidently this part of the code has never been
exercised.
* lisp/progmodes/hideif.el (hif-shiftleft, hif-shiftright):
* lisp/term/common-win.el (x-setup-function-keys):
Simplify.
* admin/unidata/unidata-gen.el, admin/unidata/uvs.el:
* doc/lispref/keymaps.texi, doc/lispref/syntax.texi:
* doc/misc/calc.texi, doc/misc/cl.texi, etc/NEWS.19:
* lisp/arc-mode.el, lisp/calc/calc-bin.el, lisp/calc/calc-comb.el:
* lisp/calc/calc-ext.el, lisp/calc/calc-math.el:
* lisp/cedet/semantic/wisent/comp.el, lisp/composite.el:
* lisp/disp-table.el, lisp/dos-fns.el, lisp/edmacro.el:
* lisp/emacs-lisp/bindat.el, lisp/emacs-lisp/byte-opt.el:
* lisp/emacs-lisp/bytecomp.el, lisp/emacs-lisp/cl-extra.el:
* lisp/erc/erc-dcc.el, lisp/facemenu.el, lisp/gnus/message.el:
* lisp/gnus/nndoc.el, lisp/gnus/nnmaildir.el, lisp/image.el:
* lisp/international/ccl.el, lisp/international/fontset.el:
* lisp/international/mule-cmds.el, lisp/international/mule.el:
* lisp/json.el, lisp/mail/binhex.el, lisp/mail/rmail.el:
* lisp/mail/uudecode.el, lisp/md4.el, lisp/net/dns.el:
* lisp/net/ntlm.el, lisp/net/sasl.el, lisp/net/socks.el:
* lisp/net/tramp.el, lisp/obsolete/levents.el:
* lisp/obsolete/pgg-parse.el, lisp/org/org.el:
* lisp/org/ox-publish.el, lisp/progmodes/cc-defs.el:
* lisp/progmodes/ebnf2ps.el, lisp/progmodes/hideif.el:
* lisp/ps-bdf.el, lisp/ps-print.el, lisp/simple.el:
* lisp/tar-mode.el, lisp/term/common-win.el:
* lisp/term/tty-colors.el, lisp/term/xterm.el, lisp/vc/vc-git.el:
* lisp/vc/vc-hg.el, lisp/x-dnd.el, test/src/data-tests.el:
Prefer ash to lsh when either will do.
2018-08-21 20:44:03 +00:00
|
|
|
|
(let ((xoff (ash rule-code -16))
|
|
|
|
|
(yoff (logand (ash rule-code -8) #xFF))
|
2004-01-23 08:43:36 +00:00
|
|
|
|
gref nref)
|
|
|
|
|
(setq rule-code (logand rule-code #xFF)
|
|
|
|
|
gref (car (rassq (/ rule-code 12) reference-point-alist))
|
|
|
|
|
nref (car (rassq (% rule-code 12) reference-point-alist)))
|
1999-12-15 00:28:11 +00:00
|
|
|
|
(or (and gref (symbolp gref) nref (symbolp nref))
|
|
|
|
|
(error "Invalid composition rule code: %S" rule-code))
|
2004-01-23 08:43:36 +00:00
|
|
|
|
(if (and (= xoff 0) (= yoff 0))
|
|
|
|
|
(cons gref nref)
|
|
|
|
|
(setq xoff (- xoff 128) yoff (- yoff 128))
|
|
|
|
|
(list gref xoff yoff nref))))
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
;; Encode composition rules in composition components COMPONENTS. The
|
|
|
|
|
;; value is a copy of COMPONENTS, where composition rules (cons of
|
|
|
|
|
;; global and new glyph reference point symbols) are replaced with
|
|
|
|
|
;; encoded composition rules. Optional 2nd argument NOCOPY non-nil
|
|
|
|
|
;; means don't make a copy but modify COMPONENTS directly.
|
|
|
|
|
|
|
|
|
|
(defun encode-composition-components (components &optional nocopy)
|
|
|
|
|
(or nocopy
|
|
|
|
|
(setq components (copy-sequence components)))
|
|
|
|
|
(if (vectorp components)
|
|
|
|
|
(let ((len (length components))
|
|
|
|
|
(i 1))
|
|
|
|
|
(while (< i len)
|
|
|
|
|
(aset components i
|
|
|
|
|
(encode-composition-rule (aref components i)))
|
|
|
|
|
(setq i (+ i 2))))
|
|
|
|
|
(let ((tail (cdr components)))
|
|
|
|
|
(while tail
|
|
|
|
|
(setcar tail
|
|
|
|
|
(encode-composition-rule (car tail)))
|
|
|
|
|
(setq tail (nthcdr 2 tail)))))
|
|
|
|
|
components)
|
|
|
|
|
|
|
|
|
|
;; Decode composition rule codes in composition components COMPONENTS.
|
|
|
|
|
;; The value is a copy of COMPONENTS, where composition rule codes are
|
|
|
|
|
;; replaced with composition rules (cons of global and new glyph
|
|
|
|
|
;; reference point symbols). Optional 2nd argument NOCOPY non-nil
|
|
|
|
|
;; means don't make a copy but modify COMPONENTS directly.
|
|
|
|
|
;; It is assumed that COMPONENTS is a vector and is for rule-base
|
|
|
|
|
;; composition, thus (2N+1)th elements are rule codes.
|
|
|
|
|
|
|
|
|
|
(defun decode-composition-components (components &optional nocopy)
|
|
|
|
|
(or nocopy
|
|
|
|
|
(setq components (copy-sequence components)))
|
|
|
|
|
(let ((len (length components))
|
|
|
|
|
(i 1))
|
|
|
|
|
(while (< i len)
|
|
|
|
|
(aset components i
|
|
|
|
|
(decode-composition-rule (aref components i)))
|
|
|
|
|
(setq i (+ i 2))))
|
|
|
|
|
components)
|
|
|
|
|
|
|
|
|
|
(defun compose-region (start end &optional components modification-func)
|
|
|
|
|
"Compose characters in the current region.
|
|
|
|
|
|
2009-06-16 00:33:58 +00:00
|
|
|
|
Characters are composed relatively, i.e. composed by overstriking
|
|
|
|
|
or stacking depending on ascent, descent and other metrics of
|
|
|
|
|
glyphs.
|
|
|
|
|
|
|
|
|
|
For instance, if the region has three characters \"XYZ\", X is
|
|
|
|
|
regarded as BASE glyph, and Y is displayed:
|
|
|
|
|
(1) above BASE if Y's descent value is not positive
|
|
|
|
|
(2) below BASE if Y's ascent value is not positive
|
|
|
|
|
(3) on BASE (i.e. at the BASE position) otherwise
|
|
|
|
|
and Z is displayed with the same rule while regarding the whole
|
|
|
|
|
XY glyphs as BASE.
|
2002-08-20 00:34:28 +00:00
|
|
|
|
|
1999-12-15 00:28:11 +00:00
|
|
|
|
When called from a program, expects these four arguments.
|
|
|
|
|
|
|
|
|
|
First two arguments START and END are positions (integers or markers)
|
|
|
|
|
specifying the region.
|
|
|
|
|
|
2003-09-11 09:24:56 +00:00
|
|
|
|
Optional 3rd argument COMPONENTS, if non-nil, is a character, a string
|
|
|
|
|
or a vector or list of integers and rules.
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
If it is a character, it is an alternate character to display instead
|
|
|
|
|
of the text in the region.
|
|
|
|
|
|
2012-02-02 09:07:29 +00:00
|
|
|
|
If it is a string, the elements are alternate characters. In
|
2008-06-29 14:44:12 +00:00
|
|
|
|
this case, TAB element has a special meaning. If the first
|
2010-10-12 15:16:57 +00:00
|
|
|
|
character is TAB, the glyphs are displayed with left padding space
|
2008-06-29 14:44:12 +00:00
|
|
|
|
so that no pixel overlaps with the previous column. If the last
|
2010-04-30 12:16:13 +00:00
|
|
|
|
character is TAB, the glyphs are displayed with right padding
|
2008-06-29 14:44:12 +00:00
|
|
|
|
space so that no pixel overlaps with the following column.
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
If it is a vector or list, it is a sequence of alternate characters and
|
|
|
|
|
composition rules, where (2N)th elements are characters and (2N+1)th
|
|
|
|
|
elements are composition rules to specify how to compose (2N+2)th
|
|
|
|
|
elements with previously composed N glyphs.
|
|
|
|
|
|
|
|
|
|
A composition rule is a cons of global and new glyph reference point
|
|
|
|
|
symbols. See the documentation of `reference-point-alist' for more
|
2010-04-30 12:16:13 +00:00
|
|
|
|
details.
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
Optional 4th argument MODIFICATION-FUNC is a function to call to
|
|
|
|
|
adjust the composition when it gets invalid because of a change of
|
|
|
|
|
text in the composition."
|
|
|
|
|
(interactive "r")
|
|
|
|
|
(let ((modified-p (buffer-modified-p))
|
2007-05-25 16:14:21 +00:00
|
|
|
|
(inhibit-read-only t))
|
1999-12-15 00:28:11 +00:00
|
|
|
|
(if (or (vectorp components) (listp components))
|
2012-02-02 09:07:29 +00:00
|
|
|
|
(setq components (encode-composition-components components)))
|
1999-12-15 00:28:11 +00:00
|
|
|
|
(compose-region-internal start end components modification-func)
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(restore-buffer-modified-p modified-p)))
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
(defun decompose-region (start end)
|
|
|
|
|
"Decompose text in the current region.
|
|
|
|
|
|
|
|
|
|
When called from a program, expects two arguments,
|
|
|
|
|
positions (integers or markers) specifying the region."
|
|
|
|
|
(interactive "r")
|
|
|
|
|
(let ((modified-p (buffer-modified-p))
|
2007-05-25 16:14:21 +00:00
|
|
|
|
(inhibit-read-only t))
|
1999-12-15 00:28:11 +00:00
|
|
|
|
(remove-text-properties start end '(composition nil))
|
2007-05-25 16:14:21 +00:00
|
|
|
|
(restore-buffer-modified-p modified-p)))
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
(defun compose-string (string &optional start end components modification-func)
|
|
|
|
|
"Compose characters in string STRING.
|
|
|
|
|
|
2002-06-27 21:59:18 +00:00
|
|
|
|
The return value is STRING with the `composition' property put on all
|
1999-12-15 00:28:11 +00:00
|
|
|
|
the characters in it.
|
|
|
|
|
|
|
|
|
|
Optional 2nd and 3rd arguments START and END specify the range of
|
2002-06-27 21:59:18 +00:00
|
|
|
|
STRING to be composed. They default to the beginning and the end of
|
1999-12-15 00:28:11 +00:00
|
|
|
|
STRING respectively.
|
|
|
|
|
|
|
|
|
|
Optional 4th argument COMPONENTS, if non-nil, is a character or a
|
|
|
|
|
sequence (vector, list, or string) of integers. See the function
|
|
|
|
|
`compose-region' for more detail.
|
|
|
|
|
|
|
|
|
|
Optional 5th argument MODIFICATION-FUNC is a function to call to
|
|
|
|
|
adjust the composition when it gets invalid because of a change of
|
|
|
|
|
text in the composition."
|
|
|
|
|
(if (or (vectorp components) (listp components))
|
2012-02-02 09:07:29 +00:00
|
|
|
|
(setq components (encode-composition-components components)))
|
1999-12-15 00:28:11 +00:00
|
|
|
|
(or start (setq start 0))
|
|
|
|
|
(or end (setq end (length string)))
|
|
|
|
|
(compose-string-internal string start end components modification-func)
|
|
|
|
|
string)
|
|
|
|
|
|
|
|
|
|
(defun decompose-string (string)
|
|
|
|
|
"Return STRING where `composition' property is removed."
|
|
|
|
|
(remove-text-properties 0 (length string) '(composition nil) string)
|
|
|
|
|
string)
|
|
|
|
|
|
|
|
|
|
(defun compose-chars (&rest args)
|
|
|
|
|
"Return a string from arguments in which all characters are composed.
|
|
|
|
|
For relative composition, arguments are characters.
|
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local.
* lisp/allout-widgets.el (allout-widgets-mode-off)
(allout-widgets-mode-on, allout-widgets-pre-command-business)
(allout-widgets-post-command-business)
(allout-widgets-after-copy-or-kill-function)
(allout-widgets-after-undo-function, allout-test-range-overlaps)
(allout-decorate-item-and-context)
(allout-graphics-modification-handler): Fix typos in docstrings.
(allout-get-or-create-parent-widget): Use `looking-at-p'.
* lisp/cmuscheme.el (scheme-start-file): Doc fix.
(inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings.
(scheme-input-filter): Use `string-match-p'.
* lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring.
* lisp/dired-x.el: Use Dired consistently in docstrings.
* lisp/dired.el: Use Dired consistently in docstrings.
(dired-readin, dired-mode): Use `setq-local'.
(dired-switches-alist): Make defvar-local.
(dired-buffers-for-dir): Use `zerop'.
(dired-safe-switches-p, dired-switches-escape-p)
(dired-insert-old-subdirs, dired-move-to-end-of-filename)
(dired-glob-regexp, dired-in-this-tree, dired-goto-file-1)
(dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check):
(dired-goto-next-nontrivial-file): Use `string-match-p'.
(dired-align-file, dired-insert-directory, dired-mark-files-in-region)
(dired-toggle-marks, dired-mark-files-containing-regexp)
(dired-mark-symlinks, dired-mark-directories, dired-mark-executables)
(dired-flag-auto-save-files, dired-flag-backup-files):
Use `looking-at-p'.
(dired-mark-files-regexp, dired-build-subdir-alist):
Use `string-match-p', `looking-at-p'.
* lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p)
(direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
|
|
|
|
For rule-based composition, Mth (where M is odd) arguments are
|
|
|
|
|
characters, and Nth (where N is even) arguments are composition rules.
|
1999-12-15 00:28:11 +00:00
|
|
|
|
A composition rule is a cons of glyph reference points of the form
|
|
|
|
|
\(GLOBAL-REF-POINT . NEW-REF-POINT). See the documentation of
|
|
|
|
|
`reference-point-alist' for more detail."
|
|
|
|
|
(let (str components)
|
|
|
|
|
(if (consp (car (cdr args)))
|
|
|
|
|
;; Rule-base composition.
|
2011-04-19 13:44:55 +00:00
|
|
|
|
(let ((tail (encode-composition-components args 'nocopy)))
|
1999-12-15 00:28:11 +00:00
|
|
|
|
(while tail
|
|
|
|
|
(setq str (cons (car tail) str))
|
|
|
|
|
(setq tail (nthcdr 2 tail)))
|
|
|
|
|
(setq str (concat (nreverse str))
|
|
|
|
|
components args))
|
|
|
|
|
;; Relative composition.
|
|
|
|
|
(setq str (concat args)))
|
|
|
|
|
(compose-string-internal str 0 (length str) components)))
|
|
|
|
|
|
|
|
|
|
(defun find-composition (pos &optional limit string detail-p)
|
2010-04-24 16:23:29 +00:00
|
|
|
|
"Return information about a composition at or near buffer position POS.
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
If the character at POS has `composition' property, the value is a list
|
2010-04-24 16:23:29 +00:00
|
|
|
|
\(FROM TO VALID-P).
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
FROM and TO specify the range of text that has the same `composition'
|
2008-09-05 00:53:00 +00:00
|
|
|
|
property, VALID-P is t if this composition is valid, and nil if not.
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
If there's no composition at POS, and the optional 2nd argument LIMIT
|
2010-04-24 16:23:29 +00:00
|
|
|
|
is non-nil, search for a composition toward the position given by LIMIT.
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
If no composition is found, return nil.
|
|
|
|
|
|
|
|
|
|
Optional 3rd argument STRING, if non-nil, is a string to look for a
|
|
|
|
|
composition in; nil means the current buffer.
|
|
|
|
|
|
|
|
|
|
If a valid composition is found and the optional 4th argument DETAIL-P
|
2010-04-24 16:23:29 +00:00
|
|
|
|
is non-nil, the return value is a list of the form
|
|
|
|
|
|
|
|
|
|
(FROM TO COMPONENTS RELATIVE-P MOD-FUNC WIDTH)
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
COMPONENTS is a vector of integers, the meaning depends on RELATIVE-P.
|
|
|
|
|
|
|
|
|
|
RELATIVE-P is t if the composition method is relative, else nil.
|
|
|
|
|
|
|
|
|
|
If RELATIVE-P is t, COMPONENTS is a vector of characters to be
|
|
|
|
|
composed. If RELATIVE-P is nil, COMPONENTS is a vector of characters
|
|
|
|
|
and composition rules as described in `compose-region'.
|
|
|
|
|
|
|
|
|
|
MOD-FUNC is a modification function of the composition.
|
|
|
|
|
|
2008-09-05 00:53:00 +00:00
|
|
|
|
WIDTH is a number of columns the composition occupies on the screen.
|
|
|
|
|
|
2010-05-01 18:53:23 +00:00
|
|
|
|
When Automatic Composition mode is on, this function also finds a
|
2008-09-05 00:53:00 +00:00
|
|
|
|
chunk of text that is automatically composed. If such a chunk is
|
|
|
|
|
found closer to POS than the position that has `composition'
|
2010-04-24 16:23:29 +00:00
|
|
|
|
property, the value is a list of FROM, TO, and a glyph-string
|
2017-11-30 17:55:41 +00:00
|
|
|
|
that specifies how the chunk is to be composed; DETAIL-P is
|
2017-12-01 16:59:13 +00:00
|
|
|
|
ignored in this case. See the function `composition-get-gstring'
|
2017-11-30 17:55:41 +00:00
|
|
|
|
for the format of the glyph-string."
|
1999-12-15 00:28:11 +00:00
|
|
|
|
(let ((result (find-composition-internal pos limit string detail-p)))
|
2008-09-05 00:53:00 +00:00
|
|
|
|
(if (and detail-p (> (length result) 3) (nth 2 result) (not (nth 3 result)))
|
1999-12-15 00:28:11 +00:00
|
|
|
|
;; This is a valid rule-base composition.
|
|
|
|
|
(decode-composition-components (nth 2 result) 'nocopy))
|
|
|
|
|
result))
|
|
|
|
|
|
|
|
|
|
|
2000-11-06 12:40:34 +00:00
|
|
|
|
(defun compose-chars-after (pos &optional limit object)
|
1999-12-15 00:28:11 +00:00
|
|
|
|
"Compose characters in current buffer after position POS.
|
|
|
|
|
|
2008-02-21 03:35:31 +00:00
|
|
|
|
It looks up the char-table `composition-function-table' (which
|
|
|
|
|
see) by a character at POS, and compose characters after POS
|
|
|
|
|
according to the contents of `composition-function-table'.
|
|
|
|
|
|
|
|
|
|
Optional 2nd arg LIMIT, if non-nil, limits characters to compose.
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
2000-11-06 12:40:34 +00:00
|
|
|
|
Optional 3rd arg OBJECT, if non-nil, is a string that contains the
|
2003-09-11 09:24:56 +00:00
|
|
|
|
text to compose. In that case, POS and LIMIT index into the string.
|
2000-11-06 12:40:34 +00:00
|
|
|
|
|
1999-12-15 00:28:11 +00:00
|
|
|
|
This function is the default value of `compose-chars-after-function'."
|
|
|
|
|
(let ((tail (aref composition-function-table (char-after pos)))
|
2008-02-21 03:35:31 +00:00
|
|
|
|
(font-obj (and (display-multi-font-p)
|
|
|
|
|
(and (not (stringp object))
|
|
|
|
|
(font-at pos (selected-window)))))
|
1999-12-15 00:28:11 +00:00
|
|
|
|
pattern func result)
|
2008-02-21 03:35:31 +00:00
|
|
|
|
(or limit
|
|
|
|
|
(setq limit (if (stringp object) (length object) (point-max))))
|
2008-05-14 01:56:07 +00:00
|
|
|
|
(when (and font-obj tail)
|
2000-07-27 05:37:42 +00:00
|
|
|
|
(save-match-data
|
|
|
|
|
(save-excursion
|
2008-02-21 03:35:31 +00:00
|
|
|
|
(while tail
|
|
|
|
|
(if (functionp (car tail))
|
|
|
|
|
(setq pattern nil func (car tail))
|
|
|
|
|
(setq pattern (car (car tail))
|
|
|
|
|
func (cdr (car tail))))
|
2000-07-27 05:37:42 +00:00
|
|
|
|
(goto-char pos)
|
2008-02-21 03:35:31 +00:00
|
|
|
|
(if pattern
|
|
|
|
|
(if (and (if (stringp object)
|
|
|
|
|
(eq (string-match pattern object) 0)
|
|
|
|
|
(looking-at pattern))
|
|
|
|
|
(<= (match-end 0) limit))
|
|
|
|
|
(setq result
|
2018-12-29 14:35:09 +00:00
|
|
|
|
(funcall func pos (match-end 0) font-obj object nil)))
|
|
|
|
|
(setq result (funcall func pos limit font-obj object nil)))
|
2008-02-21 03:35:31 +00:00
|
|
|
|
(if result (setq tail nil))))))
|
|
|
|
|
result))
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
|
|
|
|
(defun compose-last-chars (args)
|
|
|
|
|
"Compose last characters.
|
2001-01-05 05:29:56 +00:00
|
|
|
|
The argument is a parameterized event of the form
|
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local.
* lisp/allout-widgets.el (allout-widgets-mode-off)
(allout-widgets-mode-on, allout-widgets-pre-command-business)
(allout-widgets-post-command-business)
(allout-widgets-after-copy-or-kill-function)
(allout-widgets-after-undo-function, allout-test-range-overlaps)
(allout-decorate-item-and-context)
(allout-graphics-modification-handler): Fix typos in docstrings.
(allout-get-or-create-parent-widget): Use `looking-at-p'.
* lisp/cmuscheme.el (scheme-start-file): Doc fix.
(inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings.
(scheme-input-filter): Use `string-match-p'.
* lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring.
* lisp/dired-x.el: Use Dired consistently in docstrings.
* lisp/dired.el: Use Dired consistently in docstrings.
(dired-readin, dired-mode): Use `setq-local'.
(dired-switches-alist): Make defvar-local.
(dired-buffers-for-dir): Use `zerop'.
(dired-safe-switches-p, dired-switches-escape-p)
(dired-insert-old-subdirs, dired-move-to-end-of-filename)
(dired-glob-regexp, dired-in-this-tree, dired-goto-file-1)
(dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check):
(dired-goto-next-nontrivial-file): Use `string-match-p'.
(dired-align-file, dired-insert-directory, dired-mark-files-in-region)
(dired-toggle-marks, dired-mark-files-containing-regexp)
(dired-mark-symlinks, dired-mark-directories, dired-mark-executables)
(dired-flag-auto-save-files, dired-flag-backup-files):
Use `looking-at-p'.
(dired-mark-files-regexp, dired-build-subdir-alist):
Use `string-match-p', `looking-at-p'.
* lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p)
(direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
|
|
|
|
(compose-last-chars N COMPONENTS),
|
2001-01-05 05:29:56 +00:00
|
|
|
|
where N is the number of characters before point to compose,
|
|
|
|
|
COMPONENTS, if non-nil, is the same as the argument to `compose-region'
|
|
|
|
|
\(which see). If it is nil, `compose-chars-after' is called,
|
2005-07-20 13:03:40 +00:00
|
|
|
|
and that function finds a proper rule to compose the target characters.
|
1999-12-15 00:28:11 +00:00
|
|
|
|
This function is intended to be used from input methods.
|
|
|
|
|
The global keymap binds special event `compose-last-chars' to this
|
2001-01-05 05:29:56 +00:00
|
|
|
|
function. Input method may generate an event (compose-last-chars N COMPONENTS)
|
2005-07-20 13:03:40 +00:00
|
|
|
|
after a sequence of character events."
|
1999-12-15 00:28:11 +00:00
|
|
|
|
(interactive "e")
|
|
|
|
|
(let ((chars (nth 1 args)))
|
|
|
|
|
(if (and (numberp chars)
|
|
|
|
|
(>= (- (point) (point-min)) chars))
|
2001-01-05 05:29:56 +00:00
|
|
|
|
(if (nth 2 args)
|
|
|
|
|
(compose-region (- (point) chars) (point) (nth 2 args))
|
|
|
|
|
(compose-chars-after (- (point) chars) (point))))))
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
2002-11-07 06:27:27 +00:00
|
|
|
|
(global-set-key [compose-last-chars] 'compose-last-chars)
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
2002-11-07 06:27:27 +00:00
|
|
|
|
|
|
|
|
|
;;; Automatic character composition.
|
|
|
|
|
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
;; These macros must match with C macros LGSTRING_XXX and LGLYPH_XXX in font.h
|
|
|
|
|
(defsubst lgstring-header (gstring) (aref gstring 0))
|
|
|
|
|
(defsubst lgstring-set-header (gstring header) (aset gstring 0 header))
|
|
|
|
|
(defsubst lgstring-font (gstring) (aref (lgstring-header gstring) 0))
|
|
|
|
|
(defsubst lgstring-char (gstring i) (aref (lgstring-header gstring) (1+ i)))
|
|
|
|
|
(defsubst lgstring-char-len (gstring) (1- (length (lgstring-header gstring))))
|
|
|
|
|
(defsubst lgstring-shaped-p (gstring) (aref gstring 1))
|
|
|
|
|
(defsubst lgstring-set-id (gstring id) (aset gstring 1 id))
|
|
|
|
|
(defsubst lgstring-glyph (gstring i) (aref gstring (+ i 2)))
|
|
|
|
|
(defsubst lgstring-glyph-len (gstring) (- (length gstring) 2))
|
|
|
|
|
(defsubst lgstring-set-glyph (gstring i glyph) (aset gstring (+ i 2) glyph))
|
|
|
|
|
|
|
|
|
|
(defsubst lglyph-from (glyph) (aref glyph 0))
|
|
|
|
|
(defsubst lglyph-to (glyph) (aref glyph 1))
|
|
|
|
|
(defsubst lglyph-char (glyph) (aref glyph 2))
|
|
|
|
|
(defsubst lglyph-code (glyph) (aref glyph 3))
|
|
|
|
|
(defsubst lglyph-width (glyph) (aref glyph 4))
|
|
|
|
|
(defsubst lglyph-lbearing (glyph) (aref glyph 5))
|
|
|
|
|
(defsubst lglyph-rbearing (glyph) (aref glyph 6))
|
|
|
|
|
(defsubst lglyph-ascent (glyph) (aref glyph 7))
|
|
|
|
|
(defsubst lglyph-descent (glyph) (aref glyph 8))
|
|
|
|
|
(defsubst lglyph-adjustment (glyph) (aref glyph 9))
|
|
|
|
|
|
|
|
|
|
(defsubst lglyph-set-from-to (glyph from to)
|
|
|
|
|
(progn (aset glyph 0 from) (aset glyph 1 to)))
|
|
|
|
|
(defsubst lglyph-set-char (glyph char) (aset glyph 2 char))
|
2008-12-30 23:32:55 +00:00
|
|
|
|
(defsubst lglyph-set-code (glyph code) (aset glyph 3 code))
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(defsubst lglyph-set-width (glyph width) (aset glyph 4 width))
|
|
|
|
|
(defsubst lglyph-set-adjustment (glyph &optional xoff yoff wadjust)
|
|
|
|
|
(aset glyph 9 (vector (or xoff 0) (or yoff 0) (or wadjust 0))))
|
|
|
|
|
|
2017-10-08 02:48:01 +00:00
|
|
|
|
;; Return the shallow Copy of GLYPH.
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(defsubst lglyph-copy (glyph) (copy-sequence glyph))
|
|
|
|
|
|
2017-10-08 02:48:01 +00:00
|
|
|
|
;; Insert GLYPH at the index IDX of GSTRING.
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(defun lgstring-insert-glyph (gstring idx glyph)
|
|
|
|
|
(let ((nglyphs (lgstring-glyph-len gstring))
|
2011-04-19 13:44:55 +00:00
|
|
|
|
(i idx))
|
|
|
|
|
(while (and (< i nglyphs) (lgstring-glyph gstring i))
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(setq i (1+ i)))
|
|
|
|
|
(if (= i nglyphs)
|
|
|
|
|
(setq gstring (vconcat gstring (vector glyph)))
|
|
|
|
|
(if (< (1+ i) nglyphs)
|
|
|
|
|
(lgstring-set-glyph gstring (1+ i) nil)))
|
|
|
|
|
(while (> i idx)
|
|
|
|
|
(lgstring-set-glyph gstring i (lgstring-glyph gstring (1- i)))
|
|
|
|
|
(setq i (1- i)))
|
|
|
|
|
(lgstring-set-glyph gstring i glyph)
|
|
|
|
|
gstring))
|
|
|
|
|
|
2017-10-08 02:48:01 +00:00
|
|
|
|
;; Remove glyph at IDX from GSTRING.
|
|
|
|
|
(defun lgstring-remove-glyph (gstring idx)
|
|
|
|
|
(setq gstring (copy-sequence gstring))
|
|
|
|
|
(lgstring-set-id gstring nil)
|
|
|
|
|
(let ((len (length gstring)))
|
|
|
|
|
(setq idx (+ idx 3))
|
|
|
|
|
(while (< idx len)
|
|
|
|
|
(aset gstring (1- idx) (aref gstring idx))
|
|
|
|
|
(setq idx (1+ idx)))
|
|
|
|
|
(aset gstring (1- len) nil))
|
|
|
|
|
gstring)
|
|
|
|
|
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(defun compose-glyph-string (gstring from to)
|
|
|
|
|
(let ((glyph (lgstring-glyph gstring from))
|
2011-04-19 13:44:55 +00:00
|
|
|
|
from-pos to-pos)
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(setq from-pos (lglyph-from glyph)
|
|
|
|
|
to-pos (lglyph-to (lgstring-glyph gstring (1- to))))
|
|
|
|
|
(lglyph-set-from-to glyph from-pos to-pos)
|
|
|
|
|
(setq from (1+ from))
|
|
|
|
|
(while (and (< from to)
|
|
|
|
|
(setq glyph (lgstring-glyph gstring from)))
|
|
|
|
|
(lglyph-set-from-to glyph from-pos to-pos)
|
|
|
|
|
(let ((xoff (if (<= (lglyph-rbearing glyph) 0) 0
|
|
|
|
|
(- (lglyph-width glyph)))))
|
|
|
|
|
(lglyph-set-adjustment glyph xoff 0 0))
|
|
|
|
|
(setq from (1+ from)))
|
|
|
|
|
gstring))
|
|
|
|
|
|
|
|
|
|
(defun compose-glyph-string-relative (gstring from to &optional gap)
|
|
|
|
|
(let ((font-object (lgstring-font gstring))
|
|
|
|
|
(glyph (lgstring-glyph gstring from))
|
|
|
|
|
from-pos to-pos
|
2011-04-19 13:44:55 +00:00
|
|
|
|
ascent descent)
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(if gap
|
|
|
|
|
(setq gap (floor (* (font-get font-object :size) gap)))
|
|
|
|
|
(setq gap 0))
|
|
|
|
|
(setq from-pos (lglyph-from glyph)
|
|
|
|
|
to-pos (lglyph-to (lgstring-glyph gstring (1- to)))
|
|
|
|
|
ascent (lglyph-ascent glyph)
|
|
|
|
|
descent (lglyph-descent glyph))
|
|
|
|
|
(lglyph-set-from-to glyph from-pos to-pos)
|
|
|
|
|
(setq from (1+ from))
|
|
|
|
|
(while (< from to)
|
|
|
|
|
(setq glyph (lgstring-glyph gstring from))
|
|
|
|
|
(lglyph-set-from-to glyph from-pos to-pos)
|
|
|
|
|
(let ((this-ascent (lglyph-ascent glyph))
|
|
|
|
|
(this-descent (lglyph-descent glyph))
|
2011-04-19 13:44:55 +00:00
|
|
|
|
xoff yoff)
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(setq xoff (if (<= (lglyph-rbearing glyph) 0) 0
|
|
|
|
|
(- (lglyph-width glyph))))
|
|
|
|
|
(if (> this-ascent 0)
|
|
|
|
|
(if (< this-descent 0)
|
|
|
|
|
(setq yoff (- 0 ascent gap this-descent)
|
|
|
|
|
ascent (+ ascent gap this-ascent this-descent))
|
|
|
|
|
(setq yoff 0))
|
|
|
|
|
(setq yoff (+ descent gap this-ascent)
|
|
|
|
|
descent (+ descent gap this-ascent this-descent)))
|
|
|
|
|
(if (or (/= xoff 0) (/= yoff 0))
|
|
|
|
|
(lglyph-set-adjustment glyph xoff yoff 0)))
|
|
|
|
|
(setq from (1+ from)))
|
|
|
|
|
gstring))
|
|
|
|
|
|
2018-12-29 14:35:09 +00:00
|
|
|
|
(defun compose-gstring-for-graphic (gstring direction)
|
|
|
|
|
"Compose glyph-string GSTRING under bidi DIRECTION for graphic display.
|
|
|
|
|
DIRECTION is either L2R or R2L, or nil if unknown.
|
2010-05-19 01:09:50 +00:00
|
|
|
|
Combining characters are composed with the preceding base
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
character. If the preceding character is not a base character,
|
2010-05-19 01:09:50 +00:00
|
|
|
|
each combining character is composed as a spacing character by
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
a padding space before and/or after the character.
|
|
|
|
|
|
2010-05-20 01:27:49 +00:00
|
|
|
|
All non-spacing characters have this function in
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
`composition-function-table' unless overwritten."
|
2011-04-19 13:44:55 +00:00
|
|
|
|
(let ((nchars (lgstring-char-len gstring))
|
|
|
|
|
(nglyphs (lgstring-glyph-len gstring))
|
|
|
|
|
(glyph (lgstring-glyph gstring 0)))
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(cond
|
|
|
|
|
;; A non-spacing character not following a proper base character.
|
|
|
|
|
((= nchars 1)
|
|
|
|
|
(let ((lbearing (lglyph-lbearing glyph))
|
|
|
|
|
(rbearing (lglyph-rbearing glyph))
|
|
|
|
|
(width (lglyph-width glyph))
|
2011-04-19 13:44:55 +00:00
|
|
|
|
xoff)
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(if (< lbearing 0)
|
|
|
|
|
(setq xoff (- lbearing))
|
|
|
|
|
(setq xoff 0 lbearing 0))
|
|
|
|
|
(if (< rbearing width)
|
|
|
|
|
(setq rbearing width))
|
|
|
|
|
(lglyph-set-adjustment glyph xoff 0 (- rbearing lbearing))
|
|
|
|
|
gstring))
|
|
|
|
|
|
|
|
|
|
;; This sequence doesn't start with a proper base character.
|
|
|
|
|
((memq (get-char-code-property (lgstring-char gstring 0)
|
|
|
|
|
'general-category)
|
|
|
|
|
'(Mn Mc Me Zs Zl Zp Cc Cf Cs))
|
|
|
|
|
nil)
|
|
|
|
|
|
|
|
|
|
;; A base character and the following non-spacing characters.
|
|
|
|
|
(t
|
2018-12-29 14:35:09 +00:00
|
|
|
|
(let ((gstr (font-shape-gstring gstring direction)))
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(if (and gstr
|
|
|
|
|
(> (lglyph-to (lgstring-glyph gstr 0)) 0))
|
|
|
|
|
gstr
|
|
|
|
|
;; The shaper of the font couldn't shape the gstring.
|
|
|
|
|
;; Shape them according to canonical-combining-class.
|
|
|
|
|
(lgstring-set-id gstring nil)
|
|
|
|
|
(let* ((width (lglyph-width glyph))
|
|
|
|
|
(ascent (lglyph-ascent glyph))
|
|
|
|
|
(descent (lglyph-descent glyph))
|
|
|
|
|
(rbearing (lglyph-rbearing glyph))
|
|
|
|
|
(lbearing (lglyph-lbearing glyph))
|
|
|
|
|
(center (/ (+ lbearing rbearing) 2))
|
2013-09-12 14:45:28 +00:00
|
|
|
|
;; Artificial vertical gap between the glyphs.
|
2011-04-19 13:44:55 +00:00
|
|
|
|
(gap (round (* (font-get (lgstring-font gstring) :size) 0.1))))
|
2013-09-12 14:45:28 +00:00
|
|
|
|
(if (= gap 0)
|
|
|
|
|
;; Assure at least 1 pixel vertical gap.
|
|
|
|
|
(setq gap 1))
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(dotimes (i nchars)
|
|
|
|
|
(setq glyph (lgstring-glyph gstring i))
|
|
|
|
|
(when (> i 0)
|
|
|
|
|
(let* ((class (get-char-code-property
|
|
|
|
|
(lglyph-char glyph) 'canonical-combining-class))
|
|
|
|
|
(lb (lglyph-lbearing glyph))
|
|
|
|
|
(rb (lglyph-rbearing glyph))
|
|
|
|
|
(as (lglyph-ascent glyph))
|
|
|
|
|
(de (lglyph-descent glyph))
|
|
|
|
|
(ce (/ (+ lb rb) 2))
|
2019-06-26 14:24:59 +00:00
|
|
|
|
(w (lglyph-width glyph))
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
xoff yoff)
|
2013-09-12 14:45:28 +00:00
|
|
|
|
(cond
|
|
|
|
|
((and class (>= class 200) (<= class 240))
|
2008-09-10 05:49:38 +00:00
|
|
|
|
(setq xoff 0 yoff 0)
|
|
|
|
|
(cond
|
|
|
|
|
((= class 200)
|
|
|
|
|
(setq xoff (- lbearing ce)
|
|
|
|
|
yoff (if (> as 0) 0 (+ descent as))))
|
|
|
|
|
((= class 202)
|
|
|
|
|
(if (> as 0) (setq as 0))
|
|
|
|
|
(setq xoff (- center ce)
|
|
|
|
|
yoff (if (> as 0) 0 (+ descent as))))
|
|
|
|
|
((= class 204)
|
|
|
|
|
(if (> as 0) (setq as 0))
|
|
|
|
|
(setq xoff (- rbearing ce)
|
|
|
|
|
yoff (if (> as 0) 0 (+ descent as))))
|
|
|
|
|
((= class 208)
|
|
|
|
|
(setq xoff (- lbearing rb)))
|
|
|
|
|
((= class 210)
|
|
|
|
|
(setq xoff (- rbearing lb)))
|
|
|
|
|
((= class 212)
|
|
|
|
|
(setq xoff (- lbearing ce)
|
|
|
|
|
yoff (if (>= de 0) 0 (- (- ascent) de))))
|
|
|
|
|
((= class 214)
|
|
|
|
|
(setq xoff (- center ce)
|
|
|
|
|
yoff (if (>= de 0) 0 (- (- ascent) de))))
|
|
|
|
|
((= class 216)
|
|
|
|
|
(setq xoff (- rbearing ce)
|
|
|
|
|
yoff (if (>= de 0) 0 (- (- ascent) de))))
|
|
|
|
|
((= class 218)
|
|
|
|
|
(setq xoff (- lbearing ce)
|
|
|
|
|
yoff (if (> as 0) 0 (+ descent as gap))))
|
|
|
|
|
((= class 220)
|
|
|
|
|
(setq xoff (- center ce)
|
|
|
|
|
yoff (if (> as 0) 0 (+ descent as gap))))
|
|
|
|
|
((= class 222)
|
|
|
|
|
(setq xoff (- rbearing ce)
|
|
|
|
|
yoff (if (> as 0) 0 (+ descent as gap))))
|
|
|
|
|
((= class 224)
|
|
|
|
|
(setq xoff (- lbearing rb)))
|
|
|
|
|
((= class 226)
|
|
|
|
|
(setq xoff (- rbearing lb)))
|
|
|
|
|
((= class 228)
|
|
|
|
|
(setq xoff (- lbearing ce)
|
|
|
|
|
yoff (if (>= de 0) 0 (- (- ascent) de gap))))
|
|
|
|
|
((= class 230)
|
|
|
|
|
(setq xoff (- center ce)
|
|
|
|
|
yoff (if (>= de 0) 0 (- (- ascent) de gap))))
|
|
|
|
|
((= class 232)
|
|
|
|
|
(setq xoff (- rbearing ce)
|
|
|
|
|
yoff (if (>= de 0) 0 (- (+ ascent de) gap)))))
|
|
|
|
|
(lglyph-set-adjustment glyph (- xoff width) yoff)
|
|
|
|
|
(setq lb (+ lb xoff)
|
|
|
|
|
rb (+ lb xoff)
|
|
|
|
|
as (- as yoff)
|
|
|
|
|
de (+ de yoff)))
|
2013-09-12 14:45:28 +00:00
|
|
|
|
((and (= class 0)
|
|
|
|
|
(eq (get-char-code-property (lglyph-char glyph)
|
|
|
|
|
'general-category) 'Me))
|
2013-11-05 07:44:14 +00:00
|
|
|
|
;; Artificially laying out glyphs in an enclosing
|
2013-09-12 14:45:28 +00:00
|
|
|
|
;; mark is difficult. All we can do is to adjust
|
|
|
|
|
;; the x-offset and width of the base glyph to
|
|
|
|
|
;; align it at the center of the glyph of the
|
|
|
|
|
;; enclosing mark hoping that the enclosing mark
|
|
|
|
|
;; is big enough. We also have to adjust the
|
|
|
|
|
;; x-offset and width of the mark ifself properly
|
2013-11-05 07:44:14 +00:00
|
|
|
|
;; depending on how the glyph is designed.
|
2013-09-12 14:45:28 +00:00
|
|
|
|
|
|
|
|
|
;; (non-spacing or not). For instance, when we
|
|
|
|
|
;; have these glyphs:
|
|
|
|
|
;; X position |
|
|
|
|
|
;; base: <-*-> lbearing=0 rbearing=5 width=5
|
|
|
|
|
;; mark: <----------.> lb=-11 rb=2 w=0
|
|
|
|
|
;; we get a correct layout by moving them as this:
|
|
|
|
|
;; base: <-*-> XOFF=4 WAD=9
|
|
|
|
|
;; mark: <----------.> xoff=2 wad=4
|
|
|
|
|
;; we have moved the base to the left by 4-pixel
|
|
|
|
|
;; and make its width 9-pixel, then move the mark
|
|
|
|
|
;; to the left 2-pixel and make its width 4-pixel.
|
|
|
|
|
(let* (;; Adjustment for the base glyph
|
|
|
|
|
(XOFF (/ (- rb lb width) 2))
|
|
|
|
|
(WAD (+ width XOFF))
|
|
|
|
|
;; Adjustment for the enclosing mark glyph
|
|
|
|
|
(xoff (- (+ lb WAD)))
|
|
|
|
|
(wad (- rb lb WAD)))
|
|
|
|
|
(lglyph-set-adjustment glyph xoff 0 wad)
|
|
|
|
|
(setq glyph (lgstring-glyph gstring 0))
|
|
|
|
|
(lglyph-set-adjustment glyph XOFF 0 WAD))))
|
2008-09-10 05:49:38 +00:00
|
|
|
|
(if (< ascent as)
|
|
|
|
|
(setq ascent as))
|
|
|
|
|
(if (< descent de)
|
|
|
|
|
(setq descent de))))))
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(let ((i 0))
|
|
|
|
|
(while (and (< i nglyphs) (setq glyph (lgstring-glyph gstring i)))
|
|
|
|
|
(lglyph-set-from-to glyph 0 (1- nchars))
|
|
|
|
|
(setq i (1+ i))))
|
|
|
|
|
gstring))))))
|
|
|
|
|
|
2018-12-29 14:35:09 +00:00
|
|
|
|
(defun compose-gstring-for-dotted-circle (gstring direction)
|
2014-06-28 01:34:17 +00:00
|
|
|
|
(let* ((dc (lgstring-glyph gstring 0)) ; glyph of dotted-circle
|
2019-06-26 14:24:59 +00:00
|
|
|
|
(dc-id (lglyph-code dc))
|
2014-06-28 01:34:17 +00:00
|
|
|
|
(fc (lgstring-glyph gstring 1)) ; glyph of the following char
|
2019-06-26 14:24:59 +00:00
|
|
|
|
(fc-id (lglyph-code fc))
|
2018-12-29 14:35:09 +00:00
|
|
|
|
(gstr (and nil (font-shape-gstring gstring direction))))
|
2014-06-28 01:34:17 +00:00
|
|
|
|
(if (and gstr
|
|
|
|
|
(or (= (lgstring-glyph-len gstr) 1)
|
|
|
|
|
(and (= (lgstring-glyph-len gstr) 2)
|
|
|
|
|
(= (lglyph-to (lgstring-glyph gstr 0))
|
|
|
|
|
(lglyph-to (lgstring-glyph gstr 1))))))
|
|
|
|
|
;; It seems that font-shape-gstring has composed glyphs.
|
|
|
|
|
gstr
|
|
|
|
|
;; Artificially compose the following glyph with the preceding
|
|
|
|
|
;; dotted-circle.
|
|
|
|
|
(setq dc (lgstring-glyph gstring 0)
|
|
|
|
|
fc (lgstring-glyph gstring 1))
|
|
|
|
|
(let ((dc-width (lglyph-width dc))
|
|
|
|
|
(fc-width (- (lglyph-rbearing fc) (lglyph-lbearing fc)))
|
|
|
|
|
(from (lglyph-from dc))
|
|
|
|
|
(to (lglyph-to fc))
|
|
|
|
|
(xoff 0) (yoff 0) (width 0))
|
|
|
|
|
(if (and (< (lglyph-descent fc) 0)
|
|
|
|
|
(> (lglyph-ascent dc) (- (lglyph-descent fc))))
|
|
|
|
|
;; Set YOFF so that the following glyph is put on top of
|
|
|
|
|
;; the dotted-circle.
|
|
|
|
|
(setq yoff (- (- (lglyph-descent fc)) (lglyph-ascent dc))))
|
|
|
|
|
(if (> (lglyph-width fc) 0)
|
|
|
|
|
(setq xoff (- (lglyph-rbearing fc))))
|
|
|
|
|
(if (< dc-width fc-width)
|
|
|
|
|
;; The following glyph is wider, but we don't know how to
|
2014-09-11 19:44:25 +00:00
|
|
|
|
;; align both glyphs. So, try the easiest method;
|
2014-06-28 01:34:17 +00:00
|
|
|
|
;; i.e. align left edges of the glyphs.
|
|
|
|
|
(setq xoff (- xoff (- dc-width) (- (lglyph-lbearing fc )))
|
|
|
|
|
width (- fc-width dc-width)))
|
|
|
|
|
(if (or (/= xoff 0) (/= yoff 0) (/= width 0) (/= (lglyph-width fc) 0))
|
|
|
|
|
(lglyph-set-adjustment fc xoff yoff width))
|
|
|
|
|
(lglyph-set-from-to dc from to)
|
|
|
|
|
(lglyph-set-from-to fc from to))
|
|
|
|
|
(if (> (lgstring-glyph-len gstring) 2)
|
|
|
|
|
(lgstring-set-glyph gstring 2 nil))
|
|
|
|
|
gstring)))
|
|
|
|
|
|
2013-11-27 08:21:19 +00:00
|
|
|
|
;; Allow for bootstrapping without uni-*.el.
|
|
|
|
|
(when unicode-category-table
|
|
|
|
|
(let ((elt `([,(purecopy "\\c.\\c^+") 1 compose-gstring-for-graphic]
|
|
|
|
|
[nil 0 compose-gstring-for-graphic])))
|
|
|
|
|
(map-char-table
|
|
|
|
|
#'(lambda (key val)
|
|
|
|
|
(if (memq val '(Mn Mc Me))
|
|
|
|
|
(set-char-table-range composition-function-table key elt)))
|
2014-06-28 01:34:17 +00:00
|
|
|
|
unicode-category-table))
|
|
|
|
|
;; for dotted-circle
|
|
|
|
|
(aset composition-function-table #x25CC
|
|
|
|
|
`([,(purecopy ".\\c^") 0 compose-gstring-for-dotted-circle])))
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
|
2018-12-29 14:35:09 +00:00
|
|
|
|
(defun compose-gstring-for-terminal (gstring _direction)
|
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local.
* lisp/allout-widgets.el (allout-widgets-mode-off)
(allout-widgets-mode-on, allout-widgets-pre-command-business)
(allout-widgets-post-command-business)
(allout-widgets-after-copy-or-kill-function)
(allout-widgets-after-undo-function, allout-test-range-overlaps)
(allout-decorate-item-and-context)
(allout-graphics-modification-handler): Fix typos in docstrings.
(allout-get-or-create-parent-widget): Use `looking-at-p'.
* lisp/cmuscheme.el (scheme-start-file): Doc fix.
(inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings.
(scheme-input-filter): Use `string-match-p'.
* lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring.
* lisp/dired-x.el: Use Dired consistently in docstrings.
* lisp/dired.el: Use Dired consistently in docstrings.
(dired-readin, dired-mode): Use `setq-local'.
(dired-switches-alist): Make defvar-local.
(dired-buffers-for-dir): Use `zerop'.
(dired-safe-switches-p, dired-switches-escape-p)
(dired-insert-old-subdirs, dired-move-to-end-of-filename)
(dired-glob-regexp, dired-in-this-tree, dired-goto-file-1)
(dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check):
(dired-goto-next-nontrivial-file): Use `string-match-p'.
(dired-align-file, dired-insert-directory, dired-mark-files-in-region)
(dired-toggle-marks, dired-mark-files-containing-regexp)
(dired-mark-symlinks, dired-mark-directories, dired-mark-executables)
(dired-flag-auto-save-files, dired-flag-backup-files):
Use `looking-at-p'.
(dired-mark-files-regexp, dired-build-subdir-alist):
Use `string-match-p', `looking-at-p'.
* lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p)
(direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
|
|
|
|
"Compose glyph-string GSTRING for terminal display.
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
Non-spacing characters are composed with the preceding base
|
|
|
|
|
character. If the preceding character is not a base character,
|
|
|
|
|
each non-spacing character is composed as a spacing character by
|
2010-05-20 01:27:49 +00:00
|
|
|
|
prepending a space before it."
|
2011-04-19 13:44:55 +00:00
|
|
|
|
(let ((nglyphs (lgstring-glyph-len gstring))
|
|
|
|
|
(i 0)
|
|
|
|
|
(coding (lgstring-font gstring))
|
|
|
|
|
glyph)
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(while (and (< i nglyphs)
|
|
|
|
|
(setq glyph (lgstring-glyph gstring i)))
|
2009-02-04 02:00:34 +00:00
|
|
|
|
(if (not (char-charset (lglyph-char glyph) coding))
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(progn
|
2009-02-04 02:00:34 +00:00
|
|
|
|
;; As the terminal doesn't support this glyph, return a
|
2011-11-27 04:43:11 +00:00
|
|
|
|
;; gstring in which each glyph is its own grapheme-cluster
|
2009-02-04 02:00:34 +00:00
|
|
|
|
;; of width 1..
|
|
|
|
|
(setq i 0)
|
|
|
|
|
(while (and (< i nglyphs)
|
|
|
|
|
(setq glyph (lgstring-glyph gstring i)))
|
|
|
|
|
(if (< (lglyph-width glyph) 1)
|
|
|
|
|
(lglyph-set-width glyph 1))
|
|
|
|
|
(lglyph-set-from-to glyph i i)
|
|
|
|
|
(setq i (1+ i))))
|
|
|
|
|
(if (= (lglyph-width glyph) 0)
|
2009-06-10 00:35:08 +00:00
|
|
|
|
(if (eq (get-char-code-property (lglyph-char glyph)
|
|
|
|
|
'general-category)
|
|
|
|
|
'Cf)
|
|
|
|
|
(progn
|
|
|
|
|
;; Compose by replacing with a space.
|
|
|
|
|
(lglyph-set-char glyph 32)
|
|
|
|
|
(lglyph-set-width glyph 1)
|
|
|
|
|
(setq i (1+ i)))
|
2009-02-04 02:00:34 +00:00
|
|
|
|
;; Compose by prepending a space.
|
|
|
|
|
(setq gstring (lgstring-insert-glyph gstring i
|
|
|
|
|
(lglyph-copy glyph))
|
|
|
|
|
nglyphs (lgstring-glyph-len gstring))
|
|
|
|
|
(setq glyph (lgstring-glyph gstring i))
|
|
|
|
|
(lglyph-set-char glyph 32)
|
|
|
|
|
(lglyph-set-width glyph 1)
|
|
|
|
|
(setq i (+ 2)))
|
|
|
|
|
(let ((from (lglyph-from glyph))
|
|
|
|
|
(to (lglyph-to glyph))
|
|
|
|
|
(j (1+ i)))
|
|
|
|
|
(while (and (< j nglyphs)
|
|
|
|
|
(setq glyph (lgstring-glyph gstring j))
|
|
|
|
|
(char-charset (lglyph-char glyph) coding)
|
|
|
|
|
(= (lglyph-width glyph) 0))
|
|
|
|
|
(setq to (lglyph-to glyph)
|
|
|
|
|
j (1+ j)))
|
|
|
|
|
(while (< i j)
|
|
|
|
|
(setq glyph (lgstring-glyph gstring i))
|
|
|
|
|
(lglyph-set-from-to glyph from to)
|
|
|
|
|
(setq i (1+ i)))))))
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
gstring))
|
|
|
|
|
|
|
|
|
|
|
2018-12-29 14:35:09 +00:00
|
|
|
|
(defun auto-compose-chars (func from to font-object string direction)
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
"Compose the characters at FROM by FUNC.
|
2018-12-29 14:35:09 +00:00
|
|
|
|
FUNC is called with two arguments: GSTRING, which is built for
|
|
|
|
|
characters in the region FROM (inclusive) and TO (exclusive);
|
|
|
|
|
and DIRECTION, which is the bidi directionality of the characters.
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
|
|
|
|
|
If the character are composed on a graphic display, FONT-OBJECT
|
2009-03-25 12:02:15 +00:00
|
|
|
|
is a font to use. Otherwise, FONT-OBJECT is nil, and the function
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
`compose-gstring-for-terminal' is used instead of FUNC.
|
|
|
|
|
|
2007-12-25 10:49:50 +00:00
|
|
|
|
If STRING is non-nil, it is a string, and FROM and TO are indices
|
|
|
|
|
into the string. In that case, compose characters in the string.
|
2002-11-07 06:27:27 +00:00
|
|
|
|
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
The value is a gstring containing information for shaping the characters.
|
|
|
|
|
|
2002-11-07 06:27:27 +00:00
|
|
|
|
This function is the default value of `auto-composition-function' (which see)."
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(let ((gstring (composition-get-gstring from to font-object string)))
|
|
|
|
|
(if (lgstring-shaped-p gstring)
|
|
|
|
|
gstring
|
2009-02-04 02:00:34 +00:00
|
|
|
|
(or (fontp font-object 'font-object)
|
(composition-function-table): Declaration moved to
composite.c.
(terminal-composition-base-character-p): Delete it.
(terminal-composition-function): Delete it.
(terminal-composition-function-table): Delete it.
(lgstring-header, lgstring-set-header, lgstring-font)
(lgstring-char, lgstring-char-len, lgstring-shaped-p)
(lgstring-set-id, lgstring-glyph, lgstring-glyph-len)
(lgstring-set-glyph, lglyph-from, lglyph-to, lglyph-char)
(lglyph-code, lglyph-width, lglyph-lbearing, lglyph-rbearing)
(lglyph-ascent, lglyph-descent, lglyph-adjustment)
(lglyph-set-from-to, lglyph-copy, lgstring-insert-glyph)
(compose-glyph-string, compose-glyph-string-relative)
(compose-gstring-for-graphic, compose-gstring-for-terminal): New
functions.
(auto-compose-chars): Argument changed.
2008-08-29 07:59:03 +00:00
|
|
|
|
(setq func 'compose-gstring-for-terminal))
|
2018-12-29 14:35:09 +00:00
|
|
|
|
(funcall func gstring direction))))
|
2002-11-07 06:27:27 +00:00
|
|
|
|
|
2010-01-14 03:44:36 +00:00
|
|
|
|
(put 'auto-composition-mode 'permanent-local t)
|
|
|
|
|
|
2006-02-21 10:15:48 +00:00
|
|
|
|
(make-variable-buffer-local 'auto-composition-function)
|
2010-01-14 03:44:36 +00:00
|
|
|
|
(setq-default auto-composition-function 'auto-compose-chars)
|
2006-02-21 10:15:48 +00:00
|
|
|
|
|
2006-02-21 10:45:21 +00:00
|
|
|
|
;;;###autoload
|
2010-05-03 02:29:46 +00:00
|
|
|
|
(define-minor-mode auto-composition-mode
|
2008-02-21 07:53:55 +00:00
|
|
|
|
"Toggle Auto Composition mode.
|
2006-02-21 10:15:48 +00:00
|
|
|
|
|
Fix minor mode docstrings for the new meaning of a nil ARG.
* abbrev.el (abbrev-mode):
* allout.el (allout-mode):
* autoinsert.el (auto-insert-mode):
* autoarg.el (autoarg-mode, autoarg-kp-mode):
* autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-mode):
* battery.el (display-battery-mode):
* composite.el (global-auto-composition-mode)
(auto-composition-mode):
* delsel.el (delete-selection-mode):
* desktop.el (desktop-save-mode):
* dired-x.el (dired-omit-mode):
* dirtrack.el (dirtrack-mode):
* doc-view.el (doc-view-minor-mode):
* double.el (double-mode):
* electric.el (electric-indent-mode, electric-pair-mode):
* emacs-lock.el (emacs-lock-mode):
* epa-hook.el (auto-encryption-mode):
* follow.el (follow-mode):
* font-core.el (font-lock-mode):
* frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode):
* help.el (temp-buffer-resize-mode):
* hilit-chg.el (highlight-changes-mode)
(highlight-changes-visible-mode):
* hi-lock.el (hi-lock-mode):
* hl-line.el (hl-line-mode, global-hl-line-mode):
* icomplete.el (icomplete-mode):
* ido.el (ido-everywhere):
* image-file.el (auto-image-file-mode):
* image-mode.el (image-minor-mode):
* iswitchb.el (iswitchb-mode):
* jka-cmpr-hook.el (auto-compression-mode):
* linum.el (linum-mode):
* longlines.el (longlines-mode):
* master.el (master-mode):
* mb-depth.el (minibuffer-depth-indicate-mode):
* menu-bar.el (menu-bar-mode):
* minibuf-eldef.el (minibuffer-electric-default-mode):
* mouse-sel.el (mouse-sel-mode):
* msb.el (msb-mode):
* mwheel.el (mouse-wheel-mode):
* outline.el (outline-minor-mode):
* paren.el (show-paren-mode):
* recentf.el (recentf-mode):
* reveal.el (reveal-mode, global-reveal-mode):
* rfn-eshadow.el (file-name-shadow-mode):
* ruler-mode.el (ruler-mode):
* savehist.el (savehist-mode):
* scroll-all.el (scroll-all-mode):
* scroll-bar.el (scroll-bar-mode):
* server.el (server-mode):
* shell.el (shell-dirtrack-mode):
* simple.el (auto-fill-mode, transient-mark-mode)
(visual-line-mode, overwrite-mode, binary-overwrite-mode)
(line-number-mode, column-number-mode, size-indication-mode)
(auto-save-mode, normal-erase-is-backspace-mode, visible-mode):
* strokes.el (strokes-mode):
* time.el (display-time-mode):
* t-mouse.el (gpm-mouse-mode):
* tool-bar.el (tool-bar-mode):
* tooltip.el (tooltip-mode):
* type-break.el (type-break-mode-line-message-mode)
(type-break-query-mode):
* view.el (view-mode):
* whitespace.el (whitespace-mode, whitespace-newline-mode)
(global-whitespace-mode, global-whitespace-newline-mode):
* xt-mouse.el (xterm-mouse-mode): Doc fix.
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
autogenerated docstring.
2011-10-19 12:54:24 +00:00
|
|
|
|
When Auto Composition mode is enabled, text characters are
|
|
|
|
|
automatically composed by functions registered in
|
|
|
|
|
`composition-function-table'.
|
2006-02-21 10:15:48 +00:00
|
|
|
|
|
2008-02-21 07:53:55 +00:00
|
|
|
|
You can use `global-auto-composition-mode' to turn on
|
2010-10-29 03:29:29 +00:00
|
|
|
|
Auto Composition mode in all buffers (this is the default)."
|
|
|
|
|
;; It's defined in C, this stops the d-m-m macro defining it again.
|
|
|
|
|
:variable auto-composition-mode)
|
|
|
|
|
;; It's not defined with DEFVAR_PER_BUFFER though.
|
|
|
|
|
(make-variable-buffer-local 'auto-composition-mode)
|
2006-02-21 10:15:48 +00:00
|
|
|
|
|
2006-02-21 10:45:21 +00:00
|
|
|
|
;;;###autoload
|
2010-05-05 02:08:25 +00:00
|
|
|
|
(define-minor-mode global-auto-composition-mode
|
Fix minor mode docstrings for the new meaning of a nil ARG.
* abbrev.el (abbrev-mode):
* allout.el (allout-mode):
* autoinsert.el (auto-insert-mode):
* autoarg.el (autoarg-mode, autoarg-kp-mode):
* autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-mode):
* battery.el (display-battery-mode):
* composite.el (global-auto-composition-mode)
(auto-composition-mode):
* delsel.el (delete-selection-mode):
* desktop.el (desktop-save-mode):
* dired-x.el (dired-omit-mode):
* dirtrack.el (dirtrack-mode):
* doc-view.el (doc-view-minor-mode):
* double.el (double-mode):
* electric.el (electric-indent-mode, electric-pair-mode):
* emacs-lock.el (emacs-lock-mode):
* epa-hook.el (auto-encryption-mode):
* follow.el (follow-mode):
* font-core.el (font-lock-mode):
* frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode):
* help.el (temp-buffer-resize-mode):
* hilit-chg.el (highlight-changes-mode)
(highlight-changes-visible-mode):
* hi-lock.el (hi-lock-mode):
* hl-line.el (hl-line-mode, global-hl-line-mode):
* icomplete.el (icomplete-mode):
* ido.el (ido-everywhere):
* image-file.el (auto-image-file-mode):
* image-mode.el (image-minor-mode):
* iswitchb.el (iswitchb-mode):
* jka-cmpr-hook.el (auto-compression-mode):
* linum.el (linum-mode):
* longlines.el (longlines-mode):
* master.el (master-mode):
* mb-depth.el (minibuffer-depth-indicate-mode):
* menu-bar.el (menu-bar-mode):
* minibuf-eldef.el (minibuffer-electric-default-mode):
* mouse-sel.el (mouse-sel-mode):
* msb.el (msb-mode):
* mwheel.el (mouse-wheel-mode):
* outline.el (outline-minor-mode):
* paren.el (show-paren-mode):
* recentf.el (recentf-mode):
* reveal.el (reveal-mode, global-reveal-mode):
* rfn-eshadow.el (file-name-shadow-mode):
* ruler-mode.el (ruler-mode):
* savehist.el (savehist-mode):
* scroll-all.el (scroll-all-mode):
* scroll-bar.el (scroll-bar-mode):
* server.el (server-mode):
* shell.el (shell-dirtrack-mode):
* simple.el (auto-fill-mode, transient-mark-mode)
(visual-line-mode, overwrite-mode, binary-overwrite-mode)
(line-number-mode, column-number-mode, size-indication-mode)
(auto-save-mode, normal-erase-is-backspace-mode, visible-mode):
* strokes.el (strokes-mode):
* time.el (display-time-mode):
* t-mouse.el (gpm-mouse-mode):
* tool-bar.el (tool-bar-mode):
* tooltip.el (tooltip-mode):
* type-break.el (type-break-mode-line-message-mode)
(type-break-query-mode):
* view.el (view-mode):
* whitespace.el (whitespace-mode, whitespace-newline-mode)
(global-whitespace-mode, global-whitespace-newline-mode):
* xt-mouse.el (xterm-mouse-mode): Doc fix.
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
autogenerated docstring.
2011-10-19 12:54:24 +00:00
|
|
|
|
"Toggle Auto Composition mode in all buffers.
|
|
|
|
|
|
|
|
|
|
For more information on Auto Composition mode, see
|
|
|
|
|
`auto-composition-mode' ."
|
2016-02-15 19:46:17 +00:00
|
|
|
|
:global t
|
2010-05-05 02:08:25 +00:00
|
|
|
|
:variable (default-value 'auto-composition-mode))
|
|
|
|
|
|
2009-02-23 01:37:34 +00:00
|
|
|
|
(defalias 'toggle-auto-composition 'auto-composition-mode)
|
2003-09-26 11:24:10 +00:00
|
|
|
|
|
2016-11-25 10:24:22 +00:00
|
|
|
|
(provide 'composite)
|
|
|
|
|
|
1999-12-15 00:28:11 +00:00
|
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
|
|
1999-12-15 00:28:11 +00:00
|
|
|
|
;;; composite.el ends here
|