Mercurial > emacs
changeset 91181:392369adecec
(devanagari-composition-function): Use
font-shape-text if auto-compose-current-font is non-nil.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Tue, 04 Dec 2007 06:07:44 +0000 |
| parents | 583ca8a88936 |
| children | bbdb7226d848 |
| files | lisp/language/devan-util.el |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/language/devan-util.el Tue Dec 04 06:05:28 2007 +0000 +++ b/lisp/language/devan-util.el Tue Dec 04 06:07:44 2007 +0000 @@ -115,18 +115,19 @@ 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 devanagari-composable-pattern pos) pos) - (if auto-compose-current-font + (if auto-compose-current-font + (if (eq (string-match "[$,15@(B-$,16_(B]+" pos) pos) (or (font-shape-text 0 (match-end 0) auto-compose-current-font string) pos))) (goto-char pos) - (if (looking-at devanagari-composable-pattern) - (if auto-compose-current-font + (if auto-compose-current-font + (if (looking-at "[$,15@(B-$,16_(B]+") (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))))))) + (if (looking-at devanagari-composable-pattern) + (prog1 (match-end 0) + (devanagari-compose-syllable-region pos (match-end 0)))))))) ;; Notes on conversion steps.