From: MORIOKA Tomohiko Date: Tue, 26 Dec 2017 02:21:14 +0000 (+0900) Subject: Merge branch 'master' into single-inheritance X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f377e85f0822e1240aa4cdb8012df5a1ee97062c;hp=1e20cd0bdcc689472cda526d13e508bc7f39a2fa;p=chise%2Fxemacs-chise.git- Merge branch 'master' into single-inheritance --- diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index 3f24e97..47d2a3e 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,22 @@ +2017-12-25 MORIOKA Tomohiko + + * Ideograph-R079-Weapon.el (A-cgnU+2DBAD): Add `<-denotational' + for A-cgnU+53DA. + + * Ideograph-R072-Sun.el (A-cgnU+6687): Changed from U+6687. + (AJ1-01355): Unify U+6687 instead of UU+6687; use A-cgnU+6687 + instead of U+6687 as its mother. + (HNG-KAR0172-0): Use A-cgnU+6687 instead of U+6687 as its mother. + + * Ideograph-R029-Again.el (A-cgnU+53DA): Changed from U+53DA. + (AJ1-14372): Unify U+53DA instead of UU+53DA; use A-cgnU+53DA + instead of U+53DA as its mother. + (U+53DA-itaiji-003): Use A-cgnU+53DA instead of U+53DA as its + mother. + + * Ideograph-R002-Line.el (U-0002CEF7): Add `<-denotational' for + A-cgnU+53DA. + 2017-12-24 MORIOKA Tomohiko * Ideograph-R122-Net.el (A-IWDSU+7F51): New abstract node; unify diff --git a/lisp/utf-2000/Ideograph-R002-Line.el b/lisp/utf-2000/Ideograph-R002-Line.el index 0288538..d8242a9 100644 --- a/lisp/utf-2000/Ideograph-R002-Line.el +++ b/lisp/utf-2000/Ideograph-R002-Line.el @@ -1303,15 +1303,17 @@ )) )) (define-char - '((ideographic-radical . 2) ; ⼁ + '((<-denotational + ((=>ucs@cognate . #x53DA) ; &A-cgnU+53DA; + )) + (ideographic-radical . 2) ; ⼁ (ideographic-strokes . 9) (total-strokes . 10) (=ucs . #x2CEF7) ; 𬻷 (=mj . 057639) ; &I-MJ057639; (=koseki . 153290) ; 𬻷 (<-formed - ((=ucs@unicode . #x53DA) ; &AJ1-14372; - (=adobe-japan1-4 . 14372) ; &AJ1-14372; + ((=ucs . #x53DA) ; 叚 ) ((=ucs . #x6BB5) ; 段 )) diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el index c888f48..a4dd627 100644 --- a/lisp/utf-2000/Ideograph-R029-Again.el +++ b/lisp/utf-2000/Ideograph-R029-Again.el @@ -2545,11 +2545,11 @@ '((ideographic-radical . 29) ; ⼜ (ideographic-strokes . 7) (total-strokes . 9) - (=ucs . #x53DA) ; 叚 + (=>ucs@cognate . #x53DA) ; &A-cgnU+53DA; )) (define-char '((<-denotational - ((=ucs . #x53DA) ; 叚 + ((=>ucs@cognate . #x53DA) ; &A-cgnU+53DA; )) (ideographic-radical . 29) ; ⼜ (ideographic-strokes . 7) @@ -2563,14 +2563,14 @@ ) ((=big5-cdp . #x8C79) ; &CDP-8C79; )) - (=ucs@unicode . #x53DA) ; &AJ1-14372; - (=adobe-japan1-4 . 14372) ; &AJ1-14372; + (=ucs . #x53DA) ; 叚 + (=adobe-japan1-4 . 14372) ; &I-AJ1-14372; (=jis-x0212 . #x345D) ; &I-JSP-345D; [20-61] (=cns11643-3 . #x2B4F) ; &I-C3-2B4F; [11-47] (=jis-x0213-2 . #x2360) ; &I-JX2-2360; [03-64] (=big5-cdp . #x8C77) ; &I-CDP-8C77; (=daikanwa . 03165) ; &I-M-03165; - (=shinjigen . 0913) ; &AJ1-14372; + (=shinjigen . 0913) ; 叚 (=cbeta . 00556) ; &I-CB00556; (=jef-china3 . #x45F1) ; &I-JC3-45F1; (->subsumptive @@ -2606,12 +2606,15 @@ )) (define-char '((<-denotational - ((=ucs . #x53DA) ; 叚 + ((=>ucs@cognate . #x53DA) ; &A-cgnU+53DA; )) (ideographic-radical . 29) ; ⼜ (ideographic-strokes . 7) (total-strokes . 9) (=ucs-itaiji-003 . #x53DA) ; &U-i003+53DA; + (->subsumptive + ((==ucs-itaiji-003 . #x53DA) ; &g2-U-i003+53DA; + )) )) (define-char '((ideographic-radical . 29) ; ⼜ diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el index 8a1d665..e37effb 100644 --- a/lisp/utf-2000/Ideograph-R072-Sun.el +++ b/lisp/utf-2000/Ideograph-R072-Sun.el @@ -9970,13 +9970,13 @@ ) ((=ucs . #x65E5) ; 日 ) - ((=ucs . #x53DA) ; 叚 + ((=>ucs@cognate . #x53DA) ; &A-cgnU+53DA; )) - (=ucs . #x6687) ; 暇 + (=>ucs@cognate . #x6687) ; &A-cgnU+6687; )) (define-char '((<-denotational - ((=ucs . #x6687) ; 暇 + ((=>ucs@cognate . #x6687) ; &A-cgnU+6687; )) (ideographic-radical . 72) ; ⽇ (ideographic-strokes . 9) @@ -9987,11 +9987,10 @@ ) ((=ucs . #x65E5) ; 日 ) - ((=ucs@unicode . #x53DA) ; &AJ1-14372; - (=adobe-japan1-4 . 14372) ; &AJ1-14372; + ((=ucs . #x53DA) ; 叚 )) - (=ucs@unicode . #x6687) ; &AJ1-01355; - (=adobe-japan1-0 . 01355) ; &AJ1-01355; + (=ucs . #x6687) ; 暇 + (=adobe-japan1-0 . 01355) ; &I-AJ1-01355; (=jis-x0208 . #x324B) ; &I-J90-324B; [18-43] (=gb2312 . #x4F3E) ; &I-G0-4F3E; [47-30] (=ks-x1001 . #x4A2C) ; &I-K0-4A2C; [42-12] @@ -10001,7 +10000,7 @@ (=gt . 17751) ; &I-GT-17751; (=gt-pj-1 . #x324B) ; &I-GT-17751; [18-43] (=daikanwa . 14036) ; &I-M-14036; - (=shinjigen . 3363) ; &AJ1-01355; + (=shinjigen . 3363) ; 暇 (->subsumptive ((=decomposition@cid ((=ucs . #x6687) ; 暇 @@ -10039,7 +10038,7 @@ )) (define-char '((<-denotational - ((=ucs . #x6687) ; 暇 + ((=>ucs@cognate . #x6687) ; &A-cgnU+6687; )) (ideographic-radical . 72) ; ⽇ (ideographic-strokes . 9) diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el index 53c5ac4..49bac8c 100644 --- a/lisp/utf-2000/Ideograph-R079-Weapon.el +++ b/lisp/utf-2000/Ideograph-R079-Weapon.el @@ -791,8 +791,7 @@ (<-formed ((=ucs . #x6BB5) ; 段 ) - ((=ucs@unicode . #x53DA) ; &AJ1-14372; - (=adobe-japan1-4 . 14372) ; &AJ1-14372; + ((=ucs . #x53DA) ; 叚 )) (<-formed$_1*sources koseki) @@ -806,7 +805,10 @@ )) )) (define-char - '((ideographic-radical . 79) ; ⽎ + '((<-denotational + ((=>ucs@cognate . #x53DA) ; &A-cgnU+53DA; + )) + (ideographic-radical . 79) ; ⽎ (ideographic-strokes . 6) (total-strokes . 10) (=>ucs@cognate . #x2DBAD) ; &A-cgnU+2DBAD;