(dev-charseq): Avoid indian-glyph-char.

2 files changed, 228 insertions, 217 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cae85b754a6..fecd8419d17 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,16 @@
 2002-09-08  Dave Love  <fx@gnu.org>
 
+        * language/ind-util.el (ucs-devanagari-to-is13194-alist)
+        (indian-glyph-char, indian-char-glyph): Deleted.
+        (is13194-default-repertory): Renamed from
+        is13194-default-repartory,
+        (iscii-to-ucs-region): Hoist evals from loop.
+
+        * language/devan-util.el (dev-charseq): Avoid indian-glyph-char.
+
+        * language/indian.el (indian-script-table)
+        (ccl-encode-indian-glyph-font): Deleted.
+
         * international/mule-conf.el (emacs-mule, iso-2022-7bit) 
         (iso-2022-7bit-ss2, iso-2022-7bit-lock, iso-2022-8bit-ss2) 
         (compound-text, ctext-no-compositions): Remove :charset-list.
diff --git a/lisp/language/devan-util.el b/lisp/language/devan-util.el
index 73fea21d5ac..10eef8231bf 100644
--- a/lisp/language/devan-util.el
+++ b/lisp/language/devan-util.el
@@ -52,7 +52,7 @@
   "[$,15U(B-$,15y68(B-$,16?(B]")
 
 (defconst devanagari-composable-pattern
-  (concat 
+  (concat
    "\\([$,15E(B-$,15T6@6A(B][$,15A5B(B]?\\)\\|$,15C(B"
    "\\|\\("
    "\\(?:\\(?:[$,15U(B-$,15y68(B-$,16?(B]$,16-(B\\)?\\(?:[$,15U(B-$,15y68(B-$,16?(B]$,16-(B\\)?\\(?:[$,15U(B-$,15y68(B-$,16?(B]$,16-(B\\)?[$,15U(B-$,15y68(B-$,16?(B]$,16-(B\\)?"
@@ -67,8 +67,8 @@
       (narrow-to-region from to)
       (goto-char (point-min))
       (while (re-search-forward devanagari-composable-pattern nil t)
-        (devanagari-compose-syllable-region (match-beginning 0) 
-                                            (match-end 0))))))
+        (devanagari-compose-syllable-region (match-beginning 0)
+                                            (match-end 0))))))
 (defun devanagari-compose-string (string)
   (with-temp-buffer
     (insert (decompose-string string))
@@ -86,14 +86,14 @@
 
 (defun devanagari-range (from to)
   "Make the list of the integers of range FROM to TO."
-  (let (result) 
+  (let (result)
     (while (<= from to) (setq result (cons to result) to (1- to))) result))
 
 (defun devanagari-regexp-of-hashtbl-keys (hashtbl)
   "Return a regular expression that matches all keys in hashtable HASHTBL."
   (let ((max-specpdl-size 1000))
     (regexp-opt
-     (sort 
+     (sort
       (let (dummy)
         (maphash (function (lambda (key val) (setq dummy (cons key dummy)))) hashtbl)
         dummy)
@@ -111,13 +111,13 @@ PATTERN regexp."
 (mapc
  (function (lambda (ucs)
    (aset composition-function-table ucs
-         (list (cons devanagari-composable-pattern 
-                     'devanagari-composition-function)))))
+         (list (cons devanagari-composable-pattern
+                     'devanagari-composition-function)))))
  (nconc '(#x0903) (devanagari-range #x0905 #x0939) (devanagari-range #x0958 #x0961)))
 
 ;; Notes on conversion steps.
 
-;; 1. chars to glyphs 
+;; 1. chars to glyphs
 ;;
 ;; Rules will not be applied to the halant appeared at the end of the
 ;; text.  Also, the preceding/following "r" will be treated as special case.
@@ -130,8 +130,8 @@ PATTERN regexp."
 ;; Note that `consonant-glyph' mentioned here does not contain the
 ;; vertical bar (right modifier) attached at the right of the
 ;; consonant.
-;; 
-;; If the glyph-group contains right modifier, 
+;;
+;; If the glyph-group contains right modifier,
 ;;  (1) consonant-glyphs/vowels, with nukta sign
 ;;  (2) spacing
 ;;  (3) right modifier (may be matra)
@@ -140,11 +140,11 @@ PATTERN regexp."
 ;;  (6) anuswar
 ;;  (7) following "r"
 ;;  (8) bottom matra or halant.
-;; 
-;; Otherwise, 
+;;
+;; Otherwise,
 ;;  (1) consonant-glyph/vowels, with nukta sign
 ;;  (3) left matra
-;;  (4) top matra 
+;;  (4) top matra
 ;;  (5) preceding "r"
 ;;  (6) anuswar
 ;;  (7) following "r"
@@ -186,15 +186,15 @@ PATTERN regexp."
     ("$,15M5A(B" . "$,4 b"$(B")
     ("$,15M5B(B" . "$,4 b"$(B")
     ("$,16%(B" . "\$,4"L(B")
-    ("$,15N(B" . "$,4 b"@(B") 
-    ("$,15N5A(B" . "$,4 b"@"&(B") 
+    ("$,15N(B" . "$,4 b"@(B")
+    ("$,15N5A(B" . "$,4 b"@"&(B")
     ("$,16&(B" . "\$,4"@(B")
     ("$,16&5A(B" . "\$,4"@(B\$,4"&(B")
-    ("$,15O(B" . "$,4 b(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") 
-    ("$,15P5A(B" . "$,4 b"D"&(B") 
+    ("$,15P(B" . "$,4 b"D(B")
+    ("$,15P5A(B" . "$,4 b"D"&(B")
     ("$,16((B" . "\$,4"H(B")
     ("$,16(5A(B" . "\$,4"H(B\$,4"&(B")
     ("$,15Q(B" . "$,4 K")"L(B") ;; special rule for reodering.
@@ -203,21 +203,21 @@ PATTERN regexp."
     ("$,16)(B" . "\$,4")"L(B")
     ("$,16)5A(B" . "\$,4")"$(B")
     ("$,16)5B(B" . "\$,4")"$(B")
-    ("$,15R(B" . "$,4 K")"@(B") 
-    ("$,15R5A(B" . "$,4 K")"@"&(B") 
+    ("$,15R(B" . "$,4 K")"@(B")
+    ("$,15R5A(B" . "$,4 K")"@"&(B")
     ("$,16*(B" . "\$,4")"@(B")
     ("$,16*5A(B" . "\$,4")"@"&(B")
     ("$,15S(B" . "$,4 K")"D(B")
     ("$,15S5A(B" . "$,4 K")"D"&(B")
     ("$,16+(B" . "\$,4")"D(B")
     ("$,16+5A(B" . "\$,4")"D"&(B")
-    ("$,15T(B" . "$,4 K")"H(B") 
-    ("$,15T5A(B" . "$,4 K")"H"&(B") 
+    ("$,15T(B" . "$,4 K")"H(B")
+    ("$,15T5A(B" . "$,4 K")"H"&(B")
     ("$,16,(B" . "\$,4")"H(B")
     ("$,16,5A(B" . "\$,4")"H"&(B")
-    ("$,16@(B" . "$,4 a"Q(B") 
+    ("$,16@(B" . "$,4 a"Q(B")
     ;;("$,16B(B" . nil)
-    ;;("$,16A(B" . nil) 
+    ;;("$,16A(B" . nil)
     ;;("$,16C(B" . nil)
 
     ;; GRUTTALS
@@ -233,69 +233,69 @@ PATTERN regexp."
     ("$,15V6-5p(B" . "$,4 l")(B")
     ("$,15V6-5p6-(B" . "$,4 l(B")
 
-    ("$,15W(B" . "$,4 m")(B") 
-    ("$,15W6-(B" . "$,4 m(B") 
+    ("$,15W(B" . "$,4 m")(B")
+    ("$,15W6-(B" . "$,4 m(B")
     ("$,15W6-5p(B" . "$,4 o")(B")
     ("$,15W6-5p6-(B" . "$,4 o(B")
 
-    ("$,15X(B" . "$,4 p")(B") 
-    ("$,15X6-(B" . "$,4 p(B") 
-    ("$,15X6-5p(B" . "$,4 q")(B") 
-    ("$,15X6-5p6-(B" . "$,4 q(B") 
+    ("$,15X(B" . "$,4 p")(B")
+    ("$,15X6-(B" . "$,4 p(B")
+    ("$,15X6-5p(B" . "$,4 q")(B")
+    ("$,15X6-5p6-(B" . "$,4 q(B")
 
     ("$,15Y(B" . "$,4 r"S(B")
-    ;; PALATALS  
-    ("$,15Z(B" . "$,4 s")(B") 
-    ("$,15Z6-(B" . "$,4 s(B") 
-    ("$,15Z6-5p(B" . "$,4 t")(B") 
+    ;; PALATALS
+    ("$,15Z(B" . "$,4 s")(B")
+    ("$,15Z6-(B" . "$,4 s(B")
+    ("$,15Z6-5p(B" . "$,4 t")(B")
     ("$,15Z6-5p6-(B" . "$,4 t(B")
 
-    ("$,15[(B" . "$,4 u"T(B") 
+    ("$,15[(B" . "$,4 u"T(B")
 
-    ("$,15\(B" . "$,4 v")(B") 
-    ("$,15\6-(B" . "$,4 v(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^6-(B" . "$,4 y(B") 
+    ("$,15\(B" . "$,4 v")(B")
+    ("$,15\6-(B" . "$,4 v(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^6-(B" . "$,4 y(B")
 
-    ("$,15](B" . "$,4 z")(B") 
-    ("$,15]6-(B" . "$,4 z(B") 
-    ("$,15]6-5p(B" . "$,4 {")(B") 
-    ("$,15]6-5p6-(B" . "$,4 {(B") 
+    ("$,15](B" . "$,4 z")(B")
+    ("$,15]6-(B" . "$,4 z(B")
+    ("$,15]6-5p(B" . "$,4 {")(B")
+    ("$,15]6-5p6-(B" . "$,4 {(B")
 
     ("$,15^(B" . "$,4 |")(B")
     ("$,15^6-(B" . "$,4 |(B")
-    ;; CEREBRALS 
+    ;; CEREBRALS
     ("$,15_(B" . "$,4 }"U(B")
     ("$,15_6-5_(B" . "$,4 ~"U(B")
     ("$,15_6-5`(B" . "$,4 "U(B")
 
-    ("$,15`(B" . "$,4! "V(B") 
-    ("$,15`6-5`(B" . "$,4!!"V(B") 
+    ("$,15`(B" . "$,4! "V(B")
+    ("$,15`6-5`(B" . "$,4!!"V(B")
 
-    ("$,15a(B" . "$,4!""W(B") 
-    ("$,15a6-5a(B" . "$,4!$"W(B") 
-    ("$,15a6-5b(B" . "$,4!%"W(B") 
+    ("$,15a(B" . "$,4!""W(B")
+    ("$,15a6-5a(B" . "$,4!$"W(B")
+    ("$,15a6-5b(B" . "$,4!%"W(B")
 
-    ("$,15b(B" . "$,4!&"X(B") 
+    ("$,15b(B" . "$,4!&"X(B")
 
     ("$,15c(B" . "$,4!(")(B")
     ("$,15c6-(B" . "$,4!((B")
-    ;; DENTALS   
-    ("$,15d(B" . "$,4!)")(B") 
-    ("$,15d6-(B" . "$,4!)(B") 
-    ("$,15d6-5p(B" . "$,4!*")(B") 
-    ("$,15d6-5p6-(B" . "$,4!*(B") 
-    ("$,15d6-5d(B" . "$,4!+")(B") 
-    ("$,15d6-5d6-(B" . "$,4!+(B") 
-
-    ("$,15e(B" . "$,4!,")(B") 
-    ("$,15e6-(B" . "$,4!,(B") 
-    ("$,15e6-5p(B" . "$,4!-")(B") 
-    ("$,15e6-5p6-(B" . "$,4!-(B") 
-
-    ("$,15f(B" . "$,4!."Y(B") 
+    ;; DENTALS
+    ("$,15d(B" . "$,4!)")(B")
+    ("$,15d6-(B" . "$,4!)(B")
+    ("$,15d6-5p(B" . "$,4!*")(B")
+    ("$,15d6-5p6-(B" . "$,4!*(B")
+    ("$,15d6-5d(B" . "$,4!+")(B")
+    ("$,15d6-5d6-(B" . "$,4!+(B")
+
+    ("$,15e(B" . "$,4!,")(B")
+    ("$,15e6-(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")
@@ -304,61 +304,61 @@ PATTERN regexp."
     ("$,15f6-5o(B" . "$,4!4(B")
     ("$,15f6-5u(B" . "$,4!5"Y(B")
 
-    ("$,15g(B" . "$,4!6")(B") 
-    ("$,15g6-(B" . "$,4!6(B") 
-    ("$,15g6-5p(B" . "$,4!7")(B") 
-    ("$,15g6-5p6-(B" . "$,4!7(B") 
+    ("$,15g(B" . "$,4!6")(B")
+    ("$,15g6-(B" . "$,4!6(B")
+    ("$,15g6-5p(B" . "$,4!7")(B")
+    ("$,15g6-5p6-(B" . "$,4!7(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-5h6-(B" . "$,4!:(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-5h6-(B" . "$,4!:(B")
 
     ("$,15i(B" . "$,4!8"#")(B")
-    ;; LABIALS   
-    ("$,15j(B" . "$,4!;")(B") 
-    ("$,15j6-(B" . "$,4!;(B") 
-    ("$,15j6-5p(B" . "$,4!<")(B") 
-    ("$,15j6-5p6-(B" . "$,4!<(B") 
-
-    ("$,15k(B" . "$,4!a"[(B") 
-    ("$,15k6-(B" . "$,4!=(B") 
-    ("$,15k6-5p(B" . "$,4!c"[(B") 
-
-    ("$,15l(B" . "$,4!d")(B") 
-    ("$,15l6-(B" . "$,4!d(B") 
-    ("$,15l6-5p(B" . "$,4!e")(B") 
-    ("$,15l6-5p6-(B" . "$,4!e(B") 
-
-    ("$,15m(B" . "$,4!f")(B") 
-    ("$,15m6-(B" . "$,4!f(B") 
-    ("$,15m6-5p(B" . "$,4!g")(B") 
-    ("$,15m6-5p6-(B" . "$,4!g(B") 
+    ;; LABIALS
+    ("$,15j(B" . "$,4!;")(B")
+    ("$,15j6-(B" . "$,4!;(B")
+    ("$,15j6-5p(B" . "$,4!<")(B")
+    ("$,15j6-5p6-(B" . "$,4!<(B")
+
+    ("$,15k(B" . "$,4!a"[(B")
+    ("$,15k6-(B" . "$,4!=(B")
+    ("$,15k6-5p(B" . "$,4!c"[(B")
+
+    ("$,15l(B" . "$,4!d")(B")
+    ("$,15l6-(B" . "$,4!d(B")
+    ("$,15l6-5p(B" . "$,4!e")(B")
+    ("$,15l6-5p6-(B" . "$,4!e(B")
+
+    ("$,15m(B" . "$,4!f")(B")
+    ("$,15m6-(B" . "$,4!f(B")
+    ("$,15m6-5p(B" . "$,4!g")(B")
+    ("$,15m6-5p6-(B" . "$,4!g(B")
 
     ("$,15n(B" . "$,4!h")(B")
     ("$,15n6-(B" . "$,4!h(B")
     ("$,15n6-5p(B" . "$,4!i")(B")
     ("$,15n6-5p6-(B" . "$,4!i(B")
     ;; SEMIVOWELS
-    ("$,15o(B" . "$,4!j")(B") 
-    ("$,15o6-(B" . "$,4!j(B") 
-    ("$,15o6-5p(B" . "$,4!k")(B") 
-    ("$,15o6-5p6-(B" . "$,4!k(B") 
+    ("$,15o(B" . "$,4!j")(B")
+    ("$,15o6-(B" . "$,4!j(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"W(B")
     ;; ("$,15p6-(B" . "\$,4"'(B") ;; special case.  only the topmost pos.
-    ("$,15q(B" . "$,4!n"#"W(B") 
+    ("$,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") 
-    ("$,15r6-(B" . "$,4!q(B") 
-    ("$,15s(B" . "$,4!s(B") 
-    ("$,15s6-(B" . "$,4!r(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")
 
@@ -366,8 +366,8 @@ PATTERN regexp."
     ("$,15u6-(B" . "$,4!t(B")
     ("$,15u6-5p(B" . "$,4!u")(B")
     ("$,15u6-5p6-(B" . "$,4!u(B")
-    ;; SIBILANTS 
-    ("$,15v(B" . "$,4!v")(B") 
+    ;; SIBILANTS
+    ("$,15v(B" . "$,4!v")(B")
     ("$,15v6-(B" . "$,4!v(B")
     ("$,15v6-5u(B" . "$,4!w")(B")
     ("$,15v6-5u6-(B" . "$,4!w(B")
@@ -387,42 +387,42 @@ PATTERN regexp."
     ("$,15y6-5p(B" . "$,4!(B")
     ("$,15y6-5n(B" . "$,4" (B")
     ("$,15y6-5o(B" . "$,4"!(B")
-    ;; NUKTAS    
+    ;; NUKTAS
     ("$,168(B" . "$,4 f"R"S(B")
-    ("$,1686-(B" . "$,4 d(B") 
-    ("$,169(B" . "$,4 k")(B") 
-    ("$,1696-(B" . "$,4 k(B") 
-    ("$,16:(B" . "$,4 n")(B") 
-    ("$,16:6-(B" . "$,4 n(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>6-(B" . "$,4!>(B") 
+    ("$,1686-(B" . "$,4 d(B")
+    ("$,169(B" . "$,4 k")(B")
+    ("$,1696-(B" . "$,4 k(B")
+    ("$,16:(B" . "$,4 n")(B")
+    ("$,16:6-(B" . "$,4 n(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>6-(B" . "$,4!>(B")
     ("$,16?(B" . "$,4!j"#")(B")
     ;; misc modifiers.
     ("$,15A(B" . "\$,4"$(B")
-    ("$,15B(B" . "\$,4"&(B") 
+    ("$,15B(B" . "\$,4"&(B")
     ("$,15C(B" . "$,4 F(B")
     ("$,15|(B" . "$,4"#(B")
     ("$,15}(B" . "$,4 E(B")
     ("$,16-(B" . "$,4""(B")
     ("$,16-5p(B" . "$,4"%(B") ;; following "r"
-    ;; ("$,160(B" . "$,4 D(B") 
+    ;; ("$,160(B" . "$,4 D(B")
     ;; ("$,16D(B" . "$,4 J(B")
-    ;; ("$,16F(B" . "") 
-    ;; ("$,16G(B" . "") 
-    ;; ("$,16H(B" . "") 
-    ;; ("$,16I(B" . "") 
-    ;; ("$,16J(B" . "") 
-    ;; ("$,16K(B" . "") 
-    ;; ("$,16L(B" . "") 
-    ;; ("$,16M(B" . "") 
-    ;; ("$,16N(B" . "") 
+    ;; ("$,16F(B" . "")
+    ;; ("$,16G(B" . "")
+    ;; ("$,16H(B" . "")
+    ;; ("$,16I(B" . "")
+    ;; ("$,16J(B" . "")
+    ;; ("$,16K(B" . "")
+    ;; ("$,16L(B" . "")
+    ;; ("$,16M(B" . "")
+    ;; ("$,16N(B" . "")
     ;; ("$,16O(B" . "")
     )
-  "Devanagari characters to glyphs conversion table.  
+  "Devanagari characters to glyphs conversion table.
 Default value contains only the basic rules.  You may add your own
 preferred rule from the sanskrit fonts."  )
 
@@ -436,7 +436,7 @@ preferred rule from the sanskrit fonts."  )
   (devanagari-regexp-of-hashtbl-keys dev-char-glyph-hash))
 
 ;; glyph-to-glyph conversion table.
-;; it is supposed that glyphs are ordered in 
+;; it is supposed that glyphs are ordered in
 ;;   [consonant/nukta] - [matra/halant] - [preceding-r] - [anuswar].
 
 (defvar dev-glyph-glyph
@@ -493,11 +493,11 @@ preferred rule from the sanskrit fonts."  )
 
 (defun dev-charseq (from &optional to)
   (if (null to) (setq to from))
-  (mapcar (function (lambda (x) (indian-glyph-char x 'devanagari)))
-          (devanagari-range from to)))
+  (devanagari-range (make-char 'devanagari-glyph from)
+                    (make-char 'devanagari-glyph to)))
 
 (defvar dev-glyph-cvn
-  (append 
+  (append
    (dev-charseq #x2b)
    (dev-charseq #x3c #xc1)
    (dev-charseq #xc3))
@@ -508,7 +508,7 @@ preferred rule from the sanskrit fonts."  )
   "Devanagari Spacing Glyphs")
 
 (defvar dev-glyph-right-modifier
-  (append 
+  (append
    (dev-charseq #xc9)
    (dev-charseq #xd2 #xd5))
   "Devanagari Modifiers attached at the right side.")
@@ -525,7 +525,7 @@ preferred rule from the sanskrit fonts."  )
   "Devanagari Matras attached at the top side.")
 
 (defvar dev-glyph-bottom-modifier
-  (append 
+  (append
    (dev-charseq #xd6 #xdf)
    (dev-charseq #xc2))
   "Devanagari Modifiers attached at the bottom.")
@@ -541,9 +541,9 @@ preferred rule from the sanskrit fonts."  )
     (,(dev-charseq #xc5) . 7)
     (,dev-glyph-bottom-modifier . 8)))
 
-(mapc 
+(mapc
  (function (lambda (x)
-   (mapc 
+   (mapc
      (function (lambda (y)
        (put-char-code-property y 'composition-order (cdr x))))
      (car x))))
@@ -563,84 +563,84 @@ preferred rule from the sanskrit fonts."  )
 (defun devanagari-compose-syllable-region (from to)
   "Compose devanagari syllable in region FROM to TO."
   (let ((glyph-str nil) (cons-num 0) glyph-str-list
-        (last-halant nil) (preceding-r nil) (last-modifier nil) 
-        (last-char (char-before to)) match-str
-        glyph-block split-pos)
+        (last-halant nil) (preceding-r nil) (last-modifier nil)
+        (last-char (char-before to)) match-str
+        glyph-block split-pos)
     (save-excursion
       (save-restriction
-          ;;; *** char-to-glyph conversion ***
-        ;; Special rule 1. -- Last halant must be preserved.
-        (if (eq last-char ?$,16-(B)
-            (progn
-              (setq last-halant t)
-              (narrow-to-region from (1- to)))
-          (narrow-to-region from to)
-          ;; note if the last char is modifier.
-          (if (or (eq last-char ?$,15A(B) (eq last-char ?$,15B(B))
-              (setq last-modifier t)))
-        (goto-char (point-min))
-        ;; Special rule 2. -- preceding "r halant" must be modifier.
-        (when (looking-at "$,15p6-(B.")
-          (setq preceding-r t)
-          (goto-char (+ 2 (point))))
-        ;; translate the rest characters into glyphs
-        (while (re-search-forward dev-char-glyph-regexp nil t)
-          (setq match-str (match-string 0))
-          (setq glyph-str 
-                (concat glyph-str
-                        (gethash match-str dev-char-glyph-hash)))
-          ;; count the number of consonant-glyhs.
-          (if (string-match devanagari-consonant match-str)
-              (setq cons-num (1+ cons-num))))
-        ;; preceding-r must be attached before the anuswar if exists.
-        (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")))
-          ;;; *** glyph-to-glyph conversion ***
-        (when (string-match dev-glyph-glyph-regexp glyph-str)
-          (setq glyph-str
-                (replace-match (gethash (match-string 0 glyph-str) 
-                                        dev-glyph-glyph-hash)
-                               nil t glyph-str))
-          (if (and (> cons-num 1)
-                   (string-match dev-glyph-glyph-2-regexp glyph-str))
-              (setq glyph-str
-                    (replace-match (gethash (match-string 0 glyph-str)
-                                            dev-glyph-glyph-2-hash)
-                                   nil t glyph-str))))
-          ;;; *** glyph reordering ***
-        (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 
-           glyph-block 
-           (if (string-match dev-glyph-right-modifier-regexp glyph-block)
-               (sort (string-to-list glyph-block)
-                     (function (lambda (x y)
-                        (< (get-char-code-property x 'composition-order)
-                           (get-char-code-property y 'composition-order)))))
-             (sort (string-to-list glyph-block)
-                   (function (lambda (x y)
-                      (let ((xo (get-char-code-property x 'composition-order))
-                            (yo (get-char-code-property y 'composition-order)))
-                        (if (= xo 2) nil (if (= yo 2) t (< xo yo)))))))))
-          (setq glyph-str-list (nconc glyph-str-list glyph-block)))
-          ;; concatenate and attach reference-points.
-        (setq glyph-str
-              (cdr 
-               (apply 
-                'nconc 
-                (mapcar 
-                 (function (lambda (x) 
-                   (list
-                    (or (get-char-code-property x 'reference-point)
-                    '(5 . 3) ;; default reference point.
-                     )
-                    x)))
-                 glyph-str-list))))))
+          ;;; *** char-to-glyph conversion ***
+        ;; Special rule 1. -- Last halant must be preserved.
+        (if (eq last-char ?$,16-(B)
+            (progn
+              (setq last-halant t)
+              (narrow-to-region from (1- to)))
+          (narrow-to-region from to)
+          ;; note if the last char is modifier.
+          (if (or (eq last-char ?$,15A(B) (eq last-char ?$,15B(B))
+              (setq last-modifier t)))
+        (goto-char (point-min))
+        ;; Special rule 2. -- preceding "r halant" must be modifier.
+        (when (looking-at "$,15p6-(B.")
+          (setq preceding-r t)
+          (goto-char (+ 2 (point))))
+        ;; translate the rest characters into glyphs
+        (while (re-search-forward dev-char-glyph-regexp nil t)
+          (setq match-str (match-string 0))
+          (setq glyph-str
+                (concat glyph-str
+                        (gethash match-str dev-char-glyph-hash)))
+          ;; count the number of consonant-glyhs.
+          (if (string-match devanagari-consonant match-str)
+              (setq cons-num (1+ cons-num))))
+        ;; preceding-r must be attached before the anuswar if exists.
+        (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")))
+          ;;; *** glyph-to-glyph conversion ***
+        (when (string-match dev-glyph-glyph-regexp glyph-str)
+          (setq glyph-str
+                (replace-match (gethash (match-string 0 glyph-str)
+                                        dev-glyph-glyph-hash)
+                               nil t glyph-str))
+          (if (and (> cons-num 1)
+                   (string-match dev-glyph-glyph-2-regexp glyph-str))
+              (setq glyph-str
+                    (replace-match (gethash (match-string 0 glyph-str)
+                                            dev-glyph-glyph-2-hash)
+                                   nil t glyph-str))))
+          ;;; *** glyph reordering ***
+        (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
+           glyph-block
+           (if (string-match dev-glyph-right-modifier-regexp glyph-block)
+               (sort (string-to-list glyph-block)
+                     (function (lambda (x y)
+                        (< (get-char-code-property x 'composition-order)
+                           (get-char-code-property y 'composition-order)))))
+             (sort (string-to-list glyph-block)
+                   (function (lambda (x y)
+                      (let ((xo (get-char-code-property x 'composition-order))
+                            (yo (get-char-code-property y 'composition-order)))
+                        (if (= xo 2) nil (if (= yo 2) t (< xo yo)))))))))
+          (setq glyph-str-list (nconc glyph-str-list glyph-block)))
+          ;; concatenate and attach reference-points.
+        (setq glyph-str
+              (cdr
+               (apply
+                'nconc
+                (mapcar
+                 (function (lambda (x)
+                   (list
+                    (or (get-char-code-property x 'reference-point)
+                    '(5 . 3) ;; default reference point.
+                     )
+                    x)))
+                 glyph-str-list))))))
       (compose-region from to glyph-str)))
 
 (provide 'devan-util)