Use `->subsumptive' or `{<-|->}denotational' for some character

definitions.
(M-17076): Unify U-00023C69.

diff --git a/lisp/utf-2000/Ideograph-R084-Steam.el b/lisp/utf-2000/Ideograph-R084-Steam.el
index 45b2794..8f486a0 100644 (file)
--- a/lisp/utf-2000/Ideograph-R084-Steam.el
+++ b/lisp/utf-2000/Ideograph-R084-Steam.el
@@ -65,8 +65,9 @@
     (ideographic-strokes . 2)
     (total-strokes      . 6)
     (<-simplified@JP/Jouyou
-     ((=ucs              . #x6C23)     ; 氣
-      (=jis-x0208        . #x5D66)     ; &I-J90-5D66; [61-70]
+     ((=jis-x0208        . #x5D66)     ; &GT-21850; [61-70]
+      (=ks-x1001         . #x5128)     ; &I-K0-5128; [49-08]
+      (=daikanwa         . 17059)      ; &I-M-17059;
       ))
     (=ucs              . #x6C17)       ; 気
     (=jis-x0208                . #x3524)       ; &I-J90-3524; [21-04]
@@ -95,26 +96,24 @@
     (=big5             . #xCB4A)       ; &I-B-CB4A;
     ))
 (define-char
-  '((=>ucs             . #x6C1B)       ; 氛
-    (ideographic-radical . 84) ; ⽓
-    (ideographic-strokes . 4)
-    (total-strokes      . 8)
-    (shinjigen-2       . 4045)
-    (=jis-x0208                . #x5D64)       ; &GT-21840; [61-68]
-    (=big5             . #xAA5E)       ; &I-B-AA5E;
-    (=gt               . 21840)        ; &I-GT-21840;
-    (=gt-pj-1          . #x5D64)       ; &I-GT-21840; [61-68]
-    (=daikanwa         . 17048)        ; &I-M-17048;
-    (=ucs@jis          . #x6C1B)       ; &GT-21840;
-    ))
-(define-char
-  '((morohashi-daikanwa        17048 0 0)
-    (ideographic-radical . 84) ; ⽓
+  '((ideographic-radical . 84) ; ⽓
     (ideographic-strokes . 4)
     (total-strokes      . 8)
     (=ucs              . #x6C1B)       ; 氛
-    (=gb2312           . #x3755)       ; &I-G0-3755; [23-53]
-    (=cns11643-1       . #x4E41)       ; &I-C1-4E41; [46-33]
+    (->subsumptive
+     ((shinjigen-2       . 4045)
+      (=jis-x0208        . #x5D64)     ; &GT-21840; [61-68]
+      (=big5             . #xAA5E)     ; &I-B-AA5E;
+      (=gt               . 21840)      ; &I-GT-21840;
+      (=gt-pj-1                  . #x5D64)     ; &I-GT-21840; [61-68]
+      (=daikanwa         . 17048)      ; &I-M-17048;
+      (=ucs@jis                  . #x6C1B)     ; &GT-21840;
+      )
+     ((=cns11643-1       . #x4E41)     ; &C1-4E41; [46-33]
+      )
+     ((=gb2312           . #x3755)     ; &G0-3755; [23-53]
+      (=ucs@unicode      . #x6C1B)     ; &G0-3755;
+      ))
     ))
 (define-char
   '((ideographic-radical . 84) ; ⽓
@@ -126,28 +125,19 @@
     (=jef-china3       . #x55AC)       ; &I-JC3-55AC;
     ))
 (define-char
-  '((=>ucs             . #x6C1D)       ; 氝
-    (ideographic-radical . 84) ; ⽓
-    (ideographic-strokes . 4)
-    (total-strokes      . 8)
-    (=big5             . #xCCED)       ; &M-17054;
-    (=daikanwa         . 17054)        ; &I-M-17054;
-    ))
-(define-char
-  '((=>ucs             . #x6C1D)       ; 氝
-    (morohashi-daikanwa        17054 0 0)
-    (ideographic-radical . 84) ; ⽓
-    (ideographic-strokes . 4)
-    (total-strokes      . 8)
-    (=cns11643-2       . #x274E)       ; &C2-274E; [07-46]
-    ))
-(define-char
-  '((morohashi-daikanwa        17054 0 2)
-    (ideographic-radical . 84) ; ⽓
+  '((ideographic-radical . 84) ; ⽓
     (ideographic-strokes . 4)
     (total-strokes      . 8)
     (=ucs              . #x6C1D)       ; 氝
-    (=iso-ir165                . #x2E53)       ; &I-EGB-2E53; [14-51]
+    (->subsumptive
+     ((=big5             . #xCCED)     ; &M-17054;
+      (=daikanwa         . 17054)      ; &I-M-17054;
+      )
+     ((=cns11643-2       . #x274E)     ; &C2-274E; [07-46]
+      )
+     ((=iso-ir165        . #x2E53)     ; &EGB-2E53; [14-51]
+      (=ucs@unicode      . #x6C1D)     ; &EGB-2E53;
+      ))
     ))
 (define-char
   '((ideographic-radical . 84) ; ⽓
@@ -194,19 +184,16 @@
     (=daikanwa         . 17056)        ; &I-M-17056;
     ))
 (define-char
-  '((=>ucs             . #x23C60)      ; 𣱠
-    (ideographic-radical . 84) ; ⽓
-    (ideographic-strokes . 5)
-    (total-strokes      . 9)
-    (=daikanwa         . 17057)        ; &M-17057;
-    ))
-(define-char
-  '((morohashi-daikanwa        17057 0 0)
-    (ideographic-radical . 84) ; ⽓
+  '((ideographic-radical . 84) ; ⽓
     (ideographic-strokes . 5)
     (total-strokes      . 9)
     (=ucs              . #x23C60)      ; 𣱠
-    (=cns11643-5       . #x2977)       ; &I-C5-2977; [09-87]
+    (->subsumptive
+     ((=daikanwa         . 17057)      ; &M-17057;
+      )
+     ((=cns11643-5       . #x2977)     ; &C5-2977; [09-87]
+      (=ucs@iso                  . #x23C60)    ; &C5-2977;
+      ))
     ))
 (define-char
   '((ideographic-radical . 84) ; ⽓
@@ -253,24 +240,21 @@
   '((ideographic-radical . 84) ; ⽓
     (ideographic-strokes . 6)
     (total-strokes      . 10)
-    (shinjigen-2       . 4042)
     (=ucs              . #x6C23)       ; 氣
-    (=jis-x0208                . #x5D66)       ; &I-J90-5D66; [61-70]
-    (=ks-x1001         . #x5128)       ; &I-K0-5128; [49-08]
-    (=gb12345          . #x4678)       ; 氣 [38-88]
-    (=big5             . #xAEF0)       ; &I-B-AEF0;
-    (=gt               . 21850)        ; &I-GT-21850;
-    (=gt-k             . 06607)        ; &I-GT-K06607;
-    (=gt-pj-1          . #x5D66)       ; &I-GT-21850; [61-70]
-    (=daikanwa         . 17059)        ; &I-M-17059;
-    ))
-(define-char
-  '((=>ucs             . #x6C23)       ; 氣
-    (morohashi-daikanwa        17059 0 1)
-    (ideographic-radical . 84) ; ⽓
-    (ideographic-strokes . 6)
-    (total-strokes      . 10)
-    (=cns11643-1       . #x5634)       ; &C1-5634; [54-20]
+    (->subsumptive
+     ((shinjigen-2       . 4042)
+      (=jis-x0208        . #x5D66)     ; &GT-21850; [61-70]
+      (=ks-x1001         . #x5128)     ; &I-K0-5128; [49-08]
+      (=gb12345                  . #x4678)     ; &GT-21850; [38-88]
+      (=big5             . #xAEF0)     ; &I-B-AEF0;
+      (=gt               . 21850)      ; &I-GT-21850;
+      (=gt-k             . 06607)      ; &I-GT-K06607;
+      (=gt-pj-1                  . #x5D66)     ; &I-GT-21850; [61-70]
+      (=daikanwa         . 17059)      ; &I-M-17059;
+      (=ucs@unicode      . #x6C23)     ; &GT-21850;
+      )
+     ((=cns11643-1       . #x5634)     ; &C1-5634; [54-20]
+      ))
     ))
 (define-char
   '((ideographic-radical . 84) ; ⽓
@@ -305,30 +289,20 @@
     (=daikanwa         . 17062)        ; &I-M-17062;
     ))
 (define-char
-  '((=>ucs             . #x6C26)       ; 氦
-    (ideographic-radical . 84) ; ⽓
-    (ideographic-strokes . 6)
-    (total-strokes      . 10)
-    (=jis-x0212                . #x464D)       ; &M-17063; [38-45]
-    (=daikanwa         . 17063)        ; &I-M-17063;
-    (=ucs@jis          . #x6C26)       ; &M-17063;
-    ))
-(define-char
-  '((morohashi-daikanwa        17063 0 0)
-    (ideographic-radical . 84) ; ⽓
+  '((ideographic-radical . 84) ; ⽓
     (ideographic-strokes . 6)
     (total-strokes      . 10)
     (=ucs              . #x6C26)       ; 氦
-    (=gb2312           . #x3A24)       ; &I-G0-3A24; [26-04]
-    (=cns11643-1       . #x5637)       ; &I-C1-5637; [54-23]
-    ))
-(define-char
-  '((=>ucs             . #x6C26)       ; 氦
-    (morohashi-daikanwa        17063 0 1)
-    (ideographic-radical . 84) ; ⽓
-    (ideographic-strokes . 6)
-    (total-strokes      . 10)
-    (=big5             . #xAEF3)       ; &B-AEF3;
+    (=big5             . #xAEF3)       ; &I-B-AEF3;
+    (->subsumptive
+     ((=jis-x0212        . #x464D)     ; &M-17063; [38-45]
+      (=daikanwa         . 17063)      ; &I-M-17063;
+      (=ucs@jis                  . #x6C26)     ; &M-17063;
+      )
+     ((=gb2312           . #x3A24)     ; &C1-5637; [26-04]
+      (=cns11643-1       . #x5637)     ; &I-C1-5637; [54-23]
+      (=ucs@unicode      . #x6C26)     ; &C1-5637;
+      ))
     ))
 (define-char
   '((ideographic-radical . 84) ; ⽓
@@ -342,30 +316,21 @@
     (=daikanwa         . 17064)        ; &I-M-17064;
     ))
 (define-char
-  '((=>ucs             . #x6C28)       ; 氨
-    (ideographic-radical . 84) ; ⽓
-    (ideographic-strokes . 6)
-    (total-strokes      . 10)
-    (=jis-x0212                . #x464F)       ; &M-17065; [38-47]
-    (=big5             . #xAEF2)       ; &I-B-AEF2;
-    (=daikanwa         . 17065)        ; &I-M-17065;
-    (=ucs@jis          . #x6C28)       ; &M-17065;
-    ))
-(define-char
-  '((morohashi-daikanwa        17065 0 0)
-    (ideographic-radical . 84) ; ⽓
+  '((ideographic-radical . 84) ; ⽓
     (ideographic-strokes . 6)
     (total-strokes      . 10)
     (=ucs              . #x6C28)       ; 氨
-    (=gb2312           . #x3031)       ; &I-G0-3031; [16-17]
-    ))
-(define-char
-  '((=>ucs             . #x6C28)       ; 氨
-    (morohashi-daikanwa        17065 0 1)
-    (ideographic-radical . 84) ; ⽓
-    (ideographic-strokes . 6)
-    (total-strokes      . 10)
-    (=cns11643-1       . #x5636)       ; &C1-5636; [54-22]
+    (=big5             . #xAEF2)       ; &I-B-AEF2;
+    (->subsumptive
+     ((=jis-x0212        . #x464F)     ; &M-17065; [38-47]
+      (=daikanwa         . 17065)      ; &I-M-17065;
+      (=ucs@jis                  . #x6C28)     ; &M-17065;
+      )
+     ((=gb2312           . #x3031)     ; &G0-3031; [16-17]
+      (=ucs@unicode      . #x6C28)     ; &G0-3031;
+      )
+     ((=cns11643-1       . #x5636)     ; &C1-5636; [54-22]
+      ))
     ))
 (define-char
   '((ideographic-radical . 84) ; ⽓
@@ -375,19 +340,17 @@
     (=gb2312           . #x6B32)       ; &I-G0-6B32; [75-18]
     ))
 (define-char
-  '((=>ucs             . #x3CB5)       ; 㲵
-    (ideographic-radical . 84) ; ⽓
-    (ideographic-strokes . 7)
-    (total-strokes      . 11)
-    (=daikanwa         . 17066)        ; &M-17066;
-    ))
-(define-char
-  '((morohashi-daikanwa        17066 0 2)
-    (ideographic-radical . 84) ; ⽓
+  '((ideographic-radical . 84) ; ⽓
     (ideographic-strokes . 7)
     (total-strokes      . 11)
     (=ucs              . #x3CB5)       ; 㲵
-    (=cns11643-3       . #x3668)       ; &I-C3-3668; [22-72]
+    (->subsumptive
+     ((=daikanwa         . 17066)      ; &M-17066;
+      )
+     ((=ucs@unicode      . #x3CB5)     ; &UU+3CB5;
+      )
+     ((=cns11643-3       . #x3668)     ; &C3-3668; [22-72]
+      ))
     ))
 (define-char
   '((ideographic-radical . 84) ; ⽓
@@ -433,61 +396,63 @@
     (ideographic-strokes . 8)
     (total-strokes      . 12)
     (=ucs              . #x6C2E)       ; 氮
-    (=gb2312           . #x352A)       ; &I-G0-352A; [21-10]
-    (=jis-x0212                . #x4651)       ; &I-JSP-4651; [38-49]
-    (=big5             . #xB4E1)       ; &I-B-B4E1;
-    (=daikanwa         . 17071)        ; &I-M-17071;
-    ))
-(define-char
-  '((=>ucs             . #x6C2E)       ; 氮
-    (morohashi-daikanwa        17071 0 0)
-    (ideographic-radical . 84) ; ⽓
-    (ideographic-strokes . 8)
-    (total-strokes      . 12)
-    (=cns11643-1       . #x6028)       ; &C1-6028; [64-08]
+    (->subsumptive
+     ((=jis-x0212        . #x4651)     ; &M-17071; [38-49]
+      (=big5             . #xB4E1)     ; &I-B-B4E1;
+      (=daikanwa         . 17071)      ; &I-M-17071;
+      (=ucs@jis                  . #x6C2E)     ; &M-17071;
+      )
+     ((=gb2312           . #x352A)     ; &G0-352A; [21-10]
+      (=ucs@unicode      . #x6C2E)     ; &G0-352A;
+      )
+     ((=cns11643-1       . #x6028)     ; &C1-6028; [64-08]
+      ))
     ))
 (define-char
-  '((=>ucs             . #x6C2F)       ; 氯
-    (ideographic-radical . 84) ; ⽓
+  '((ideographic-radical . 84) ; ⽓
     (ideographic-strokes . 8)
     (total-strokes      . 12)
-    (=cns11643-1       . #x6029)       ; &M-17072; [64-09]
-    (=big5             . #xB4E2)       ; &I-B-B4E2;
-    (=daikanwa         . 17072)        ; &I-M-17072;
+    (=ucs              . #x6C2F)       ; 氯
+    (->subsumptive
+     ((=cns11643-1       . #x6029)     ; &M-17072; [64-09]
+      (=big5             . #xB4E2)     ; &I-B-B4E2;
+      (=daikanwa         . 17072)      ; &I-M-17072;
+      )
+     ((=gb2312           . #x4248)     ; &G0-4248; [34-40]
+      (=ucs@unicode      . #x6C2F)     ; &G0-4248;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa        17072 0 5)
-    (ideographic-radical . 84) ; ⽓
+  '((ideographic-radical . 84) ; ⽓
     (ideographic-strokes . 8)
     (total-strokes      . 12)
-    (=ucs              . #x6C2F)       ; 氯
-    (=gb2312           . #x4248)       ; &I-G0-4248; [34-40]
+    (=ucs              . #x6C30)       ; 氰
     ))
 (define-char
-  '((=>ucs             . #x6C30)       ; 氰
-    (morohashi-daikanwa        17072 1)
+  '((morohashi-daikanwa        17072 1)
     (ideographic-radical . 84) ; ⽓
     (ideographic-strokes . 8)
     (total-strokes      . 12)
+    (<-denotational
+     ((=ucs              . #x6C30)     ; 氰
+      ))
     (=big5             . #xD9E6)       ; &GT-21862;
     (=gt               . 21862)        ; &I-GT-21862;
     (=gt-pj-4          . #x493C)       ; &I-GT-21862; [41-28]
     ))
 (define-char
-  '((morohashi-daikanwa        17072 1 4)
-    (ideographic-radical . 84) ; ⽓
-    (ideographic-strokes . 8)
-    (total-strokes      . 12)
-    (=ucs              . #x6C30)       ; 氰
-    (=gb2312           . #x4768)       ; &I-G0-4768; [39-72]
-    ))
-(define-char
-  '((=>ucs             . #x6C30)       ; 氰
-    (morohashi-daikanwa        17072 1 5)
-    (ideographic-radical . 84) ; ⽓
+  '((ideographic-radical . 84) ; ⽓
     (ideographic-strokes . 8)
     (total-strokes      . 12)
-    (=cns11643-2       . #x3D2B)       ; &C2-3D2B; [29-11]
+    (<-denotational
+     ((=ucs              . #x6C30)     ; 氰
+      ))
+    (->subsumptive
+     ((=gb2312           . #x4768)     ; &G0-4768; [39-72]
+      (=ucs@unicode      . #x6C30)     ; &G0-4768;
+      )
+     ((=cns11643-2       . #x3D2B)     ; &C2-3D2B; [29-11]
+      ))
     ))
 (define-char
   '((ideographic-radical . 84) ; ⽓
@@ -501,36 +466,33 @@
   '((ideographic-radical . 84) ; ⽓
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
-      (=ucs              . #x2FF9)     ; ⿹
-      )
-     ((=ucs              . #x6C14)     ; 气
-      )
-     ((=jis-x0208-1978   . #x4B5F)     ; &GT-29425; [43-63]
-      (=jis-x0208-1983   . #x4B5F)     ; &I-J83-4B5F; [43-63]
-      (=ks-x1001         . #x5D4E)     ; &I-K0-5D4E; [61-46]
-      (=daikanwa         . 22959)      ; &I-M-22959;
-      ))
     (=ucs              . #x23C66)      ; 𣱦
-    (=daikanwa         . 17073)        ; &I-M-17073;
-    (=cbeta            . 00645)        ; &I-CB00645;
-    ))
-(define-char
-  '((=>ucs             . #x23C66)      ; 𣱦
-    (morohashi-daikanwa        17073 0 0)
-    (ideographic-radical . 84) ; ⽓
-    (ideographic-strokes . 9)
-    (total-strokes      . 13)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
-      (=ucs              . #x2FF9)     ; ⿹
-      )
-     ((=ucs              . #x6C14)     ; 气
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+       (=ucs               . #x2FF9)   ; ⿹
+       )
+       ((=ucs              . #x6C14)   ; 气
+       )
+       ((=jis-x0208@1978    . #x4B5F)  ; &GT-29425; [43-63]
+       (=jis-x0208@1983    . #x4B5F)   ; &I-J83-4B5F; [43-63]
+       (=ks-x1001          . #x5D4E)   ; &I-K0-5D4E; [61-46]
+       (=daikanwa          . 22959)    ; &I-M-22959;
+       ))
+      (=daikanwa         . 17073)      ; &M-17073;
+      (=cbeta            . 00645)      ; &I-CB00645;
+      (=ucs@iso                  . #x23C66)    ; &M-17073;
       )
-     ((=ucs              . #x76C6)     ; 盆
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+       (=ucs               . #x2FF9)   ; ⿹
+       )
+       ((=ucs              . #x6C14)   ; 气
+       )
+       ((=cns11643-1       . #x5259)   ; &C1-5259; [50-57]
+       ))
+      (=cns11643-6       . #x5432)     ; &C6-5432; [52-18]
       ))
-    (=cns11643-6       . #x5432)       ; &C6-5432; [52-18]
     ))
 (define-char
   '((ideographic-radical . 84) ; ⽓
@@ -564,7 +526,8 @@
   '((ideographic-radical . 84) ; ⽓
     (ideographic-strokes . 10)
     (total-strokes      . 14)
-    (=daikanwa         . 17076)        ; &M-17076;
+    (=ucs              . #x23C69)      ; 𣱩
+    (=daikanwa         . 17076)        ; &I-M-17076;
     ))
 (define-char
   '((ideographic-radical . 84) ; ⽓
@@ -575,19 +538,16 @@
     (=daikanwa         . 17077)        ; &I-M-17077;
     ))
 (define-char
-  '((=>ucs             . #x23C6B)      ; 𣱫
-    (ideographic-radical . 84) ; ⽓
-    (ideographic-strokes . 11)
-    (total-strokes      . 15)
-    (=daikanwa         . 17078)        ; &M-17078;
-    ))
-(define-char
-  '((morohashi-daikanwa        17078 0 0)
-    (ideographic-radical . 84) ; ⽓
+  '((ideographic-radical . 84) ; ⽓
     (ideographic-strokes . 11)
     (total-strokes      . 15)
     (=ucs              . #x23C6B)      ; 𣱫
-    (=cns11643-7       . #x243A)       ; &I-C7-243A; [04-26]
+    (->subsumptive
+     ((=daikanwa         . 17078)      ; &M-17078;
+      )
+     ((=cns11643-7       . #x243A)     ; &C7-243A; [04-26]
+      (=ucs@iso                  . #x23C6B)    ; &C7-243A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 84) ; ⽓