# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1230680061 0
# Node ID b3c1355a0eda97256f8e7051d0f2667b3fa1c374
# Parent  79c848cc0c06255f69dafd0298e4043a26809d37
(compose-gstring-for-variation-glyph): New
function.  Register it in composition-function-table.

diff -r 79c848cc0c06 -r b3c1355a0eda lisp/language/japanese.el
--- a/lisp/language/japanese.el	Tue Dec 30 23:32:55 2008 +0000
+++ b/lisp/language/japanese.el	Tue Dec 30 23:34:21 2008 +0000
@@ -250,6 +250,29 @@
   (define-translation-table 'unicode-to-jisx0213
     (char-table-extra-slot table 0)))
 
+(defun compose-gstring-for-variation-glyph (gstring)
+  "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)
 
 ;; arch-tag: 450f5537-9d53-4d5e-b731-4cf116d8cbc9