(A-IWDSU+5A1B): New abstract node.

(A-J0-3864): Add `<-denotational' for A-IWDSU+5A1B; unify A-JU+5A2F;
add `ideographic-structure'.
(U+5A1B): Add `<-denotational@usage' for BUCS+5A1B; apply new
conventions for glyph granularity.
(U-0002F863): Use U+5A1B instead of A-J0-3864 as its mother.
(U+5A31): Use `->denotational' and `->subsumptive'; add
`<-denotational' for A-IWDSU+5A1B; add `<-denotational@usage' for
BUCS+5A1B.
(U+5A2F): Add `<-denotational@usage' for BUCS+5A1B.
(BUCS+5A1B): New abstract node; unify A2-DJT-02118.

diff --git a/lisp/utf-2000/Ideograph-R038-Woman.el b/lisp/utf-2000/Ideograph-R038-Woman.el
index f0b24f5..787a918 100644 (file)
--- a/lisp/utf-2000/Ideograph-R038-Woman.el
+++ b/lisp/utf-2000/Ideograph-R038-Woman.el
@@ -15684,14 +15684,43 @@
     ))
 (define-char
   '((ideographic-radical . 38) ; ⼥
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x5973)     ; 女
+      )
+     ((=>ucs@iwds-1      . #x5433)     ; &A-IWDSU+5433;
+      (=>iwds-1                  .  0313)      ; &A-IWDSU+5433;
+      ))
+    (=>ucs@iwds-1      . #x5A1B)       ; &A-IWDSU+5A1B;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@iwds-1      . #x5A1B)     ; &A-IWDSU+5A1B;
+      ))
+    (ideographic-radical . 38) ; ⼥
     (ideographic-strokes . 7)
     (total-strokes      . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x5973)     ; 女
+      )
+     ((=>jis-x0208       . #x3862)     ; &J97-3862; [24-66]
+      ))
+    (=>ucs@jis         . #x5A2F)       ; &J97-3864;
     (=>jis-x0208       . #x3864)       ; &J97-3864; [24-68]
     (=>jis-x0213-1     . #x3864)       ; &J97-3864; [24-68]
     ))
 (define-char
   '((<-denotational
-     ((=>jis-x0208       . #x3864)     ; &J97-3864; [24-68]
+     ((=>ucs@jis         . #x5A2F)     ; &J97-3864;
+      (=>jis-x0208       . #x3864)     ; &J97-3864; [24-68]
+      ))
+    (<-denotational@usage
+     ((==>ucs@bucs       . #x5A1B)     ; &BUCS+5A1B;
       ))
     (ideographic-radical . 38) ; ⼥
     (ideographic-strokes . 7)
@@ -15706,13 +15735,32 @@
       ))
     (sound@ja/on       "gu" "go")
     (=ucs              . #x5A1B)       ; 娛
-    (=mj               . 009717)       ; &I-MJ009717;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x5A1B)     ; 娛
+      ))
+    (ideographic-radical . 38) ; ⼥
+    (ideographic-strokes . 7)
+    (total-strokes      . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x5973)     ; 女
+      )
+     ((=ucs@unicode      . #x5433)     ; &AJ1-13760;
+      (=adobe-japan1-4   . 13760)      ; &AJ1-13760;
+      ))
+    (=ucs@unicode      . #x5A1B)       ; &MJ009717;
+    (=mj               . 009717)       ; &MJ009717;
     (=adobe-japan1-4   . 13761)        ; &I-AJ1-13761;
     (=ks-x1001         . #x6774)       ; &I-K0-6774; [71-84]
     (=cns11643-1       . #x5476)       ; &I-C1-5476; [52-86]
     (=big5             . #xAE54)       ; &I-B-AE54;
-    (=koseki           . 072050)       ; 娛
+    (=koseki           . 072050)       ; &MJ009717;
     (=daikanwa         . 06307)        ; &I-M-06307;
+    (=daijiten         . 02118)        ; &I-DJT-02118;
     (=jef-china3       . #x49BA)       ; &I-JC3-49BA;
     (<-formed
      ((=ucs@unicode      . #x5A2F)     ; &MJ009741;
@@ -15740,10 +15788,13 @@
       (==ks-x1001        . #x6774)     ; &g2-MJ009717; [71-84]
       (==koseki                  . 072050)     ; &g2-MJ009717;
       (==daikanwa        . 06307)      ; &g2-MJ009717;
+      (==daijiten        . 02118)      ; &g2-MJ009717;
       (==jef-china3      . #x49BA)     ; &g2-MJ009717;
       (->subsumptive
        ((===daikanwa       . 06307)    ; &R-M-06307;
        )
+       ((===daijiten       . 02118)    ; &R-DJT-02118;
+       )
        ((===mj             . 009717)   ; &R-MJ009717;
        )
        ((===jef-china3     . #x49BA)   ; &R-JC3-49BA;
@@ -15767,7 +15818,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>jis-x0208       . #x3864)     ; &J97-3864; [24-68]
+     ((=ucs              . #x5A1B)     ; 娛
       ))
     (=>ucs*            . #x5A1B)       ; 娛
     (ideographic-radical . 38) ; ⼥
@@ -15790,7 +15841,61 @@
     ))
 (define-char
   '((<-denotational
-     ((=>jis-x0208       . #x3864)     ; &J97-3864; [24-68]
+     ((=>ucs@iwds-1      . #x5A1B)     ; &A-IWDSU+5A1B;
+      ))
+    (<-denotational@usage
+     ((==>ucs@bucs       . #x5A1B)     ; &BUCS+5A1B;
+      ))
+    (ideographic-radical . 38) ; ⼥
+    (ideographic-strokes . 7)
+    (total-strokes      . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x5973)     ; 女
+      )
+     ((=ucs              . #x5434)     ; 吴
+      ))
+    (=ucs              . #x5A31)       ; 娱
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x5A31)     ; 娱
+      ))
+    (ideographic-radical . 38) ; ⼥
+    (ideographic-strokes . 7)
+    (total-strokes      . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x5973)     ; 女
+      )
+     ((=ucs@unicode      . #x5434)     ; &AJ1-19223;
+      (=adobe-japan1-5   . 19223)      ; &AJ1-19223;
+      ))
+    (=ucs@unicode      . #x5A31)       ; &C3-304B;
+    (=gb2312           . #x5369)       ; &C3-304B; [51-73]
+    (=cns11643-3       . #x304B)       ; &I-C3-304B; [16-43]
+    (->subsumptive
+     ((==ucs@unicode     . #x5A31)     ; &g2-UU+5A31;
+      (==gb2312                  . #x5369)     ; &g2-UU+5A31; [51-73]
+      (->subsumptive
+       ((===ucs@unicode            . #x5A31)   ; &R-UU+5A31;
+       ))
+      )
+     ((==ucs@cns         . #x5A31)     ; &g2-CU+5A31;
+      (==cns11643-3      . #x304B)     ; &g2-CU+5A31; [16-43]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@jis         . #x5A2F)     ; &J97-3864;
+      (=>jis-x0208       . #x3864)     ; &J97-3864; [24-68]
+      ))
+    (<-denotational@usage
+     ((==>ucs@bucs       . #x5A1B)     ; &BUCS+5A1B;
       ))
     (ideographic-radical . 38) ; ⼥
     (ideographic-strokes . 7)
@@ -18540,20 +18645,6 @@
   '((ideographic-radical . 38) ; ⼥
     (ideographic-strokes . 7)
     (total-strokes      . 10)
-    (=ucs              . #x5A31)       ; 娱
-    (=gb2312           . #x5369)       ; &I-G0-5369; [51-73]
-    ))
-(define-char
-  '((=>ucs             . #x5A31)       ; 娱
-    (ideographic-radical . 38) ; ⼥
-    (ideographic-strokes . 7)
-    (total-strokes      . 10)
-    (=cns11643-3       . #x304B)       ; &C3-304B; [16-43]
-    ))
-(define-char
-  '((ideographic-radical . 38) ; ⼥
-    (ideographic-strokes . 7)
-    (total-strokes      . 10)
     (=ucs              . #x5A32)       ; 娲
     (=gb2312           . #x6634)       ; &I-G0-6634; [70-20]
     ))
@@ -55108,6 +55199,11 @@
     ))
 (define-char
   '((ideographic-radical . 38) ; ⼥
+    (==>ucs@bucs       . #x5A1B)       ; &BUCS+5A1B;
+    (==>daijiten       . 02118)        ; &BUCS+5A1B;
+    ))
+(define-char
+  '((ideographic-radical . 38) ; ⼥
     (==>ucs@bucs       . #x5AFA)       ; &BUCS+5AFA;
     (==>daijiten       . 02226)        ; &BUCS+5AFA;
     ))