Mercurial > emacs
changeset 91153:e89e6dacdffa
(devanagari-composition-function): Use
font-shape-text if auto-compose-current-font is non-nil.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Sat, 01 Dec 2007 04:20:22 +0000 |
| parents | 6a5d0cc191af |
| children | e9a946a24fb0 |
| files | lisp/language/devan-util.el |
| diffstat | 1 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/language/devan-util.el Sat Dec 01 04:19:31 2007 +0000 +++ b/lisp/language/devan-util.el Sat Dec 01 04:20:22 2007 +0000 @@ -115,12 +115,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 - ;; Not yet implemented. - nil + (if (eq (string-match devanagari-composable-pattern pos) pos) + (if auto-compose-current-font + (or (font-shape-text 0 (match-end 0) auto-compose-current-font + string) + pos))) (goto-char pos) (if (looking-at devanagari-composable-pattern) - (prog1 (match-end 0) - (devanagari-compose-syllable-region pos (match-end 0)))))) + (if auto-compose-current-font + (or (font-shape-text pos (match-end 0) auto-compose-current-font) + pos) + (prog1 (match-end 0) + (devanagari-compose-syllable-region pos (match-end 0))))))) ;; Notes on conversion steps.