(U+5167): Apply new conventions for glyph granularity.

(U+5167-var-001): Unify U+5167-var-004.
(A-IWDSU+5167): Omit `<-denotational@usage' for BUCS+5167.
(U+5185): Add <-denotational@usage' for BUCS+5167; apply new
conventions for glyph granularity.
(BUCS+5167): Unify A2-DJT-00585.

diff --git a/lisp/utf-2000/Ideograph-R011-Enter.el b/lisp/utf-2000/Ideograph-R011-Enter.el
index a6bf137..02f4477 100644 (file)
--- a/lisp/utf-2000/Ideograph-R011-Enter.el
+++ b/lisp/utf-2000/Ideograph-R011-Enter.el
@@ -226,12 +226,11 @@
       (=>jis-x0208       . #x4662)     ; &J97-4662; [38-66]
       ))
     (<-denotational@usage
-     ((==>daijiten       . 00585)      ; &A2-DJT-00585;
+     ((==>ucs@bucs       . #x5167)     ; &BUCS+5167;
       ))
     (ideographic-radical . 11) ; ⼊
     (ideographic-strokes . 2)
     (total-strokes      . 4)
-    (hanyu-dazidian    1 97 2)
     (ideographic-structure
      ((name              . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
       (=ucs              . #x2FFB)     ; ⿻
@@ -241,12 +240,29 @@
      ((=ucs              . #x5165)     ; 入
       ))
     (=ucs              . #x5167)       ; 內
-    (=adobe-japan1-4   . 13966)        ; &I-AJ1-13966;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x5167)     ; 內
+      ))
+    (ideographic-radical . 11) ; ⼊
+    (ideographic-strokes . 2)
+    (total-strokes      . 4)
+    (hanyu-dazidian    1 97 2)
+    (ideographic-structure
+     ((=ucs-itaiji-001   . #x2FF1)     ; &U-i001+2FF1;
+      )
+     ((=ucs              . #x5165)     ; 入
+      )
+     ((=ucs              . #x5182)     ; 冂
+      ))
+    (=ucs@unicode      . #x5167)       ; &AJ1-13966;
+    (=adobe-japan1-4   . 13966)        ; &AJ1-13966;
     (=ks-x1001         . #x522E)       ; &I-K0-522E; [50-14]
     (=cns11643-1       . #x4479)       ; &I-C1-4479; [36-89]
     (=daikanwa         . 01418)        ; &I-M-01418;
     (=daijiten         . 00585)        ; &I-DJT-00585;
-    (=shinjigen                .  0482)        ; 內
+    (=shinjigen                .  0482)        ; &AJ1-13966;
     (=jef-china3       . #x43DE)       ; &I-JC3-43DE;
     (->subsumptive
      ((=decomposition@cid
@@ -293,6 +309,7 @@
     (ideographic-strokes . 2)
     (total-strokes      . 4)
     (=ucs-var-001      . #x5167)       ; &U-v001+5167;
+    (=ucs-var-004      . #x5167)       ; &U-v001+5167;
     ))
 (define-char
   '((<-denotational@component
@@ -469,10 +486,7 @@
       ))
     ))
 (define-char
-  '((<-denotational@usage
-     ((==>ucs@bucs       . #x5167)     ; &BUCS+5167;
-      ))
-    (ideographic-radical@ucs . 13)     ; ⼌
+  '((ideographic-radical@ucs . 13)     ; ⼌
     (ideographic-strokes@ucs . 2)
     (ideographic-radical@ucs*sources
      daikanwa=01512 cns11643-6 ucs=0x5185)
@@ -499,38 +513,15 @@
       (=>ucs@jis         . #x5185)     ; &J97-4662;
       (=>jis-x0208       . #x4662)     ; &J97-4662; [38-66]
       ))
+    (<-denotational@usage
+     ((==>ucs@bucs       . #x5167)     ; &BUCS+5167;
+      ))
     (ideographic-radical@ucs . 13)     ; ⼌
     (ideographic-strokes@ucs . 2)
-    (ideographic-radical@ucs*sources
-     daikanwa cns11643-6 ucs)
     (ideographic-radical@cns . 9)      ; ⼈
     (ideographic-strokes@cns . 2)
-    (ideographic-radical@cns*sources
-     cns11643-3 daikanwa)
     (total-strokes      . 4)
     (=ucs              . #x5185)       ; 内
-    (=adobe-japan1-0   . 03258)        ; &I-AJ1-03258;
-    (=jis-x0208                . #x4662)       ; &I-J90-4662; [38-66]
-    (=gb2312           . #x445A)       ; &I-G0-445A; [36-58]
-    (=cns11643-3       . #x2148)       ; &I-C3-2148; [01-40]
-    (=jis-x0213-1      . #x4662)       ; &I-JX1-4662; [38-66]
-    (=big5-cdp         . #x8C57)       ; &I-CDP-8C57;
-    (=gt               . 01983)        ; &I-GT-01983;
-    (=gt-k             . 00547)        ; &I-GT-K00547;
-    (=gt-pj-1          . #x4662)       ; &I-GT-01983; [38-66]
-    (=daikanwa         . 01512)        ; &I-M-01512;
-    (=daikanwa/+p      . 00366)        ; 内
-    (=shinjigen                .  0481)        ; 内
-    (<-same
-     ((=ucs              . #x5167)     ; 內
-      ))
-    (<-same*sources
-     daikanwa=00366/+p)
-    (<-vulgar
-     ((=ucs              . #x5167)     ; 內
-      ))
-    (<-vulgar*sources
-     daikanwa=01512)
     ))
 (define-char
   '((<-denotational
@@ -547,33 +538,111 @@
      cns11643-3 daikanwa=00366/+p)
     (total-strokes      . 4)
     (=ucs              . #x2F814)      ; 內
+    (=ucs@unicode      . #x5185)       ; 內
+    (=ucs@cns          . #x2F814)      ; 內
+    (=adobe-japan1-0   . 03258)        ; &I-AJ1-03258;
+    (=jis-x0208                . #x4662)       ; &I-J90-4662; [38-66]
+    (=gb2312           . #x445A)       ; &I-G0-445A; [36-58]
+    (=cns11643-3       . #x2148)       ; &I-C3-2148; [01-40]
     (=cns11643-6       . #x2150)       ; &I-C6-2150; [01-48]
-    (=gt               . 01982)        ; &I-GT-01982;
-    (=gt-pj-2          . #x3D2C)       ; &I-GT-01982; [29-12]
-    (=>>daikanwa       . 01512)        ; 內
-    (=>>daikanwa/+p    . 00366)        ; 內
+    (=jis-x0213-1      . #x4662)       ; &I-JX1-4662; [38-66]
+    (=big5-cdp         . #x8C57)       ; &I-CDP-8C57;
+    (=gt               . 01983)        ; &I-GT-01983;
+    (=gt-k             . 00547)        ; &I-GT-K00547;
+    (=gt-pj-1          . #x4662)       ; &I-GT-01983; [38-66]
+    (=daikanwa         . 01512)        ; &I-M-01512;
+    (=daikanwa/+p      . 00366)        ; 內
+    (=shinjigen                .  0481)        ; 內
+    (<-same
+     ((=ucs@unicode      . #x5167)     ; &AJ1-13966;
+      (=adobe-japan1-4   . 13966)      ; &AJ1-13966;
+      (=daikanwa         . 01418)      ; &I-M-01418;
+      ))
+    (<-same*sources
+     daikanwa=00366/+p daikanwa)
+    (<-vulgar
+     ((=ucs@unicode      . #x5167)     ; &AJ1-13966;
+      (=adobe-japan1-4   . 13966)      ; &AJ1-13966;
+      (=daikanwa         . 01418)      ; &I-M-01418;
+      ))
+    (<-vulgar*sources
+     daikanwa=01512 daikanwa)
     (->subsumptive
-     ((==ucs@cns         . #x2F814)    ; &g2-GT-01982;
-      (==cns11643-6      . #x2150)     ; &g2-GT-01982; [01-48]
-      (==gt              . 01982)      ; &g2-GT-01982;
-      (==daikanwa        . 01512)      ; &g2-GT-01982;
-      (==daikanwa/+p     . 00366)      ; &g2-GT-01982;
+     ((ideographic-radical@ucs . 13)   ; ⼌
+      (ideographic-strokes@ucs . 2)
+      (ideographic-radical@ucs*sources
+       daikanwa=01512 cns11643-6 ucs)
+      (ideographic-radical@cns . 9)    ; ⼈
+      (ideographic-strokes@cns . 2)
+      (total-strokes      . 4)
+      (=>>ucs@cns        . #x2F814)    ; &GT-01982;
+      (=>>cns11643-6     . #x2150)     ; &GT-01982; [01-48]
+      (=gt               . 01982)      ; &GT-01982;
+      (=gt-pj-2                  . #x3D2C)     ; &GT-01982; [29-12]
+      (=>>daikanwa       . 01512)      ; &GT-01982;
+      (=>>daikanwa/+p    . 00366)      ; &GT-01982;
+      (->subsumptive
+       ((==ucs@cns         . #x2F814)  ; &g2-GT-01982;
+       (==cns11643-6       . #x2150)   ; &g2-GT-01982; [01-48]
+       (==gt               . 01982)    ; &g2-GT-01982;
+       (==daikanwa         . 01512)    ; &g2-GT-01982;
+       (==daikanwa/+p      . 00366)    ; &g2-GT-01982;
+       (->subsumptive
+        ((ideographic-radical . 13)    ; ⼌
+         (ideographic-strokes . 2)
+         (===daikanwa        . 01512)  ; &R-M-01512;
+         )
+        ((ideographic-radical . 13)    ; ⼌
+         (ideographic-strokes . 2)
+         (===cns11643-6      . #x2150) ; &R-C6-2150; [01-48]
+         )
+        ((===gt              . 01982)  ; &R-GT-01982;
+         )
+        ((ideographic-radical . 9)     ; ⼈
+         (ideographic-strokes . 2)
+         (===daikanwa/+p     . 00366)  ; &R-M-p00366;
+         )
+        ((===hng-kak         . 00180)  ; &HNG017-00180;
+         ))
+       ))
+      )
+     ((ideographic-radical . 9)        ; ⼈
+      (ideographic-strokes . 2)
+      (total-strokes      . 4)
+      (==ucs@cns         . #x5185)     ; &g2-CU+5185;
+      (==cns11643-3      . #x2148)     ; &g2-CU+5185; [01-40]
+      )
+     ((ideographic-radical . 13)       ; ⼌
+      (ideographic-strokes . 2)
+      (total-strokes      . 4)
+      (=decomposition@cid
+       ((=ucs              . #x5185)   ; 内
+       )
+       ((=ucs              . #xE0100)  ; 󠄀
+       ))
+      (==ucs@unicode     . #x5185)     ; &g2-AJ1-03258;
+      (==adobe-japan1-0          . 03258)      ; &g2-AJ1-03258;
+      (==gb2312                  . #x445A)     ; &g2-AJ1-03258; [36-58]
+      (==jis-x0208       . #x4662)     ; &g2-AJ1-03258; [38-66]
+      (==jis-x0213-1     . #x4662)     ; &g2-AJ1-03258; [38-66]
+      (==big5-cdp        . #x8C57)     ; &g2-AJ1-03258;
+      (==gt              . 01983)      ; &g2-AJ1-03258;
+      (==gt-k            . 00547)      ; &g2-AJ1-03258;
+      (==shinjigen       .  0481)      ; &g2-AJ1-03258;
       (->subsumptive
-       ((ideographic-radical . 13)     ; ⼌
-       (ideographic-strokes . 2)
-       (===daikanwa        . 01512)    ; &R-M-01512;
+       ((===jis-x0208      . #x4662)   ; &R-J0-4662; [38-66]
+       (===jis-x0213-1     . #x4662)   ; &R-J0-4662; [38-66]
+       )
+       ((===adobe-japan1-0  . 03258)   ; &R-AJ1-03258;
        )
-       ((ideographic-radical . 13)     ; ⼌
-       (ideographic-strokes . 2)
-       (===cns11643-6      . #x2150)   ; &R-C6-2150; [01-48]
+       ((===big5-cdp       . #x8C57)   ; &R-CDP-8C57;
        )
-       ((===gt             . 01982)    ; &R-GT-01982;
+       ((===gt             . 01983)    ; &R-GT-01983;
+       (===gt-k            . 00547)    ; &R-GT-01983;
        )
-       ((ideographic-radical . 9)      ; ⼈
-       (ideographic-strokes . 2)
-       (===daikanwa/+p     . 00366)    ; &R-M-p00366;
+       ((===ucs@unicode            . #x5185)   ; &R-UU+5185;
        )
-       ((===hng-kak        . 00180)    ; &HNG017-00180;
+       ((===hng-kar        . 05810)    ; &HNG018-05810;
        ))
       ))
     ))
@@ -582,6 +651,7 @@
     (ideographic-strokes . 2)
     (total-strokes      . 4)
     (==>ucs@bucs       . #x5167)       ; &BUCS+5167;
+    (==>daijiten       . 00585)        ; &BUCS+5167;
     ))
 (define-char
   '((<-denotational@component