(U+580B): Use `->denotational' instead of `->subsumptive'.

(U+5835): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
`=jis-x0208@1997'.
(J78-4548): Unify JX3-4548.
(J90-4548): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
JX1-4548; use `<-simplified@JP/jis' instead of `<-simplified@JP' for
J78-4548.
(B-D8AD): Moved to abstract node.
(U+5858): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
`=jis-x0208@1997'.
(U+585A): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
(U+FA10): Unify abstract JX1-2F57.
(JX1-2F57): Add S2-1441.
(U+FA7C): Unify abstract JX1-444D.
(U+585D): Use `->subsumptive'.
(J0-3A49): Unify S1-1462.
(U+5860): Add `ideographic-structure'.
(GT-06747): Use representative component in `ideographic-structure'.
(C3-405C): Likewise.
(GT-06654): Likewise.
(J97-4536): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
(U+5861): Unify abstract JX1-2F58.
(U+586B): Unify abstract JX1-4536.
(J90-4536): Add `<-simplified@JP/jis' for JX1-2F58.
(B-D8A7): Unify abstract JX2-252B.
(U+588D): Use `->denotational' instead of `->subsumptive'; integrate
abstract glyph of JX2-252B.
(JC3-47D8): Use `<-denotational' for U+588D instead of B-D8A7; omit
`=>ucs' and `=>daikanwa'.
(U+58AB): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
`=jis-x0208@1997'.

diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el
index 64b2efb..f7fc59b 100644 (file)
--- a/lisp/utf-2000/Ideograph-R032-Earth.el
+++ b/lisp/utf-2000/Ideograph-R032-Earth.el
@@ -4797,27 +4797,27 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5         . #x57E9)     ; &B-D4C9;
-      (=big5             . #xD4C9)     ; &B-D4C9;
+     ((=ucs              . #x57E9)     ; 埩
       ))
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (hanyu-dazidian    1 455 1)
-    (=ucs@jis          . #x57E9)       ; &M-05174;
-    (=jis-x0212                . #x3771)       ; &M-05174; [23-81]
-    (=daikanwa         . 05174)        ; &I-M-05174;
-    (=jef-china3       . #x48A1)       ; &I-JC3-48A1;
+    (=ucs@big5         . #x57E9)       ; &B-D4C9;
+    (=big5             . #xD4C9)       ; &B-D4C9;
     ))
 (define-char
   '((<-denotational
-     ((=ucs              . #x57E9)     ; 埩
+     ((=ucs@big5         . #x57E9)     ; &B-D4C9;
+      (=big5             . #xD4C9)     ; &B-D4C9;
       ))
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (=ucs@big5         . #x57E9)       ; &B-D4C9;
-    (=big5             . #xD4C9)       ; &B-D4C9;
+    (hanyu-dazidian    1 455 1)
+    (=ucs@jis          . #x57E9)       ; &M-05174;
+    (=jis-x0212                . #x3771)       ; &M-05174; [23-81]
+    (=daikanwa         . 05174)        ; &I-M-05174;
+    (=jef-china3       . #x48A1)       ; &I-JC3-48A1;
     ))
 (define-char
   '((<-denotational
@@ -5583,23 +5583,39 @@
     (ideographic-strokes . 8)
     (total-strokes      . 11)
     (=ucs              . #x580B)       ; 堋
-    (=jis-x0208@1997   . #x5444)       ; 堋 [52-36]
-    (->subsumptive
-     ((=jis-x0208@1978   . #x5444)     ; &M-05217; [52-36]
-      (=daikanwa         . 05217)      ; &I-M-05217;
-      )
-     ((hanyu-dazidian    1 455 9)
-      (=ucs@unicode      . #x580B)     ; &GT-06579;
-      (=gb2312           . #x5C21)     ; &GT-06579; [60-01]
-      (=jis-x0208@1983   . #x5444)     ; &I-J83-5444; [52-36]
-      (=jis-x0208@1990   . #x5444)     ; &I-J90-5444; [52-36]
-      (=cns11643-2       . #x343B)     ; &I-C2-343B; [20-27]
-      (=jis-x0213-1      . #x5444)     ; &I-JX1-5444; [52-36]
-      (=big5             . #xD4B8)     ; &I-B-D4B8;
-      (=gt               . 06579)      ; &I-GT-06579;
-      (=gt-pj-1                  . #x5444)     ; &I-GT-06579; [52-36]
-      (=jef-china3       . #x48C8)     ; &I-JC3-48C8;
+    (=>jis-x0208       . #x5444)       ; 堋 [52-36]
+    (=>jis-x0213-1     . #x5444)       ; 堋 [52-36]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x580B)     ; 堋
       ))
+    (ideographic-radical . 32) ; ⼟
+    (ideographic-strokes . 8)
+    (total-strokes      . 11)
+    (=jis-x0208@1978   . #x5444)       ; &GT-06578; [52-36]
+    (=gt               . 06578)        ; &I-GT-06578;
+    (=gt-pj-2          . #x6055)       ; &I-GT-06578; [64-53]
+    (=daikanwa         . 05217)        ; &I-M-05217;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x580B)     ; 堋
+      ))
+    (ideographic-radical . 32) ; ⼟
+    (ideographic-strokes . 8)
+    (total-strokes      . 11)
+    (hanyu-dazidian    1 455 9)
+    (=ucs@unicode      . #x580B)       ; &GT-06579;
+    (=gb2312           . #x5C21)       ; &GT-06579; [60-01]
+    (=jis-x0208@1983   . #x5444)       ; &I-J83-5444; [52-36]
+    (=jis-x0208@1990   . #x5444)       ; &I-J90-5444; [52-36]
+    (=cns11643-2       . #x343B)       ; &I-C2-343B; [20-27]
+    (=jis-x0213-1      . #x5444)       ; &I-JX1-5444; [52-36]
+    (=big5             . #xD4B8)       ; &I-B-D4B8;
+    (=gt               . 06579)        ; &I-GT-06579;
+    (=gt-pj-1          . #x5444)       ; &I-GT-06579; [52-36]
+    (=jef-china3       . #x48C8)       ; &I-JC3-48C8;
     ))
 (define-char
   '((ideographic-radical . 32) ; ⼟
@@ -6756,8 +6772,9 @@
 (define-char
   '((ideographic-radical . 32) ; ⼟
     (=ucs              . #x5835)       ; 堵
+    (=>jis-x0208       . #x4548)       ; 堵 [37-40]
+    (=>jis-x0213-1     . #x4548)       ; 堵 [37-40]
     (=big5             . #xB0F4)       ; &I-B-B0F4;
-    (=jis-x0208@1997   . #x4548)       ; 堵 [37-40]
     ))
 (define-char
   '((<-denotational
@@ -6768,6 +6785,7 @@
     (total-strokes      . 12)
     (=jis-x0208@1978   . #x4548)       ; &M-05279; [37-40]
     (=ks-x1001         . #x5372)       ; &I-K0-5372; [51-82]
+    (=jis-x0213-1@2004 . #x4548)       ; &I-JX3-4548; [37-40]
     (=daikanwa         . 05279)        ; &I-M-05279;
     ))
 (define-char
@@ -6783,13 +6801,14 @@
     (=jis-x0208@1983   . #x4548)       ; &I-J83-4548; [37-40]
     (=jis-x0208@1990   . #x4548)       ; &I-J90-4548; [37-40]
     (=cns11643-1       . #x5959)       ; &I-C1-5959; [57-57]
-    (=jis-x0213-1      . #x4548)       ; &I-JX1-4548; [37-40]
+    (=jis-x0213-1@2000 . #x4548)       ; &I-JX1-4548; [37-40]
     (=gt               . 06554)        ; &I-GT-06554;
     (=gt-pj-1          . #x4548)       ; &I-GT-06554; [37-40]
     (=jef-china3       . #x47CB)       ; &I-JC3-47CB;
-    (<-simplified@JP
+    (<-simplified@JP/jis
      ((=jis-x0208@1978   . #x4548)     ; &M-05279; [37-40]
       (=ks-x1001         . #x5372)     ; &I-K0-5372; [51-82]
+      (=jis-x0213-1@2004  . #x4548)    ; &I-JX3-4548; [37-40]
       (=daikanwa         . 05279)      ; &I-M-05279;
       ))
     ))
@@ -6798,11 +6817,11 @@
     (ideographic-strokes . 9)
     (total-strokes      . 12)
     (=ucs              . #x5836)       ; 堶
+    (=big5             . #xD8AD)       ; &I-B-D8AD;
     (->subsumptive
      ((hanyu-dazidian    1 461 9)
       (=ucs@unicode      . #x5836)     ; &M-05280;
-      (=big5             . #xD8AD)     ; &M-05280;
-      (=daikanwa         . 05280)      ; &I-M-05280;
+      (=daikanwa         . 05280)      ; &M-05280;
       )
      ((=ucs@cns                  . #x5836)     ; &C2-3A6F;
       (=cns11643-2       . #x3A6F)     ; &C2-3A6F; [26-79]
@@ -8003,7 +8022,8 @@
     (ideographic-strokes . 10)
     (total-strokes      . 13)
     (=ucs              . #x5858)       ; 塘
-    (=jis-x0208@1997   . #x4564)       ; 塘 [37-68]
+    (=>jis-x0208       . #x4564)       ; 塘 [37-68]
+    (=>jis-x0213-1     . #x4564)       ; 塘 [37-68]
     ))
 (define-char
   '((<-denotational
@@ -8056,7 +8076,6 @@
     (=big5             . #xDCEC)       ; &I-B-DCEC;
     (->subsumptive
      ((=ucs@jis                  . #x5859)     ; &GT-06721;
-      (=ucs@big5         . #x5859)     ; &GT-06721;
       (=jis-x0208        . #x4839)     ; &GT-06721; [40-25]
       (=jis-x0213-1      . #x4839)     ; &I-JX1-4839; [40-25]
       (=gt               . 06721)      ; &I-GT-06721;
@@ -8119,7 +8138,7 @@
 (define-char
   '((ideographic-radical . 32) ; ⼟
     (=ucs              . #x585A)       ; 塚
-    (=jis-x0208@1997   . #x444D)       ; 塚 [36-45]
+    (=>jis-x0208@1997  . #x444D)       ; 塚 [36-45]
     ))
 (define-char
   '((<-denotational
@@ -8135,6 +8154,7 @@
     (hanyu-dazidian    1 476 7)
     (=ucs              . #xFA10)       ; 塚
     (=ucs@big5         . #x585A)       ; 塚
+    (=>jis-x0213-1     . #x2F57)       ; 塚 [15-55]
     (=big5             . #xB6EF)       ; &I-B-B6EF;
     (->subsumptive
      ((=ucs@unicode      . #xFA10)     ; &GT-06756;
@@ -8146,6 +8166,7 @@
       (=gt-pj-2                  . #x6166)     ; &I-GT-06756; [65-70]
       (=daikanwa         . 05345)      ; &I-M-05345;
       (=shinjigen@1ed    .  1463)      ; &GT-06756;
+      (=shinjigen@rev    .  1441)      ; &GT-06756;
       )
      ((=ucs@unicode      . #x585A)     ; &EGB-2E32;
       (=iso-ir165        . #x2E32)     ; &EGB-2E32; [14-18]
@@ -8163,6 +8184,7 @@
     (ideographic-strokes . 9)
     (total-strokes      . 12)
     (=ucs              . #xFA7C)       ; 塚
+    (=>jis-x0213-1     . #x444D)       ; 塚 [36-45]
     (->subsumptive
      ((=ucs@jis                  . #x585A)     ; &GT-06661;
       (=jis-x0208@1983   . #x444D)     ; &GT-06661; [36-45]
@@ -8194,24 +8216,20 @@
     (=daikanwa         . 05346)        ; &I-M-05346;
     ))
 (define-char
-  '((=>ucs             . #x585D)       ; 塝
-    (ideographic-radical . 32) ; ⼟
-    (ideographic-strokes . 10)
-    (total-strokes      . 13)
-    (=ucs@big5         . #x585D)       ; &M-05347;
-    (=big5             . #xDCEB)       ; &M-05347;
-    (=daikanwa         . 05347)        ; &I-M-05347;
-    (=jef-china3       . #x91BC)       ; &I-JC3-91BC;
-    ))
-(define-char
-  '((morohashi-daikanwa        5347 0 0)
-    (ideographic-radical . 32) ; ⼟
+  '((ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 10)
     (total-strokes      . 13)
     (hanyu-dazidian    1 474 2)
     (=ucs              . #x585D)       ; 塝
-    (=iso-ir165                . #x2E31)       ; &I-EGB-2E31; [14-17]
-    (=cns11643-2       . #x4232)       ; &I-C2-4232; [34-18]
+    (=big5             . #xDCEB)       ; &I-B-DCEB;
+    (->subsumptive
+     ((=daikanwa         . 05347)      ; &M-05347;
+      (=jef-china3       . #x91BC)     ; &I-JC3-91BC;
+      )
+     ((=ucs@unicode      . #x585D)     ; &C2-4232;
+      (=iso-ir165        . #x2E31)     ; &C2-4232; [14-17]
+      (=cns11643-2       . #x4232)     ; &I-C2-4232; [34-18]
+      ))
     ))
 (define-char
   '((ideographic-radical . 32) ; ⼟
@@ -8244,6 +8262,7 @@
       (=gt-k             . 10208)      ; &I-GT-K10208;
       (=gt-pj-1                  . #x3A49)     ; &I-GT-06725; [26-41]
       (=daikanwa         . 05349)      ; &I-M-05349;
+      (=shinjigen@1ed    .  1462)      ; &GT-06725;
       (=shinjigen@rev    .  1464)      ; &GT-06725;
       )
      ((=ucs@unicode      . #x585E)     ; &C1-6352;
@@ -8318,6 +8337,14 @@
     ))
 (define-char
   '((ideographic-radical . 32) ; ⼟
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x571F)     ; 土
+      )
+     ((=ucs              . #x8FFD)     ; 追
+      ))
     (=ucs              . #x5860)       ; 塠
     ))
 (define-char
@@ -8331,7 +8358,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
-     ((=ucs              . #x571F)     ; 土
+     ((=gt-k             . 00199)      ; &GT-K00199;
       )
      ((=ks-x1001         . #x755A)     ; &M-38836; [85-58]
       (=daikanwa         . 38836)      ; &I-M-38836;
@@ -8353,7 +8380,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
-     ((=ucs              . #x571F)     ; 土
+     ((=gt-k             . 00199)      ; &GT-K00199;
       )
      ((=cns11643-1       . #x5851)     ; &C1-5851; [56-49]
       ))
@@ -8371,7 +8398,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
-     ((=ucs              . #x571F)     ; 土
+     ((=gt-k             . 00199)      ; &GT-K00199;
       )
      ((=ucs@unicode      . #x8FFD)     ; &GT-51912;
       (=jis-x0208        . #x4449)     ; &GT-51912; [36-41]
@@ -8384,15 +8411,23 @@
     (=hanziku-2                . #xAFC7)       ; &I-HZK02-AFC7;
     ))
 (define-char
+  '((ideographic-radical . 32) ; ⼟
+    (ideographic-strokes . 10)
+    (total-strokes      . 13)
+    (=ucs@big5         . #x586B)       ; &J97-4536;
+    (=>jis-x0208@1997  . #x4536)       ; &J97-4536; [37-22]
+    (=big5             . #xB6F1)       ; &J97-4536;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5         . #x586B)     ; &B-B6F1;
-      (=big5             . #xB6F1)     ; &B-B6F1;
-      (=jis-x0208@1997   . #x4536)     ; &B-B6F1; [37-22]
+     ((=ucs@big5         . #x586B)     ; &J97-4536;
+      (=>jis-x0208@1997          . #x4536)     ; &J97-4536; [37-22]
       ))
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 10)
     (total-strokes      . 13)
     (=ucs              . #x5861)       ; 塡
+    (=>jis-x0213-1     . #x2F58)       ; 塡 [15-56]
     (->subsumptive
      ((=ucs@jis                  . #x5861)     ; &M-05355;
       (=jis-x0208@1978   . #x4536)     ; &M-05355; [37-22]
@@ -8410,14 +8445,6 @@
   '((ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (=ucs@big5         . #x586B)       ; &B-B6F1;
-    (=big5             . #xB6F1)       ; &B-B6F1;
-    (=jis-x0208@1997   . #x4536)       ; &B-B6F1; [37-22]
-    ))
-(define-char
-  '((ideographic-radical . 32) ; ⼟
-    (ideographic-strokes . 10)
-    (total-strokes      . 13)
     (=ucs              . #x213B7)      ; 𡎷
     (->subsumptive
      ((=daikanwa         . 05356)      ; &M-05356;
@@ -8907,14 +8934,14 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5         . #x586B)     ; &B-B6F1;
-      (=big5             . #xB6F1)     ; &B-B6F1;
-      (=jis-x0208@1997   . #x4536)     ; &B-B6F1; [37-22]
+     ((=ucs@big5         . #x586B)     ; &J97-4536;
+      (=>jis-x0208@1997          . #x4536)     ; &J97-4536; [37-22]
       ))
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 10)
     (total-strokes      . 13)
     (=ucs              . #x586B)       ; 填
+    (=>jis-x0213-1     . #x4536)       ; 填 [37-22]
     ))
 (define-char
   '((<-denotational
@@ -8931,6 +8958,14 @@
     (=gt               . 06762)        ; &I-GT-06762;
     (=gt-pj-1          . #x4536)       ; &I-GT-06762; [37-22]
     (=jef-china3       . #x47CA)       ; &I-JC3-47CA;
+    (<-simplified@JP/jis
+     ((=ucs@jis                  . #x5861)     ; &M-05355;
+      (=jis-x0208@1978   . #x4536)     ; &M-05355; [37-22]
+      (=ks-x1001         . #x6E73)     ; &I-K0-6E73; [78-83]
+      (=jis-x0212        . #x3834)     ; &I-JSP-3834; [24-20]
+      (=jis-x0213-1      . #x2F58)     ; &I-JX1-2F58; [15-56]
+      (=daikanwa         . 05355)      ; &I-M-05355;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -9737,14 +9772,29 @@
     (=cbeta            . 01838)        ; &CB01838;
     ))
 (define-char
+  '((ideographic-radical . 32) ; ⼟
+    (=ucs@big5         . #x5848)       ; &B-D8A7;
+    (=>jis-x0213-2     . #x252B)       ; &B-D8A7; [05-11]
+    (=big5             . #xD8A7)       ; &B-D8A7;
+    ))
+(define-char
   '((<-denotational
      ((=ucs@big5         . #x5848)     ; &B-D8A7;
-      (=big5             . #xD8A7)     ; &B-D8A7;
+      (=>jis-x0213-2     . #x252B)     ; &B-D8A7; [05-11]
       ))
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 11)
     (total-strokes      . 14)
     (=ucs              . #x588D)       ; 墍
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x588D)     ; 墍
+      ))
+    (ideographic-radical . 32) ; ⼟
+    (ideographic-strokes . 11)
+    (total-strokes      . 14)
+    (=>>jis-x0213-2    . #x252B)       ; &MCS-000F02E2; [05-11]
     (->subsumptive
      ((=ucs@jis                  . #x588D)     ; &M-05423;
       (=jis-x0212        . #x3842)     ; &M-05423; [24-34]
@@ -9757,14 +9807,18 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 32) ; ⼟
-    (=ucs@big5         . #x5848)       ; &B-D8A7;
-    (=big5             . #xD8A7)       ; &B-D8A7;
+  '((<-denotational
+     ((=ucs              . #x588D)     ; 墍
+      ))
+    (ideographic-radical . 32) ; ⼟
+    (ideographic-strokes . 12)
+    (total-strokes      . 15)
+    (=jef-china3       . #x47D8)       ; &JC3-47D8;
     ))
 (define-char
   '((<-denotational
      ((=ucs@big5         . #x5848)     ; &B-D8A7;
-      (=big5             . #xD8A7)     ; &B-D8A7;
+      (=>jis-x0213-2     . #x252B)     ; &B-D8A7; [05-11]
       ))
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 9)
@@ -9782,18 +9836,6 @@
       ))
     ))
 (define-char
-  '((<-denotational
-     ((=ucs@big5         . #x5848)     ; &B-D8A7;
-      (=big5             . #xD8A7)     ; &B-D8A7;
-      ))
-    (=>ucs             . #x588D)       ; 墍
-    (=>daikanwa                . 05423)        ; &M-05423;
-    (ideographic-radical . 32) ; ⼟
-    (ideographic-strokes . 12)
-    (total-strokes      . 15)
-    (=jef-china3       . #x47D8)       ; &JC3-47D8;
-    ))
-(define-char
   '((ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 11)
     (total-strokes      . 14)
@@ -10697,8 +10739,9 @@
     (total-strokes      . 15)
     (hanyu-dazidian    1 488 14)
     (=ucs              . #x58AB)       ; 墫
+    (=>jis-x0208       . #x5453)       ; 墫 [52-51]
+    (=>jis-x0213-1     . #x5453)       ; 墫 [52-51]
     (=big5             . #xE54A)       ; &I-B-E54A;
-    (=jis-x0208@1997   . #x5453)       ; 墫 [52-51]
     ))
 (define-char
   '((<-denotational