(dev-glyph-glyph, dev-glyph-glyph-2)

(devanagari-compose-syllable-region):
Escape `"' in string literals.

2 files changed, 36 insertions, 34 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 45c3c71e3f..4135b5b048 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
 	* language/devan-util.el (dev-char-glyph): Escape `"' in
 	string literals.
+	(dev-glyph-glyph, dev-glyph-glyph-2) 
+	(devanagari-compose-syllable-region): Likewise.
 
 2001-11-26  Richard M. Stallman  <[email protected]>
 
diff --git a/lisp/language/devan-util.el b/lisp/language/devan-util.el
index 0e0c84d028..34117732a1 100644
--- a/lisp/language/devan-util.el
+++ b/lisp/language/devan-util.el
@@ -431,32 +431,32 @@ preferred rule from the sanskrit fonts."  )
 ;;   [consonant/nukta] - [matra/halant] - [preceding-r] - [anuswar].
 
 (defvar dev-glyph-glyph
-  '(("\$,4"'(B\$,4"&(B" . "\$,4"((B")
-    ("\$,4"'(B\$,4"$(B" . "\$,4"((B")
-    ("$,4"*(B\$,4"&(B" . "$,4"+(B")
-    ("$,4"*(B\$,4"'(B" . "$,4",(B")
-    ("$,4"*(B\$,4"'(B\$,4"&(B" . "$,4"-(B")
-    ("$,4"2(B\$,4"&(B" . "$,4"3(B")
-    ("$,4"2(B\$,4"'(B" . "$,4"4(B")
-    ("$,4"2(B\$,4"'(B\$,4"&(B" . "$,4"5(B")
-    ("$,4"#(B\$,4"6(B" . "$,4"7(B")
-    ("$,4"%(B\$,4"6(B" . "$,4"8(B")
-    ;;("$,4"6(B" . "$,4"9(B")
-    ("$,4"#(B\$,4":(B" . "$,4";(B")
-    ("$,4"%(B\$,4":(B" . "$,4"<(B")
-    ;;("$,4":(B" . "$,4"=(B")
-    ("\$,4"@(B\$,4"&(B" . "\$,4"A(B")
-    ("\$,4"@(B\$,4"'(B" . "\$,4"B(B")
-    ("\$,4"@(B\$,4"'(B\$,4"&(B" . "\$,4"C(B")
-    ("\$,4"D(B\$,4"&(B" . "\$,4"E(B")
-    ("\$,4"D(B\$,4"'(B" . "\$,4"F(B")
-    ("\$,4"D(B\$,4"'(B\$,4"&(B" . "\$,4"G(B")
-    ("\$,4"H(B\$,4"&(B" . "\$,4"I(B")
-    ("\$,4"H(B\$,4"'(B" . "\$,4"J(B")
-    ("\$,4"H(B\$,4"'(B\$,4"&(B" . "\$,4"K(B")
-    ("\$,4"L(B\$,4"&(B" . "\$,4"M(B")
-    ("\$,4"L(B\$,4"'(B" . "\$,4"N(B")
-    ("\$,4"L(B\$,4"'(B\$,4"&(B" . "\$,4"O(B")
+  '(("\$,4\"'(B\$,4\"&(B" . "\$,4\"((B")
+    ("\$,4\"'(B\$,4\"$(B" . "\$,4\"((B")
+    ("$,4\"*(B\$,4\"&(B" . "$,4\"+(B")
+    ("$,4\"*(B\$,4\"'(B" . "$,4\",(B")
+    ("$,4\"*(B\$,4\"'(B\$,4\"&(B" . "$,4\"-(B")
+    ("$,4\"2(B\$,4\"&(B" . "$,4\"3(B")
+    ("$,4\"2(B\$,4\"'(B" . "$,4\"4(B")
+    ("$,4\"2(B\$,4\"'(B\$,4\"&(B" . "$,4\"5(B")
+    ("$,4\"#(B\$,4\"6(B" . "$,4\"7(B")
+    ("$,4\"%(B\$,4\"6(B" . "$,4\"8(B")
+    ;;("$,4\"6(B" . "$,4\"9(B")
+    ("$,4\"#(B\$,4\":(B" . "$,4\";(B")
+    ("$,4\"%(B\$,4\":(B" . "$,4\"<(B")
+    ;;("$,4\":(B" . "$,4\"=(B")
+    ("\$,4\"@(B\$,4\"&(B" . "\$,4\"A(B")
+    ("\$,4\"@(B\$,4\"'(B" . "\$,4\"B(B")
+    ("\$,4\"@(B\$,4\"'(B\$,4\"&(B" . "\$,4\"C(B")
+    ("\$,4\"D(B\$,4\"&(B" . "\$,4\"E(B")
+    ("\$,4\"D(B\$,4\"'(B" . "\$,4\"F(B")
+    ("\$,4\"D(B\$,4\"'(B\$,4\"&(B" . "\$,4\"G(B")
+    ("\$,4\"H(B\$,4\"&(B" . "\$,4\"I(B")
+    ("\$,4\"H(B\$,4\"'(B" . "\$,4\"J(B")
+    ("\$,4\"H(B\$,4\"'(B\$,4\"&(B" . "\$,4\"K(B")
+    ("\$,4\"L(B\$,4\"&(B" . "\$,4\"M(B")
+    ("\$,4\"L(B\$,4\"'(B" . "\$,4\"N(B")
+    ("\$,4\"L(B\$,4\"'(B\$,4\"&(B" . "\$,4\"O(B")
     ))
 (defvar dev-glyph-glyph-hash
   (let* ((hash (makehash 'equal)))
@@ -469,10 +469,10 @@ preferred rule from the sanskrit fonts."  )
 
 ;; yet another glyph-to-glyph conversions.
 (defvar dev-glyph-glyph-2
-  '(("$,4"*(B" . "$,4".(B")
-    ("$,4"+(B" . "$,4"/(B")
-    ("$,4",(B" . "$,4"0(B")
-    ("$,4"-(B" . "$,4"1(B")))
+  '(("$,4\"*(B" . "$,4\".(B")
+    ("$,4\"+(B" . "$,4\"/(B")
+    ("$,4\",(B" . "$,4\"0(B")
+    ("$,4\"-(B" . "$,4\"1(B")))
 (defvar dev-glyph-glyph-2-hash
   (let* ((hash (makehash 'equal)))
     (mapc (function (lambda (x) (puthash (car x) (cdr x) hash)))
@@ -587,9 +587,9 @@ preferred rule from the sanskrit fonts."  )
         (if preceding-r 
             (if last-modifier
                 (setq glyph-str (concat (substring glyph-str 0 -1) 
-                                        "$,4"'(B" (substring glyph-str -1)))
-              (setq glyph-str (concat glyph-str "$,4"'(B"))))
-        (if last-halant (setq glyph-str (concat glyph-str "$,4""(B")))
+                                        "$,4\"'(B" (substring glyph-str -1)))
+              (setq glyph-str (concat glyph-str "$,4\"'(B"))))
+        (if last-halant (setq glyph-str (concat glyph-str "$,4\"\"(B")))
           ;;; *** glyph-to-glyph conversion ***
         (when (string-match dev-glyph-glyph-regexp glyph-str)
           (setq glyph-str
@@ -603,7 +603,7 @@ preferred rule from the sanskrit fonts."  )
                                             dev-glyph-glyph-2-hash)
                                    nil t glyph-str))))
           ;;; *** glyph reordering ***
-        (while (setq split-pos (string-match "$,4""(B\\|.$" glyph-str))
+        (while (setq split-pos (string-match "$,4\"\"(B\\|.$" glyph-str))
           (setq glyph-block (substring glyph-str 0 (1+ split-pos)))
           (setq glyph-str (substring glyph-str (1+ split-pos)))
           (setq