(U-00024B0C): Apply new conventions for glyph granularity.

(U+74E5): Apply new conventions for glyph granularity.
(U-00024B23): Apply new conventions for glyph granularity.
(U-00024B24): Apply new conventions for glyph granularity.

diff --git a/lisp/utf-2000/Ideograph-R097-Melon.el b/lisp/utf-2000/Ideograph-R097-Melon.el
index d4bf4ed..826dcab 100644 (file)
--- a/lisp/utf-2000/Ideograph-R097-Melon.el
+++ b/lisp/utf-2000/Ideograph-R097-Melon.el
@@ -1317,12 +1317,78 @@
   '((ideographic-radical . 97) ; ⽠
     (ideographic-strokes . 9)
     (total-strokes      . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x5F56)     ; 彖
+      )
+     ((=ucs              . #x74DC)     ; 瓜
+      ))
     (=ucs              . #x24B0C)      ; 𤬌
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x24B0C)    ; 𤬌
+      ))
+    (ideographic-radical . 97) ; ⽠
+    (ideographic-strokes . 9)
+    (total-strokes      . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs@unicode      . #x5F56)     ; &MJ011233;
+      (=mj               . 011233)     ; &MJ011233;
+      )
+     ((=ucs              . #x74DC)     ; 瓜
+      ))
+    (=+>ucs@iso                . #x24B0C)      ; &o-IU+24B0C;
     (->subsumptive
-     ((=ucs@iso                  . #x24B0C)    ; &M-21410;
-      (=daikanwa         . 21410)      ; &M-21410;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+       (=ucs               . #x2FF0)   ; ⿰
+       )
+       ((=ucs@unicode      . #x5F56)   ; &MJ011233;
+       (=mj                . 011233)   ; &MJ011233;
+       )
+       ((=ucs@unicode      . #x74DC)   ; &G0-394F;
+       (=gb2312            . #x394F)   ; &G0-394F; [25-47]
+       (=daikanwa          . 21371)    ; &I-M-21371;
+       ))
+      (=ucs@iso                  . #x24B0C)    ; &MJ041159;
+      (=mj               . 041159)     ; &MJ041159;
+      (=koseki           . 240040)     ; &MJ041159;
+      (=daikanwa         . 21410)      ; &I-M-21410;
+      (->subsumptive
+       ((==ucs@iso         . #x24B0C)  ; &g2-M-21410;
+       (==koseki           . 240040)   ; &g2-M-21410;
+       (==daikanwa         . 21410)    ; &g2-M-21410;
+       (->subsumptive
+        ((===daikanwa        . 21410)  ; &R-M-21410;
+         )
+        ((===ucs@iso         . #x24B0C)        ; &R-U-00024B0C;
+         ))
+       )
+       ((==mj              . 041159)   ; &g2-MJ041159;
+       ))
       )
-     ((=cns11643-5       . #x4744)     ; &C5-4744; [39-36]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+       (=ucs               . #x2FF0)   ; ⿰
+       )
+       ((=ucs@unicode      . #x5F56)   ; &MJ011233;
+       (=mj                . 011233)   ; &MJ011233;
+       )
+       ((=ucs@cns          . #x74DC)   ; &HD-JT-B5DE;
+       (=cns11643-1        . #x466A)   ; &HD-JT-B5DE; [38-74]
+       ))
+      (=ucs@cns                  . #x24B0C)    ; &C5-4744;
+      (=cns11643-5       . #x4744)     ; &C5-4744; [39-36]
+      (->subsumptive
+       ((==ucs@cns         . #x24B0C)  ; &g2-CU+24B0C;
+       (==cns11643-5       . #x4744)   ; &g2-CU+24B0C; [39-36]
+       ))
       ))
     ))
 (define-char
@@ -2053,17 +2119,47 @@
     ))
 (define-char
   '((ideographic-radical . 97) ; ⽠
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER RIGHT")
+      (=ucs              . #x2FFD)     ; ⿽
+      )
+     ((=ucs              . #x87F8)     ; 蟸
+      )
+     ((=ucs              . #x74DC)     ; 瓜
+      ))
+    (=ucs              . #x74E5)       ; 瓥
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x74E5)     ; 瓥
+      ))
+    (ideographic-radical . 97) ; ⽠
     (ideographic-strokes . 19)
     (total-strokes      . 24)
-    (=ucs              . #x74E5)       ; 瓥
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER RIGHT")
+      (=ucs              . #x2FFD)     ; ⿽
+      )
+     ((=ucs@unicode      . #x87F8)     ; &JSP-5B65;
+      (=jis-x0212        . #x5B65)     ; &JSP-5B65; [59-69]
+      (=cns11643-3       . #x5B2C)     ; &I-C3-5B2C; [59-12]
+      (=daikanwa         . 33666)      ; &I-M-33666;
+      )
+     ((=ucs@cns                  . #x74DC)     ; &HD-JT-B5DE;
+      (=cns11643-1       . #x466A)     ; &HD-JT-B5DE; [38-74]
+      ))
+    (=ucs@unicode      . #x74E5)       ; &C2-7041;
+    (=cns11643-2       . #x7041)       ; &C2-7041; [80-33]
     (=big5             . #xF8B3)       ; &I-B-F8B3;
+    (=daikanwa         . 21433)        ; &I-M-21433;
     (->subsumptive
-     ((=daikanwa         . 21433)      ; &M-21433;
+     ((==daikanwa        . 21433)      ; &g2-M-21433;
       )
-     ((=ucs@unicode      . #x74E5)     ; &UU+74E5;
+     ((==ucs@unicode     . #x74E5)     ; &g2-UU+74E5;
+      (==ucs@JP/hanazono  . nil)
       )
-     ((=ucs@cns                  . #x74E5)     ; &C2-7041;
-      (=cns11643-2       . #x7041)     ; &C2-7041; [80-33]
+     ((==ucs@cns         . #x74E5)     ; &g2-CU+74E5;
+      (==cns11643-2      . #x7041)     ; &g2-CU+74E5; [80-33]
       ))
     ))
 (define-char
@@ -2083,15 +2179,237 @@
   '((ideographic-radical . 97) ; ⽠
     (ideographic-strokes . 21)
     (total-strokes      . 26)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=>ucs-itaiji-004          . #x26989)    ; &A-U-i004+26989;
+      )
+     ((=ucs              . #x74E0)     ; 瓠
+      ))
+    (sound@ja/on       "hEu")
     (=ucs              . #x24B23)      ; 𤬣
-    (=cns11643-7       . #x623B)       ; &I-C7-623B; [66-27]
     ))
 (define-char
-  '((ideographic-radical . 97) ; ⽠
+  '((<-denotational
+     ((=ucs              . #x24B23)    ; 𤬣
+      ))
+    (ideographic-radical . 97) ; ⽠
     (ideographic-strokes . 21)
     (total-strokes      . 26)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=ucs-itaiji-004   . #x26989)    ; &U-i004+26989;
+      )
+     ((=ucs@jis/1990     . #x74E0)     ; &AJ1-05688;
+      (=ucs@jis/2000     . #x74E0)     ; &AJ1-05688;
+      (=ucs@jis/2004     . #x74E0)     ; &AJ1-05688;
+      (=ucs@ks           . #x74E0)     ; &AJ1-05688;
+      (=adobe-japan1-0   . 05688)      ; &AJ1-05688;
+      ))
+    (=mj               . 041176)       ; &MJ041176;
+    (=koseki           . 240340)       ; &MJ041176;
+    (=daikanwa         . 21435)        ; &I-M-21435;
+    (<-ancient
+     ((=ucs@unicode      . #x74E2)     ; &G0-4630;
+      (=gb2312           . #x4630)     ; &G0-4630; [38-16]
+      (=daikanwa         . 21419)      ; &I-M-21419;
+      ))
+    (<-ancient*sources
+     jiyun daikanwa)
+    (<-formed
+     ((=ucs@jis                  . #x74E2)     ; &AJ1-03501;
+      (=ucs@ks           . #x74E2)     ; &AJ1-03501;
+      (=adobe-japan1-0   . 03501)      ; &AJ1-03501;
+      ))
+    (<-formed$_1*sources
+     mj)
+    (<-formed*sources
+     mj)
+    (->subsumptive
+     ((==mj              . 041176)     ; &g2-MJ041176;
+      (==koseki                  . 240340)     ; &g2-MJ041176;
+      (==daikanwa        . 21435)      ; &g2-MJ041176;
+      (->subsumptive
+       ((===daikanwa       . 21435)    ; &R-M-21435;
+       )
+       ((===mj             . 041176)   ; &R-MJ041176;
+       ))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x24B23)    ; 𤬣
+      ))
+    (ideographic-radical . 97) ; ⽠
+    (ideographic-strokes . 21)
+    (total-strokes      . 26)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=ucs-itaiji-004   . #x26989)    ; &U-i004+26989;
+      )
+     ((=ucs@unicode      . #x74E0)     ; &G0-702D;
+      (=jis-x0208@1978   . #x6121)     ; &G0-702D; [65-01]
+      (=gb2312           . #x702D)     ; &I-G0-702D; [80-13]
+      (=jis-x0208@1983   . #x6121)     ; &I-J83-6121; [65-01]
+      (=daikanwa         . 21392)      ; &I-M-21392;
+      ))
+    (=ucs@iso          . #x24B23)      ; &U-00024B23;
+    (->subsumptive
+     ((==ucs@iso         . #x24B23)    ; &g2-IU-00024B23;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x24B23)    ; 𤬣
+      ))
+    (ideographic-radical . 97) ; ⽠
+    (ideographic-strokes . 21)
+    (total-strokes      . 26)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=ucs-itaiji-004   . #x26989)    ; &U-i004+26989;
+      )
+     ((=ucs@cns                  . #x74E0)     ; &C1-5C24;
+      (=cns11643-1       . #x5C24)     ; &C1-5C24; [60-04]
+      ))
+    (=ucs@cns          . #x24B23)      ; &C7-623B;
+    (=cns11643-7       . #x623B)       ; &C7-623B; [66-27]
+    (->subsumptive
+     ((==ucs@cns         . #x24B23)    ; &g2-CU+24B23;
+      (==cns11643-7      . #x623B)     ; &g2-CU+24B23; [66-27]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 97) ; ⽠
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+      (=ucs              . #x2FFA)     ; ⿺
+      )
+     ((=ucs              . #x8821)     ; 蠡
+      )
+     ((=ucs              . #x74DC)     ; 瓜
+      ))
+    (ideographic-structure@apparent
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=ucs              . #x24B0C)    ; 𤬌
+      )
+     ((=ucs              . #x45B5)     ; 䖵
+      ))
+    (sound@ja/on       "rei")
     (=ucs              . #x24B24)      ; 𤬤
-    (=cns11643-7       . #x623C)       ; &I-C7-623C; [66-28]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x24B24)    ; 𤬤
+      ))
+    (ideographic-radical . 97) ; ⽠
+    (ideographic-strokes . 21)
+    (total-strokes      . 26)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+      (=ucs              . #x2FFA)     ; ⿺
+      )
+     ((=ucs@unicode      . #x8821)     ; &MJ023807;
+      (=mj               . 023807)     ; &MJ023807;
+      )
+     ((=ucs              . #x74DC)     ; 瓜
+      ))
+    (ideographic-structure@apparent
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=+>ucs@iso        . #x24B0C)    ; &o-IU+24B0C;
+      )
+     ((=ucs              . #x45B5)     ; 䖵
+      ))
+    (=+>ucs@iso                . #x24B24)      ; &o-IU+24B24;
+    (->subsumptive
+     ((ideographic-structure@apparent
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+       (=ucs               . #x2FF1)   ; ⿱
+       )
+       ((=ucs@iso          . #x24B0C)  ; &MJ041159;
+       (=daikanwa          . 21410)    ; &I-M-21410;
+       )
+       ((=ucs              . #x45B5)   ; 䖵
+       ))
+      (=mj               . 041177)     ; &MJ041177;
+      (=koseki           . 240350)     ; &MJ041177;
+      (=daikanwa         . 21436)      ; &I-M-21436;
+      (<-formed
+       ((=ucs@unicode      . #x74E5)   ; &C2-7041;
+       (=cns11643-2        . #x7041)   ; &C2-7041; [80-33]
+       (=daikanwa          . 21433)    ; &I-M-21433;
+       ))
+      (<-formed$_1*sources
+       koseki)
+      (<-formed*sources
+       koseki)
+      (<-same
+       ((=ucs@unicode      . #x74E5)   ; &C2-7041;
+       (=cns11643-2        . #x7041)   ; &C2-7041; [80-33]
+       (=daikanwa          . 21433)    ; &I-M-21433;
+       ))
+      (<-same*sources
+       pianhai daikanwa)
+      (->subsumptive
+       ((==koseki          . 240350)   ; &g2-M-21436;
+       (==daikanwa         . 21436)    ; &g2-M-21436;
+       )
+       ((==mj              . 041177)   ; &g2-MJ041177;
+       ))
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+       (=ucs               . #x2FFA)   ; ⿺
+       )
+       ((=ucs@unicode      . #x8821)   ; &MJ023807;
+       (=mj                . 023807)   ; &MJ023807;
+       )
+       ((=ucs@unicode      . #x74DC)   ; &G0-394F;
+       (=gb2312            . #x394F)   ; &G0-394F; [25-47]
+       (=daikanwa          . 21371)    ; &I-M-21371;
+       ))
+      (=ucs@iso                  . #x24B24)    ; &U-00024B24;
+      (->subsumptive
+       ((==ucs@iso         . #x24B24)  ; &g2-IU-00024B24;
+       ))
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+       (=ucs               . #x2FFA)   ; ⿺
+       )
+       ((=ucs@unicode      . #x8821)   ; &MJ023807;
+       (=mj                . 023807)   ; &MJ023807;
+       )
+       ((=ucs@cns          . #x74DC)   ; &HD-JT-B5DE;
+       (=cns11643-1        . #x466A)   ; &HD-JT-B5DE; [38-74]
+       ))
+      (ideographic-structure@apparent
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+       (=ucs               . #x2FF1)   ; ⿱
+       )
+       ((=ucs@cns          . #x24B0C)  ; &C5-4744;
+       (=cns11643-5        . #x4744)   ; &C5-4744; [39-36]
+       )
+       ((=ucs              . #x45B5)   ; 䖵
+       ))
+      (=ucs@cns                  . #x24B24)    ; &C7-623C;
+      (=cns11643-7       . #x623C)     ; &C7-623C; [66-28]
+      (->subsumptive
+       ((==ucs@cns         . #x24B24)  ; &g2-CU+24B24;
+       (==cns11643-7       . #x623C)   ; &g2-CU+24B24; [66-28]
+       ))
+      ))
     ))
 (define-char
   '((ideographic-radical . 97) ; ⽠