(setup-default-fontset): Use

indian-font-char-range for specifying ranges of indian-glyph
chars.  Setup for AKRUTI fonts.

2 files changed, 107 insertions, 80 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f11109fe57b..9f0eeca1ffe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2003-03-22  Kenichi Handa  <handa@etlken2>
+
+        * international/fontset.el (setup-default-fontset): Use
+        indian-font-char-range for specifying ranges of indian-glyph
+        chars.  Setup for AKRUTI fonts.
+
+        * language/indian.el (indian-font-foundry): New variable.
+        (indian-script-language-alist): New variable.
+        (indian-font-char-index-table): New variable.
+        (indian-font-char): New function. 
+        (indian-font-char-range): New function.
+        (font-ccl-encoder-alist): Add entry for AKRUTI font.
+
 2003-03-22  Kim F. Storm  <storm@cua.dk>
 
         * progmodes/cperl-mode.el (cperl-electric-backspace): Add
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index f845837c8db..acb4b635618 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -42,86 +42,100 @@
 
 (defun setup-default-fontset ()
   "Setup the default fontset."
-  (dolist
-      (elt
-       ;; Eval this at compile-time, since fontset.el is always loaded
-       ;; when run under X and this would always load ind-util.el as well.
-       (eval-when-compile
-         `((latin-iso8859-1 . (nil . "ISO8859-1"))
-           (latin-iso8859-2 . (nil . "ISO8859-2"))
-           (latin-iso8859-3 . (nil . "ISO8859-3"))
-           (latin-iso8859-4 . (nil . "ISO8859-4"))
-           (thai-tis620 . ("*" . "TIS620"))
-           (greek-iso8859-7 . ("*" . "ISO8859-7"))
-           (arabic-iso8859-6 . ("*" . "ISO8859-6"))
-           (hebrew-iso8859-8 . ("*" . "ISO8859-8"))
-           (katakana-jisx0201 . ("*" . "JISX0201"))
-           (latin-jisx0201 . (nil . "JISX0201"))
-           (cyrillic-iso8859-5 . ("*" . "ISO8859-5"))
-           (latin-iso8859-9 . (nil . "ISO8859-9"))
-           (japanese-jisx0208-1978 . ("*" . "JISX0208.1978"))
-           (chinese-gb2312 . ("*" . "GB2312.1980"))
-           (japanese-jisx0208 . ("*" . "JISX0208.1990"))
-           (korean-ksc5601 . ("*" . "KSC5601.1989"))
-           (japanese-jisx0212 . ("*" . "JISX0212"))
-           (chinese-cns11643-1 . ("*" . "CNS11643.1992-1"))
-           (chinese-cns11643-2 . ("*" . "CNS11643.1992-2"))
-           (chinese-cns11643-3 . ("*" . "CNS11643.1992-3"))
-           (chinese-cns11643-4 . ("*" . "CNS11643.1992-4"))
-           (chinese-cns11643-5 . ("*" . "CNS11643.1992-5"))
-           (chinese-cns11643-6 . ("*" . "CNS11643.1992-6"))
-           (chinese-cns11643-7 . ("*" . "CNS11643.1992-7"))
-           (chinese-big5-1 . ("*" . "Big5"))
-           (chinese-big5-2 . ("*" . "Big5"))
-           (chinese-sisheng . (nil . "sisheng_cwnn"))
-           (vietnamese-viscii-lower . (nil . "VISCII1.1"))
-           (vietnamese-viscii-upper . (nil . "VISCII1.1"))
-           (arabic-digit . ("*" . "MuleArabic-0"))
-           (arabic-1-column . ("*" . "MuleArabic-1"))
-           (arabic-2-column . ("*" . "MuleArabic-2"))
-           (ipa . (nil . "MuleIPA"))
-           (ethiopic . ("*" . "Ethiopic-Unicode"))
-           (ascii-right-to-left . (nil . "ISO8859-1"))
-           (indian-is13194 . ("*" . "IS13194-Devanagari"))
-           (indian-2-column . ("*" . "MuleIndian-2"))
-           (lao . ("*" . "MuleLao-1"))
-           (tibetan . ("proportional" . "MuleTibetan-2"))
-           (tibetan-1-column . ("*" . "MuleTibetan-1"))
-           (latin-iso8859-14 . (nil . "ISO8859-14"))
-           (latin-iso8859-15 . (nil . "ISO8859-15"))
-           (mule-unicode-0100-24ff . (nil . "ISO10646-1"))
-           (mule-unicode-2500-33ff . (nil . "ISO10646-1"))
-           (mule-unicode-e000-ffff . (nil . "ISO10646-1"))
-           (japanese-jisx0213-1 . ("*" . "JISX0213.2000-1"))
-           (japanese-jisx0213-2 . ("*" . "JISX0213.2000-2"))
-           ;; unicode
-           ((,(decode-char 'ucs #x0900)
-             . ,(decode-char 'ucs #x097F)) . ("*" . "ISO10646.indian-1"))
-           ;; indian
-           (indian-glyph . ("*" . "Devanagari-CDAC"))
-           ((,(indian-glyph-char 0 'devanagari)
-             . ,(indian-glyph-char 255 'devanagari)) . ("*" . "Devanagari-CDAC"))
-           ((,(indian-glyph-char 0 'sanskrit)
-             . ,(indian-glyph-char 255 'sanskrit)) . ("*" . "Sanskrit-CDAC"))
-           ((,(indian-glyph-char 0 'bengali)
-             . ,(indian-glyph-char 255 'bengali)) . ("*" . "Bengali-CDAC"))
-           ((,(indian-glyph-char 0 'assamese)
-             . ,(indian-glyph-char 255 'assamese)) . ("*" . "Assamese-CDAC"))
-           ((,(indian-glyph-char 0 'punjabi)
-             . ,(indian-glyph-char 255 'punjabi)) . ("*" . "Punjabi-CDAC"))
-           ((,(indian-glyph-char 0 'gujarati)
-             . ,(indian-glyph-char 255 'gujarati)) . ("*" . "Gujarati-CDAC"))
-           ((,(indian-glyph-char 0 'oriya)
-             . ,(indian-glyph-char 255 'oriya)) . ("*" . "Oriya-CDAC"))
-           ((,(indian-glyph-char 0 'tamil)
-             . ,(indian-glyph-char 255 'tamil)) . ("*" . "Tamil-CDAC"))
-           ((,(indian-glyph-char 0 'telugu)
-             . ,(indian-glyph-char 255 'telugu)) . ("*" . "Telugu-CDAC"))
-           ((,(indian-glyph-char 0 'kannada)
-             . ,(indian-glyph-char 255 'kannada)) . ("*" . "Kannada-CDAC"))
-           ((,(indian-glyph-char 0 'malayalam)
-             . ,(indian-glyph-char 255 'malayalam)) . ("*" . "Malayalam-CDAC"))
-           )))
+  (dolist (elt
+           `((latin-iso8859-1 . (nil . "ISO8859-1"))
+             (latin-iso8859-2 . (nil . "ISO8859-2"))
+             (latin-iso8859-3 . (nil . "ISO8859-3"))
+             (latin-iso8859-4 . (nil . "ISO8859-4"))
+             (thai-tis620 . ("*" . "TIS620"))
+             (greek-iso8859-7 . ("*" . "ISO8859-7"))
+             (arabic-iso8859-6 . ("*" . "ISO8859-6"))
+             (hebrew-iso8859-8 . ("*" . "ISO8859-8"))
+             (katakana-jisx0201 . ("*" . "JISX0201"))
+             (latin-jisx0201 . (nil . "JISX0201"))
+             (cyrillic-iso8859-5 . ("*" . "ISO8859-5"))
+             (latin-iso8859-9 . (nil . "ISO8859-9"))
+             (japanese-jisx0208-1978 . ("*" . "JISX0208.1978"))
+             (chinese-gb2312 . ("*" . "GB2312.1980"))
+             (japanese-jisx0208 . ("*" . "JISX0208.1990"))
+             (korean-ksc5601 . ("*" . "KSC5601.1989"))
+             (japanese-jisx0212 . ("*" . "JISX0212"))
+             (chinese-cns11643-1 . ("*" . "CNS11643.1992-1"))
+             (chinese-cns11643-2 . ("*" . "CNS11643.1992-2"))
+             (chinese-cns11643-3 . ("*" . "CNS11643.1992-3"))
+             (chinese-cns11643-4 . ("*" . "CNS11643.1992-4"))
+             (chinese-cns11643-5 . ("*" . "CNS11643.1992-5"))
+             (chinese-cns11643-6 . ("*" . "CNS11643.1992-6"))
+             (chinese-cns11643-7 . ("*" . "CNS11643.1992-7"))
+             (chinese-big5-1 . ("*" . "Big5"))
+             (chinese-big5-2 . ("*" . "Big5"))
+             (chinese-sisheng . (nil . "sisheng_cwnn"))
+             (vietnamese-viscii-lower . (nil . "VISCII1.1"))
+             (vietnamese-viscii-upper . (nil . "VISCII1.1"))
+             (arabic-digit . ("*" . "MuleArabic-0"))
+             (arabic-1-column . ("*" . "MuleArabic-1"))
+             (arabic-2-column . ("*" . "MuleArabic-2"))
+             (ipa . (nil . "MuleIPA"))
+             (ethiopic . ("*" . "Ethiopic-Unicode"))
+             (ascii-right-to-left . (nil . "ISO8859-1"))
+             (indian-is13194 . ("*" . "IS13194-Devanagari"))
+             (indian-2-column . ("*" . "MuleIndian-2"))
+             (lao . ("*" . "MuleLao-1"))
+             (tibetan . ("proportional" . "MuleTibetan-2"))
+             (tibetan-1-column . ("*" . "MuleTibetan-1"))
+             (latin-iso8859-14 . (nil . "ISO8859-14"))
+             (latin-iso8859-15 . (nil . "ISO8859-15"))
+             (mule-unicode-0100-24ff . (nil . "ISO10646-1"))
+             (mule-unicode-2500-33ff . (nil . "ISO10646-1"))
+             (mule-unicode-e000-ffff . (nil . "ISO10646-1"))
+             (japanese-jisx0213-1 . ("*" . "JISX0213.2000-1"))
+             (japanese-jisx0213-2 . ("*" . "JISX0213.2000-2"))
+             ;; unicode
+             ((,(decode-char 'ucs #x0900) . ,(decode-char 'ucs #x097F))
+              . ("*" . "ISO10646.indian-1"))
+             ;; Indian CDAC
+             (,(indian-font-char-range 'cdac:dv-ttsurekh)
+              . ("*" . "Devanagari-CDAC"))
+             (,(indian-font-char-range 'cdac:sd-ttsurekh)
+              . ("*" . "Sanskrit-CDAC"))
+             (,(indian-font-char-range 'cdac:bn-ttdurga)
+              . ("*" . "Bengali-CDAC"))
+             (,(indian-font-char-range 'cdac:as-ttdurga)
+              . ("*" . "Assamese-CDAC"))
+             (,(indian-font-char-range 'cdac:pn-ttamar)
+              . ("*" . "Punjabi-CDAC"))
+             (,(indian-font-char-range 'cdac:gj-ttavantika)
+              . ("*" . "Gujarati-CDAC"))
+             (,(indian-font-char-range 'cdac:or-ttsarala)
+              . ("*" . "Oriya-CDAC"))
+             (,(indian-font-char-range 'cdac:tm-ttvalluvar)
+              . ("*" . "Tamil-CDAC"))
+             (,(indian-font-char-range 'cdac:tl-tthemalatha)
+              . ("*" . "Telugu-CDAC"))
+             (,(indian-font-char-range 'cdac:kn-ttuma)
+              . ("*" . "Kannada-CDAC"))
+             (,(indian-font-char-range 'cdac:ml-ttkarthika)
+              . ("*" . "Malayalam-CDAC"))
+             ;; Indian AKRUTI
+             (,(indian-font-char-range 'akruti:dev)
+              . ("*" . "dev-AKRUTHI"))
+             (,(indian-font-char-range 'akruti:bng)
+              . ("*" . "bng-AKRUTHI"))
+             (,(indian-font-char-range 'akruti:pnj)
+              . ("*" . "png-AKRUTHI"))
+             (,(indian-font-char-range 'akruti:guj)
+              . ("*" . "guj-AKRUTHI"))
+             (,(indian-font-char-range 'akruti:ori)
+              . ("*" . "ori-AKRUTHI"))
+             (,(indian-font-char-range 'akruti:tml)
+              . ("*" . "tml-AKRUTHI"))
+             (,(indian-font-char-range 'akruti:tlg)
+              . ("*" . "tlg-AKRUTHI"))
+             (,(indian-font-char-range 'akruti:knd)
+              . ("*" . "kng-AKRUTHI"))
+             (,(indian-font-char-range 'akruti:mal)
+              . ("*" . "mal-AKRUTHI"))
+             ))
     (set-fontset-font "fontset-default" (car elt) (cdr elt))))
 
 ;; Set arguments in `font-encoding-alist' (which see).