From: tomo Date: Fri, 5 Sep 2008 16:05:09 +0000 (+0000) Subject: Sync up with r21-4-21-chise-0_24-3. X-Git-Tag: r21-4-21-u2km-0_24-3 X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git;a=commitdiff_plain;h=b732eb058855429b28390f820ddc1ed4f8f76093 Sync up with r21-4-21-chise-0_24-3. --- diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index ed6d774..f23a4ab 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,17 @@ +2008-09-04 MORIOKA Tomohiko + + * Ideograph-R085-Water.el (B-D24C): Moved to U+6D58. + (U+6D5A): Use `->denotational' and `->subsumptive'. + (U+6D5B): Use `->subsumptive'. + +2008-09-04 MORIOKA Tomohiko + + * Ideograph-R130-Meat.el (B-D061): Moved to U+80CA. + (U+80CB): Use `->subsumptive'. + + * Ideograph-R075-Tree.el (U+69CF): Use `->denotational'. + (U+69D0): Use `->subsumptive'. + 2008-08-21 MORIOKA Tomohiko * char-db-util.el (char-db-insert-ccs-feature): Add setting for diff --git a/lisp/utf-2000/Ideograph-R075-Tree.el b/lisp/utf-2000/Ideograph-R075-Tree.el index 6604f64..217896c 100644 --- a/lisp/utf-2000/Ideograph-R075-Tree.el +++ b/lisp/utf-2000/Ideograph-R075-Tree.el @@ -16120,54 +16120,62 @@ )) )) (define-char - '((=>ucs . #x69CF) ; 槏 - (ideographic-radical . 75) ; ⽊ + '((ideographic-radical . 75) ; ⽊ (ideographic-strokes . 10) (total-strokes . 14) - (=daikanwa . 15321) ; &M-15321; + (=ucs . #x69CF) ; 槏 + (=big5 . #xE256) ; &I-B-E256; )) (define-char - '((morohashi-daikanwa 15321 0 2) + '((<-denotational + ((=ucs . #x69CF) ; 槏 + )) (ideographic-radical . 75) ; ⽊ (ideographic-strokes . 10) (total-strokes . 14) - (=ucs . #x69CF) ; 槏 - (=cns11643-2 . #x4A7C) ; &I-C2-4A7C; [42-92] + (=daikanwa . 15321) ; &M-15321; )) (define-char - '((=>ucs . #x69CF) ; 槏 - (morohashi-daikanwa 15321 0 4) + '((<-denotational + ((=ucs . #x69CF) ; 槏 + )) (ideographic-radical . 75) ; ⽊ (ideographic-strokes . 10) (total-strokes . 14) - (=jis-x0213-1-2000 . #x757D) ; &JX1-757D; [85-93] - (=big5 . #xE256) ; &I-B-E256; - (=ucs@jis . #x69CF) ; &JX1-757D; - (=ucs@big5 . #x69CF) ; &JX1-757D; + (=cns11643-2 . #x4A7C) ; &C2-4A7C; [42-92] + (=ucs@unicode . #x69CF) ; &C2-4A7C; )) (define-char - '((=>ucs . #x69D0) ; 槐 + '((<-denotational + ((=ucs . #x69CF) ; 槏 + )) (ideographic-radical . 75) ; ⽊ (ideographic-strokes . 10) (total-strokes . 14) - (=jis-x0208 . #x5C47) ; >-19448; [60-39] - (=ks-x1001 . #x4E59) ; &I-K0-4E59; [46-57] - (=cns11643-1 . #x6932) ; &I-C1-6932; [73-18] - (=big5 . #xBA69) ; &I-B-BA69; - (=gt . 19448) ; &I-GT-19448; - (=gt-pj-1 . #x5C47) ; &I-GT-19448; [60-39] - (=daikanwa . 15323) ; &I-M-15323; - (=shinjigen@rev . 3744) ; >-19448; - (=ucs@jis . #x69D0) ; >-19448; - (=ucs@big5 . #x69D0) ; >-19448; + (=jis-x0213-1-2000 . #x757D) ; &JX1-757D; [85-93] + (=ucs@jis . #x69CF) ; &JX1-757D; )) (define-char - '((morohashi-daikanwa 15323 0 1) - (ideographic-radical . 75) ; ⽊ - (ideographic-strokes . 9) - (total-strokes . 13) + '((ideographic-radical . 75) ; ⽊ (=ucs . #x69D0) ; 槐 - (=gb2312 . #x3B31) ; &I-G0-3B31; [27-17] + (=big5 . #xBA69) ; &I-B-BA69; + (->subsumptive + ((ideographic-strokes . 10) + (total-strokes . 14) + (=jis-x0208 . #x5C47) ; >-19448; [60-39] + (=ks-x1001 . #x4E59) ; &I-K0-4E59; [46-57] + (=cns11643-1 . #x6932) ; &I-C1-6932; [73-18] + (=gt . 19448) ; &I-GT-19448; + (=gt-pj-1 . #x5C47) ; &I-GT-19448; [60-39] + (=daikanwa . 15323) ; &I-M-15323; + (=shinjigen@rev . 3744) ; >-19448; + (=ucs@jis . #x69D0) ; >-19448; + ) + ((ideographic-strokes . 9) + (total-strokes . 13) + (=gb2312 . #x3B31) ; &G0-3B31; [27-17] + (=ucs@unicode . #x69D0) ; &G0-3B31; + )) )) (define-char '((ideographic-radical . 75) ; ⽊ diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el index 727d03f..ac9fbda 100644 --- a/lisp/utf-2000/Ideograph-R085-Water.el +++ b/lisp/utf-2000/Ideograph-R085-Water.el @@ -5562,9 +5562,9 @@ (ideographic-strokes . 7) (total-strokes . 10) (=ucs . #x6D58) ; 浘 + (=big5 . #xD24C) ; &I-B-D24C; (->subsumptive ((=jis-x0213-1-2000 . #x7667) ; &M-17457; [86-71] - (=big5 . #xD24C) ; &I-B-D24C; (=daikanwa . 17457) ; &I-M-17457; (=ucs@unicode . #x6D58) ; &M-17457; ) @@ -5588,60 +5588,64 @@ (=shinjigen@rev . 4224) ; 浙 )) (define-char - '((=>ucs . #x6D5A) ; 浚 + '((ideographic-radical . 85) ; ⽔ + (ideographic-strokes . 7) + (total-strokes . 10) + (=ucs . #x6D5A) ; 浚 + (=big5 . #xAF43) ; &I-B-AF43; + )) +(define-char + '((<-denotational + ((=ucs . #x6D5A) ; 浚 + )) (ideographic-radical . 85) ; ⽔ (ideographic-strokes . 7) (total-strokes . 10) - (=daikanwa . 17460) ; &M-17460; + (->subsumptive + ((=daikanwa . 17460) ; &M-17460; + ) + ((=cns11643-1 . #x5646) ; &C1-5646; [54-38] + )) )) (define-char - '((=>ucs . #x6D5A) ; 浚 - (morohashi-daikanwa 17460 0 0) + '((<-denotational + ((=ucs . #x6D5A) ; 浚 + )) (ideographic-radical . 85) ; ⽔ (ideographic-strokes . 7) (total-strokes . 10) - (=cns11643-1 . #x5646) ; &C1-5646; [54-38] + (=gb2312 . #x3F23) ; &G0-3F23; [31-03] + (=ucs@unicode . #x6D5A) ; &G0-3F23; )) (define-char - '((=>ucs . #x6D5A) ; 浚 - (morohashi-daikanwa 17460 0 1) + '((<-denotational + ((=ucs . #x6D5A) ; 浚 + )) (ideographic-radical . 85) ; ⽔ (ideographic-strokes . 7) (total-strokes . 10) (=jis-x0208 . #x5E34) ; >-22350; [62-20] (=ks-x1001 . #x715D) ; &I-K0-715D; [81-61] - (=big5 . #xAF43) ; &I-B-AF43; (=gt . 22350) ; &I-GT-22350; (=gt-pj-1 . #x5E34) ; &I-GT-22350; [62-20] (=shinjigen@rev . 4213) ; >-22350; (=ucs@jis . #x6D5A) ; >-22350; )) (define-char - '((morohashi-daikanwa 17460 0 2) - (ideographic-radical . 85) ; ⽔ - (ideographic-strokes . 7) - (total-strokes . 10) - (=ucs . #x6D5A) ; 浚 - (=gb2312 . #x3F23) ; &I-G0-3F23; [31-03] - )) -(define-char - '((=>ucs . #x6D5B) ; 浛 - (ideographic-radical . 85) ; ⽔ - (ideographic-strokes . 7) - (total-strokes . 10) - (=cns11643-3 . #x3179) ; &M-17461; [17-89] - (=jis-x0213-2-2000 . #x6E52) ; &I-JX2-6E52; [78-50] - (=daikanwa . 17461) ; &I-M-17461; - (=cbeta . 01890) ; &I-CB01890; - (=ucs@jis . #x6D5B) ; &M-17461; - )) -(define-char - '((morohashi-daikanwa 17461 0 0) - (ideographic-radical . 85) ; ⽔ + '((ideographic-radical . 85) ; ⽔ (ideographic-strokes . 7) (total-strokes . 10) (=ucs . #x6D5B) ; 浛 - (=iso-ir165 . #x7C7E) ; &I-EGB-7C7E; [92-94] + (->subsumptive + ((=cns11643-3 . #x3179) ; &M-17461; [17-89] + (=jis-x0213-2-2000 . #x6E52) ; &I-JX2-6E52; [78-50] + (=daikanwa . 17461) ; &I-M-17461; + (=cbeta . 01890) ; &I-CB01890; + (=ucs@jis . #x6D5B) ; &M-17461; + ) + ((=iso-ir165 . #x7C7E) ; &EGB-7C7E; [92-94] + (=ucs@unicode . #x6D5B) ; &EGB-7C7E; + )) )) (define-char '((ideographic-radical . 85) ; ⽔ diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el index 1a34a2f..646c704 100644 --- a/lisp/utf-2000/Ideograph-R130-Meat.el +++ b/lisp/utf-2000/Ideograph-R130-Meat.el @@ -2359,9 +2359,9 @@ (ideographic-strokes . 5) (total-strokes . 9) (=ucs . #x80CA) ; 胊 + (=big5 . #xD061) ; &I-B-D061; (->subsumptive ((=jis-x0213-1-2000 . #x7A4A) ; &M-29360; [90-42] - (=big5 . #xD061) ; &I-B-D061; (=daikanwa . 29360) ; &I-M-29360; (=ucs@jis . #x80CA) ; &M-29360; ) @@ -2389,15 +2389,12 @@ (ideographic-strokes . 5) (total-strokes . 9) (=ucs . #x80CB) ; 胋 - (=daikanwa . 29362) ; &I-M-29362; - )) -(define-char - '((=>ucs . #x80CB) ; 胋 - (morohashi-daikanwa 29362 0 0) - (ideographic-radical . 130) ; ⾁ - (ideographic-strokes . 5) - (total-strokes . 9) - (=cns11643-3 . #x2E60) ; &C3-2E60; [14-64] + (->subsumptive + ((=daikanwa . 29362) ; &M-29362; + (=ucs@unicode . #x80CB) ; &M-29362; + ) + ((=cns11643-3 . #x2E60) ; &C3-2E60; [14-64] + )) )) (define-char '((ideographic-radical . 130) ; ⾁