From e1aff92397832f36e0a458c79bf8306e73a47f04 Mon Sep 17 00:00:00 2001 From: tomo Date: Sun, 2 Mar 2003 10:38:44 +0000 Subject: [PATCH] Sync up with r21-4-10-utf-2000-0_20-dkw2l. --- lisp/ChangeLog | 6 ++++++ lisp/mule/mule-conf.el | 12 +++++++++++- src/ChangeLog | 13 +++++++++++++ src/char-ucs.h | 9 +++------ src/mule-charset.c | 14 -------------- 5 files changed, 33 insertions(+), 21 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c1409e1..9b983a7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2003-03-01 MORIOKA Tomohiko + + * mule/mule-conf.el (ideograph-daikanwa-2): New coded-charsets + when `utf-2000' is provided + [was builtin coded-charsets]. + 2003-02-28 MORIOKA Tomohiko * mule/mule-conf.el (=hanziku-*): Renamed from diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el index 7b6bb48..03026c7 100644 --- a/lisp/mule/mule-conf.el +++ b/lisp/mule/mule-conf.el @@ -167,9 +167,19 @@ direction l2r mother ucs)) + (make-charset 'ideograph-daikanwa-2 + "Daikanwa Rev." + `(long-name "Daikanwa dictionary (revised version)" + chars 256 + dimension 2 + columns 2 + graphic 2 + direction l2r + registry "Daikanwa\\(\\.[0-9]+\\)?-2")) + (make-charset 'ideograph-daikanwa "Daikanwa" - `(long-name "Morohashi's Daikanwa Rev.2" + `(long-name "Daikanwa dictionary (revised version 2)" chars 256 dimension 2 columns 2 diff --git a/src/ChangeLog b/src/ChangeLog index 8cea7e4..0f5c7bf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,16 @@ +2003-03-01 MORIOKA Tomohiko + + * mule-charset.c (Vcharset_ideograph_daikanwa_2): Deleted. + (Qideograph_daikanwa_2): Deleted. + (syms_of_mule_charset): Delete `ideograph-daikanwa-2'. + (complex_vars_of_mule_charset): Likewise. + + * char-ucs.h (LEADING_BYTE_DAIKANWA_0): Deleted. + (LEADING_BYTE_DAIKANWA_1): Deleted. + (LEADING_BYTE_DAIKANWA_2): Deleted. + (MIN_CHAR_DAIKANWA): Deleted. + (MAX_CHAR_DAIKANWA): Deleted. + 2003-02-27 MORIOKA Tomohiko * char-ucs.h (LEADING_BYTE_DAIKANWA_3): Deleted. diff --git a/src/char-ucs.h b/src/char-ucs.h index f627cd3..893ff6f 100644 --- a/src/char-ucs.h +++ b/src/char-ucs.h @@ -116,10 +116,6 @@ typedef short Charset_ID; #define LEADING_BYTE_ETHIOPIC_UCS (MIN_LEADING_BYTE + 27) -#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 MIN_LEADING_BYTE_PRIVATE (MIN_LEADING_BYTE + 97) #define MAX_LEADING_BYTE_PRIVATE -1 @@ -455,15 +451,16 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir) #define MIN_CHAR_SIP 0x020000 #define MAX_CHAR_SIP 0x02FFFF +#if 0 #define MIN_CHAR_DAIKANWA 0x00E00000 #define MAX_CHAR_DAIKANWA (MIN_CHAR_DAIKANWA + 50100) /* 0xE0FFFF */ -/* + #define MIN_CHAR_CBETA 0x00E20000 #define MAX_CHAR_CBETA 0x00E2FFFF #define MIN_CHAR_CHINA3_JEF 0x00E80000 #define MAX_CHAR_CHINA3_JEF 0x00E8FFFF -*/ +#endif #define MIN_CHAR_94 0x00E90940 #define MAX_CHAR_94 (MIN_CHAR_94 + 94 * 80 - 1) diff --git a/src/mule-charset.c b/src/mule-charset.c index f5adcb1..296a025 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -78,7 +78,6 @@ 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_daikanwa_2; Lisp_Object Vcharset_ethiopic_ucs; #endif Lisp_Object Vcharset_chinese_big5_1; @@ -324,7 +323,6 @@ Lisp_Object Qascii, Qvietnamese_viscii_upper, Qjis_x0208, Qchinese_big5, - Qideograph_daikanwa_2, Qethiopic_ucs, #endif Qchinese_big5_1, @@ -2396,7 +2394,6 @@ syms_of_mule_charset (void) defsymbol (&Qvietnamese_viscii_lower, "vietnamese-viscii-lower"); defsymbol (&Qvietnamese_viscii_upper, "vietnamese-viscii-upper"); defsymbol (&Qjis_x0208, "=jis-x0208"); - defsymbol (&Qideograph_daikanwa_2, "ideograph-daikanwa-2"); defsymbol (&Qchinese_big5, "chinese-big5"); defsymbol (&Qethiopic_ucs, "ethiopic-ucs"); #endif @@ -2853,17 +2850,6 @@ complex_vars_of_mule_charset (void) MIN_CHAR_BIG5_CDP, MAX_CHAR_BIG5_CDP, MIN_CHAR_BIG5_CDP, 0, Qnil, CONVERSION_IDENTICAL); - staticpro (&Vcharset_ideograph_daikanwa_2); - Vcharset_ideograph_daikanwa_2 = - make_charset (LEADING_BYTE_DAIKANWA_2, Qideograph_daikanwa_2, 256, 2, - 2, 2, 0, CHARSET_LEFT_TO_RIGHT, - build_string ("Daikanwa Rev."), - build_string ("Morohashi's Daikanwa Rev."), - build_string - ("Daikanwa dictionary (revised version)"), - build_string ("Daikanwa\\(\\.[0-9]+\\)?-2"), - Qnil, 0, 0, 0, 0, Qnil, CONVERSION_IDENTICAL); - staticpro (&Vcharset_ethiopic_ucs); Vcharset_ethiopic_ucs = make_charset (LEADING_BYTE_ETHIOPIC_UCS, Qethiopic_ucs, 256, 2, -- 1.7.10.4