Mercurial > emacs
changeset 89302:b1774ad77cc7
(thai-post-read-conversion): Delete this
function.
(thai-composition-function): Change arguments to conform to
composition-function-table.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Thu, 07 Nov 2002 06:32:26 +0000 |
| parents | 85b9175715b8 |
| children | cba12d896f41 |
| files | lisp/language/thai-util.el |
| diffstat | 1 files changed, 14 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/language/thai-util.el Thu Nov 07 06:32:02 2002 +0000 +++ b/lisp/language/thai-util.el Thu Nov 07 06:32:26 2002 +0000 @@ -185,24 +185,20 @@ (thai-compose-region (point-min) (point-max))) ;;;###autoload -(defun thai-post-read-conversion (len) - (thai-compose-region (point) (+ (point) len)) - len) - -;;;###autoload -(defun thai-composition-function (from to pattern &optional string) - "Compose Thai text in the region FROM and TO. -The text matches the regular expression PATTERN. -Optional 4th argument STRING, if non-nil, is a string containing text -to compose. - -The return value is number of composed characters." - (if (< (1+ from) to) - (prog1 (- to from) - (if string - (compose-string string from to) - (compose-region from to)) - (- to from)))) +(defun thai-composition-function (pos &optional string) + (setq pos (1- pos)) + (let ((pattern "[,T!(B-,TCEG(B-,TN!(B-,TCEG(B-,TN(B][,TQT(B-,TWgnX(B-,TZQT(B-,TWgnX(B-,TZ(B]?[,Th(B-,Tmh(B-,Tm(B]?")) + (if string + (if (and (>= pos 0) + (eq (string-match pattern string pos) pos)) + (prog1 (match-end 0) + (compose-string string pos (match-end 0)))) + (if (>= pos (point-min)) + (progn + (goto-char pos) + (if (looking-at pattern) + (prog1 (match-end 0) + (compose-region pos (match-end 0))))))))) ;; (provide 'thai-util)