From 71516f90fa01ad1c519753f2ab5dec3d5b4f310e Mon Sep 17 00:00:00 2001
From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Sun, 2 Jul 2023 11:04:22 +0900
Subject: [PATCH] (U+3CBD): Add `sound@ja/on/{kan|go}'. (UU+3CBD): Unify
 M-17137; add `<-same' and `->formed' for UU+6D8A. (U+6D8A):
 Add `<-denotational@usage' for A2-DJT-06194; apply new
 conventions for glyph granularity. (A2-DJT-06194): New
 abstract node.

---
 lisp/utf-2000/Ideograph-R085-Water.el |  275 +++++++++++++++++++++------------
 1 file changed, 180 insertions(+), 95 deletions(-)

diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el
index d214066..bccec89 100644
--- a/lisp/utf-2000/Ideograph-R085-Water.el
+++ b/lisp/utf-2000/Ideograph-R085-Water.el
@@ -2323,6 +2323,118 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6C35)	; æ°µ
+      )
+     ((=>ucs@iwds-1	  . #x5203)	; &A-IWDSU+5203;
+      (=>iwds-1		  .  0106)	; &A-IWDSU+5203;
+      ))
+    (sound@ja/on/go	"neN" "sIyAu" "niN")
+    (sound@ja/on/kan	"deN" "sIyAu" "ziN")
+    (=ucs		. #x3CBD)	; ã²½
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3CBD)	; ã²½
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 3)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6C35)	; æ°µ
+      )
+     ((=ucs@unicode	  . #x5203)	; &MJ007450;
+      (=mj		  . 007450)	; &MJ007450;
+      ))
+    (=ucs@unicode	. #x3CBD)	; &C4-2322;
+    (=cns11643-4	. #x2322)	; &C4-2322; [03-02]
+    (=daikanwa		. 17137)	; &I-M-17137;
+    (<-same
+     ((=ucs@unicode	  . #x6D8A)	; &AJ1-17938;
+      (=adobe-japan1-5	  . 17938)	; &AJ1-17938;
+      (=daikanwa	  . 17532)	; &I-M-17532;
+      ))
+    (<-same$_1*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (<-same*sources
+     shuowen-tongxun-dingsheng daikanwa)
+    (->formed
+     ((=ucs@unicode	  . #x6D8A)	; &AJ1-17938;
+      (=adobe-japan1-5	  . 17938)	; &AJ1-17938;
+      ))
+    (->formed$_1*sources
+     shuowen-tongxun-dingsheng)
+    (->formed*sources
+     shuowen-tongxun-dingsheng)
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6C35)	; æ°µ
+	)
+       ((=>>ucs@unicode	    . #x5203)	; &G-MJ007450;
+	(=>>mj		    . 007450)	; &G-MJ007450;
+	))
+      (=>>ucs@unicode	  . #x3CBD)	; &G-UU+3CBD;
+      (=>>daikanwa	  . 17137)	; &G-UU+3CBD;
+      (->subsumptive
+       ((==ucs@unicode	    . #x3CBD)	; &g2-M-17137;
+	(==daikanwa	    . 17137)	; &g2-M-17137;
+	(->subsumptive
+	 ((===ucs@unicode     . #x3CBD)	; &R-UU+3CBD;
+	  )
+	 ((===daikanwa	      . 17137)	; &R-M-17137;
+	  ))
+	))
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x6C35)	; æ°µ
+	)
+       ((=>>ucs@cns	    . #x5203)	; &G-GT-02406;
+	(=>>gt		    . 02406)	; &G-GT-02406;
+	))
+      (=>>ucs@cns	  . #x3CBD)	; &G-C4-2322;
+      (=>>cns11643-4	  . #x2322)	; &G-C4-2322; [03-02]
+      (->subsumptive
+       ((==ucs@cns	    . #x3CBD)	; &g2-CU+3CBD;
+	(==cns11643-4	    . #x2322)	; &g2-CU+3CBD; [03-02]
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3CBD)	; ã²½
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 3)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6C35)	; æ°µ
+      )
+     ((=ucs		  . #x2F81E)	; 刃
+      ))
+    (=ucs-var-001	. #x3CBD)	; &U-v001+3CBD;
+    (->subsumptive
+     ((==ucs-var-001	  . #x3CBD)	; &g2-U-v001+3CBD;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 3)
+    (total-strokes	 . 6)
     (=ucs		. #x6C5D)	; 汝
     (=adobe-japan1-0	. 03274)	; &I-AJ1-03274;
     (=jis-x0208		. #x4672)	; &I-J90-4672; [38-82]
@@ -2670,94 +2782,6 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6C35)	; æ°µ
-      )
-     ((=>ucs@iwds-1	  . #x5203)	; &A-IWDSU+5203;
-      (=>iwds-1		  .  0106)	; &A-IWDSU+5203;
-      ))
-    (=ucs		. #x3CBD)	; ã²½
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x3CBD)	; ã²½
-      ))
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6C35)	; æ°µ
-      )
-     ((=ucs		  . #x2F81E)	; 刃
-      ))
-    (=ucs-var-001	. #x3CBD)	; &U-v001+3CBD;
-    (->subsumptive
-     ((==ucs-var-001	  . #x3CBD)	; &g2-U-v001+3CBD;
-      ))
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x3CBD)	; ã²½
-      ))
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6C35)	; æ°µ
-      )
-     ((=ucs@unicode	  . #x5203)	; &MJ007450;
-      (=mj		  . 007450)	; &MJ007450;
-      ))
-    (=ucs@unicode	. #x3CBD)	; &C4-2322;
-    (=cns11643-4	. #x2322)	; &C4-2322; [03-02]
-    (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x6C35)	; æ°µ
-	)
-       ((=>>ucs@unicode	    . #x5203)	; &G-MJ007450;
-	(=>>adobe-japan1-4  . 13858)	; &G-MJ007450;
-	))
-      (=>>ucs@unicode	  . #x3CBD)	; &G-UU+3CBD;
-      (->subsumptive
-       ((==ucs@unicode	    . #x3CBD)	; &g2-UU+3CBD;
-	(->subsumptive
-	 ((===ucs@unicode     . #x3CBD)	; &R-UU+3CBD;
-	  ))
-	))
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x6C35)	; æ°µ
-	)
-       ((=>>ucs@cns	    . #x5203)	; &G-GT-02406;
-	(=>>gt		    . 02406)	; &G-GT-02406;
-	))
-      (=>>ucs@cns	  . #x3CBD)	; &G-C4-2322;
-      (=>>cns11643-4	  . #x2322)	; &G-C4-2322; [03-02]
-      (->subsumptive
-       ((==ucs@cns	    . #x3CBD)	; &g2-CU+3CBD;
-	(==cns11643-4	    . #x2322)	; &g2-CU+3CBD; [03-02]
-	))
-      ))
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
     (=ucs		. #x6C62)	; æ±¢
     (=adobe-japan1-0	. 05384)	; &I-AJ1-05384;
     (=jis-x0208		. #x5D69)	; &I-J90-5D69; [61-73]
@@ -16197,19 +16221,76 @@
     (=cbeta		. 00578)	; &I-CB00578;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational@usage
+     ((==>daijiten	  . 06194)	; &A2-DJT-06194;
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6C35)	; æ°µ
+      )
+     ((=ucs		  . #x5FCD)	; 忍
+      ))
+    (sound@ja/on/go	"neN" "niN")
+    (sound@ja/on/kan	"deN" "ziN")
     (=ucs		. #x6D8A)	; 涊
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6D8A)	; 涊
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6C35)	; æ°µ
+      )
+     ((=ucs@unicode	  . #x5FCD)	; &MJ011378;
+      (=mj		  . 011378)	; &MJ011378;
+      ))
+    (=ucs@unicode	. #x6D8A)	; &AJ1-17938;
+    (=adobe-japan1-5	. 17938)	; &AJ1-17938;
+    (=cns11643-1	. #x564A)	; &I-C1-564A; [54-42]
+    (=jis-x0213-2	. #x6E58)	; &I-JX2-6E58; [78-56]
     (=big5		. #xAF47)	; &I-B-AF47;
+    (=daikanwa		. 17532)	; &I-M-17532;
+    (=daijiten		. 06194)	; &I-DJT-06194;
+    (=jef-china3	. #x56AC)	; &I-JC3-56AC;
+    (<-formed
+     ((=ucs@unicode	  . #x3CBD)	; &C4-2322;
+      (=cns11643-4	  . #x2322)	; &C4-2322; [03-02]
+      (=daikanwa	  . 17137)	; &I-M-17137;
+      ))
     (->subsumptive
-     ((=ucs@unicode	  . #x6D8A)	; &AJ1-17938;
-      (=adobe-japan1-5	  . 17938)	; &AJ1-17938;
-      (=jis-x0213-2	  . #x6E58)	; &I-JX2-6E58; [78-56]
-      (=daikanwa	  . 17532)	; &I-M-17532;
-      (=jef-china3	  . #x56AC)	; &I-JC3-56AC;
+     ((==ucs@unicode	  . #x6D8A)	; &g2-AJ1-17938;
+      (==adobe-japan1-5	  . 17938)	; &g2-AJ1-17938;
+      (==jis-x0213-2	  . #x6E58)	; &g2-AJ1-17938; [78-56]
+      (==daikanwa	  . 17532)	; &g2-AJ1-17938;
+      (==daijiten	  . 06194)	; &g2-AJ1-17938;
+      (==jef-china3	  . #x56AC)	; &g2-AJ1-17938;
+      (->subsumptive
+       ((===daikanwa	    . 17532)	; &R-M-17532;
+	)
+       ((===daijiten	    . 06194)	; &R-DJT-06194;
+	)
+       ((===jis-x0213-2	    . #x6E58)	; &R-JX2-6E58; [78-56]
+	)
+       ((===adobe-japan1-5  . 17938)	; &R-AJ1-17938;
+	)
+       ((===jef-china3	    . #x56AC)	; &R-JC3-56AC;
+	)
+       ((===ucs@unicode	    . #x6D8A)	; &R-UU+6D8A;
+	))
       )
-     ((=cns11643-1	  . #x564A)	; &C1-564A; [54-42]
+     ((==ucs@cns	  . #x6D8A)	; &g2-CU+6D8A;
+      (==cns11643-1	  . #x564A)	; &g2-CU+6D8A; [54-42]
       ))
     ))
 (define-char
@@ -66037,6 +66118,10 @@
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
+    (==>daijiten	. 06194)	; &A2-DJT-06194;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
     (==>ucs@bucs	. #x6D95)	; &BUCS+6D95;
     (==>daijiten	. 06202)	; &BUCS+6D95;
     ))
-- 
1.7.10.4