Move Unicode Indian equivalents

from Devanagari to Indian.

diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 6b8a534f1d960db5aa6e0510bad4cf8c1776813e..5b6efa0f4e77dedac3efea3402e4c15cc9fc4b62 100644 (file)
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -275,13 +275,6 @@
                  ("\e$(5!3\e(B-\e$(5!X\e(B"        "w"     ?0) ; consonant
                  ("\e$(5!Z\e(B-\e$(5!g\e(B"        "w"     ?8) ; matra
                  ("\e$(5!q\e(B-\e$(5!z\e(B"        "w"     ?6) ; digit
-                 ;; Unicode equivalents
-                 ("\e$,15A5B5C\e(B"      "w"     ?7) ; vowel-modifying diacritical mark
-                                           ; chandrabindu, anuswar, visarga
-                 ("\e$,15E\e(B-\e$,15M\e(B"        "w"     ?1) ; independent vowel
-                 ("\e$,15U\e(B-\e$,15y\e(B"        "w"     ?0) ; consonant
-                 ("\e$,15~\e(B-\e$,16)\e(B"        "w"     ?8) ; matra
-                 ("\e$,16F\e(B-\e$,16O\e(B"        "w"     ?6) ; digit
                  ))
       elm chars len syntax category to ch i)
   (while deflist
@@ -379,6 +372,10 @@
 (modify-category-entry (make-char 'indian-is13194) ?i)
 (modify-category-entry (make-char 'indian-2-column) ?I)
 (modify-category-entry (make-char 'indian-1-column) ?I)
+(let ((c #x901))                       ; Unicode Devanagari range
+  (while (<= c #x970)
+    (modify-category-entry (decode-char 'ucs c) ?i)
+    (setq c (1+ c))))
 
 (let ((deflist 
        '(;; chars      syntax  category
@@ -388,6 +385,13 @@
          ("\e(53\e(B-\e(5X\e(B"    "w"     ?0) ; consonant
          ("\e(5Z\e(B-\e(5g\e(B"    "w"     ?8) ; matra
          ("\e(5q\e(B-\e(5z\e(B"    "w"     ?6) ; digit
+         ;; Unicode equivalents (ranges somewhat extended from the above)
+         ("\e$,15A5B5C\e(B"      "w"     ?7) ; vowel-modifying diacritical mark
+                                   ; chandrabindu, anuswar, visarga
+         ("\e$,15E\e(B-\e$,15T\e(B"        "w"     ?1) ; independent vowel
+         ("\e$,15U\e(B-\e$,15y\e(B"        "w"     ?0) ; consonant
+         ("\e$,15~\e(B-\e$,16,\e(B"        "w"     ?8) ; matra
+         ("\e$,16F\e(B-\e$,16O\e(B"        "w"     ?6) ; digit
          ))
       elm chars len syntax category to ch i)
   (while deflist