[Emacs-diffs] Changes to emacs/lisp/language/lao-util.el,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/08/29 07:59:39

Index: lao-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/language/lao-util.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- lao-util.el 6 May 2008 04:22:13 -0000       1.31
+++ lao-util.el 29 Aug 2008 07:59:39 -0000      1.32
@@ -492,18 +492,16 @@
 
 ;;;###autoload
 (defun lao-composition-function (from to font-object string)
-  (or (and font-object
-          (font-shape-text from to font-object string))
-      (with-category-table lao-category-table
-       (if string
-           (if (eq (string-match lao-composition-pattern string from) to)
-               (prog1 (match-end 0)
-                 (compose-string string from (match-end 0))))
-         (save-excursion
-           (goto-char from)
-           (if (looking-at lao-composition-pattern)
-               (prog1 (match-end 0)
-                 (compose-region from (match-end 0)))))))))
+  (if (= (lgstirng-char-len gstring) 1)
+      (compose-gstring-for-graphic gstring)
+    (or (font-shape-text from to font-object string))
+       (let ((glyph-len (lgstring-glyph-len gstring))
+             (i 0)
+             glyph)
+         (while (and (< i glyph-len)
+                     (setq glyph (lgstring-glyph gstring i)))
+           (setq i (1+ i)))
+         (compose-glyph-string-relative gstring 0 i 0.1))))
 
 ;;;###autoload
 (defun lao-compose-region (from to)