From: Kenichi Handa <handa@m17n.org>
Date: Thu, 7 Nov 2002 06:33:13 +0000 (+0000)
Subject: (tibetan-composition-function): Change
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~157
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6b00e74e82ba0323a669dfdd224b8c3f746f10fe;p=emacs.git

(tibetan-composition-function): Change
arguments to conform to composition-function-table.
---

diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index ced6dee6531..6412b4f3654 100644
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -120,7 +120,7 @@ The returned string has no composition information."
 ;;;
 ;;; Here are examples of the words "bsgrubs" and "hfauM"
 ;;;
-;;;            4$(7"70"714%qx!"U0"G###C"U14"70"714"G0"G1(B            4$(7"Hx!"Rx!"Ur'"_0"H"R"U"_1(B
+;;;            $(7"7"G###C"U"7"G(B            $(7"H"R"U"_(B
 ;;;
 ;;;                             M
 ;;;             b s b s         h
@@ -146,7 +146,7 @@ The returned string has no composition information."
     ;; If 'a follows a consonant, turn it into the subjoined form.
     ;; * Disabled by Tomabechi 2000/06/09 *
     ;; Because in Unicode, $(7"A(B may follow directly a consonant without
-    ;; any intervening vowel, as in 4$(7"90"914""0"""Q14"A0"A1!;(B=4$(7"90"91(B 4$(7""0""1(B 4$(7"A0"A1(B not 4$(7"90"91(B 4$(7""0""1(B $(7"Q(B 4$(7"A0"A1(B  
+    ;; any intervening vowel, as in $(7"9"""Q"A!;(B=$(7"9(B $(7""(B $(7"A(B not $(7"9(B $(7""(B $(7"Q(B $(7"A(B  
     ;;(if (and (= char ?$(7"A(B)
     ;;	     (aref (char-category-set (car last)) ?0))
     ;;	(setq char ?$(7"R(B)) ;; modified for new font by Tomabechi 1999/12/10
@@ -294,11 +294,17 @@ are decomposed into normal Tibetan character sequences."
     new))
 
 ;;;###autoload
-(defun tibetan-composition-function (from to pattern &optional string)
+(defun tibetan-composition-function (pos &optional string)
+  (setq pos (1- pos))
   (if string
-      (tibetan-compose-string string)
-    (tibetan-compose-region from to))
-  (- to from))
+      ;; Not yet implemented.
+      nil
+    (if (>= pos (point-min))
+	(save-excursion
+	  (goto-char pos)
+	  (if (looking-at tibetan-composable-pattern)
+	      (prog1 (match-end 0)
+		(tibetan-compose-region pos (match-end 0))))))))
 
 ;;;
 ;;; This variable is used to avoid repeated decomposition.