Merge branch 'master' into single-inheritance

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index 9c484c9..3f57cb7 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,33 @@
+2017-11-30  MORIOKA Tomohiko  <tomo.git@chise.org>
+
+       * Ideograph-R044-Corpse.el (A-compU+21C25): New abstract
+       component; add `<-denotational' for A-BC-8C7A.
+       (U-00021C25): Add `<-denotational@component' for A-compU+21C25;
+       add `ideographic-structure'.
+       (BC-8C7A): Use A-compU+21C25 instead of A-BC-8C7A as its mother;
+       apply new conventions for glyph granularity.
+       (U+2BD56-itaiji-001): New character.
+
+       * Ideograph-R041-Inch.el (U+3DC9): Apply new conventions for glyph
+       granularity.
+
+       * Ideograph-R018-Knife.el (A-compU+5202): Changed from U+5202.
+       (AJ1-14356): Unify U+5202 instead of UU+5202.
+       (BC-8969): Use `<-denotational@component' for A-compU+5202 instead
+       of `<-denotational' for U+5202.
+       (GT-K00114): New character; use `<-subsumptive' for BC-8969.
+       (BC-8BEA): Use `<-denotational@component' for A-compU+5202 instead
+       of `<-denotational' for U+5202; apply new conventions for glyph
+       granularity.
+       (U-00020737): Apply new conventions for glyph granularity.
+       (A-IWDSU+20760): New abstract node.
+       (U-00020760): Use `->denotational' and `->subsumptive'; add
+       `<-denotational' for A-IWDSU+20760.
+       (U-0002076C): New character; use `<-denotational' for
+       A-IWDSU+20760.
+       (U-000207FD): Use `->denotational' and `->subsumptive'.
+       (A-IWDSU+7588): Unify A-cgnU+7588; modify for A-compU+5202.
+
 2017-11-29  MORIOKA Tomohiko  <tomo.git@chise.org>
 
        * Ideograph-R057-Bow.el (A-cgnU+5F13): Changed from U+5F13.

diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el
index 93219e7..191c1d8 100644 (file)
--- a/lisp/utf-2000/Ideograph-R018-Knife.el
+++ b/lisp/utf-2000/Ideograph-R018-Knife.el
@@ -176,18 +176,18 @@
   '((ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 0)
     (total-strokes      . 2)
