From 3fdfa14d22f539086c64c5c6f3c66e5884f31e25 Mon Sep 17 00:00:00 2001 From: tomo Date: Fri, 28 Feb 2003 02:58:47 +0000 Subject: [PATCH] Sync up with r21-4-10-utf-2000-0_20-dkw3hzkl. --- lisp/ChangeLog | 8 +++- lisp/mule/mule-conf.el | 33 ++++++++++++++++ src/ChangeLog | 16 ++++++++ src/char-ucs.h | 17 +-------- src/mule-charset.c | 98 ------------------------------------------------ 5 files changed, 58 insertions(+), 114 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d41fcdd..929ae10 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,12 @@ 2003-02-27 MORIOKA Tomohiko - * mule-conf.el (=gt-pj-*): Renamed from `ideograph-gt-pj-*'. + * mule/mule-conf.el (ideograph-daikanwa): New coded-charsets when + `utf-2000' is provided [was builtin coded-charsets]. + (ideograph-hanziku-{1..12}): Likewise. + +2003-02-27 MORIOKA Tomohiko + + * mule/mule-conf.el (=gt-pj-*): Renamed from `ideograph-gt-pj-*'. (ideograph-gt-pj-*): Changed to an alias for `=gt-pj-*'. 2003-02-26 MORIOKA Tomohiko diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el index f843d38..a2929ec 100644 --- a/lisp/mule/mule-conf.el +++ b/lisp/mule/mule-conf.el @@ -167,6 +167,19 @@ direction l2r mother ucs)) + (make-charset 'ideograph-daikanwa + "Daikanwa" + `(long-name "Morohashi's Daikanwa Rev.2" + chars 256 + dimension 2 + columns 2 + graphic 2 + direction l2r + registry "Daikanwa\\(\\.[0-9]+\\)?-3" + min-code #xE00000 + max-code ,(+ #xE00000 50100) + code-offset #xE00000)) + (make-charset '=big5-pua "Big5-PUA" `(long-name "Big5 with private used area" @@ -228,6 +241,26 @@ min-code #x8140 max-code #x8DFE)) (define-charset-alias 'chinese-big5-cdp '=big5-cdp) + (let* ((i 1) + (hzk-min (+ (lsh #x6200 16) 65536)) + (hzk-max (+ hzk-min 65535))) + (while (<= i 12) + (make-charset + (intern (format "ideograph-hanziku-%d" i)) + (format "HANZIKU-%d" i) + `(long-name ,(format "HANZIKU (pseudo BIG5 encoding) part %d" i) + chars 256 + dimension 2 + columns 2 + graphic 2 + direction l2r + registry ,(format "hanziku-%d$" i i) + min-code ,hzk-min + max-code ,hzk-max + code-offset ,hzk-min)) + (setq hzk-min (1+ hzk-max) + hzk-max (+ hzk-min 65535)) + (setq i (1+ i)))) (make-charset '=gt "GT" diff --git a/src/ChangeLog b/src/ChangeLog index ce52b8f..8cea7e4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,19 @@ +2003-02-27 MORIOKA Tomohiko + + * char-ucs.h (LEADING_BYTE_DAIKANWA_3): Deleted. + (LEADING_BYTE_HANZIKU_{1..12}): Deleted. + ({MIN|MAX}_CHAR_HANZIKU_{1..12}): Deleted. + + * mule-charset.c (Vcharset_ideograph_hanziku_{1..12}): Deleted. + (Vcharset_ideograph_daikanwa): Deleted. + (Qideograph_hanziku_{1..12}): Deleted. + (Qideograph_daikanwa): Deleted. + (encode_builtin_char_1): Don't use {MIN|MAX}_CHAR_DAIKANWA and + Vcharset_ideograph_daikanwa. + (syms_of_mule_charset): Delete `ideograph-daikanwa' and + `ideograph-hanziku-{1..12}'. + (complex_vars_of_mule_charset): Likewise. + 2003-02-26 MORIOKA Tomohiko * char-ucs.h (LEADING_BYTE_GT_PJ_{1..11}): Deleted. diff --git a/src/char-ucs.h b/src/char-ucs.h index 22cb173..f627cd3 100644 --- a/src/char-ucs.h +++ b/src/char-ucs.h @@ -119,21 +119,6 @@ typedef short Charset_ID; #define LEADING_BYTE_DAIKANWA_0 (MIN_LEADING_BYTE + 28) #define LEADING_BYTE_DAIKANWA_1 (MIN_LEADING_BYTE + 29) #define LEADING_BYTE_DAIKANWA_2 (MIN_LEADING_BYTE + 30) -#define LEADING_BYTE_DAIKANWA_3 (MIN_LEADING_BYTE + 31) - -/* #define LEADING_BYTE_CHINESE_BIG5_CDP (MIN_LEADING_BYTE + 84) */ -#define LEADING_BYTE_HANZIKU_1 (MIN_LEADING_BYTE + 85) -#define LEADING_BYTE_HANZIKU_2 (MIN_LEADING_BYTE + 86) -#define LEADING_BYTE_HANZIKU_3 (MIN_LEADING_BYTE + 87) -#define LEADING_BYTE_HANZIKU_4 (MIN_LEADING_BYTE + 88) -#define LEADING_BYTE_HANZIKU_5 (MIN_LEADING_BYTE + 89) -#define LEADING_BYTE_HANZIKU_6 (MIN_LEADING_BYTE + 90) -#define LEADING_BYTE_HANZIKU_7 (MIN_LEADING_BYTE + 91) -#define LEADING_BYTE_HANZIKU_8 (MIN_LEADING_BYTE + 92) -#define LEADING_BYTE_HANZIKU_9 (MIN_LEADING_BYTE + 93) -#define LEADING_BYTE_HANZIKU_10 (MIN_LEADING_BYTE + 94) -#define LEADING_BYTE_HANZIKU_11 (MIN_LEADING_BYTE + 95) -#define LEADING_BYTE_HANZIKU_12 (MIN_LEADING_BYTE + 96) #define MIN_LEADING_BYTE_PRIVATE (MIN_LEADING_BYTE + 97) #define MAX_LEADING_BYTE_PRIVATE -1 @@ -498,6 +483,7 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir) */ #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) @@ -522,6 +508,7 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir) #define MAX_CHAR_HANZIKU_11 (0x62000000 + 65536 * 11 + 65535) #define MIN_CHAR_HANZIKU_12 (0x62000000 + 65536 * 12) #define MAX_CHAR_HANZIKU_12 (0x62000000 + 65536 * 12 + 65535) +*/ Emchar decode_builtin_char (Lisp_Object charset, int code_point); diff --git a/src/mule-charset.c b/src/mule-charset.c index 74b5220..f5adcb1 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -78,20 +78,7 @@ Lisp_Object Vcharset_latin_viscii_lower; Lisp_Object Vcharset_latin_viscii_upper; Lisp_Object Vcharset_jis_x0208; Lisp_Object Vcharset_chinese_big5; -Lisp_Object Vcharset_ideograph_hanziku_1; -Lisp_Object Vcharset_ideograph_hanziku_2; -Lisp_Object Vcharset_ideograph_hanziku_3; -Lisp_Object Vcharset_ideograph_hanziku_4; -Lisp_Object Vcharset_ideograph_hanziku_5; -Lisp_Object Vcharset_ideograph_hanziku_6; -Lisp_Object Vcharset_ideograph_hanziku_7; -Lisp_Object Vcharset_ideograph_hanziku_8; -Lisp_Object Vcharset_ideograph_hanziku_9; -Lisp_Object Vcharset_ideograph_hanziku_10; -Lisp_Object Vcharset_ideograph_hanziku_11; -Lisp_Object Vcharset_ideograph_hanziku_12; Lisp_Object Vcharset_ideograph_daikanwa_2; -Lisp_Object Vcharset_ideograph_daikanwa; Lisp_Object Vcharset_ethiopic_ucs; #endif Lisp_Object Vcharset_chinese_big5_1; @@ -337,21 +324,7 @@ Lisp_Object Qascii, Qvietnamese_viscii_upper, Qjis_x0208, Qchinese_big5, - /* Qchinese_big5_cdp, */ - Qideograph_hanziku_1, - Qideograph_hanziku_2, - Qideograph_hanziku_3, - Qideograph_hanziku_4, - Qideograph_hanziku_5, - Qideograph_hanziku_6, - Qideograph_hanziku_7, - Qideograph_hanziku_8, - Qideograph_hanziku_9, - Qideograph_hanziku_10, - Qideograph_hanziku_11, - Qideograph_hanziku_12, Qideograph_daikanwa_2, - Qideograph_daikanwa, Qethiopic_ucs, #endif Qchinese_big5_1, @@ -1227,16 +1200,6 @@ encode_builtin_char_1 (Emchar c, Lisp_Object* charset) *charset = Vcharset_ucs_sip; return c - MIN_CHAR_SIP; } - else if (c < MIN_CHAR_DAIKANWA) - { - *charset = Vcharset_ucs; - return c; - } - else if (c <= MAX_CHAR_DAIKANWA) - { - *charset = Vcharset_ideograph_daikanwa; - return c - MIN_CHAR_DAIKANWA; - } else if (c < MIN_CHAR_94) { *charset = Vcharset_ucs; @@ -2434,21 +2397,7 @@ syms_of_mule_charset (void) defsymbol (&Qvietnamese_viscii_upper, "vietnamese-viscii-upper"); defsymbol (&Qjis_x0208, "=jis-x0208"); defsymbol (&Qideograph_daikanwa_2, "ideograph-daikanwa-2"); - defsymbol (&Qideograph_daikanwa, "ideograph-daikanwa"); defsymbol (&Qchinese_big5, "chinese-big5"); - /* defsymbol (&Qchinese_big5_cdp, "chinese-big5-cdp"); */ - defsymbol (&Qideograph_hanziku_1, "ideograph-hanziku-1"); - defsymbol (&Qideograph_hanziku_2, "ideograph-hanziku-2"); - defsymbol (&Qideograph_hanziku_3, "ideograph-hanziku-3"); - defsymbol (&Qideograph_hanziku_4, "ideograph-hanziku-4"); - defsymbol (&Qideograph_hanziku_5, "ideograph-hanziku-5"); - defsymbol (&Qideograph_hanziku_6, "ideograph-hanziku-6"); - defsymbol (&Qideograph_hanziku_7, "ideograph-hanziku-7"); - defsymbol (&Qideograph_hanziku_8, "ideograph-hanziku-8"); - defsymbol (&Qideograph_hanziku_9, "ideograph-hanziku-9"); - defsymbol (&Qideograph_hanziku_10, "ideograph-hanziku-10"); - defsymbol (&Qideograph_hanziku_11, "ideograph-hanziku-11"); - defsymbol (&Qideograph_hanziku_12, "ideograph-hanziku-12"); defsymbol (&Qethiopic_ucs, "ethiopic-ucs"); #endif defsymbol (&Qchinese_big5_1, "chinese-big5-1"); @@ -2903,42 +2852,6 @@ complex_vars_of_mule_charset (void) Qnil, 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 = - make_charset (LEADING_BYTE_CHINESE_BIG5_CDP, Qchinese_big5_cdp, 256, 2, - 2, 2, 0, CHARSET_LEFT_TO_RIGHT, - build_string ("Big5-CDP"), - build_string ("Big5 + CDP extension"), - build_string ("Big5 with CDP extension"), - build_string ("big5\\.cdp-0"), - Qnil, MIN_CHAR_BIG5_CDP, MAX_CHAR_BIG5_CDP, - MIN_CHAR_BIG5_CDP, 0, Qnil, CONVERSION_IDENTICAL); -#endif -#define DEF_HANZIKU(n) \ - staticpro (&Vcharset_ideograph_hanziku_##n); \ - Vcharset_ideograph_hanziku_##n = \ - make_charset (LEADING_BYTE_HANZIKU_##n, Qideograph_hanziku_##n, 256, 2, \ - 2, 2, 0, CHARSET_LEFT_TO_RIGHT, \ - build_string ("HZK-"#n), \ - build_string ("HANZIKU-"#n), \ - build_string ("HANZIKU (pseudo BIG5 encoding) part "#n), \ - build_string \ - ("hanziku-"#n"$"), \ - Qnil, MIN_CHAR_HANZIKU_##n, MAX_CHAR_HANZIKU_##n, \ - MIN_CHAR_HANZIKU_##n, 0, Qnil, CONVERSION_IDENTICAL); - DEF_HANZIKU (1); - DEF_HANZIKU (2); - DEF_HANZIKU (3); - DEF_HANZIKU (4); - DEF_HANZIKU (5); - DEF_HANZIKU (6); - DEF_HANZIKU (7); - DEF_HANZIKU (8); - DEF_HANZIKU (9); - DEF_HANZIKU (10); - DEF_HANZIKU (11); - DEF_HANZIKU (12); staticpro (&Vcharset_ideograph_daikanwa_2); Vcharset_ideograph_daikanwa_2 = @@ -2950,17 +2863,6 @@ complex_vars_of_mule_charset (void) ("Daikanwa dictionary (revised version)"), build_string ("Daikanwa\\(\\.[0-9]+\\)?-2"), Qnil, 0, 0, 0, 0, Qnil, CONVERSION_IDENTICAL); - staticpro (&Vcharset_ideograph_daikanwa); - Vcharset_ideograph_daikanwa = - make_charset (LEADING_BYTE_DAIKANWA_3, Qideograph_daikanwa, 256, 2, - 2, 2, 0, CHARSET_LEFT_TO_RIGHT, - build_string ("Daikanwa"), - build_string ("Morohashi's Daikanwa Rev.2"), - build_string - ("Daikanwa dictionary (second revised version)"), - build_string ("Daikanwa\\(\\.[0-9]+\\)?-3"), - Qnil, MIN_CHAR_DAIKANWA, MAX_CHAR_DAIKANWA, - MIN_CHAR_DAIKANWA, 0, Qnil, CONVERSION_IDENTICAL); staticpro (&Vcharset_ethiopic_ucs); Vcharset_ethiopic_ucs = -- 1.7.10.4