(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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc0a9f9be761e07682e55124aee8221e23a01cc0..92fe082efb5eddbbf446849263b170a8b5c84600 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2002-09-14  Dave Love  <d.love@dl.ac.uk>
+
+       * Makefile.in (DONTCOMPILE): Add indian.el.
+
+       * language/ind-util.el:
+       (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.
+
 2002-09-14  Dave Love  <fx@gnu.org>
 
        * international/mule-cmds.el (charset): Move.

diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index 63ae278d99eeccee5f72e8661f20bfa7b2d9a4b9..d5478e13acb357cf6b7ddc63ce5720f249a75f88 100644 (file)
--- 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 . "\e(5!\e(B")
+       (?\x0902 . "\e(5"\e(B")
+       (?\x0903 . "\e(5#\e(B")
+       (?\x0904 . "[U+0904]")
+       (?\x0905 . "\e(5$\e(B")
+       (?\x0906 . "\e(5%\e(B")
+       (?\x0907 . "\e(5&\e(B")
+       (?\x0908 . "\e(5'\e(B")
+       (?\x0909 . "\e(5(\e(B")
+       (?\x090a . "\e(5)\e(B")
+       (?\x090b . "\e(5*\e(B")
+       (?\x090c . "\e(5&i\e(B")
+       (?\x090d . "\e(5.\e(B")
+       (?\x090e . "\e(5+\e(B")
+       (?\x090f . "\e(5,\e(B")
+       (?\x0910 . "\e(5-\e(B")
+       (?\x0911 . "\e(52\e(B")
+       (?\x0912 . "\e(5/\e(B")
+       (?\x0913 . "\e(50\e(B")
+       (?\x0914 . "\e(51\e(B")
+       (?\x0915 . "\e(53\e(B")
+       (?\x0916 . "\e(54\e(B")
+       (?\x0917 . "\e(55\e(B")
+       (?\x0918 . "\e(56\e(B")
+       (?\x0919 . "\e(57\e(B")
+       (?\x091a . "\e(58\e(B")
+       (?\x091b . "\e(59\e(B")
+       (?\x091c . "\e(5:\e(B")
+       (?\x091d . "\e(5;\e(B")
+       (?\x091e . "\e(5<\e(B")
+       (?\x091f . "\e(5=\e(B")
+       (?\x0920 . "\e(5>\e(B")
+       (?\x0921 . "\e(5?\e(B")
+       (?\x0922 . "\e(5@\e(B")
+       (?\x0923 . "\e(5A\e(B")
+       (?\x0924 . "\e(5B\e(B")
+       (?\x0925 . "\e(5C\e(B")
+       (?\x0926 . "\e(5D\e(B")
+       (?\x0927 . "\e(5E\e(B")
+       (?\x0928 . "\e(5F\e(B")
+       (?\x0929 . "\e(5G\e(B")
+       (?\x092a . "\e(5H\e(B")
+       (?\x092b . "\e(5I\e(B")
+       (?\x092c . "\e(5J\e(B")
+       (?\x092d . "\e(5K\e(B")
+       (?\x092e . "\e(5L\e(B")
+       (?\x092f . "\e(5M\e(B")
+       (?\x0930 . "\e(5O\e(B")
+       (?\x0931 . "\e(5P\e(B")
+       (?\x0932 . "\e(5Q\e(B")
+       (?\x0933 . "\e(5R\e(B")
+       (?\x0934 . "\e(5S\e(B")
+       (?\x0935 . "\e(5T\e(B")
+       (?\x0936 . "\e(5U\e(B")
+       (?\x0937 . "\e(5V\e(B")
+       (?\x0938 . "\e(5W\e(B")
+       (?\x0939 . "\e(5X\e(B")
+       (?\x093a . "[U+093a]")
+       (?\x093b . "[U+093b]")
+       (?\x093c . "\e(5i\e(B")
+       (?\x093d . "\e(5ji\e(B")
+       (?\x093e . "\e(5Z\e(B")
+       (?\x093f . "\e(5[\e(B")
+       (?\x0940 . "\e(5\\e(B")
+       (?\x0941 . "\e(5]\e(B")
+       (?\x0942 . "\e(5^\e(B")
+       (?\x0943 . "\e(5_\e(B")
+       (?\x0944 . "\e(5_i\e(B")
+       (?\x0945 . "\e(5c\e(B")
+       (?\x0946 . "\e(5`\e(B")
+       (?\x0947 . "\e(5a\e(B")
+       (?\x0948 . "\e(5b\e(B")
+       (?\x0949 . "\e(5g\e(B")
+       (?\x094a . "\e(5d\e(B")
+       (?\x094b . "\e(5e\e(B")
+       (?\x094c . "\e(5f\e(B")
+       (?\x094d . "\e(5h\e(B")
+       (?\x094e . "[U+094e]")
+       (?\x094f . "[U+094f]")
+       (?\x0950 . "\e(5!i\e(B")
+       (?\x0951 . "\e(5p5\e(B")
+       (?\x0952 . "\e(5p8\e(B")
+       (?\x0953 . "[DEVANAGARI GRAVE ACCENT]")
+       (?\x0954 . "[DEVANAGARI ACUTE ACCENT]")
+       (?\x0955 . "[U+0955]")
+       (?\x0956 . "[U+0956]")
+       (?\x0957 . "[U+0957]")
+       (?\x0958 . "\e(53i\e(B")
+       (?\x0959 . "\e(54i\e(B")
+       (?\x095a . "\e(55i\e(B")
+       (?\x095b . "\e(5:i\e(B")
+       (?\x095c . "\e(5?i\e(B")
+       (?\x095d . "\e(5@i\e(B")
+       (?\x095e . "\e(5Ii\e(B")
+       (?\x095f . "\e(5N\e(B")
+       (?\x0960 . "\e(5*i\e(B")
+       (?\x0961 . "\e(5'i\e(B")
+       (?\x0962 . "\e(5[i\e(B")
+       (?\x0963 . "\e(5ei\e(B")
+       (?\x0964 . "\e(5j\e(B")
+       (?\x0965 . "\e(5jj\e(B")
+       (?\x0966 . "\e(5q\e(B")
+       (?\x0967 . "\e(5r\e(B")
+       (?\x0968 . "\e(5s\e(B")
+       (?\x0969 . "\e(5t\e(B")
+       (?\x096a . "\e(5u\e(B")
+       (?\x096b . "\e(5v\e(B")
+       (?\x096c . "\e(5w\e(B")
+       (?\x096d . "\e(5x\e(B")
+       (?\x096e . "\e(5y\e(B")
+       (?\x096f . "\e(5z\e(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.