From: tomo Date: Tue, 13 Jan 2004 22:46:55 +0000 (+0000) Subject: Sync up with r21-4-14-chise-0_21-18. X-Git-Tag: r21-2-44-utf-2000-m0_18-n0_21-18~1 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=053c4d40147ee3eef7d0a094d57e7c8b6de8d3e4;p=chise%2Fxemacs-chise.git Sync up with r21-4-14-chise-0_21-18. --- diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index 25ed4d6..baced92 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,38 @@ +2004-01-13 MORIOKA Tomohiko + + * Ideograph-R019-Power.el (U+52B4): Use `script', `<-simplified' + and `<-simplified*sources' instead of `comment'. + + * char-db-util.el (insert-char-attributes): Delete formatter for + `simplified-ideograph-of' and `ideographic-different-form-of'. + + * Ideograph-R058-Snout.el (U-00022450): Use + `<-vulgar-ideograph*sources' instead of char-ref in + `<-vulgar-ideograph'. + (U+5F53): Use `<-simplified' and `<-simplified*sources' instead of + `simplified-ideograph-of'. + +2004-01-12 MORIOKA Tomohiko + + * Ideograph-R211-Tooth.el, Ideograph-R181-Leaf.el, + Ideograph-R170-Mound.el, Ideograph-R165-Distinguish.el, + Ideograph-R167-Gold.el, Ideograph-R164-Wine.el, + Ideograph-R162-Walk.el, Ideograph-R138-Stopping.el, + Ideograph-R156-Run.el, Ideograph-R117-Stand.el, + Ideograph-R113-Spirit.el, Ideograph-R108-Dish.el, + Ideograph-R094-Dog.el, Ideograph-R086-Fire.el, + Ideograph-R085-Water.el, Ideograph-R075-Tree.el, + Ideograph-R072-Sun.el, Ideograph-R052-Short-Thread.el, + Ideograph-R064-Hand.el, Ideograph-R041-Inch.el, + Ideograph-R036-Evening.el, Ideograph-R037-Big.el, + Ideograph-R032-Earth.el, Ideograph-R031-Enclosure.el, + Ideograph-R030-Mouth.el, Ideograph-R028-Private.el, + Ideograph-R027-Cliff.el, Ideograph-R024-Ten.el, + Ideograph-R023-Hiding-Enclosure.el, Ideograph-R019-Power.el, + Ideograph-R018-Knife.el, Ideograph-R008-Lid.el, + Ideograph-R002-Line.el: Rename `<-simplified-ideograph' to + `<-simplified'. + 2004-01-09 MORIOKA Tomohiko * ideograph-util.el (total-strokes-string<): Abolished. diff --git a/lisp/utf-2000/Ideograph-R002-Line.el b/lisp/utf-2000/Ideograph-R002-Line.el index af1c15b..29ffe1f 100644 --- a/lisp/utf-2000/Ideograph-R002-Line.el +++ b/lisp/utf-2000/Ideograph-R002-Line.el @@ -438,7 +438,7 @@ '((ideographic-radical . 2) ; ⼁ (ideographic-strokes . 7) (total-strokes . 8) - (<-simplified-ideograph + (<-simplified ((=daikanwa . 00084) ; ø¸€” )) (=big5-cdp . #x89CD) ; ý¢€ˆ§ diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el index 4d4e50d..32101c4 100644 --- a/lisp/utf-2000/Ideograph-R008-Lid.el +++ b/lisp/utf-2000/Ideograph-R008-Lid.el @@ -195,7 +195,7 @@ '((ideographic-radical . 8) ; ⼇ (ideographic-strokes . 3) (total-strokes . 5) - (<-simplified-ideograph + (<-simplified ((=daikanwa . 45313) ; ø¸‹„ )) (ideographic-structure @@ -712,7 +712,7 @@ '((ideographic-radical . 8) ; ⼇ (ideographic-strokes . 5) (total-strokes . 7) - (<-simplified-ideograph + (<-simplified ((=daikanwa . 45313) ; ø¸‹„ )) (ideographic-structure diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el index 60f7a5e..4c16add 100644 --- a/lisp/utf-2000/Ideograph-R018-Knife.el +++ b/lisp/utf-2000/Ideograph-R018-Knife.el @@ -4638,7 +4638,7 @@ (ideographic-radical . 18) ; ⼑ (ideographic-strokes . 8) (total-strokes . 10) - (<-simplified-ideograph + (<-simplified (:char ((shinjigen-1 . 653) (=daikanwa . 02228) ; ø¸€¢´ ) @@ -4670,7 +4670,7 @@ (ideographic-radical . 18) ; ⼑ (ideographic-strokes . 8) (total-strokes . 10) - (<-simplified-ideograph + (<-simplified (:sources (shinjigen-1) :char ((shinjigen-1 . 659) (=jis-x0208 . #x517D) ; ø½Š½¸ @@ -5389,7 +5389,7 @@ (ideographic-radical . 18) ; ⼑ (ideographic-strokes . 9) (total-strokes . 11) - (<-simplified-ideograph + (<-simplified ((=ucs . #x5294) ; 劔 )) (=jef-china3 . #x44CF) ; øº„“ @@ -5399,7 +5399,7 @@ (ideographic-radical . 18) ; ⼑ (ideographic-strokes . 9) (total-strokes . 11) - (<-simplified-ideograph + (<-simplified ((=ucs . #x5294) ; 劔 )) (ideographic-structure @@ -5418,7 +5418,7 @@ (ideographic-radical . 18) ; ⼑ (ideographic-strokes . 9) (total-strokes . 11) - (<-simplified-ideograph + (<-simplified ((=ucs . #x5294) ; 劔 )) (ideographic-structure @@ -5437,7 +5437,7 @@ (ideographic-radical . 18) ; ⼑ (ideographic-strokes . 9) (total-strokes . 11) - (<-simplified-ideograph + (<-simplified ((=jis-x0208 . #x5179) ; ø½Š½´ (=daikanwa . 02245) ; ø¸€£… )) diff --git a/lisp/utf-2000/Ideograph-R019-Power.el b/lisp/utf-2000/Ideograph-R019-Power.el index b020218..644fad1 100644 --- a/lisp/utf-2000/Ideograph-R019-Power.el +++ b/lisp/utf-2000/Ideograph-R019-Power.el @@ -743,7 +743,7 @@ (ideographic-radical . 19) ; ⼒ (ideographic-strokes . 5) (total-strokes . 7) - (<-simplified-ideograph + (<-simplified (:sources (sougen-irai-zokujifu morohashi-daikanwa shinjigen-1) :char ((shinjigen-1 . 716) (=daikanwa . 02472) ; ø¸€¦¨ @@ -840,10 +840,16 @@ (=jef-china3 . #x82B2) ; øºˆŠ² )) (define-char - '((ideographic-radical . 19) ; ⼒ + '((script JP-Jouyou Ideograph) + (ideographic-radical . 19) ; ⼒ (ideographic-strokes . 5) (total-strokes . 7) - (comment . "[JP-Jouyou] of S1-0718") + (<-simplified + ((shinjigen-1 . 718) + (=daikanwa . 02410) ; ø¸€¥ª + )) + (<-simplified*sources + shinjigen-1) (shinjigen-1 . 717) (shinjigen-2 . 717) (=ucs . #x52B4) ; 労 @@ -2780,10 +2786,10 @@ (ideographic-radical . 19) ; ⼒ (ideographic-strokes . 10) (total-strokes . 12) - (<-simplified-ideograph + (<-simplified ((=daikanwa . 02424) ; ø¸€¥¸ )) - (<-simplified-ideograph*sources + (<-simplified*sources daikanwa) (<-vulgar-ideograph ((shinjigen-1 . 744) @@ -3195,7 +3201,7 @@ (ideographic-radical . 19) ; ⼒ (ideographic-strokes . 11) (total-strokes . 13) - (<-simplified-ideograph + (<-simplified (:char ((shinjigen-1 . 751) (=daikanwa . 02486) ; ø¸€¦¶ ) diff --git a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el index ac732ad..3214aaa 100644 --- a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el +++ b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el @@ -90,7 +90,7 @@ (ideographic-radical . 23) ; ⼖ (ideographic-strokes . 2) (total-strokes . 4) - (<-simplified-ideograph + (<-simplified (:sources (morohashi-daikanwa) :char ((=daikanwa . 02691) ; ø¸€ªƒ ) @@ -112,7 +112,7 @@ (ideographic-radical . 23) ; ⼖ (ideographic-strokes . 2) (total-strokes . 4) - (<-simplified-ideograph + (<-simplified (:sources (shinjigen-1) :char ((shinjigen-1 . 802) (=daikanwa . 02691) ; ø¸€ªƒ diff --git a/lisp/utf-2000/Ideograph-R024-Ten.el b/lisp/utf-2000/Ideograph-R024-Ten.el index 5344192..fc30d4d 100644 --- a/lisp/utf-2000/Ideograph-R024-Ten.el +++ b/lisp/utf-2000/Ideograph-R024-Ten.el @@ -373,7 +373,7 @@ '((ideographic-radical . 24) ; ⼗ (ideographic-strokes . 3) (total-strokes . 5) - (<-simplified-ideograph + (<-simplified ((=daikanwa . 07833) ; ø¸º™ )) (mojikyo . 071896) ; ý €‘£˜ @@ -382,8 +382,7 @@ '((ideographic-radical . 24) ; ⼗ (ideographic-strokes . 3) (total-strokes . 5) - (->mojikyo . 071896) ; ý €‘£˜ - (<-simplified-ideograph + (<-simplified ((=daikanwa . 07833) ; ø¸º™ )) (=big5-cdp . #x8B75) ; ý¢€ˆ­µ @@ -1109,7 +1108,7 @@ (ideographic-radical . 24) ; ⼗ (ideographic-strokes . 7) (total-strokes . 9) - (<-simplified-ideograph + (<-simplified (:char ((shinjigen-1 . 1170) (=daikanwa . 03993) ; ø¸€¾™ ) diff --git a/lisp/utf-2000/Ideograph-R027-Cliff.el b/lisp/utf-2000/Ideograph-R027-Cliff.el index 0f28166..7be3044 100644 --- a/lisp/utf-2000/Ideograph-R027-Cliff.el +++ b/lisp/utf-2000/Ideograph-R027-Cliff.el @@ -3089,7 +3089,7 @@ (ideographic-radical . 27) ; ⼚ (ideographic-strokes . 15) (total-strokes . 17) - (<-simplified-ideograph + (<-simplified (:sources (morohashi-daikanwa shinjigen-1) :char ((ideographic-radical . 30) ; ⼝ (shinjigen-1 . 1286) diff --git a/lisp/utf-2000/Ideograph-R028-Private.el b/lisp/utf-2000/Ideograph-R028-Private.el index 3182858..aa13ceb 100644 --- a/lisp/utf-2000/Ideograph-R028-Private.el +++ b/lisp/utf-2000/Ideograph-R028-Private.el @@ -590,7 +590,7 @@ (ideographic-radical . 28) ; ⼛ (ideographic-strokes . 6) (total-strokes . 8) - (<-simplified-ideograph + (<-simplified (:sources (morohashi-daikanwa shinjigen-1) :char ((shinjigen-1 . 893) (=daikanwa . 03098) ; ø¸€°š diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el index 930c9b3..b9a03ce 100644 --- a/lisp/utf-2000/Ideograph-R030-Mouth.el +++ b/lisp/utf-2000/Ideograph-R030-Mouth.el @@ -30066,10 +30066,10 @@ (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 15) (total-strokes . 18) - (<-simplified-ideograph + (<-simplified ((=daikanwa . 04633) ; ø¸ˆ™ )) - (<-simplified-ideograph*sources + (<-simplified*sources daikanwa) (=ucs . #x56A2) ; 嚢 (=jis-x0208-1983 . #x4739) ; ø»‡ˆ”