From: tomo Date: Tue, 14 May 2002 12:15:47 +0000 (+0000) Subject: Sync with r21-2-44-0_18-m8. X-Git-Tag: r21-2-44-utf-2000-0_18-lazy-n10c~5 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f8a03a9ea0345d9026b9bbbe9f4612e963217bca;p=chise%2Fxemacs-chise.git Sync with r21-2-44-0_18-m8. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c554849..9fe55b1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,16 @@ +2002-04-12 MORIOKA Tomohiko + + * mule/mule-charset.el (default-coded-charset-priority-list): Add + `chinese-big5-eten-a' and `chinese-big5-eten-b'. + +2002-04-11 MORIOKA Tomohiko + + * mule/mule-conf.el (chinese-big5-pua): New coded-charset. + (chinese-big5-eten-a): Likewise. + (chinese-big5-eten-b): Likewise. + (chinese-big5-cdp): Declare as a subset of `chinese-big5' whose + code range is #x8140 .. #x8DFE. + 2002-04-08 MORIOKA Tomohiko * mule/mule-conf.el (chinese-big5-eten): New coded-charset in diff --git a/lisp/mule/mule-charset.el b/lisp/mule/mule-charset.el index 389b12a..ba483a5 100644 --- a/lisp/mule/mule-charset.el +++ b/lisp/mule/mule-charset.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1992 Free Software Foundation, Inc. ;; Copyright (C) 1995 Amdahl Corporation. ;; Copyright (C) 1996 Sun Microsystems. -;; Copyright (C) 1999,2000,2001 MORIOKA Tomohiko +;; Copyright (C) 1999,2000,2001,2002 MORIOKA Tomohiko ;; Author: Unknown ;; Keywords: i18n, mule, internal @@ -292,11 +292,6 @@ DESCRIPTION (string) is the description string of the charset." chinese-cns11643-6 chinese-cns11643-7 korean-ksc5601 - ideograph-daikanwa-2 - ideograph-daikanwa - china3-jef - ideograph-cbeta - chinese-big5-cdp ;; chinese-gb12345 chinese-isoir165 katakana-jisx0201 @@ -308,18 +303,6 @@ DESCRIPTION (string) is the description string of the charset." lao ethiopic-ucs ethiopic - ideograph-hanziku-1 - ideograph-hanziku-2 - ideograph-hanziku-3 - ideograph-hanziku-4 - ideograph-hanziku-5 - ideograph-hanziku-6 - ideograph-hanziku-7 - ideograph-hanziku-8 - ideograph-hanziku-9 - ideograph-hanziku-10 - ideograph-hanziku-11 - ideograph-hanziku-12 arabic-digit arabic-1-column arabic-2-column @@ -334,8 +317,27 @@ DESCRIPTION (string) is the description string of the charset." ideograph-gt-pj-9 ideograph-gt-pj-10 ideograph-gt-pj-11 + ideograph-daikanwa-2 + ideograph-daikanwa + chinese-big5-cdp + chinese-big5-eten-a + chinese-big5-eten-b chinese-big5 + ideograph-cbeta ucs-bmp + ideograph-hanziku-1 + ideograph-hanziku-2 + ideograph-hanziku-3 + ideograph-hanziku-4 + ideograph-hanziku-5 + ideograph-hanziku-6 + ideograph-hanziku-7 + ideograph-hanziku-8 + ideograph-hanziku-9 + ideograph-hanziku-10 + ideograph-hanziku-11 + ideograph-hanziku-12 + china3-jef arabic-iso8859-6))) ;;; mule-charset.el ends here diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el index ebe9435..c2cc7b9 100644 --- a/lisp/mule/mule-conf.el +++ b/lisp/mule/mule-conf.el @@ -2,7 +2,7 @@ ;; Copyright (C) 1995,1999 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. -;; Copyright (C) 1997,1999,2000 MORIOKA Tomohiko +;; Copyright (C) 1997,1999,2000,2002 MORIOKA Tomohiko ;; Keywords: mule, multilingual, character set, coding system @@ -116,4 +116,69 @@ final ?P graphic 0)) +(when (featurep 'utf-2000) + (make-charset + 'chinese-big5-pua + "Big5-PUA" + `(long-name "Big5 with private used area" + chars 256 + dimension 2 + columns 2 + graphic 2 + direction l2r + mother chinese-big5 + registry "Big5\\.ETEN")) + (make-charset + 'chinese-big5-eten + "Big5-ETEN" + `(long-name "Big5 ETEN" + chars 256 + dimension 2 + columns 2 + graphic 2 + direction l2r + mother chinese-big5 + min-code #x8140 max-code #xFEFE + registry "Big5\\.ETEN")) + (make-charset + 'chinese-big5-eten-a + "Big5-ETEN-a" + `(long-name "Big5 ETEN (#xF9D6 .. #xF9FE)" + chars 256 + dimension 2 + columns 2 + graphic 2 + direction l2r + mother chinese-big5 + min-code #xF9D6 max-code #xF9FE + registry "Big5\\.ETEN")) + (make-charset + 'chinese-big5-eten-b + "Big5-ETEN-b" + `(long-name "Big5 ETEN (#xC6A1 .. #xC8FE)" + chars 256 + dimension 2 + columns 2 + graphic 2 + direction l2r + mother chinese-big5 + min-code #xC6A1 max-code #xC8FE + registry "Big5\\.ETEN")) + (make-charset + 'chinese-big5-cdp + "Big5-CDP" + `(long-name "Big5 with CDP extension" + chars 256 + dimension 2 + columns 2 + graphic 2 + direction l2r + registry "big5\\.cdp-0" + ;; min-code ,(lsh #x6200 16) + ;; max-code ,(+ (lsh #x6200 16) #xFFFF) + ;; code-offset ,(lsh #x6200 16) + mother chinese-big5 + min-code #x8140 max-code #x8DFE)) + ) + ;;; mule-conf.el ends here diff --git a/src/ChangeLog b/src/ChangeLog index 68f6447..51d42a5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,20 @@ +2002-04-11 MORIOKA Tomohiko + + * mule-charset.c (decode_builtin_char): Use `decode_builtin_char' + instead of `DECODE_CHAR' for mother; don't use special code for + chinese-big5 to use code space of chinese-big5-1 and + chinese-big5-2. + (complex_vars_of_mule_charset): Use `MIN_CHAR_BIG5_CDP' and + `MAX_CHAR_BIG5_CDP' for chinese-big5. + + * char-ucs.h (MIN_CHAR_BIG5_CDP): Revival. + (MAX_CHAR_BIG5_CDP): Revival. + +2002-04-09 MORIOKA Tomohiko + + * mule-charset.c (complex_vars_of_mule_charset): Use "big5-0" as + the XLFD registry-encoding name of `chinese-big5'. + 2002-04-08 MORIOKA Tomohiko * mule-charset.c (Vcharset_chinese_big5_cdp): Deleted. diff --git a/src/char-ucs.h b/src/char-ucs.h index c826fc8..3714f5a 100644 --- a/src/char-ucs.h +++ b/src/char-ucs.h @@ -477,8 +477,8 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir) #define MIN_CHAR_GT 0x61000000 #define MAX_CHAR_GT (MIN_CHAR_GT + 66773) -/* #define MIN_CHAR_BIG5_CDP 0x62000000 */ -/* #define MAX_CHAR_BIG5_CDP 0x6200FFFF */ +#define MIN_CHAR_BIG5_CDP 0x62000000 +#define MAX_CHAR_BIG5_CDP 0x6200FFFF #define MIN_CHAR_HANZIKU_1 (0x62000000 + 65536 * 1) #define MAX_CHAR_HANZIKU_1 (0x62000000 + 65536 * 1 + 65535) #define MIN_CHAR_HANZIKU_2 (0x62000000 + 65536 * 2) diff --git a/src/mule-charset.c b/src/mule-charset.c index 7f57ba4..6889030 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -950,8 +950,10 @@ decode_builtin_char (Lisp_Object charset, int code_point) + (row - (18 + 32)) * 94 + cell - 33; } - return DECODE_CHAR (mother, code + XCHARSET_CODE_OFFSET(charset)); + return + decode_builtin_char (mother, code + XCHARSET_CODE_OFFSET(charset)); } +#if 0 else if (EQ (charset, Vcharset_chinese_big5)) { int c1 = code_point >> 8; @@ -978,6 +980,7 @@ decode_builtin_char (Lisp_Object charset, int code_point) code_point = ((I / 94 + 33) << 8) | (I % 94 + 33); } } +#endif if ((final = XCHARSET_FINAL (charset)) >= '0') { if (XCHARSET_DIMENSION (charset) == 1) @@ -3063,11 +3066,10 @@ complex_vars_of_mule_charset (void) build_string ("Big5"), build_string ("Big5"), build_string ("Big5 Chinese traditional"), - build_string ("big5"), + build_string ("big5-0"), Qnil, - 0 /* MIN_CHAR_BIG5_CDP */, - 0 /* MAX_CHAR_BIG5_CDP */, 0, 0, - Qnil, CONVERSION_IDENTICAL); + MIN_CHAR_BIG5_CDP, MAX_CHAR_BIG5_CDP, + MIN_CHAR_BIG5_CDP, 0, Qnil, CONVERSION_IDENTICAL); #if 0 staticpro (&Vcharset_chinese_big5_cdp); Vcharset_chinese_big5_cdp =