From 205a743ce39b24af3a435cf22b9cc311de8b7a3d Mon Sep 17 00:00:00 2001
From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Fri, 5 Mar 2021 04:07:15 +0900
Subject: [PATCH] (U+6530): Apply new conventions for glyph granularity.
 (U+6530-var-001): New character; use `<-denotational' for
 U+6530.

---
 lisp/utf-2000/Ideograph-R019-Power.el |   89 ++++++++++++++++++++++++---------
 1 file changed, 65 insertions(+), 24 deletions(-)

diff --git a/lisp/utf-2000/Ideograph-R019-Power.el b/lisp/utf-2000/Ideograph-R019-Power.el
index d0c423e..3bc1ad0 100644
--- a/lisp/utf-2000/Ideograph-R019-Power.el
+++ b/lisp/utf-2000/Ideograph-R019-Power.el
@@ -727,42 +727,65 @@
   '((ideographic-radical . 19)	; ⼒
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (ideographic-structure
+     ((=>ucs@iwds-1	  . #x2FFA)	; &A-IWDSU+2FFA;
+      (=>iwds-1		  .  0307)	; &A-IWDSU+2FFA;
+      )
+     ((=ucs		  . #x652F)	; 支
+      )
+     ((=ucs		  . #x529B)	; 力
+      ))
+    (sound@ja/on	"ki")
+    (=ucs		. #x6530)	; 攰
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6530)	; 攰
+      ))
+    (ideographic-radical . 19)	; ⼒
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
     (hanyu-dazidian	1 367 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
       (=ucs		  . #x2FFA)	; ⿺
       )
-     ((=ucs		  . #x652F)	; 支
+     ((=ucs@unicode	  . #x652F)	; &AJ1-02215;
+      (=adobe-japan1-0	  . 02215)	; &AJ1-02215;
       )
      ((=ucs		  . #x529B)	; 力
       ))
-    (=ucs		. #x6530)	; 攰
+    (=ucs@unicode	. #x6530)	; &MJ012942;
+    (=mj		. 012942)	; &MJ012942;
     (=cns11643-6	. #x236C)	; &I-C6-236C; [03-76]
-    (=gb12345		. #x7C3F)	; 攰 [92-31]
+    (=gb12345		. #x7C3F)	; &MJ012942; [92-31]
+    (=koseki		. 026810)	; &MJ012942;
     (=daikanwa		. 02308)	; &I-M-02308;
+    (<-formed
+     ((=ucs@unicode	  . #x3A7B)	; &C4-2D40;
+      (=cns11643-4	  . #x2D40)	; &C4-2D40; [13-32]
+      (=daikanwa	  . 13072)	; &I-M-13072;
+      )
+     ((=ucs@unicode	  . #x6532)	; &AJ1-17718;
+      (=adobe-japan1-5	  . 17718)	; &AJ1-17718;
+      ))
+    (<-formed$_1*sources
+     jiyun koseki)
+    (<-formed$_2*sources
+     koseki@mj)
+    (<-formed*sources
+     koseki mj)
+    (<-same
+     ((=ucs@unicode	  . #x3A7B)	; &C4-2D40;
+      (=cns11643-4	  . #x2D40)	; &C4-2D40; [13-32]
+      (=daikanwa	  . 13072)	; &I-M-13072;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
-	(=ucs		    . #x2FFA)	; ⿺
-	)
-       ((=jef-china3	    . #x50BD)	; &JC3-50BD;
-	)
-       ((==ucs@unicode	    . #x529B)	; &g2-AJ1-03991;
-	(==adobe-japan1-0   . 03991)	; &g2-AJ1-03991;
-	))
-      (==daikanwa	  . 02308)	; &g2-M-02308;
+     ((==daikanwa	  . 02308)	; &g2-M-02308;
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
-	(=ucs		    . #x2FFA)	; ⿺
-	)
-       ((==ucs@unicode	    . #x652F)	; &g2-AJ1-02215;
-	(==adobe-japan1-0   . 02215)	; &g2-AJ1-02215;
-	)
-       ((==ucs@unicode	    . #x529B)	; &g2-AJ1-03991;
-	(==adobe-japan1-0   . 03991)	; &g2-AJ1-03991;
-	))
-      (==ucs@unicode	  . #x6530)	; &g2-UU+6530;
+     ((==ucs@unicode	  . #x6530)	; &g2-UU+6530;
       (==cns11643-6	  . #x236C)	; &g2-UU+6530; [03-76]
       (==gb12345	  . #x7C3F)	; &g2-UU+6530; [92-31]
       (->subsumptive
@@ -775,6 +798,24 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x6530)	; 攰
+      ))
+    (ideographic-radical . 19)	; ⼒
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@unicode	  . #x652F)	; &AJ1-02215;
+      (=adobe-japan1-0	  . 02215)	; &AJ1-02215;
+      )
+     ((=ucs		  . #x529B)	; 力
+      ))
+    (=ucs-var-001	. #x6530)	; &U-v001+6530;
+    ))
+(define-char
   '((ideographic-radical . 19)	; ⼒
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
-- 
1.7.10.4