mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-13 16:38:14 +00:00
Code Issues Releases Activity

Move compose-gstring-for-variation-glyph

Browse Source 
It logically belongs in composite.el, not japanese.el

* lisp/language/japanese.el (compose-gstring-for-variation-glyph):
Remove from here.
* lisp/composite.el (compose-gstring-for-variation-glyph): And add here.
This commit is contained in:
Robert Pluim 2021-09-21 17:46:32 +02:00
parent 04e236044a
commit fdaae2e7be
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lisp/composite.el
View File

@ -815,6 +815,28 @@ prepending a space before it."
(setq i (1+ i)))))))
gstring))
(defun compose-gstring-for-variation-glyph (gstring _direction)
"Compose glyph-string GSTRING for graphic display.
GSTRING must have two glyphs; the first is a glyph for a han character,
and the second is a glyph for a variation selector."
(let* ((font (lgstring-font gstring))
(han (lgstring-char gstring 0))
(vs (lgstring-char gstring 1))
(glyphs (font-variation-glyphs font han))
(g0 (lgstring-glyph gstring 0))
(g1 (lgstring-glyph gstring 1)))
(catch 'tag
(dolist (elt glyphs)
(if (= (car elt) vs)
(progn
(lglyph-set-code g0 (cdr elt))
(lglyph-set-from-to g0 (lglyph-from g0) (lglyph-to g1))
(lgstring-set-glyph gstring 1 nil)
(throw 'tag gstring)))))))
(let ((elt '([".." 1 compose-gstring-for-variation-glyph])))
(set-char-table-range composition-function-table '(#xFE00 . #xFE0F) elt)
(set-char-table-range composition-function-table '(#xE0100 . #xE01EF) elt))
(defun auto-compose-chars (func from to font-object string direction)
"Compose the characters at FROM by FUNC.

23
lisp/language/japanese.el
View File

@ -264,29 +264,6 @@ eucJP-ms is defined in <http://www.opengroup.or.jp/jvc/cde/appendix.html>."
(define-translation-table 'unicode-to-jisx0213
(char-table-extra-slot table 0)))
(defun compose-gstring-for-variation-glyph (gstring _direction)
"Compose glyph-string GSTRING for graphic display.
GSTRING must have two glyphs; the first is a glyph for a han character,
and the second is a glyph for a variation selector."
(let* ((font (lgstring-font gstring))
(han (lgstring-char gstring 0))
(vs (lgstring-char gstring 1))
(glyphs (font-variation-glyphs font han))
(g0 (lgstring-glyph gstring 0))
(g1 (lgstring-glyph gstring 1)))
(catch 'tag
(dolist (elt glyphs)
(if (= (car elt) vs)
(progn
(lglyph-set-code g0 (cdr elt))
(lglyph-set-from-to g0 (lglyph-from g0) (lglyph-to g1))
(lgstring-set-glyph gstring 1 nil)
(throw 'tag gstring)))))))
(let ((elt '([".." 1 compose-gstring-for-variation-glyph])))
(set-char-table-range composition-function-table '(#xFE00 . #xFE0F) elt)
(set-char-table-range composition-function-table '(#xE0100 . #xE01EF) elt))
(provide 'japanese)
;;; japanese.el ends here