Mercurial > emacs
changeset 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 | 20eba9f5ae64 |
| children | db40129142b2 |
| files | lisp/language/tibet-util.el |
| diffstat | 1 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/language/tibet-util.el Thu Dec 06 07:34:50 2007 +0000 +++ b/lisp/language/tibet-util.el Thu Dec 06 07:36:14 2007 +0000 @@ -317,13 +317,17 @@ ;;;###autoload (defun tibetan-composition-function (pos &optional string) - (setq pos (1- pos)) (if string - ;; Not yet implemented. - nil - (if (>= pos (point-min)) - (save-excursion - (goto-char pos) + (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))))))))