From: Kenichi Handa <handa@m17n.org>
Date: Wed, 2 Dec 2009 08:01:02 +0000 (+0000)
Subject: Include ZWJ and ZWNJ in the patterns to shape for all Indic scripts.
X-Git-Tag: emacs-pretest-23.1.90~119
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1ff4cb9823e61aed80bd74d4c10e532b734a1be3;p=emacs.git

Include ZWJ and ZWNJ in the patterns to shape for all Indic scripts.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b360022c5f1..7f1e189fdde 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-02  Kenichi Handa  <handa@m17n.org>
+
+	* language/indian.el: Include ZWJ and ZWNJ in the patterns to
+	shape for all Indic scripts.
+
 2009-12-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	Use completion-in-buffer.
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index 3ea28f0c125..841ec26eb9c 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -165,15 +165,15 @@ South Indian language Malayalam is supported in this language environment."))
   "Regexp matching a composable sequence of Malayalam characters.")
 
 (let ((script-regexp-alist
-       `((devanagari . ,devanagari-composable-pattern)
+       `((devanagari . "[\x900-\x97F\x200C\x200D]+")
 	 (bengali . "[\x980-\x9FF\x200C\x200D]+")
 	 (gurmukhi . "[\xA00-\xA7F\x200C\x200D]+")
 	 (gujarati . "[\xA80-\xAFF\x200C\x200D]+")
 	 (oriya . "[\xB00-\xB7F\x200C\x200D]+")
-	 (tamil . ,tamil-composable-pattern)
+	 (tamil . "[\xB80-\xBFF\x200C\x200D]+")
 	 (telugu . "[\xC00-\xC7F\x200C\x200D]+")
-	 (kannada . ,kannada-composable-pattern)
-	 (malayalam . ,malayalam-composable-pattern))))
+	 (kannada . "[\xC80-\xCFF\x200C\x200D]+")
+	 (malayalam . "[\xD00-\xD7F\x200C\x200D]+"))))
   (map-char-table
    #'(lambda (key val)
        (let ((slot (assq val script-regexp-alist)))