# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1203903486 0
# Node ID 86535242951853c411305cda8448635ced5f9cb5
# Parent  008ecb0c705adf49e9732700b4ad4f034d9a832c
(tibetan-composition-function): Adjusted for the new calling way
(argument changed).  Try font-shape-text if possible.

diff -r 008ecb0c705a -r 865352429518 lisp/language/tibet-util.el
--- a/lisp/language/tibet-util.el	Mon Feb 25 01:36:48 2008 +0000
+++ b/lisp/language/tibet-util.el	Mon Feb 25 01:38:06 2008 +0000
@@ -316,21 +316,12 @@
     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.