(ucs-bengali-to-is13194-alist, ucs-assamese-to-is13194-alist)

(ucs-gurmukhi-to-is13194-alist, ucs-gujarati-to-is13194-alist)
(ucs-oriya-to-is13194-alist, ucs-tamil-to-is13194-alist)
(ucs-telugu-to-is13194-alist, ucs-malayalam-to-is13194-alist))):
Remove declarations and let-bind them in re-written top-level loop
over scripts, including ucs-devanagari-to-is13194-alist.

1 files changed, 146 insertions, 21 deletions

diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index 63ae278d99e..d5478e13acb 100644
--- a/lisp/language/ind-util.el
+++ b/lisp/language/ind-util.el
@@ -349,15 +349,6 @@ FUNCTION will be called 15 times."
 
 ;; The following provide conversion between IS 13194 (ISCII) and UCS.
 
-(defvar ucs-bengali-to-is13194-alist nil)
-(defvar ucs-assamese-to-is13194-alist nil)
-(defvar ucs-gurmukhi-to-is13194-alist nil)
-(defvar ucs-gujarati-to-is13194-alist nil)
-(defvar ucs-oriya-to-is13194-alist nil)
-(defvar ucs-tamil-to-is13194-alist nil)
-(defvar ucs-telugu-to-is13194-alist nil)
-(defvar ucs-malayalam-to-is13194-alist nil)
-
 (defvar is13194-default-repertory 'devanagari)
 
 (defvar is13194-repertory-to-ucs-script
@@ -394,24 +385,158 @@ FUNCTION will be called 15 times."
 (defvar is13194-to-ucs-malayalam-hashtbl nil)
 (defvar is13194-to-ucs-malayalam-regexp nil)
 
-(mapc
- (function (lambda (script)
+(let
+    ;;Unicode vs IS13194.  Only Devanagari is supported currently.
+    ((ucs-devanagari-to-is13194-alist
+      '((?\x0900 . "[U+0900]")
+	(?\x0901 . "(5!(B")
+	(?\x0902 . "(5"(B")
+	(?\x0903 . "(5#(B")
+	(?\x0904 . "[U+0904]")
+	(?\x0905 . "(5$(B")
+	(?\x0906 . "(5%(B")
+	(?\x0907 . "(5&(B")
+	(?\x0908 . "(5'(B")
+	(?\x0909 . "(5((B")
+	(?\x090a . "(5)(B")
+	(?\x090b . "(5*(B")
+	(?\x090c . "(5&i(B")
+	(?\x090d . "(5.(B")
+	(?\x090e . "(5+(B")
+	(?\x090f . "(5,(B")
+	(?\x0910 . "(5-(B")
+	(?\x0911 . "(52(B")
+	(?\x0912 . "(5/(B")
+	(?\x0913 . "(50(B")
+	(?\x0914 . "(51(B")
+	(?\x0915 . "(53(B")
+	(?\x0916 . "(54(B")
+	(?\x0917 . "(55(B")
+	(?\x0918 . "(56(B")
+	(?\x0919 . "(57(B")
+	(?\x091a . "(58(B")
+	(?\x091b . "(59(B")
+	(?\x091c . "(5:(B")
+	(?\x091d . "(5;(B")
+	(?\x091e . "(5<(B")
+	(?\x091f . "(5=(B")
+	(?\x0920 . "(5>(B")
+	(?\x0921 . "(5?(B")
+	(?\x0922 . "(5@(B")
+	(?\x0923 . "(5A(B")
+	(?\x0924 . "(5B(B")
+	(?\x0925 . "(5C(B")
+	(?\x0926 . "(5D(B")
+	(?\x0927 . "(5E(B")
+	(?\x0928 . "(5F(B")
+	(?\x0929 . "(5G(B")
+	(?\x092a . "(5H(B")
+	(?\x092b . "(5I(B")
+	(?\x092c . "(5J(B")
+	(?\x092d . "(5K(B")
+	(?\x092e . "(5L(B")
+	(?\x092f . "(5M(B")
+	(?\x0930 . "(5O(B")
+	(?\x0931 . "(5P(B")
+	(?\x0932 . "(5Q(B")
+	(?\x0933 . "(5R(B")
+	(?\x0934 . "(5S(B")
+	(?\x0935 . "(5T(B")
+	(?\x0936 . "(5U(B")
+	(?\x0937 . "(5V(B")
+	(?\x0938 . "(5W(B")
+	(?\x0939 . "(5X(B")
+	(?\x093a . "[U+093a]")
+	(?\x093b . "[U+093b]")
+	(?\x093c . "(5i(B")
+	(?\x093d . "(5ji(B")
+	(?\x093e . "(5Z(B")
+	(?\x093f . "(5[(B")
+	(?\x0940 . "(5\(B")
+	(?\x0941 . "(5](B")
+	(?\x0942 . "(5^(B")
+	(?\x0943 . "(5_(B")
+	(?\x0944 . "(5_i(B")
+	(?\x0945 . "(5c(B")
+	(?\x0946 . "(5`(B")
+	(?\x0947 . "(5a(B")
+	(?\x0948 . "(5b(B")
+	(?\x0949 . "(5g(B")
+	(?\x094a . "(5d(B")
+	(?\x094b . "(5e(B")
+	(?\x094c . "(5f(B")
+	(?\x094d . "(5h(B")
+	(?\x094e . "[U+094e]")
+	(?\x094f . "[U+094f]")
+	(?\x0950 . "(5!i(B")
+	(?\x0951 . "(5p5(B")
+	(?\x0952 . "(5p8(B")
+	(?\x0953 . "[DEVANAGARI GRAVE ACCENT]")
+	(?\x0954 . "[DEVANAGARI ACUTE ACCENT]")
+	(?\x0955 . "[U+0955]")
+	(?\x0956 . "[U+0956]")
+	(?\x0957 . "[U+0957]")
+	(?\x0958 . "(53i(B")
+	(?\x0959 . "(54i(B")
+	(?\x095a . "(55i(B")
+	(?\x095b . "(5:i(B")
+	(?\x095c . "(5?i(B")
+	(?\x095d . "(5@i(B")
+	(?\x095e . "(5Ii(B")
+	(?\x095f . "(5N(B")
+	(?\x0960 . "(5*i(B")
+	(?\x0961 . "(5'i(B")
+	(?\x0962 . "(5[i(B")
+	(?\x0963 . "(5ei(B")
+	(?\x0964 . "(5j(B")
+	(?\x0965 . "(5jj(B")
+	(?\x0966 . "(5q(B")
+	(?\x0967 . "(5r(B")
+	(?\x0968 . "(5s(B")
+	(?\x0969 . "(5t(B")
+	(?\x096a . "(5u(B")
+	(?\x096b . "(5v(B")
+	(?\x096c . "(5w(B")
+	(?\x096d . "(5x(B")
+	(?\x096e . "(5y(B")
+	(?\x096f . "(5z(B")
+	(?\x0970 . "[U+0970]")
+	(?\x0971 . "[U+0971]")
+	(?\x0972 . "[U+0972]")
+	(?\x0973 . "[U+0973]")
+	(?\x0974 . "[U+0974]")
+	(?\x0975 . "[U+0975]")
+	(?\x0976 . "[U+0976]")
+	(?\x0977 . "[U+0977]")
+	(?\x0978 . "[U+0978]")
+	(?\x0979 . "[U+0979]")
+	(?\x097a . "[U+097a]")
+	(?\x097b . "[U+097b]")
+	(?\x097c . "[U+097c]")
+	(?\x097d . "[U+097d]")
+	(?\x097e . "[U+097e]")
+	(?\x097f . "[U+097f]")))
+     (ucs-bengali-to-is13194-alist nil)
+     (ucs-assamese-to-is13194-alist nil)
+     (ucs-gurmukhi-to-is13194-alist nil)
+     (ucs-gujarati-to-is13194-alist nil)
+     (ucs-oriya-to-is13194-alist nil)
+     (ucs-tamil-to-is13194-alist nil)
+     (ucs-telugu-to-is13194-alist nil)
+     (ucs-malayalam-to-is13194-alist nil))
+  (dolist (script '(devanagari bengali assamese gurmukhi gujarati
+		    oriya tamil telugu malayalam))
    (let ((hashtable (intern (concat "is13194-to-ucs-"
 				    (symbol-name script) "-hashtbl" )))
 	 (regexp    (intern (concat "is13194-to-ucs-"
 				    (symbol-name script) "-regexp"))))
      (set hashtable (make-hash-table :test 'equal :size 128))
-     (mapc
-      (function (lambda (x)
-	(put-char-code-property (car x) 'script script)
-	(put-char-code-property (car x) 'iscii (cdr x))
-	(puthash (cdr x) (char-to-string (car x))
-		 (eval hashtable))))
-      (eval (intern (concat "ucs-" (symbol-name script)
-			    "-to-is13194-alist"))))
+     (dolist (x (eval (intern (concat "ucs-" (symbol-name script)
+				      "-to-is13194-alist"))))
+       (put-char-code-property (car x) 'script script)
+       (put-char-code-property (car x) 'iscii (cdr x))
+       (puthash (cdr x) (char-to-string (car x)) (eval hashtable)))
      (set regexp (indian-regexp-of-hashtbl-keys (eval hashtable))))))
- '(devanagari bengali assamese gurmukhi gujarati
-   oriya tamil telugu malayalam))
 
 (defvar ucs-to-is13194-regexp
   ;; only Devanagari is supported now.