Mercurial > emacs
changeset 91199:06f583f75d55
(tamil-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:33:28 +0000 |
| parents | 34fe548702cc |
| children | d7ab840d0941 |
| files | lisp/language/tml-util.el |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/language/tml-util.el Thu Dec 06 07:33:02 2007 +0000 +++ b/lisp/language/tml-util.el Thu Dec 06 07:33:28 2007 +0000 @@ -360,17 +360,18 @@ If STRING is not nil, it is a string, and POS is an index to the string. In this case, compose characters after POS of the string." (if string - (if (eq (string-match tamil-composable-pattern pos) pos) - (if auto-compose-current-font + (if auto-compose-current-font + (if (eq (string-match "[$,1< (B-$,1=?(B]+" pos) pos) (or (font-shape-text 0 (match-end 0) auto-compose-current-font string) pos))) (goto-char pos) - (if (looking-at tamil-composable-pattern) - (if auto-compose-current-font + (if auto-compose-current-font + (if (looking-at "[$,1< (B-$,1=?(B]+") (or (font-shape-text pos (match-end 0) auto-compose-current-font)) - (prog1 (match-end 0) - (tamil-compose-syllable-region pos (match-end 0))))))) + (if (looking-at tamil-composable-pattern) + (prog1 (match-end 0) + (tamil-compose-syllable-region pos (match-end 0)))))))) (provide 'tml-util)