(devanagari-digit-viram-visarga): Set the

correct value.
(devanagari-composite-glyph-unit): Likewise.
(devanagari-char-to-glyph-rules): Likewise.

diff --git a/lisp/language/devan-util.el b/lisp/language/devan-util.el
index b1de89339628887f499a1d02e6e9470e07b4fe4e..cd5a978e88103de92df62daa00e14667f9ebe809 100644 (file)
--- a/lisp/language/devan-util.el
+++ b/lisp/language/devan-util.el
@@ -215,16 +215,17 @@ of '\e$(5!*!&!'\e(B' and nukta sign.")
 ;;
 
 (defconst devanagari-digit-viram-visarga
-  "[\e$(5!q\e(B-\e$(5!z!j!#\e(B]")
+ "[\e$(5!q\e(B-\e$(5!z!j!#\e(B]")
+
 (defconst devanagari-other-sign
   "\\([\e$(5!!!j\e(B]\e$(5!i\e(B\\)\\|\\([\e$(5#!#J\e(B]\\)")
 
 (defconst devanagari-composite-glyph-unit
   (concat "\\(" devanagari-cons-syllable
          "\\)\\|\\(" devanagari-vowel-syllable
-         "\\)\\|\\(" devanagari-digit-viram-visarga
          "\\)\\|\\(" devanagari-cons-vowel-syllable
-         "\\)\\|\\(" devanagari-other-sign "\\)")
+         "\\)\\|\\(" devanagari-other-sign
+         "\\)\\|\\(" devanagari-digit-viram-visarga "\\)")
   "Regexp matching to Devanagari string to be composed form one glyph.")
 
 ;;(put-charset-property charset-devanagari-1-column
@@ -516,10 +517,10 @@ of '\e$(5!*!&!'\e(B' and nukta sign.")
     ("\\(\e$(5!j!i\e(B\\)" "\e$(5#J\e(B")
 
     ;; Special rule for "r + some vowels"
+    ("\\(\e$(5!O!_!i\e(B\\)" "\e$(5#*"p\e(B")
+    ("\\(\e$(5!O![!i\e(B\\)" "\e$(5#&"p\e(B")
+    ("\\(\e$(5!O!\!i\e(B\\)" "\e$(5#'"p\e(B")
     ("\\(\e$(5!O!_\e(B\\)" "\e$(5!*"p\e(B")
-    ("\\(\e$(5!O#L\e(B\\)" "\e$(5#&"p\e(B")
-    ("\\(\e$(5!O#K\e(B\\)" "\e$(5#*"p\e(B")
-    ("\\(\e$(5!O#M\e(B\\)" "\e$(5#'"p\e(B")
     ;; If everything fails, "y" will connect to the front consonant.
     ("\\(\e$(5!h!M\e(B\\)" "\e$(5"]\e(B")
     )