# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1196926408 0
# Node ID 06f583f75d5581a9531d7e0a188e7f9eb2817d3c
# Parent  34fe548702cc06f6de3285f9844d799b7c7f1358
(tamil-composition-function): Use
font-shape-text if auto-compose-current-font is non-nil.

diff -r 34fe548702cc -r 06f583f75d55 lisp/language/tml-util.el
--- 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)