[Emacs-diffs] Changes to emacs/lisp/international/fontset.el

[Kenichi Handa]

Index: emacs/lisp/international/fontset.el
diff -c emacs/lisp/international/fontset.el:1.60 
emacs/lisp/international/fontset.el:1.61
*** emacs/lisp/international/fontset.el:1.60    Wed Jul 30 02:40:49 2003
--- emacs/lisp/international/fontset.el Fri Aug 15 08:10:45 2003
***************
*** 47,140 ****
             (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)
!             . ("*" . "Devanagari-Akruti"))
             (,(indian-font-char-range 'akruti:bng)
!             . ("*" . "Bengali-Akruti"))
             (,(indian-font-char-range 'akruti:pnj)
!             . ("*" . "Punjabi-Akruti"))
             (,(indian-font-char-range 'akruti:guj)
!             . ("*" . "Gujarati-Akruti"))
             (,(indian-font-char-range 'akruti:ori)
!             . ("*" . "Oriay-Akruti"))
             (,(indian-font-char-range 'akruti:tml)
!             . ("*" . "Tamil-Akruti"))
             (,(indian-font-char-range 'akruti:tlg)
!             . ("*" . "Telugu-Akruti"))
             (,(indian-font-char-range 'akruti:knd)
!             . ("*" . "Kannada-Akruti"))
             (,(indian-font-char-range 'akruti:mal)
!             . ("*" . "Malayalam-Akruti"))
             ))
      (set-fontset-font "fontset-default" (car elt) (cdr elt))))
  
--- 47,140 ----
             (latin-iso8859-2 . (nil . "ISO8859-2"))
             (latin-iso8859-3 . (nil . "ISO8859-3"))
             (latin-iso8859-4 . (nil . "ISO8859-4"))
!            (thai-tis620 . (nil . "TIS620"))
!            (greek-iso8859-7 . (nil . "ISO8859-7"))
!            (arabic-iso8859-6 . (nil . "ISO8859-6"))
!            (hebrew-iso8859-8 . (nil . "ISO8859-8"))
!            (katakana-jisx0201 . (nil . "JISX0201"))
             (latin-jisx0201 . (nil . "JISX0201"))
!            (cyrillic-iso8859-5 . (nil . "ISO8859-5"))
             (latin-iso8859-9 . (nil . "ISO8859-9"))
!            (japanese-jisx0208-1978 . (nil . "JISX0208.1978"))
!            (chinese-gb2312 . (nil . "GB2312.1980"))
!            (japanese-jisx0208 . (nil . "JISX0208.1990"))
!            (korean-ksc5601 . (nil . "KSC5601.1989"))
!            (japanese-jisx0212 . (nil . "JISX0212"))
!            (chinese-cns11643-1 . (nil . "CNS11643.1992-1"))
!            (chinese-cns11643-2 . (nil . "CNS11643.1992-2"))
!            (chinese-cns11643-3 . (nil . "CNS11643.1992-3"))
!            (chinese-cns11643-4 . (nil . "CNS11643.1992-4"))
!            (chinese-cns11643-5 . (nil . "CNS11643.1992-5"))
!            (chinese-cns11643-6 . (nil . "CNS11643.1992-6"))
!            (chinese-cns11643-7 . (nil . "CNS11643.1992-7"))
!            (chinese-big5-1 . (nil . "Big5"))
!            (chinese-big5-2 . (nil . "Big5"))
             (chinese-sisheng . (nil . "sisheng_cwnn"))
             (vietnamese-viscii-lower . (nil . "VISCII1.1"))
             (vietnamese-viscii-upper . (nil . "VISCII1.1"))
!            (arabic-digit . (nil . "MuleArabic-0"))
!            (arabic-1-column . (nil . "MuleArabic-1"))
!            (arabic-2-column . (nil . "MuleArabic-2"))
             (ipa . (nil . "MuleIPA"))
!            (ethiopic . (nil . "Ethiopic-Unicode"))
             (ascii-right-to-left . (nil . "ISO8859-1"))
!            (indian-is13194 . (nil . "IS13194-Devanagari"))
!            (indian-2-column . (nil . "MuleIndian-2"))
!            (lao . (nil . "MuleLao-1"))
             (tibetan . ("proportional" . "MuleTibetan-2"))
!            (tibetan-1-column . (nil . "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 . (nil . "JISX0213.2000-1"))
!            (japanese-jisx0213-2 . (nil . "JISX0213.2000-2"))
             ;; unicode
             ((,(decode-char 'ucs #x0900) . ,(decode-char 'ucs #x097F))
!             . (nil . "ISO10646.indian-1"))
             ;; Indian CDAC
             (,(indian-font-char-range 'cdac:dv-ttsurekh)
!             . (nil . "Devanagari-CDAC"))
             (,(indian-font-char-range 'cdac:sd-ttsurekh)
!             . (nil . "Sanskrit-CDAC"))
             (,(indian-font-char-range 'cdac:bn-ttdurga)
!             . (nil . "Bengali-CDAC"))
             (,(indian-font-char-range 'cdac:as-ttdurga)
!             . (nil . "Assamese-CDAC"))
             (,(indian-font-char-range 'cdac:pn-ttamar)
!             . (nil . "Punjabi-CDAC"))
             (,(indian-font-char-range 'cdac:gj-ttavantika)
!             . (nil . "Gujarati-CDAC"))
             (,(indian-font-char-range 'cdac:or-ttsarala)
!             . (nil . "Oriya-CDAC"))
             (,(indian-font-char-range 'cdac:tm-ttvalluvar)
!             . (nil . "Tamil-CDAC"))
             (,(indian-font-char-range 'cdac:tl-tthemalatha)
!             . (nil . "Telugu-CDAC"))
             (,(indian-font-char-range 'cdac:kn-ttuma)
!             . (nil . "Kannada-CDAC"))
             (,(indian-font-char-range 'cdac:ml-ttkarthika)
!             . (nil . "Malayalam-CDAC"))
             ;; Indian AKRUTI
             (,(indian-font-char-range 'akruti:dev)
!             . (nil . "Devanagari-Akruti"))
             (,(indian-font-char-range 'akruti:bng)
!             . (nil . "Bengali-Akruti"))
             (,(indian-font-char-range 'akruti:pnj)
!             . (nil . "Punjabi-Akruti"))
             (,(indian-font-char-range 'akruti:guj)
!             . (nil . "Gujarati-Akruti"))
             (,(indian-font-char-range 'akruti:ori)
!             . (nil . "Oriay-Akruti"))
             (,(indian-font-char-range 'akruti:tml)
!             . (nil . "Tamil-Akruti"))
             (,(indian-font-char-range 'akruti:tlg)
!             . (nil . "Telugu-Akruti"))
             (,(indian-font-char-range 'akruti:knd)
!             . (nil . "Kannada-Akruti"))
             (,(indian-font-char-range 'akruti:mal)
!             . (nil . "Malayalam-Akruti"))
             ))
      (set-fontset-font "fontset-default" (car elt) (cdr elt))))