From: tomo Date: Wed, 19 Mar 2003 05:04:37 +0000 (+0000) Subject: Sync up with r21-4-11-chise-0_21-=daikanwa-rev1+2. X-Git-Tag: r21-2-44-utf-2000-m0_18-=daikanwa-rev1+2~1 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ff41b5aa9a8da699c405a4458f827374fdbdc5b;p=chise%2Fxemacs-chise.git Sync up with r21-4-11-chise-0_21-=daikanwa-rev1+2. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index da80a98..79f9fb3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2003-03-16 MORIOKA Tomohiko + + * lisp/mule-conf.el (=daikanwa-rev1): Renamed from + `ideograph-daikanwa-2'. + (ideograph-daikanwa-2): Changed to an alias for `=daikanwa-rev1'. + (=daikanwa-rev2): New coded-charset when `utf-2000' is provided. + 2003-03-09 MORIOKA Tomohiko * mule/mule-charset.el (default-coded-charset-priority-list): diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el index 5403694..0d7960c 100644 --- a/lisp/mule/mule-conf.el +++ b/lisp/mule/mule-conf.el @@ -205,7 +205,20 @@ direction l2r mother =ucs)) - (make-charset 'ideograph-daikanwa-2 + (make-charset 'ideograph-daikanwa + "Daikanwa" + `(long-name "Daikanwa dictionary (revised version 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 '=daikanwa-rev1 "Daikanwa Rev." `(long-name "Daikanwa dictionary (revised version)" chars 256 @@ -214,8 +227,9 @@ graphic 2 direction l2r registry "Daikanwa\\(\\.[0-9]+\\)?-2")) + (define-charset-alias 'ideograph-daikanwa-2 '=daikanwa-rev1) - (make-charset 'ideograph-daikanwa + (make-charset '=daikanwa-rev2 "Daikanwa" `(long-name "Daikanwa dictionary (revised version 2)" chars 256 diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index 8ab3c23..58a5fc3 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,23 @@ +2003-03-16 MORIOKA Tomohiko + + * Ideograph-R037-Big.el: Rename `ideograph-daikanwa-2' to + `=daikanwa-rev1'; use `=daikanwa-rev2' instead of + `ideograph-daikanwa' when it and `=daikanwa-rev1' have different + values. + + * ideograph-util.el (char-representative-of-daikanwa): Use + `encode-char' instead of `get-char-attribute' for + `ideograph-daikanwa'; regard `=daikanwa-rev2' as same as + `ideograph-daikanwa'. + (char-daikanwa): Likewise. + +2003-03-16 MORIOKA Tomohiko + + * char-db-util.el (char-db-make-char-spec): Regard + `=daikanwa-rev2' as same as `ideograph-daikanwa'. + (insert-char-attributes): Regard `=daikanwa-rev1' and + `=daikanwa-rev2' as same as `ideograph-daikanwa'. + 2003-03-09 MORIOKA Tomohiko * u0FFF0-Specials.el, u0FF00-Halfwidth-and-Fullwidth-Forms.el, diff --git a/lisp/utf-2000/Ideograph-R037-Big.el b/lisp/utf-2000/Ideograph-R037-Big.el index ce40b74..3c38f0b 100644 --- a/lisp/utf-2000/Ideograph-R037-Big.el +++ b/lisp/utf-2000/Ideograph-R037-Big.el @@ -951,9 +951,9 @@ (ideographic-radical . 37) ; ⼤ (ideographic-strokes . 5) (total-strokes . 8) - (ideograph-daikanwa-2 . 05898) ; ø¸œ‰ - (ideograph-daikanwa . 05897) ; ø¸œ‰ - (mojikyo . 005897) ; ý €œ‰ + (=daikanwa-rev1 . 05898) ; ø¸œ‰ + (=daikanwa-rev2 . 05897) ; ø¸œ‰ + (mojikyo . 005897) ; ý €œ‰ )) (define-char '((morohashi-daikanwa 5897 0 0) @@ -977,8 +977,8 @@ (ideographic-radical . 37) ; ⼤ (ideographic-strokes . 5) (total-strokes . 8) - (ideograph-daikanwa-2 . 05899) ; ø¸œŠ - (ideograph-daikanwa . 05898) ; ø¸œŠ + (=daikanwa-rev1 . 05899) ; ø¸œŠ + (=daikanwa-rev2 . 05898) ; ø¸œŠ )) (define-char '((morohashi-daikanwa 5898 0 0) @@ -994,49 +994,49 @@ (ideographic-strokes . 5) (total-strokes . 8) (hanyu-dazidian 1 533 3) - (chinese-cns11643-6 . #x2A59) ; ø»œ‚¶ - (ideograph-daikanwa-2 . 05900) ; 𡗿 - (ideograph-daikanwa . 05899) ; ø¸œ‹ - (=hanziku-2 . #xBDB2) ; ý¢€«¶² - (mojikyo . 005899) ; ý €œ‹ - (=ucs . #x215FF) ; 𡗿 + (chinese-cns11643-6 . #x2A59) ; ø»œ‚¶ + (=daikanwa-rev1 . 05900) ; 𡗿 + (=daikanwa-rev2 . 05899) ; ø¸œ‹ + (=hanziku-2 . #xBDB2) ; ý¢€«¶² + (mojikyo . 005899) ; ý €œ‹ + (=ucs . #x215FF) ; 𡗿 )) (define-char '((ideographic-radical . 37) ; ⼤ (ideographic-strokes . 5) (total-strokes . 8) (hanyu-dazidian 1 535 1) - (chinese-gb2312 . #x375C) ; ø»„§“ - (chinese-isoir165 . #x375C) ; ø»£ - (chinese-cns11643-3 . #x282E) ; ø»•¡ƒ - (ideograph-daikanwa-2 . 05901) ; 奋 - (ideograph-daikanwa . 05900) ; ø¸œŒ - (=hanziku-2 . #xBDF0) ; ý¢€«·° - (mojikyo . 005900) ; ý €œŒ - (=ucs . #x594B) ; 奋 + (chinese-gb2312 . #x375C) ; ø»„§“ + (chinese-isoir165 . #x375C) ; ø»£ + (chinese-cns11643-3 . #x282E) ; ø»•¡ƒ + (=daikanwa-rev1 . 05901) ; 奋 + (=daikanwa-rev2 . 05900) ; ø¸œŒ + (=hanziku-2 . #xBDF0) ; ý¢€«·° + (mojikyo . 005900) ; ý €œŒ + (=ucs . #x594B) ; 奋 )) (define-char '((ideographic-radical . 37) ; ⼤ (ideographic-strokes . 5) (total-strokes . 8) (hanyu-dazidian 1 535 5) - (chinese-cns11643-6 . #x2A5B) ; ø»œ‚¸ - (ideograph-daikanwa-2 . 05902) ; 𡘄 - (ideograph-daikanwa . 05901) ; ø¸œ - (=hanziku-2 . #xBDF4) ; ý¢€«·´ - (mojikyo . 005901) ; ý €œ - (=ucs . #x21604) ; 𡘄 + (chinese-cns11643-6 . #x2A5B) ; ø»œ‚¸ + (=daikanwa-rev1 . 05902) ; 𡘄 + (=daikanwa-rev2 . 05901) ; ø¸œ + (=hanziku-2 . #xBDF4) ; ý¢€«·´ + (mojikyo . 005901) ; ý €œ + (=ucs . #x21604) ; 𡘄 )) (define-char '((ideographic-radical . 37) ; ⼤ (ideographic-strokes . 5) (total-strokes . 8) (hanyu-dazidian 1 536 1) - (ideograph-daikanwa-2 . 05903) ; 𡘅 - (ideograph-daikanwa . 05902) ; ø¸œŽ - (=hanziku-2 . #xBE51) ; ý¢€«¹‘ - (mojikyo . 005902) ; ý €œŽ - (=ucs . #x21605) ; 𡘅 + (=daikanwa-rev1 . 05903) ; 𡘅 + (=daikanwa-rev2 . 05902) ; ø¸œŽ + (=hanziku-2 . #xBE51) ; ý¢€«¹‘ + (mojikyo . 005902) ; ý €œŽ + (=ucs . #x21605) ; 𡘅 )) (define-char '((=>ucs . #x21605) ; 𡘅 @@ -1050,58 +1050,58 @@ '((ideographic-radical . 37) ; ⼤ (ideographic-strokes . 5) (total-strokes . 8) - (ideograph-daikanwa-2 . 05904) ; ø¸œ - (ideograph-daikanwa . 05903) ; ø¸œ + (=daikanwa-rev1 . 05904) ; ø¸œ + (=daikanwa-rev2 . 05903) ; ø¸œ )) (define-char '((ideographic-radical . 37) ; ⼤ (ideographic-strokes . 5) (total-strokes . 8) - (ideograph-daikanwa-2 . 05905) ; ø¸œ - (ideograph-daikanwa . 05904) ; ø¸œ + (=daikanwa-rev1 . 05905) ; ø¸œ + (=daikanwa-rev2 . 05904) ; ø¸œ )) (define-char '((ideographic-radical . 37) ; ⼤ (ideographic-strokes . 5) (total-strokes . 8) (hanyu-dazidian 1 534 1) - (chinese-cns11643-6 . #x2A5A) ; ø»œ‚· - (ideograph-daikanwa-2 . 05906) ; 𡘂 - (ideograph-daikanwa . 05905) ; ø¸œ‘ - (=hanziku-2 . #xBDD0) ; ý¢€«· - (mojikyo . 005905) ; ý €œ‘ - (=ucs . #x21602) ; 𡘂 + (chinese-cns11643-6 . #x2A5A) ; ø»œ‚· + (=daikanwa-rev1 . 05906) ; 𡘂 + (=daikanwa-rev2 . 05905) ; ø¸œ‘ + (=hanziku-2 . #xBDD0) ; ý¢€«· + (mojikyo . 005905) ; ý €œ‘ + (=ucs . #x21602) ; 𡘂 )) (define-char '((ideographic-radical . 37) ; ⼤ (ideographic-strokes . 5) (total-strokes . 8) - (=jis-x0213-2-2000 . #x2541) ; ø»¤£˜ - (ideograph-daikanwa-2 . 05907) ; 㚙 - (ideograph-daikanwa . 05906) ; ø¸œ’ - (=ucs . #x3699) ; 㚙 + (=jis-x0213-2-2000 . #x2541) ; ø»¤£˜ + (=daikanwa-rev1 . 05907) ; 㚙 + (=daikanwa-rev2 . 05906) ; ø¸œ’ + (=ucs . #x3699) ; 㚙 )) (define-char '((ideographic-radical . 37) ; ⼤ (ideographic-strokes . 5) (total-strokes . 8) (hanyu-dazidian 1 536 4) - (chinese-cns11643-4 . #x2579) ; ø»—§¸ - (ideograph-daikanwa-2 . 05908) ; 𡘆 - (ideograph-daikanwa . 05907) ; ø¸œ“ - (=hanziku-2 . #xBE54) ; ý¢€«¹” - (mojikyo . 005907) ; ý €œ“ - (=ucs . #x21606) ; 𡘆 + (chinese-cns11643-4 . #x2579) ; ø»—§¸ + (=daikanwa-rev1 . 05908) ; 𡘆 + (=daikanwa-rev2 . 05907) ; ø¸œ“ + (=hanziku-2 . #xBE54) ; ý¢€«¹” + (mojikyo . 005907) ; ý €œ“ + (=ucs . #x21606) ; 𡘆 )) (define-char '((ideographic-radical . 37) ; ⼤ (ideographic-strokes . 5) (total-strokes . 8) - (ideograph-daikanwa-2 . 05909) ; 奌 - (ideograph-daikanwa . 05908) ; ø¸œ” - (=jef-china3 . #x48E9) ; øº„£© - (mojikyo . 005908) ; ý €œ” - (=ucs . #x594C) ; 奌 + (=daikanwa-rev1 . 05909) ; 奌 + (=daikanwa-rev2 . 05908) ; ø¸œ” + (=jef-china3 . #x48E9) ; øº„£© + (mojikyo . 005908) ; ý €œ” + (=ucs . #x594C) ; 奌 )) (define-char '((=>ucs . #x594C) ; 奌 @@ -1121,11 +1121,11 @@ '((ideographic-radical . 37) ; ⼤ (ideographic-strokes . 6) (total-strokes . 9) - (chinese-big5 . #xD15A) ; ý¢€…š - (ideograph-daikanwa-2 . 05897) ; 奊 - (ideograph-daikanwa . 05909) ; ø¸œ• - (mojikyo . 005909) ; ý €œ• - (=ucs . #x594A) ; 奊 + (chinese-big5 . #xD15A) ; ý¢€…š + (=daikanwa-rev1 . 05897) ; 奊 + (=daikanwa-rev2 . 05909) ; ø¸œ• + (mojikyo . 005909) ; ý €œ• + (=ucs . #x594A) ; 奊 )) (define-char '((=>ucs . #x594A) ; 奊 diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 03f66e4..34dd0d3 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -170,7 +170,7 @@ chinese-isoir165 katakana-jisx0201 hebrew-iso8859-8 - japanese-jisx0208-1990 + =jis-x0208-1990 chinese-gb12345 latin-viscii ethiopic-ucs @@ -220,9 +220,13 @@ (setq rest (cdr rest)))))) (setq char-spec (list ret)) (dolist (ccs (delq (car ret) (charset-list))) - (if (or (and (charset-iso-final-char ccs) - (setq ret (get-char-attribute char ccs))) - (eq ccs 'ideograph-daikanwa)) + (if (and (or (charset-iso-final-char ccs) + (memq ccs + '(ideograph-daikanwa + =daikanwa-rev2 + ;; =gt-k + ))) + (setq ret (get-char-attribute char ccs))) (setq char-spec (cons (cons ccs ret) char-spec)))) (if (null char-spec) (setq char-spec (split-char char))) @@ -964,8 +968,9 @@ (setq value (get-char-attribute char name))) (insert (format - (cond ((memq name '(ideograph-daikanwa-2 - ideograph-daikanwa + (cond ((memq name '(ideograph-daikanwa + =daikanwa-rev1 + =daikanwa-rev2 =gt =gt-k =cbeta)) (if has-long-ccs-name "(%-26s . %05d)\t; %c%s" diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el index e176fd9..5c9bccc 100644 --- a/lisp/utf-2000/ideograph-util.el +++ b/lisp/utf-2000/ideograph-util.el @@ -169,7 +169,8 @@ ;;;###autoload (defun char-representative-of-daikanwa (char) - (if (get-char-attribute char 'ideograph-daikanwa) + (if (or (encode-char char 'ideograph-daikanwa 'defined-only) + (encode-char char '=daikanwa-rev2 'defined-only)) char (let ((m (get-char-attribute char 'morohashi-daikanwa)) m-m m-s pat) @@ -177,7 +178,8 @@ (setq m-m (pop m)) (setq m-s (pop m)) (if (= m-s 0) - (decode-char 'ideograph-daikanwa m-m) + (or (decode-char '=daikanwa-rev2 m-m 'defined-only) + (decode-char 'ideograph-daikanwa m-m)) (when m (setq pat (list m-m m-s)) (map-char-attribute (lambda (c v) @@ -231,7 +233,8 @@ ;;;###autoload (defun char-daikanwa (char) - (or (get-char-attribute char 'ideograph-daikanwa) + (or (encode-char char 'ideograph-daikanwa 'defined-only) + (encode-char char '=daikanwa-rev2 'defined-only) (get-char-attribute char 'morohashi-daikanwa))) ;;;###autoload