From: Kenichi Handa <handa@m17n.org>
Date: Mon, 25 Feb 2008 01:38:06 +0000 (+0000)
Subject: (tibetan-composition-function): Adjusted for the new calling way
X-Git-Tag: emacs-pretest-23.0.90~7690
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7d8402965e9e7f364a84fde59881f463bd12e5ef;p=emacs.git

(tibetan-composition-function): Adjusted for the new calling way
(argument changed).  Try font-shape-text if possible.
---

diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index 88f970e5704..5dc948ed90e 100644
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -316,21 +316,12 @@ are decomposed into normal Tibetan character sequences."
     new))
 
 ;;;###autoload
-(defun tibetan-composition-function (pos &optional string)
-  (if string
-      (if auto-compose-current-font
-	  (if (eq (string-match "[$(7!0(B-$,1GQ(B]+" pos) pos)
-	      (or (font-shape-text 0 (match-end 0) auto-compose-current-font
-				   string)
-		  pos)))
-    (goto-char pos)
-    (if auto-compose-current-font
-	(if (looking-at "[$(7!0(B-$,1GQ(B]+")
-	    (or (font-shape-text pos (match-end 0) auto-compose-current-font)
-		pos)
-	  (if (looking-at tibetan-composable-pattern)
-	      (prog1 (match-end 0)
-		(tibetan-compose-region pos (match-end 0))))))))
+(defun tibetan-composition-function (from to font-object string)
+  (or (and font-object
+	   (font-shape-text from to font-object string))
+      (if string
+	  (tibetan-compose-string string)
+	(tibetan-compose-region from to))))
 
 ;;;
 ;;; This variable is used to avoid repeated decomposition.