Mercurial > emacs
changeset 92179:865352429518
(tibetan-composition-function): Adjusted for the new calling way
(argument changed). Try font-shape-text if possible.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 25 Feb 2008 01:38:06 +0000 |
| parents | 008ecb0c705a |
| children | 77454a3dacb5 |
| files | lisp/language/tibet-util.el |
| diffstat | 1 files changed, 6 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/language/tibet-util.el Mon Feb 25 01:36:48 2008 +0000 +++ b/lisp/language/tibet-util.el Mon Feb 25 01:38:06 2008 +0000 @@ -316,21 +316,12 @@ new)) ;;;###autoload -(defun tibetan-composition-function (pos &optional string) - (if string - (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)))))))) +(defun tibetan-composition-function (from to font-object string) + (or (and font-object + (font-shape-text from to font-object string)) + (if string + (tibetan-compose-string string) + (tibetan-compose-region from to)))) ;;; ;;; This variable is used to avoid repeated decomposition.