# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1196482822 0
# Node ID e89e6dacdffa19d51feae333c2df9a25807a6f6a
# Parent  6a5d0cc191af4f7cc5b9488780c619de22f142a4
(devanagari-composition-function): Use
font-shape-text if auto-compose-current-font is non-nil.

diff -r 6a5d0cc191af -r e89e6dacdffa lisp/language/devan-util.el
--- 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.