From bd7d83d9ee3ce1cd6e43017fb7159aac826f21ba Mon Sep 17 00:00:00 2001 From: tomo Date: Thu, 27 Feb 2003 06:10:31 +0000 Subject: [PATCH] Sync up with r21-4-10-utf-2000-0_20-gtpjl. --- lisp/ChangeLog | 5 +++ lisp/mule/mule-conf.el | 13 ++++++++ lisp/utf-2000/Ideograph-R019-Power.el | 2 +- lisp/utf-2000/mojikyo-conf.el | 8 ++--- src/ChangeLog | 9 ++++++ src/char-ucs.h | 14 +-------- src/mule-charset.c | 55 --------------------------------- 7 files changed, 33 insertions(+), 73 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6489569..11467fb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-02-26 MORIOKA Tomohiko + + * mule/mule-conf.el (ideograph-gt-pj-{1..11}): New coded-charsets + when `utf-2000' is provided [was builtin coded-charsets]. + 2003-02-26 MORIOKA Tomohiko * mule/mule-charset.el (default-coded-charset-priority-list): Use diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el index 93130b8..fc1472c 100644 --- a/lisp/mule/mule-conf.el +++ b/lisp/mule/mule-conf.el @@ -255,6 +255,19 @@ max-code ,(+ (lsh #x6110 16) 17090) code-offset ,(lsh #x6110 16))) (define-charset-alias 'ideograph-gt-k '=gt-k) + (let ((i 1)) + (while (<= i 11) + (make-charset + (intern (format "ideograph-gt-pj-%d" i)) + (format "GT PJ %d" i) + `(long-name ,(format "GT 2000 (pseudo JIS encoding) part %d" i) + chars 94 + dimension 2 + columns 2 + graphic 0 + direction l2r + registry ,(format "\\(GTpj-%d\\|jisx0208\\.GT-%d\\)$" i i))) + (setq i (1+ i)))) (make-charset 'ideograph-gt-pj-k1 "GT K1" diff --git a/lisp/utf-2000/Ideograph-R019-Power.el b/lisp/utf-2000/Ideograph-R019-Power.el index 4296f41..d2bcf79 100644 --- a/lisp/utf-2000/Ideograph-R019-Power.el +++ b/lisp/utf-2000/Ideograph-R019-Power.el @@ -3060,7 +3060,7 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (ucs . #x2FF0) ; â¿° ) - ((=gt-k . 08651) ; ý¡„‚‡‹ + ((=gt . 56364) ; ý¡€°¬ ) ((ucs . #x529B) ; 力 )) diff --git a/lisp/utf-2000/mojikyo-conf.el b/lisp/utf-2000/mojikyo-conf.el index 63615ce..bc4515e 100644 --- a/lisp/utf-2000/mojikyo-conf.el +++ b/lisp/utf-2000/mojikyo-conf.el @@ -24,10 +24,10 @@ ;;; Code: -(unless (memq 'mojikyo default-coded-charset-priority-list) - (setq default-coded-charset-priority-list - (append default-coded-charset-priority-list - '(mojikyo)))) +;; (unless (memq 'mojikyo default-coded-charset-priority-list) +;; (setq default-coded-charset-priority-list +;; (append default-coded-charset-priority-list +;; '(mojikyo)))) (let ((i 1) name) diff --git a/src/ChangeLog b/src/ChangeLog index 637103f..ce52b8f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2003-02-26 MORIOKA Tomohiko + + * char-ucs.h (LEADING_BYTE_GT_PJ_{1..11}): Deleted. + + * mule-charset.c (Vcharset_ideograph_gt_pj_{1..11}): Deleted. + (Qideograph_gt_pj_{1..11}): Deleted. + (syms_of_mule_charset): Delete `ideograph-gt-pj-{1..11}'. + (complex_vars_of_mule_charset): Likewise. + 2003-02-17 MORIOKA Tomohiko * mule-charset.c (Vcharset_ucs_big5): Deleted. diff --git a/src/char-ucs.h b/src/char-ucs.h index 3698e70..22cb173 100644 --- a/src/char-ucs.h +++ b/src/char-ucs.h @@ -121,18 +121,6 @@ typedef short Charset_ID; #define LEADING_BYTE_DAIKANWA_2 (MIN_LEADING_BYTE + 30) #define LEADING_BYTE_DAIKANWA_3 (MIN_LEADING_BYTE + 31) -#define LEADING_BYTE_GT_PJ_1 (MIN_LEADING_BYTE + 41) -#define LEADING_BYTE_GT_PJ_2 (MIN_LEADING_BYTE + 42) -#define LEADING_BYTE_GT_PJ_3 (MIN_LEADING_BYTE + 43) -#define LEADING_BYTE_GT_PJ_4 (MIN_LEADING_BYTE + 44) -#define LEADING_BYTE_GT_PJ_5 (MIN_LEADING_BYTE + 45) -#define LEADING_BYTE_GT_PJ_6 (MIN_LEADING_BYTE + 46) -#define LEADING_BYTE_GT_PJ_7 (MIN_LEADING_BYTE + 47) -#define LEADING_BYTE_GT_PJ_8 (MIN_LEADING_BYTE + 48) -#define LEADING_BYTE_GT_PJ_9 (MIN_LEADING_BYTE + 49) -#define LEADING_BYTE_GT_PJ_10 (MIN_LEADING_BYTE + 50) -#define LEADING_BYTE_GT_PJ_11 (MIN_LEADING_BYTE + 51) - /* #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) @@ -506,7 +494,7 @@ 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 MAX_CHAR_GT (MIN_CHAR_GT + 67547) */ #define MIN_CHAR_BIG5_CDP 0x62000000 #define MAX_CHAR_BIG5_CDP 0x6200FFFF diff --git a/src/mule-charset.c b/src/mule-charset.c index 4f5c2a3..74b5220 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -90,17 +90,6 @@ 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_gt_pj_1; -Lisp_Object Vcharset_ideograph_gt_pj_2; -Lisp_Object Vcharset_ideograph_gt_pj_3; -Lisp_Object Vcharset_ideograph_gt_pj_4; -Lisp_Object Vcharset_ideograph_gt_pj_5; -Lisp_Object Vcharset_ideograph_gt_pj_6; -Lisp_Object Vcharset_ideograph_gt_pj_7; -Lisp_Object Vcharset_ideograph_gt_pj_8; -Lisp_Object Vcharset_ideograph_gt_pj_9; -Lisp_Object Vcharset_ideograph_gt_pj_10; -Lisp_Object Vcharset_ideograph_gt_pj_11; Lisp_Object Vcharset_ideograph_daikanwa_2; Lisp_Object Vcharset_ideograph_daikanwa; Lisp_Object Vcharset_ethiopic_ucs; @@ -363,17 +352,6 @@ Lisp_Object Qascii, Qideograph_hanziku_12, Qideograph_daikanwa_2, Qideograph_daikanwa, - Qideograph_gt_pj_1, - Qideograph_gt_pj_2, - Qideograph_gt_pj_3, - Qideograph_gt_pj_4, - Qideograph_gt_pj_5, - Qideograph_gt_pj_6, - Qideograph_gt_pj_7, - Qideograph_gt_pj_8, - Qideograph_gt_pj_9, - Qideograph_gt_pj_10, - Qideograph_gt_pj_11, Qethiopic_ucs, #endif Qchinese_big5_1, @@ -2455,17 +2433,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_gt_pj_1, "ideograph-gt-pj-1"); - defsymbol (&Qideograph_gt_pj_2, "ideograph-gt-pj-2"); - defsymbol (&Qideograph_gt_pj_3, "ideograph-gt-pj-3"); - defsymbol (&Qideograph_gt_pj_4, "ideograph-gt-pj-4"); - defsymbol (&Qideograph_gt_pj_5, "ideograph-gt-pj-5"); - defsymbol (&Qideograph_gt_pj_6, "ideograph-gt-pj-6"); - defsymbol (&Qideograph_gt_pj_7, "ideograph-gt-pj-7"); - defsymbol (&Qideograph_gt_pj_8, "ideograph-gt-pj-8"); - defsymbol (&Qideograph_gt_pj_9, "ideograph-gt-pj-9"); - defsymbol (&Qideograph_gt_pj_10, "ideograph-gt-pj-10"); - defsymbol (&Qideograph_gt_pj_11, "ideograph-gt-pj-11"); defsymbol (&Qideograph_daikanwa_2, "ideograph-daikanwa-2"); defsymbol (&Qideograph_daikanwa, "ideograph-daikanwa"); defsymbol (&Qchinese_big5, "chinese-big5"); @@ -2972,28 +2939,6 @@ complex_vars_of_mule_charset (void) DEF_HANZIKU (10); DEF_HANZIKU (11); DEF_HANZIKU (12); -#define DEF_GT_PJ(n) \ - staticpro (&Vcharset_ideograph_gt_pj_##n); \ - Vcharset_ideograph_gt_pj_##n = \ - make_charset (LEADING_BYTE_GT_PJ_##n, Qideograph_gt_pj_##n, 94, 2, \ - 2, 0, 0, CHARSET_LEFT_TO_RIGHT, \ - build_string ("GT-PJ-"#n), \ - build_string ("GT (pseudo JIS encoding) part "#n), \ - build_string ("GT 2000 (pseudo JIS encoding) part "#n), \ - build_string \ - ("\\(GTpj-"#n "\\|jisx0208\\.GT-"#n "\\)$"), \ - Qnil, 0, 0, 0, 33, Qnil, CONVERSION_IDENTICAL); - DEF_GT_PJ (1); - DEF_GT_PJ (2); - DEF_GT_PJ (3); - DEF_GT_PJ (4); - DEF_GT_PJ (5); - DEF_GT_PJ (6); - DEF_GT_PJ (7); - DEF_GT_PJ (8); - DEF_GT_PJ (9); - DEF_GT_PJ (10); - DEF_GT_PJ (11); staticpro (&Vcharset_ideograph_daikanwa_2); Vcharset_ideograph_daikanwa_2 = -- 1.7.10.4