[Emacs-diffs] Changes to emacs/lisp/language/devan-util.el

[Gerd Moellmann]

Index: emacs/lisp/language/devan-util.el
diff -u emacs/lisp/language/devan-util.el:1.31 
emacs/lisp/language/devan-util.el:1.32
--- emacs/lisp/language/devan-util.el:1.31      Mon Nov 26 06:57:02 2001
+++ emacs/lisp/language/devan-util.el   Mon Nov 26 08:11:51 2001
@@ -31,7 +31,6 @@
 
 ;;; Code:
 
-;;;###autoload
 
 ;; Devanagari Composable Pattern
 ;;    C .. Consonants
@@ -156,38 +155,38 @@
 
 (defvar dev-char-glyph
   '(("$,15E(B" . "$,4 K(B")
-    ("$,15F(B" . "$,4 K\")(B")
-    ("$,15~(B" . "$,4\")(B")
+    ("$,15F(B" . "$,4 K\"(B)")
+    ("$,15~(B" . "$,4\"(B)")
     ("$,15G(B" . "$,4 \(B")
-    ("$,15(B" . "$,4\"*(B")
-    ("$,155A(B" . "$,4\"*(B\$,4\"&(B")
+    ("$,15(B" . "$,4\"(B*")
+    ("$,155A(B" . "$,4\"(B*\$,4\"(B&")
     ("$,15H(B" . "$,4 \"'(B")
-    ("$,15H5A(B" . "$,4 \"'\"&(B")
-    ("$,16 (B" . "$,4\"2(B")
+    ("$,15H5A(B" . "$,4 \"'\"(B&")
+    ("$,16 (B" . "$,4\"(B2")
     ("$,16 5A(B" . "$,4\"2\"&(B")
     ("$,15I(B" . "$,4 ](B")
-    ("$,16!(B" . "$,4\"6(B")
-    ("$,15J(B" . "$,4 ^\"P(B")
-    ("$,16"(B" . "$,4\":(B")
-    ("$,15K(B" . "$,4 `\"Q(B")
-    ("$,16#(B" . "$,4\">(B")
+    ("$,16!(B" . "$,4\"(B6")
+    ("$,15J(B" . "$,4 ^\"(BP")
+    ("$,16"(B" . "$,4\"(B:")
+    ("$,15K(B" . "$,4 `\"(BQ")
+    ("$,16#(B" . "$,4\"(B>")
     ;;("$,15L(B" . nil) ; not implemented.
-    ("$,16$(B" . "$,4\"?(B")
-    ("$,15M(B" . "$,4 b\"L(B")
-    ("$,15M5A(B" . "$,4 b\"$(B")
-    ("$,15M5B(B" . "$,4 b\"$(B")
-    ("$,16%(B" . "\$,4\"L(B")
-    ("$,15N(B" . "$,4 b\"@(B") 
+    ("$,16$(B" . "$,4\"(B?")
+    ("$,15M(B" . "$,4 b\"(BL")
+    ("$,15M5A(B" . "$,4 b\"(B$")
+    ("$,15M5B(B" . "$,4 b\"(B$")
+    ("$,16%(B" . "\$,4\"(BL")
+    ("$,15N(B" . "$,4 b\"(B@") 
     ("$,15N5A(B" . "$,4 b\"@\"&(B") 
-    ("$,16&(B" . "\$,4\"@(B")
-    ("$,16&5A(B" . "\$,4\"@(B\$,4\"&(B")
+    ("$,16&(B" . "\$,4\"(B@")
+    ("$,16&5A(B" . "\$,4\"(address@hidden,4\"(B&")
     ("$,15O(B" . "$,4 b(B") 
-    ("$,16'(B" . "\$,4\"D(B")
-    ("$,16'5A(B" . "\$,4\"D(B\$,4\"&(B")
-    ("$,15P(B" . "$,4 b\"D(B") 
+    ("$,16'(B" . "\$,4\"(BD")
+    ("$,16'5A(B" . "\$,4\"(BD\$,4\"(B&")
+    ("$,15P(B" . "$,4 b\"(BD") 
     ("$,15P5A(B" . "$,4 b\"D\"&(B") 
-    ("$,16((B" . "\$,4\"H(B")
-    ("$,16(5A(B" . "\$,4\"H(B\$,4\"&(B")
+    ("$,16((B" . "\$,4\"(BH")
+    ("$,16(5A(B" . "\$,4\"(BH\$,4\"(B&")
     ("$,15Q(B" . "$,4 K\")\"L(B") ;; special rule for reodering.
     ("$,15Q5A(B" . "$,4 K\")\"$(B")
     ("$,15Q5B(B" . "$,4 K\")\"$(B")
@@ -195,211 +194,211 @@
     ("$,16)5A(B" . "\$,4\")\"$(B")
     ("$,16)5B(B" . "\$,4\")\"$(B")
     ("$,15R(B" . "$,4 K\")\"@(B") 
-    ("$,15R5A(B" . "$,4 K\")\"@\"&(B") 
+    ("$,15R5A(B" . "$,4 K\")\"@\"(B&") 
     ("$,16*(B" . "\$,4\")\"@(B")
-    ("$,16*5A(B" . "\$,4\")\"@\"&(B")
+    ("$,16*5A(B" . "\$,4\")\"@\"(B&")
     ("$,15S(B" . "$,4 K\")\"D(B")
-    ("$,15S5A(B" . "$,4 K\")\"D\"&(B")
+    ("$,15S5A(B" . "$,4 K\")\"D\"(B&")
     ("$,16+(B" . "\$,4\")\"D(B")
-    ("$,16+5A(B" . "\$,4\")\"D\"&(B")
+    ("$,16+5A(B" . "\$,4\")\"D\"(B&")
     ("$,15T(B" . "$,4 K\")\"H(B") 
-    ("$,15T5A(B" . "$,4 K\")\"H\"&(B") 
+    ("$,15T5A(B" . "$,4 K\")\"H\"(B&") 
     ("$,16,(B" . "\$,4\")\"H(B")
-    ("$,16,5A(B" . "\$,4\")\"H\"&(B")
-    ("$,address@hidden(B" . "$,4 a\"Q(B") 
+    ("$,16,5A(B" . "\$,4\")\"H\"(B&")
+    ("$,address@hidden(B" . "$,4 a\"(BQ") 
     ;;("$,16B(B" . nil)
     ;;("$,16A(B" . nil) 
     ;;("$,16C(B" . nil)
 
     ;; GRUTTALS
-    ("$,15U(B" . "$,4 e\"R(B")
+    ("$,15U(B" . "$,4 e\"(BR")
     ("$,15U6-(B" . "$,4 c(B")
-    ("$,15U6-5p(B" . "$,4 g\"R(B")
-    ("$,15U6-5d(B" . "$,4 h\"R(B")
-    ("$,15U6-5w(B" . "$,4 i\")(B")
+    ("$,15U6-5p(B" . "$,4 g\"(BR")
+    ("$,15U6-5d(B" . "$,4 h\"(BR")
+    ("$,15U6-5w(B" . "$,4 i\"(B)")
     ("$,15U6-5w6-(B" . "$,4 i(B")
 
-    ("$,15V(B" . "$,4 j\")(B")
+    ("$,15V(B" . "$,4 j\"(B)")
     ("$,15V6-(B" . "$,4 j(B")
-    ("$,15V6-5p(B" . "$,4 l\")(B")
+    ("$,15V6-5p(B" . "$,4 l\"(B)")
     ("$,15V6-5p6-(B" . "$,4 l(B")
 
-    ("$,15W(B" . "$,4 m\")(B") 
+    ("$,15W(B" . "$,4 m\"(B)") 
     ("$,15W6-(B" . "$,4 m(B") 
-    ("$,15W6-5p(B" . "$,4 o\")(B")
+    ("$,15W6-5p(B" . "$,4 o\"(B)")
     ("$,15W6-5p6-(B" . "$,4 o(B")
 
-    ("$,15X(B" . "$,4 p\")(B") 
+    ("$,15X(B" . "$,4 p\"(B)") 
     ("$,15X6-(B" . "$,4 p(B") 
-    ("$,15X6-5p(B" . "$,4 q\")(B") 
+    ("$,15X6-5p(B" . "$,4 q\"(B)") 
     ("$,15X6-5p6-(B" . "$,4 q(B") 
 
-    ("$,15Y(B" . "$,4 r\"S(B")
+    ("$,15Y(B" . "$,4 r\"(BS")
     ;; PALATALS  
-    ("$,15Z(B" . "$,4 s\")(B") 
+    ("$,15Z(B" . "$,4 s\"(B)") 
     ("$,15Z6-(B" . "$,4 s(B") 
-    ("$,15Z6-5p(B" . "$,4 t\")(B") 
+    ("$,15Z6-5p(B" . "$,4 t\"(B)") 
     ("$,15Z6-5p6-(B" . "$,4 t(B")
 
-    ("$,15[(B" . "$,4 u\"T(B") 
+    ("$,15[(B" . "$,4 u\"(BT") 
 
-    ("$,15\(B" . "$,4 v\")(B") 
+    ("$,15\(B" . "$,4 v\"(B)") 
     ("$,15\6-(B" . "$,4 v(B") 
-    ("$,15\6-5p(B" . "$,4 x\")(B") 
+    ("$,15\6-5p(B" . "$,4 x\"(B)") 
     ("$,15\6-5p6-(B" . "$,4 x(B") 
-    ("$,15\6-5^(B" . "$,4 y\")(B") 
+    ("$,15\6-5^(B" . "$,4 y\"(B)") 
     ("$,15\6-5^6-(B" . "$,4 y(B") 
 
-    ("$,15](B" . "$,4 z\")(B") 
+    ("$,15](B" . "$,4 z\"(B)") 
     ("$,15]6-(B" . "$,4 z(B") 
-    ("$,15]6-5p(B" . "$,4 {\")(B") 
+    ("$,15]6-5p(B" . "$,4 {\"(B)") 
     ("$,15]6-5p6-(B" . "$,4 {(B") 
 
-    ("$,15^(B" . "$,4 |\")(B")
+    ("$,15^(B" . "$,4 |\"(B)")
     ("$,15^6-(B" . "$,4 |(B")
     ;; CEREBRALS 
-    ("$,15_(B" . "$,4 }\"U(B")
-    ("$,15_6-5_(B" . "$,4 ~\"U(B")
-    ("$,15_6-5`(B" . "$,4 \"U(B")
+    ("$,15_(B" . "$,4 }\"(BU")
+    ("$,15_6-5_(B" . "$,4 ~\"(BU")
+    ("$,15_6-5`(B" . "$,4 \"(BU")
 
-    ("$,15`(B" . "$,4! \"V(B") 
-    ("$,15`6-5`(B" . "$,4!!\"V(B") 
+    ("$,15`(B" . "$,4! \"(BV") 
+    ("$,15`6-5`(B" . "$,4!!\"(BV") 
 
     ("$,15a(B" . "$,4!\"\"W(B") 
-    ("$,15a6-5a(B" . "$,4!$\"W(B") 
-    ("$,15a6-5b(B" . "$,4!%\"W(B") 
+    ("$,15a6-5a(B" . "$,4!$\"(BW") 
+    ("$,15a6-5b(B" . "$,4!%\"(BW") 
 
-    ("$,15b(B" . "$,4!&\"X(B") 
+    ("$,15b(B" . "$,4!&\"(BX") 
 
-    ("$,15c(B" . "$,4!(\")(B")
+    ("$,15c(B" . "$,4!(\"(B)")
     ("$,15c6-(B" . "$,4!((B")
     ;; DENTALS   
-    ("$,15d(B" . "$,4!)\")(B") 
+    ("$,15d(B" . "$,4!)\"(B)") 
     ("$,15d6-(B" . "$,4!)(B") 
-    ("$,15d6-5p(B" . "$,4!*\")(B") 
+    ("$,15d6-5p(B" . "$,4!*\"(B)") 
     ("$,15d6-5p6-(B" . "$,4!*(B") 
-    ("$,15d6-5d(B" . "$,4!+\")(B") 
+    ("$,15d6-5d(B" . "$,4!+\"(B)") 
     ("$,15d6-5d6-(B" . "$,4!+(B") 
 
-    ("$,15e(B" . "$,4!,\")(B") 
+    ("$,15e(B" . "$,4!,\"(B)") 
     ("$,15e6-(B" . "$,4!,(B") 
-    ("$,15e6-5p(B" . "$,4!-\")(B") 
+    ("$,15e6-5p(B" . "$,4!-\"(B)") 
     ("$,15e6-5p6-(B" . "$,4!-(B") 
 
-    ("$,15f(B" . "$,4!.\"Y(B") 
-    ("$,15f6#(B" . "$,4!/\"Y(B")
-    ("$,15f6-5p(B" . "$,4!0\"Y(B")
-    ("$,15f6-5f(B" . "$,4!1\"Y(B")
-    ("$,15f6-5g(B" . "$,4!2\"Y(B")
+    ("$,15f(B" . "$,4!.\"(BY") 
+    ("$,15f6#(B" . "$,4!/\"(BY")
+    ("$,15f6-5p(B" . "$,4!0\"(BY")
+    ("$,15f6-5f(B" . "$,4!1\"(BY")
+    ("$,15f6-5g(B" . "$,4!2\"(BY")
     ("$,15f6-5n(B" . "$,4!3(B")
     ("$,15f6-5o(B" . "$,4!4(B")
-    ("$,15f6-5u(B" . "$,4!5\"Y(B")
+    ("$,15f6-5u(B" . "$,4!5\"(BY")
 
-    ("$,15g(B" . "$,4!6\")(B") 
+    ("$,15g(B" . "$,4!6\"(B)") 
     ("$,15g6-(B" . "$,4!6(B") 
-    ("$,15g6-5p(B" . "$,4!7\")(B") 
+    ("$,15g6-5p(B" . "$,4!7\"(B)") 
     ("$,15g6-5p6-(B" . "$,4!7(B") 
 
-    ("$,15h(B" . "$,4!8\")(B") 
+    ("$,15h(B" . "$,4!8\"(B)") 
     ("$,15h6-(B" . "$,4!8(B") 
-    ("$,15h6-5p(B" . "$,4!9\")(B") 
-    ("$,15h6-5p6-(B" . "$,4!9\")(B") 
-    ("$,15h6-5h(B" . "$,4!:\")(B") 
+    ("$,15h6-5p(B" . "$,4!9\"(B)") 
+    ("$,15h6-5p6-(B" . "$,4!9\"(B)") 
+    ("$,15h6-5h(B" . "$,4!:\"(B)") 
     ("$,15h6-5h6-(B" . "$,4!:(B") 
 
     ("$,15i(B" . "$,4!8\"#\")(B")
     ;; LABIALS   
-    ("$,15j(B" . "$,4!;\")(B") 
+    ("$,15j(B" . "$,4!;\"(B)") 
     ("$,15j6-(B" . "$,4!;(B") 
-    ("$,15j6-5p(B" . "$,4!<\")(B") 
+    ("$,15j6-5p(B" . "$,4!<\"(B)") 
     ("$,15j6-5p6-(B" . "$,4!<(B") 
 
-    ("$,15k(B" . "$,4!a\"[(B") 
+    ("$,15k(B" . "$,4!a\"(B[") 
     ("$,15k6-(B" . "$,4!=(B") 
-    ("$,15k6-5p(B" . "$,4!c\"[(B") 
+    ("$,15k6-5p(B" . "$,4!c\"(B[") 
 
-    ("$,15l(B" . "$,4!d\")(B") 
+    ("$,15l(B" . "$,4!d\"(B)") 
     ("$,15l6-(B" . "$,4!d(B") 
-    ("$,15l6-5p(B" . "$,4!e\")(B") 
+    ("$,15l6-5p(B" . "$,4!e\"(B)") 
     ("$,15l6-5p6-(B" . "$,4!e(B") 
 
-    ("$,15m(B" . "$,4!f\")(B") 
+    ("$,15m(B" . "$,4!f\"(B)") 
     ("$,15m6-(B" . "$,4!f(B") 
-    ("$,15m6-5p(B" . "$,4!g\")(B") 
+    ("$,15m6-5p(B" . "$,4!g\"(B)") 
     ("$,15m6-5p6-(B" . "$,4!g(B") 
 
-    ("$,15n(B" . "$,4!h\")(B")
+    ("$,15n(B" . "$,4!h\"(B)")
     ("$,15n6-(B" . "$,4!h(B")
-    ("$,15n6-5p(B" . "$,4!i\")(B")
+    ("$,15n6-5p(B" . "$,4!i\"(B)")
     ("$,15n6-5p6-(B" . "$,4!i(B")
     ;; SEMIVOWELS
-    ("$,15o(B" . "$,4!j\")(B") 
+    ("$,15o(B" . "$,4!j\"(B)") 
     ("$,15o6-(B" . "$,4!j(B") 
-    ("$,15o6-5p(B" . "$,4!k\")(B") 
+    ("$,15o6-5p(B" . "$,4!k\"(B)") 
     ("$,15o6-5p6-(B" . "$,4!k(B") 
     ("$,16-5o(B" . "$,4!l(B") ;; when every ohter lig. fails.
 
-    ("$,15p(B" . "$,4!n\"W(B") 
+    ("$,15p(B" . "$,4!n\"(BW") 
     ;; ("$,15p6-(B" . "\$,4"'(B") ;; special case.  only the topmost pos.
     ("$,15q(B" . "$,4!n\"#\"W(B") 
     ("$,15q6-(B" . "$,4!m(B") ;; IS 13194 speical rule.
-    ("$,15p6!(B" . "$,4!o\"[(B") 
-    ("$,15p6"(B" . "$,4!p\"\(B") 
+    ("$,15p6!(B" . "$,4!o\"(B[") 
+    ("$,15p6"(B" . "$,4!p\"(B\\") 
 
-    ("$,15r(B" . "$,4!q\")(B") 
+    ("$,15r(B" . "$,4!q\"(B)") 
     ("$,15r6-(B" . "$,4!q(B") 
     ("$,15s(B" . "$,4!s(B") 
     ("$,15s6-(B" . "$,4!r(B") 
-    ("$,15t(B" . "$,4!s\"#(B")
-    ("$,15t6-(B" . "$,4!r\"#(B")
+    ("$,15t(B" . "$,4!s\"(B#")
+    ("$,15t6-(B" . "$,4!r\"(B#")
 
-    ("$,15u(B" . "$,4!t\")(B")
+    ("$,15u(B" . "$,4!t\"(B)")
     ("$,15u6-(B" . "$,4!t(B")
-    ("$,15u6-5p(B" . "$,4!u\")(B")
+    ("$,15u6-5p(B" . "$,4!u\"(B)")
     ("$,15u6-5p6-(B" . "$,4!u(B")
     ;; SIBILANTS 
-    ("$,15v(B" . "$,4!v\")(B") 
+    ("$,15v(B" . "$,4!v\"(B)") 
     ("$,15v6-(B" . "$,4!v(B")
-    ("$,15v6-5u(B" . "$,4!w\")(B")
+    ("$,15v6-5u(B" . "$,4!w\"(B)")
     ("$,15v6-5u6-(B" . "$,4!w(B")
-    ("$,15v6-5p(B" . "$,4!x\")(B")
+    ("$,15v6-5p(B" . "$,4!x\"(B)")
     ("$,15v6-5p6-(B" . "$,4!x(B")
 
-    ("$,15w(B" . "$,4!y\")(B")
+    ("$,15w(B" . "$,4!y\"(B)")
     ("$,15w6-(B" . "$,4!y(B")
-    ("$,15x(B" . "$,4!z\")(B")
+    ("$,15x(B" . "$,4!z\"(B)")
     ("$,15x6-(B" . "$,4!z(B")
-    ("$,15x6-5p(B" . "$,4!{\")(B")
+    ("$,15x6-5p(B" . "$,4!{\"(B)")
     ("$,15x6-5p6-(B" . "$,4!{(B")
 
     ("$,15y(B" . "$,4!}(B")
     ("$,15y6-(B" . "$,4!|(B")
     ("$,15y6#(B" . "$,4!~(B")
     ("$,15y6-5p(B" . "$,4!(B")
-    ("$,15y6-5n(B" . "$,4\" (B")
-    ("$,15y6-5o(B" . "$,4\"!(B")
+    ("$,15y6-5n(B" . "$,4\"(B ")
+    ("$,15y6-5o(B" . "$,4\"(B!")
     ;; NUKTAS    
     ("$,168(B" . "$,4 f\"R\"S(B")
     ("$,1686-(B" . "$,4 d(B") 
-    ("$,169(B" . "$,4 k\")(B") 
+    ("$,169(B" . "$,4 k\"(B)") 
     ("$,1696-(B" . "$,4 k(B") 
-    ("$,16:(B" . "$,4 n\")(B") 
+    ("$,16:(B" . "$,4 n\"(B)") 
     ("$,16:6-(B" . "$,4 n(B") 
-    ("$,16;(B" . "$,4 w\")(B") 
+    ("$,16;(B" . "$,4 w\"(B)") 
     ("$,16;6-(B" . "$,4 w(B") 
-    ("$,16<(B" . "$,4!#\"W(B") 
-    ("$,16=(B" . "$,4!'\"X(B") 
-    ("$,16>(B" . "$,4!b\"[(B") 
+    ("$,16<(B" . "$,4!#\"(BW") 
+    ("$,16=(B" . "$,4!'\"(BX") 
+    ("$,16>(B" . "$,4!b\"(B[") 
     ("$,16>6-(B" . "$,4!>(B") 
     ("$,16?(B" . "$,4!j\"#\")(B")
     ;; misc modifiers.
-    ("$,15A(B" . "\$,4\"$(B")
-    ("$,15B(B" . "\$,4\"&(B") 
+    ("$,15A(B" . "\$,4\"(B$")
+    ("$,15B(B" . "\$,4\"(B&") 
     ("$,15C(B" . "$,4 F(B")
-    ("$,15|(B" . "$,4\"#(B")
+    ("$,15|(B" . "$,4\"(B#")
     ("$,15}(B" . "$,4 E(B")
     ("$,16-(B" . "$,4\"\"(B")
-    ("$,16-5p(B" . "$,4\"%(B") ;; following "r"
+    ("$,16-5p(B" . "$,4\"(B%") ;; following "r"
     ;; ("$,160(B" . "$,4 D(B") 
     ;; ("$,16D(B" . "$,4 J(B")
     ;; ("$,16F(B" . "") 
@@ -431,32 +430,32 @@
 ;;   [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\"(B2\$,4\"(B&" . "$,4\"(B3")
+    ("$,4\"(B2\$,4\"(B'" . "$,4\"(B4")
+    ("$,4\"(B2\$,4\"(B'\$,4\"(B&" . "$,4\"(B5")
+    ("$,4\"(B#\$,4\"(B6" . "$,4\"(B7")
+    ("$,4\"(B%\$,4\"(B6" . "$,4\"(B8")
+    ;;("$,4\"(B6" . "$,4\"(B9")
+    ("$,4\"(B#\$,4\"(B:" . "$,4\"(B;")
+    ("$,4\"(B%\$,4\"(B:" . "$,4\"(B<")
+    ;;("$,4\"(B:" . "$,4\"(B=")
+    ("\$,4\"(address@hidden,4\"(B&" . "\$,4\"(BA")
+    ("\$,4\"(address@hidden,4\"(B'" . "\$,4\"(BB")
+    ("\$,4\"(address@hidden,4\"(B'\$,4\"(B&" . "\$,4\"(BC")
+    ("\$,4\"(BD\$,4\"(B&" . "\$,4\"(BE")
+    ("\$,4\"(BD\$,4\"(B'" . "\$,4\"(BF")
+    ("\$,4\"(BD\$,4\"(B'\$,4\"(B&" . "\$,4\"(BG")
+    ("\$,4\"(BH\$,4\"(B&" . "\$,4\"(BI")
+    ("\$,4\"(BH\$,4\"(B'" . "\$,4\"(BJ")
+    ("\$,4\"(BH\$,4\"(B'\$,4\"(B&" . "\$,4\"(BK")
+    ("\$,4\"(BL\$,4\"(B&" . "\$,4\"(BM")
+    ("\$,4\"(BL\$,4\"(B'" . "\$,4\"(BN")
+    ("\$,4\"(BL\$,4\"(B'\$,4\"(B&" . "\$,4\"(BO")
     ))
 (defvar dev-glyph-glyph-hash
   (let* ((hash (makehash 'equal)))
@@ -469,10 +468,10 @@
 
 ;; 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\"(B0")
+    ("$,4\"(B-" . "$,4\"(B1")))
 (defvar dev-glyph-glyph-2-hash
   (let* ((hash (makehash 'equal)))
     (mapc (function (lambda (x) (puthash (car x) (cdr x) hash)))
@@ -587,8 +586,8 @@
         (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"))))
+                                        "$,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)