; * lisp/language/indian.el ("Brahmi"): Enhance composition rules.

diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index 310905534e63a5eaa9a06e5f7cfdb236ac483662..0a50dd999fac50a78d6ec4008899e27190f7831c 100644 (file)
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -396,7 +396,8 @@ The ancient Brahmi script is supported in this language environment."))
 
 ;; Brahmi composition rules
 (let ((consonant     "[\U00011013-\U00011034]")
-      (non-consonant "[^\U00011013-\U00011034]")
+      (non-consonant "[^\U00011013-\U00011034\U00011046\U0001107F]")
+      (vowel         "[\U00011038-\U0001103D\U00011042-\U00011045]")
       (numeral       "[\U00011052-\U00011065]")
       (multiplier    "[\U00011064\U00011065]")
       (virama        "\U00011046")
@@ -405,7 +406,8 @@ The ancient Brahmi script is supported in this language environment."))
                        '(#x11046 . #x11046)
                         (list (vector
                                ;; Consonant conjuncts
-                               (concat consonant virama consonant)
+                               (concat consonant "\\(?:" virama consonant "\\)+"
+                                       vowel "?")
                                1 'font-shape-gstring)
                               (vector
                                ;; Vowelless consonants