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

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 45c3c71e3fe3baaa05096eebf0194cf96189f968..4135b5b048b745fb37384bcf0bf65e29594f6d29 100644 (file)
--- 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  <rms@gnu.org>
 

diff --git a/lisp/language/devan-util.el b/lisp/language/devan-util.el
index 0e0c84d028e1fb717b922f1b6781ec64adde9e9f..34117732a1a71f178adf5e5dfe82377b55de9aef 100644 (file)
--- 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
-  '(("\\e$,4"'\e(B\\e$,4"&\e(B" . "\\e$,4"(\e(B")
-    ("\\e$,4"'\e(B\\e$,4"$\e(B" . "\\e$,4"(\e(B")
-    ("\e$,4"*\e(B\\e$,4"&\e(B" . "\e$,4"+\e(B")
-    ("\e$,4"*\e(B\\e$,4"'\e(B" . "\e$,4",\e(B")
-    ("\e$,4"*\e(B\\e$,4"'\e(B\\e$,4"&\e(B" . "\e$,4"-\e(B")
-    ("\e$,4"2\e(B\\e$,4"&\e(B" . "\e$,4"3\e(B")
-    ("\e$,4"2\e(B\\e$,4"'\e(B" . "\e$,4"4\e(B")
-    ("\e$,4"2\e(B\\e$,4"'\e(B\\e$,4"&\e(B" . "\e$,4"5\e(B")
-    ("\e$,4"#\e(B\\e$,4"6\e(B" . "\e$,4"7\e(B")
-    ("\e$,4"%\e(B\\e$,4"6\e(B" . "\e$,4"8\e(B")
-    ;;("\e$,4"6\e(B" . "\e$,4"9\e(B")
-    ("\e$,4"#\e(B\\e$,4":\e(B" . "\e$,4";\e(B")
-    ("\e$,4"%\e(B\\e$,4":\e(B" . "\e$,4"<\e(B")
-    ;;("\e$,4":\e(B" . "\e$,4"=\e(B")
-    ("\\e$,4"@\e(B\\e$,4"&\e(B" . "\\e$,4"A\e(B")
-    ("\\e$,4"@\e(B\\e$,4"'\e(B" . "\\e$,4"B\e(B")
-    ("\\e$,4"@\e(B\\e$,4"'\e(B\\e$,4"&\e(B" . "\\e$,4"C\e(B")
-    ("\\e$,4"D\e(B\\e$,4"&\e(B" . "\\e$,4"E\e(B")
-    ("\\e$,4"D\e(B\\e$,4"'\e(B" . "\\e$,4"F\e(B")
-    ("\\e$,4"D\e(B\\e$,4"'\e(B\\e$,4"&\e(B" . "\\e$,4"G\e(B")
-    ("\\e$,4"H\e(B\\e$,4"&\e(B" . "\\e$,4"I\e(B")
-    ("\\e$,4"H\e(B\\e$,4"'\e(B" . "\\e$,4"J\e(B")
-    ("\\e$,4"H\e(B\\e$,4"'\e(B\\e$,4"&\e(B" . "\\e$,4"K\e(B")
-    ("\\e$,4"L\e(B\\e$,4"&\e(B" . "\\e$,4"M\e(B")
-    ("\\e$,4"L\e(B\\e$,4"'\e(B" . "\\e$,4"N\e(B")
-    ("\\e$,4"L\e(B\\e$,4"'\e(B\\e$,4"&\e(B" . "\\e$,4"O\e(B")
+  '(("\\e$,4\"'\e(B\\e$,4\"&\e(B" . "\\e$,4\"(\e(B")
+    ("\\e$,4\"'\e(B\\e$,4\"$\e(B" . "\\e$,4\"(\e(B")
+    ("\e$,4\"*\e(B\\e$,4\"&\e(B" . "\e$,4\"+\e(B")
+    ("\e$,4\"*\e(B\\e$,4\"'\e(B" . "\e$,4\",\e(B")
+    ("\e$,4\"*\e(B\\e$,4\"'\e(B\\e$,4\"&\e(B" . "\e$,4\"-\e(B")
+    ("\e$,4\"2\e(B\\e$,4\"&\e(B" . "\e$,4\"3\e(B")
+    ("\e$,4\"2\e(B\\e$,4\"'\e(B" . "\e$,4\"4\e(B")
+    ("\e$,4\"2\e(B\\e$,4\"'\e(B\\e$,4\"&\e(B" . "\e$,4\"5\e(B")
+    ("\e$,4\"#\e(B\\e$,4\"6\e(B" . "\e$,4\"7\e(B")
+    ("\e$,4\"%\e(B\\e$,4\"6\e(B" . "\e$,4\"8\e(B")
+    ;;("\e$,4\"6\e(B" . "\e$,4\"9\e(B")
+    ("\e$,4\"#\e(B\\e$,4\":\e(B" . "\e$,4\";\e(B")
+    ("\e$,4\"%\e(B\\e$,4\":\e(B" . "\e$,4\"<\e(B")
+    ;;("\e$,4\":\e(B" . "\e$,4\"=\e(B")
+    ("\\e$,4\"@\e(B\\e$,4\"&\e(B" . "\\e$,4\"A\e(B")
+    ("\\e$,4\"@\e(B\\e$,4\"'\e(B" . "\\e$,4\"B\e(B")
+    ("\\e$,4\"@\e(B\\e$,4\"'\e(B\\e$,4\"&\e(B" . "\\e$,4\"C\e(B")
+    ("\\e$,4\"D\e(B\\e$,4\"&\e(B" . "\\e$,4\"E\e(B")
+    ("\\e$,4\"D\e(B\\e$,4\"'\e(B" . "\\e$,4\"F\e(B")
+    ("\\e$,4\"D\e(B\\e$,4\"'\e(B\\e$,4\"&\e(B" . "\\e$,4\"G\e(B")
+    ("\\e$,4\"H\e(B\\e$,4\"&\e(B" . "\\e$,4\"I\e(B")
+    ("\\e$,4\"H\e(B\\e$,4\"'\e(B" . "\\e$,4\"J\e(B")
+    ("\\e$,4\"H\e(B\\e$,4\"'\e(B\\e$,4\"&\e(B" . "\\e$,4\"K\e(B")
+    ("\\e$,4\"L\e(B\\e$,4\"&\e(B" . "\\e$,4\"M\e(B")
+    ("\\e$,4\"L\e(B\\e$,4\"'\e(B" . "\\e$,4\"N\e(B")
+    ("\\e$,4\"L\e(B\\e$,4\"'\e(B\\e$,4\"&\e(B" . "\\e$,4\"O\e(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
-  '(("\e$,4"*\e(B" . "\e$,4".\e(B")
-    ("\e$,4"+\e(B" . "\e$,4"/\e(B")
-    ("\e$,4",\e(B" . "\e$,4"0\e(B")
-    ("\e$,4"-\e(B" . "\e$,4"1\e(B")))
+  '(("\e$,4\"*\e(B" . "\e$,4\".\e(B")
+    ("\e$,4\"+\e(B" . "\e$,4\"/\e(B")
+    ("\e$,4\",\e(B" . "\e$,4\"0\e(B")
+    ("\e$,4\"-\e(B" . "\e$,4\"1\e(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) 
-                                        "\e$,4"'\e(B" (substring glyph-str -1)))
-              (setq glyph-str (concat glyph-str "\e$,4"'\e(B"))))
-        (if last-halant (setq glyph-str (concat glyph-str "\e$,4""\e(B")))
+                                        "\e$,4\"'\e(B" (substring glyph-str -1)))
+              (setq glyph-str (concat glyph-str "\e$,4\"'\e(B"))))
+        (if last-halant (setq glyph-str (concat glyph-str "\e$,4\"\"\e(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 "\e$,4""\e(B\\|.$" glyph-str))
+        (while (setq split-pos (string-match "\e$,4\"\"\e(B\\|.$" glyph-str))
           (setq glyph-block (substring glyph-str 0 (1+ split-pos)))
           (setq glyph-str (substring glyph-str (1+ split-pos)))
           (setq