Mercurial > emacs
comparison lisp/language/tibet-util.el @ 91202:018583232611
(tibetan-composition-function): Use
font-shape-text if auto-compose-current-font is non-nil.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Thu, 06 Dec 2007 07:36:14 +0000 |
parents | f55f9811f5d7 |
children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
91201:20eba9f5ae64 | 91202:018583232611 |
---|---|
315 idx (1+ idx))) | 315 idx (1+ idx))) |
316 new)) | 316 new)) |
317 | 317 |
318 ;;;###autoload | 318 ;;;###autoload |
319 (defun tibetan-composition-function (pos &optional string) | 319 (defun tibetan-composition-function (pos &optional string) |
320 (setq pos (1- pos)) | |
321 (if string | 320 (if string |
322 ;; Not yet implemented. | 321 (if auto-compose-current-font |
323 nil | 322 (if (eq (string-match "[$(7!0(B-$,1GQ(B]+" pos) pos) |
324 (if (>= pos (point-min)) | 323 (or (font-shape-text 0 (match-end 0) auto-compose-current-font |
325 (save-excursion | 324 string) |
326 (goto-char pos) | 325 pos))) |
326 (goto-char pos) | |
327 (if auto-compose-current-font | |
328 (if (looking-at "[$(7!0(B-$,1GQ(B]+") | |
329 (or (font-shape-text pos (match-end 0) auto-compose-current-font) | |
330 pos) | |
327 (if (looking-at tibetan-composable-pattern) | 331 (if (looking-at tibetan-composable-pattern) |
328 (prog1 (match-end 0) | 332 (prog1 (match-end 0) |
329 (tibetan-compose-region pos (match-end 0)))))))) | 333 (tibetan-compose-region pos (match-end 0)))))))) |
330 | 334 |
331 ;;; | 335 ;;; |