-    (=ucs              . #x5202)       ; 刂
+    (=>ucs@component   . #x5202)       ; &A-compU+5202;
     ))
 (define-char
-  '((<-denotational
-     ((=ucs              . #x5202)     ; 刂
+  '((<-denotational@component
+     ((=>ucs@component   . #x5202)     ; &A-compU+5202;
       ))
     (ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 0)
     (total-strokes      . 2)
     (hanyu-dazidian    1 320 1)
-    (=ucs@unicode      . #x5202)       ; &AJ1-14356;
-    (=adobe-japan1-4   . 14356)        ; &AJ1-14356;
+    (=ucs              . #x5202)       ; 刂
+    (=adobe-japan1-4   . 14356)        ; &I-AJ1-14356;
     (=gb2312           . #x5856)       ; &I-G0-5856; [56-54]
     (=jis-x0212                . #x3331)       ; &I-JSP-3331; [19-17]
     (=cns11643-4       . #x212A)       ; &I-C4-212A; [01-10]
@@ -243,35 +243,44 @@
       (mirrored                . nil)
       (=ucs              . #x2E89)     ; ⺉
       (<-identical@component/connect-left
-       ((=ucs@unicode      . #x5202)   ; &AJ1-14356;
-       (=adobe-japan1-4    . 14356)    ; &AJ1-14356;
+       ((=ucs              . #x5202)   ; 刂
        ))
       ))
     ))
 (define-char
-  '((<-denotational
-     ((=ucs              . #x5202)     ; 刂
+  '((<-denotational@component
+     ((=>ucs@component   . #x5202)     ; &A-compU+5202;
       ))
     (ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 0)
     (total-strokes      . 2)
     (=big5-cdp         . #x8969)       ; &CDP-8969;
     (->subsumptive
-     ((==big5-cdp        . #x8969)     ; &g2-CDP-8969;
+     ((=>>big5-cdp       . #x8969)     ; &G-CDP-8969;
+      (->subsumptive
+       ((==big5-cdp        . #x8969)   ; &g2-CDP-8969;
+       ))
+      )
+     ((=gt-k             . 00114)      ; &GT-K00114;
+      (=gt-pj-k2         . #x3271)     ; &GT-K00114; [18-81]
+      (->subsumptive
+       ((==gt-k                    . 00114)    ; &g2-GT-K00114;
+       (==gt-pj-k2         . #x3271)   ; &g2-GT-K00114; [18-81]
+       ))
       ))
     ))
 (define-char
-  '((<-denotational
-     ((=ucs              . #x5202)     ; 刂
+  '((<-denotational@component
+     ((=>ucs@component   . #x5202)     ; &A-compU+5202;
       ))
     (ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 0)
     (total-strokes      . 2)
     (=big5-cdp         . #x8BEA)       ; &CDP-8BEA;
-    (=gt-k             . 00113)        ; &I-GT-K00113;
-    (=gt-pj-k1         . #x3448)       ; &CDP-8BEA; [20-40]
     (->subsumptive
-     ((=>>big5-cdp       . #x8BEA)     ; &G-CDP-8BEA;
+     ((=>>big5-cdp       . #x8BEA)     ; &GT-K00113;
+      (=gt-k             . 00113)      ; &GT-K00113;
+      (=gt-pj-k1         . #x3448)     ; &GT-K00113; [20-40]
       (->subsumptive
        ((==big5-cdp        . #x8BEA)   ; &g2-CDP-8BEA;
        )
@@ -7279,12 +7288,31 @@
   '((ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 8)
     (total-strokes      . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x209E2)    ; 𠧢
+      )
+     ((=ucs              . #x5202)     ; 刂
+      ))
     (=ucs              . #x20737)      ; 𠜷
+    (=cns11643-6       . #x354E)       ; &I-C6-354E; [21-46]
+    (=daikanwa         . 02045)        ; &I-M-02045;
+    (<-ancient
+     ((=ucs@unicode      . #x65B7)     ; &AJ1-05079;
+      (=adobe-japan1-0   . 05079)      ; &AJ1-05079;
+      (=daikanwa         . 13611)      ; &I-M-13611;
+      ))
+    (<-ancient*sources
+     shuowen daikanwa)
     (->subsumptive
-     ((=ucs@iso                  . #x20737)    ; &M-02045;
-      (=daikanwa         . 02045)      ; &M-02045;
+     ((==daikanwa        . 02045)      ; &g2-M-02045;
+      )
+     ((==ucs@iso         . #x20737)    ; &g2-IU-00020737;
       )
-     ((=cns11643-6       . #x354E)     ; &C6-354E; [21-46]
+     ((==ucs@cns         . #x20737)    ; &g2-CU+20737;
+      (==cns11643-6      . #x354E)     ; &g2-CU+20737; [21-46]
       ))
     ))
 (define-char
@@ -8401,19 +8429,113 @@
     (=daikanwa         . 02081)        ; &I-M-02081;
     ))
 (define-char
-  '((=>ucs             . #x20760)      ; 𠝠
-    (ideographic-radical . 18) ; ⼑
+  '((ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 9)
     (total-strokes      . 11)
-    (=daikanwa         . 02082)        ; &M-02082;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x53DC)     ; 叜
+      )
+     ((=ucs              . #x5202)     ; 刂
+      ))
+    (=>ucs@iwds-1      . #x20760)      ; &A-IWDSU+20760;
     ))
 (define-char
-  '((morohashi-daikanwa        2082 0 0)
+  '((<-denotational
+     ((=>ucs@iwds-1      . #x20760)    ; &A-IWDSU+20760;
+      ))
     (ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 9)
     (total-strokes      . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=>mj              . 057139)     ; &A-MJ057139;
+      )
+     ((=ucs              . #x5202)     ; 刂
+      ))
+    (sound@ja/on/go    "syu")
+    (sound@ja/on/kan   "sIu")
     (=ucs              . #x20760)      ; 𠝠
-    (=cns11643-5       . #x312A)       ; &I-C5-312A; [17-10]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x20760)    ; 𠝠
+      ))
+    (ideographic-radical . 18) ; ⼑
+    (ideographic-strokes . 9)
+    (total-strokes      . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=mj               . 057139)     ; &MJ057139;
+      )
+     ((=ucs              . #x5202)     ; 刂
+      ))
+    (=ucs@iso          . #x20760)      ; &MJ031364;
+    (=mj               . 031364)       ; &MJ031364;
+    (=koseki           . 024410)       ; &MJ031364;
+    (=daikanwa         . 02082)        ; &I-M-02082;
+    (->subsumptive
+     ((==daikanwa        . 02082)      ; &g2-M-02082;
+      )
+     ((==ucs@iso         . #x20760)    ; &g2-MJ031364;
+      (==mj              . 031364)     ; &g2-MJ031364;
+      (==koseki                  . 024410)     ; &g2-MJ031364;
+      (->subsumptive
+       ((===mj             . 031364)   ; &R-MJ031364;
+       )
+       ((===ucs@iso        . #x20760)  ; &R-U-00020760;
+       ))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x20760)    ; 𠝠
+      ))
+    (ideographic-radical . 18) ; ⼑
+    (ideographic-strokes . 9)
+    (total-strokes      . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs-itaiji-006   . #x53DC)     ; &U-i006+53DC;
+      )
+     ((=ucs              . #x5202)     ; 刂
+      ))
+    (=ucs@cns          . #x20760)      ; &C5-312A;
+    (=cns11643-5       . #x312A)       ; &C5-312A; [17-10]
+    (->subsumptive
+     ((==ucs@cns         . #x20760)    ; &g2-CU+20760;
+      (==cns11643-5      . #x312A)     ; &g2-CU+20760; [17-10]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@iwds-1      . #x20760)    ; &A-IWDSU+20760;
+      ))
+    (ideographic-radical . 18) ; ⼑
+    (ideographic-strokes . 9)
+    (total-strokes      . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs@unicode      . #x53DC)     ; &C3-2B4E;
+      (=cns11643-3       . #x2B4E)     ; &C3-2B4E; [11-46]
+      (=daikanwa         . 03167)      ; &I-M-03167;
+      )
+     ((=ucs              . #x5202)     ; 刂
+      ))
+    (=ucs              . #x2076C)      ; 𠝬
+    (->subsumptive
+     ((==ucs@iso         . #x2076C)    ; &g2-IU-0002076C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 18) ; ⼑
@@ -13392,26 +13514,75 @@
       ))
     ))
 (define-char
-  '((=>ucs             . #x207FD)      ; 𠟽
-    (ideographic-radical . 18) ; ⼑
-    (ideographic-strokes . 14)
-    (total-strokes      . 16)
-    (=daikanwa         . 02246)        ; &M-02246;
+  '((ideographic-radical . 18) ; ⼑
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x26D6F)    ; 𦵯
+      )
+     ((=ucs              . #x5202)     ; 刂
+      ))
+    (sound@ja/on/go    "keti")
+    (sound@ja/on/kan   "kWatu")
+    (=ucs              . #x207FD)      ; 𠟽
     ))
 (define-char
-  '((=>ucs             . #x207FD)      ; 𠟽
-    (morohashi-daikanwa        2246 0 2)
+  '((<-denotational
+     ((=ucs              . #x207FD)    ; 𠟽
+      ))
     (ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 14)
     (total-strokes      . 16)
-    (=cns11643-7       . #x2C4A)       ; &C7-2C4A; [12-42]
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=gt               . 41840)      ; &GT-41840;
+      (=daikanwa         . 31573)      ; &I-M-31573;
+      )
+     ((=ucs              . #x5202)     ; 刂
+      ))
+    (=ucs@cns          . #x207FD)      ; &MJ031463;
+    (=mj               . 031463)       ; &MJ031463;
+    (=cns11643-7       . #x2C4A)       ; &I-C7-2C4A; [12-42]
+    (=koseki           . 026140)       ; &MJ031463;
+    (=daikanwa         . 02246)        ; &I-M-02246;
+    (<-vulgar
+     ((=ucs              . #x5280)     ; 劀
+      (=daikanwa         . 02180)      ; &I-M-02180;
+      ))
+    (<-vulgar*sources
+     yupian daikanwa)
+    (->subsumptive
+     ((==koseki                  . 026140)     ; &g2-M-02246;
+      (==daikanwa        . 02246)      ; &g2-M-02246;
+      )
+     ((==mj              . 031463)     ; &g2-MJ031463;
+      )
+     ((==ucs@cns         . #x207FD)    ; &g2-CU+207FD;
+      (==cns11643-7      . #x2C4A)     ; &g2-CU+207FD; [12-42]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa        2246 0 3)
+  '((<-denotational
+     ((=ucs              . #x207FD)    ; 𠟽
+      ))
     (ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 14)
     (total-strokes      . 16)
-    (=ucs              . #x207FD)      ; 𠟽
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=cns11643-4       . #x4655)     ; &C4-4655; [38-53]
+      )
+     ((=ucs              . #x5202)     ; 刂
+      ))
+    (=ucs@iso          . #x207FD)      ; &U-000207FD;
+    (->subsumptive
+     ((==ucs@iso         . #x207FD)    ; &g2-IU-000207FD;
+      ))
     ))
 (define-char
   '((ideographic-radical . 18) ; ⼑
@@ -14098,13 +14269,15 @@
       )
      ((=ucs              . #x3F6C)     ; 㽬
       )
-     ((=ucs              . #x5202)     ; 刂
+     ((=>ucs@component   . #x5202)     ; &A-compU+5202;
       ))
     (=>ucs@iwds-1      . #x7588)       ; &A-IWDSU+7588;
+    (=>ucs@cognate     . #x7588)       ; &A-IWDSU+7588;
     ))
 (define-char
   '((<-denotational
      ((=>ucs@iwds-1      . #x7588)     ; &A-IWDSU+7588;
+      (=>ucs@cognate     . #x7588)     ; &A-IWDSU+7588;
       ))
     (ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 18)
@@ -14115,8 +14288,7 @@
       )
      ((=ucs              . #x3F6C)     ; 㽬
       )
-     ((=ucs@unicode      . #x5202)     ; &AJ1-14356;
-      (=adobe-japan1-4   . 14356)      ; &AJ1-14356;
+     ((=ucs              . #x5202)     ; 刂
       ))
     (=ucs              . #x20826)      ; 𠠦
     (=cns11643-7       . #x4D40)       ; &I-C7-4D40; [45-32]

diff --git a/lisp/utf-2000/Ideograph-R041-Inch.el b/lisp/utf-2000/Ideograph-R041-Inch.el
index 4328fb9..a2f649d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R041-Inch.el
+++ b/lisp/utf-2000/Ideograph-R041-Inch.el
@@ -2355,13 +2355,38 @@
   '((ideographic-radical . 41) ; ⼨
     (ideographic-strokes . 9)
     (total-strokes      . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs-itaiji-001   . #x2BD56)    ; &U-i001+2BD56;
+      )
+     ((=ucs              . #x5BF8)     ; 寸
+      ))
     (=ucs              . #x3DC9)       ; 㷉
+    (=cns11643-3       . #x3B23)       ; &I-C3-3B23; [27-03]
+    (=daikanwa         . 07451)        ; &I-M-07451;
+    (<-formed
+     ((=ucs              . #x5C09)     ; 尉
+      ))
+    (<-formed*sources
+     zhengzitong)
+    (<-same
+     ((=ucs              . #x5C09)     ; 尉
+      (=daikanwa         . 07440)      ; &I-M-07440;
+      ))
+    (<-same*sources
+     zhengzitong daikanwa)
     (->subsumptive
-     ((=daikanwa         . 07451)      ; &M-07451;
+     ((==daikanwa        . 07451)      ; &g2-M-07451;
       )
-     ((=ucs@unicode      . #x3DC9)     ; &UU+3DC9;
+     ((==ucs@unicode     . #x3DC9)     ; &g2-UU+3DC9;
+      (->subsumptive
+       ((===ucs@unicode            . #x3DC9)   ; &R-UU+3DC9;
+       ))
       )
-     ((=cns11643-3       . #x3B23)     ; &C3-3B23; [27-03]
+     ((==ucs@cns         . #x3DC9)     ; &g2-CU+3DC9;
+      (==cns11643-3      . #x3B23)     ; &g2-CU+3DC9; [27-03]
       ))
     ))
 (define-char

diff --git a/lisp/utf-2000/Ideograph-R044-Corpse.el b/lisp/utf-2000/Ideograph-R044-Corpse.el
index e20b4a3..1dab24f 100644 (file)
--- a/lisp/utf-2000/Ideograph-R044-Corpse.el
+++ b/lisp/utf-2000/Ideograph-R044-Corpse.el
@@ -367,12 +367,88 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 44) ; ⼫
+  '((<-denotational
+     ((=>big5-cdp        . #x8C7A)     ; &A-CDP-8C7A;
+      ))
+    (ideographic-radical . 44) ; ⼫
+    (=>ucs@component   . #x21C25)      ; &A-compU+21C25;
+    ))
+(define-char
+  '((<-denotational@component
+     ((=>ucs@component   . #x21C25)    ; &A-compU+21C25;
+      ))
+    (ideographic-radical . 44) ; ⼫
     (ideographic-strokes . 2)
     (total-strokes      . 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs              . #x2FF8)     ; ⿸
+      )
+     ((=ucs              . #x5C38)     ; 尸
+      )
+     ((=ucs              . #x4E8C)     ; 二
+      ))
+    (sound@ja/on/go/p=ren2 "niN")
+    (sound@ja/on/kan/p=ren2 "ziN")
+    (sound@ja/on/p=yi2 "i")
     (=ucs              . #x21C25)      ; 𡰥
     (=cns11643-4       . #x2174)       ; &I-C4-2174; [01-84]
     (=daikanwa         . 07636)        ; &I-M-07636;
+    (<-ancient@p=ren2
+     ((=ucs              . #x4EC1)     ; 仁
+      (=daikanwa         . 00349)      ; &I-M-00349;
+      ))
+    (<-ancient@p=ren2*sources
+     shuowen yupian jiyun daikanwa)
+    (<-ancient@p=yi2
+     ((=ucs              . #x5937)     ; 夷
+      (=daikanwa         . 05852)      ; &I-M-05852;
+      ))
+    (<-ancient@p=yi2*sources
+     yupian daikanwa)
+    (<-simplified@JP/misc
+     ((=ucs@unicode      . #x5C3C)     ; &AJ1-03276;
+      (=adobe-japan1-0   . 03276)      ; &AJ1-03276;
+      (=jis-x0208        . #x4674)     ; &I-J90-4674; [38-84]
+      (=daikanwa         . 07635)      ; &I-M-07635;
+      ))
+    (<-simplified@JP/misc*sources
+     daikanwa)
+    (->subsumptive
+     ((==ucs@iso         . #x21C25)    ; &g2-M-07636;
+      (==cns11643-4      . #x2174)     ; &g2-M-07636; [01-84]
+      (==daikanwa        . 07636)      ; &g2-M-07636;
+      (->subsumptive
+       ((===daikanwa       . 07636)    ; &R-M-07636;
+       )
+       ((===cns11643-4     . #x2174)   ; &R-C4-2174; [01-84]
+       )
+       ((===ucs@iso        . #x21C25)  ; &R-U-00021C25;
+       ))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@component   . #x21C25)    ; &A-compU+21C25;
+      ))
+    (ideographic-radical . 44) ; ⼫
+    (ideographic-strokes . 2)
+    (total-strokes      . 5)
+    (sound@ja/on       "ka")
+    (=big5-cdp         . #x8C7A)       ; &CDP-8C7A;
+    (->subsumptive
+     ((==big5-cdp        . #x8C7A)     ; &g2-CDP-8C7A;
+      )
+     ((=gt-k             . 01501)      ; &GT-K01501;
+      (=gt-pj-k1         . #x3B27)     ; &GT-K01501; [27-07]
+      (<-identical@component/connect-right
+       ((=big5-cdp         . #x8C7A)   ; &CDP-8C7A;
+       ))
+      (->subsumptive
+       ((==gt-k                    . 01501)    ; &g2-GT-K01501;
+       (==gt-pj-k1         . #x3B27)   ; &g2-GT-K01501; [27-07]
+       ))
+      ))
     ))
 (define-char
   '((<-denotational@component
@@ -451,20 +527,17 @@
      ((=>big5-cdp        . #x8C7A)     ; &A-CDP-8C7A;
       ))
     (ideographic-radical . 44) ; ⼫
-    (ideographic-strokes . 2)
-    (total-strokes      . 5)
-    (=big5-cdp         . #x8C7A)       ; &CDP-8C7A;
-    (=gt-k             . 01501)        ; &I-GT-K01501;
-    (=gt-pj-k1         . #x3B27)       ; &CDP-8C7A; [27-07]
-    (->subsumptive
-     ((==big5-cdp        . #x8C7A)     ; &g2-CDP-8C7A;
+    (ideographic-strokes . 3)
+    (total-strokes      . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
       )
-     ((==gt-k            . 01501)      ; &g2-GT-K01501;
-      (==gt-pj-k1        . #x3B27)     ; &g2-GT-K01501; [27-07]
-      (<-identical@component/connect-right
-       ((=big5-cdp         . #x8C7A)   ; &CDP-8C7A;
-       ))
+     ((=ucs              . #x4E3F)     ; 丿
+      )
+     ((=big5-cdp         . #x8C7A)     ; &CDP-8C7A;
       ))
+    (=big5-cdp-var-002 . #x8C7A)       ; &CDP-v002-8C7A;
     ))
 (define-char
   '((ideographic-radical . 44) ; ⼫
@@ -652,23 +725,6 @@
       ))
     ))
 (define-char
-  '((<-denotational
-     ((=>big5-cdp        . #x8C7A)     ; &A-CDP-8C7A;
-      ))
-    (ideographic-radical . 44) ; ⼫
-    (ideographic-strokes . 3)
-    (total-strokes      . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs              . #x2FF1)     ; ⿱
-      )
-     ((=ucs              . #x4E3F)     ; 丿
-      )
-     ((=big5-cdp         . #x8C7A)     ; &CDP-8C7A;
-      ))
-    (=big5-cdp-var-002 . #x8C7A)       ; &CDP-v002-8C7A;
-    ))
-(define-char
   '((ideographic-radical . 44) ; ⼫
     (ideographic-strokes . 4)
     (total-strokes      . 7)
@@ -1798,6 +1854,26 @@
     ))
 (define-char
   '((ideographic-radical . 44) ; ⼫
+    (ideographic-strokes . 6)
+    (total-strokes      . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs              . #x2FF8)     ; ⿸
+      )
+     ((=ucs              . #x21C25)    ; 𡰥
+      )
+     ((=ucs              . #x706B)     ; 火
+      ))
+    (=ucs-itaiji-001   . #x2BD56)      ; &U-i001+2BD56;
+    (<-formed@component
+     ((=ucs              . #x2BD56)    ; 𫵖
+      ))
+    (->subsumptive
+     ((==ucs-itaiji-001          . #x2BD56)    ; &g2-U-i001+2BD56;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 44) ; ⼫
     (ideographic-strokes . 7)
     (total-strokes      . 10)
     (=ucs              . #x21C62)      ; 𡱢