From: Kenichi Handa <handa@m17n.org>
Date: Fri, 29 Aug 2008 07:59:39 +0000 (+0000)
Subject: (lao-composition-function): Argument changed.
X-Git-Tag: emacs-pretest-23.0.90~3162
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=39a7775db4c03021630940758e8ece6d85d92c94;p=emacs.git

(lao-composition-function): Argument changed.
---

diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index 18fa4c51870..adbe30f0622 100644
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@ -492,18 +492,16 @@ syllable.  In that case, FROM and TO are indexes to STR."
 
 ;;;###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)