# HG changeset patch # User Kenichi Handa # Date 1036650793 0 # Node ID 5b82d8f14d06ea84b39b5f082d583756853157e5 # Parent cba12d896f41c6184650ebdb58078084be6e5a4d (tibetan-composition-function): Change arguments to conform to composition-function-table. diff -r cba12d896f41 -r 5b82d8f14d06 lisp/language/tibet-util.el --- a/lisp/language/tibet-util.el Thu Nov 07 06:32:49 2002 +0000 +++ b/lisp/language/tibet-util.el Thu Nov 07 06:33:13 2002 +0000 @@ -120,7 +120,7 @@ ;;; ;;; 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 @@ ;; 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 @@ 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.