From edc296e6806605a075f3b3a58357db2aeecc2599 Mon Sep 17 00:00:00 2001
From: tomo <tomo>
Date: Sun, 5 Aug 2001 08:00:21 +0000
Subject: [PATCH] - Merge `ideographic-cdp'. - Add `ideographic-structure'.

---
 lisp/utf-2000/Ideograph-R001-One.el  |   93 ++++++++++++++++++++++++++++++++++
 lisp/utf-2000/Ideograph-R002-Line.el |   17 +++++++
 2 files changed, 110 insertions(+)

diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el
index e48f9d4..d46b7e7 100644
--- a/lisp/utf-2000/Ideograph-R001-One.el
+++ b/lisp/utf-2000/Ideograph-R001-One.el
@@ -2,6 +2,7 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 0)
     (total-strokes	 . 1)
+    (ideographic-cdp	. 1)
     (shinjigen-1	. 1)
     (shinjigen-2	. 1)
     (japanese-jisx0208-1978	. #x306C)	; ø»‚“
@@ -22,6 +23,7 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 1)
     (total-strokes	 . 2)
+    (ideographic-cdp	. 6)
     (shinjigen-1	. 4)
     (shinjigen-2	. 4)
     (japanese-jisx0208-1978	. #x437A)	; ø»‚¯•
@@ -102,6 +104,7 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 1)
     (total-strokes	 . 2)
+    (ideographic-cdp	. 9)
     (shinjigen-1	. 3)
     (shinjigen-2	. 3)
     (japanese-jisx0208-1978	. #x3C37)	; ø»‚¤€
@@ -177,6 +180,7 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
+    (ideographic-cdp	. 23)
     (shinjigen-1	. 12)
     (shinjigen-2	. 12)
     (japanese-jisx0208-1978	. #x4B7C)	; ø»‚»‡
@@ -213,6 +217,7 @@
     (ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
+    (ideographic-cdp	. 22)
     (shinjigen-1	. 9)
     (shinjigen-2	. 9)
     (chinese-gb2312		. #x5549)	; ø»…“„
@@ -228,6 +233,7 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
+    (ideographic-cdp	. 12)
     (shinjigen-1	. 6)
     (shinjigen-2	. 6)
     (japanese-jisx0208-1978	. #x3B30)	; ø»‚¢›
@@ -248,6 +254,7 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
+    (ideographic-cdp	. 18)
     (shinjigen-1	. 8)
     (shinjigen-2	. 8)
     (japanese-jisx0208-1978	. #x3E65)	; ø»‚§ª
@@ -268,6 +275,7 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
+    (ideographic-cdp	. 19)
     (shinjigen-1	. 5)
     (shinjigen-2	. 5)
     (japanese-jisx0208-1978	. #x323C)	; ø»‚•™
@@ -288,6 +296,7 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
+    (ideographic-cdp	. 21)
     (chinese-gb2312	. #x5822)	; ø»…–·
     (japanese-jisx0212	. #x3024)	; ø»Šº•
     (chinese-isoir165	. #x5822)	; ø»¿‡
@@ -367,6 +376,7 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
+    (ideographic-cdp	. 38)
     (shinjigen-1	. 18)
     (shinjigen-2	. 18)
     (japanese-jisx0208-1978	. #x4954)	; ø»‚·£
@@ -395,6 +405,17 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
+    (ideographic-cdp	. 17)
+    (ideographic-structure
+     (:cdp-combinator	3
+      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+		 (ucs		     . #x2FF3)	; ⿳
+		 )
+      )
+     ((ucs		  . #xF537)	; 
+      )
+     ((ucs		  . #x4E00)	; 一
+      ))
     (chinese-gb2312	. #x536B)	; ø»…ª
     (chinese-isoir165	. #x536B)	; ø»¸º
     (chinese-cns11643-2 . #x212F)	; ø»“Œ®
@@ -430,6 +451,7 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
+    (ideographic-cdp	. 37)
     (shinjigen-1	. 19)
     (chinese-isoir165		. #x7A21)	; ø»Ž±‚
     (chinese-cns11643-2		. #x212D)	; ø»“Œ¬
@@ -445,6 +467,7 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
+    (ideographic-cdp	. 32)
     (shinjigen-1	. 15)
     (shinjigen-2	. 15)
     (japanese-jisx0208-1978	. #x5022)	; ø»ƒƒ
@@ -465,6 +488,7 @@
     (ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
+    (ideographic-cdp	. 45)
     (shinjigen-1	. 16)
     (shinjigen-2	. 16)
     (japanese-jisx0208-1978	. #x312F)	; ø»‚“®
@@ -579,6 +603,17 @@
     (ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
+    (ideographic-cdp	. 845)
+    (ideographic-structure
+     (:cdp-combinator	2
+      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+		 (ucs		     . #x2FF1)	; ⿱
+		 )
+      )
+     ((ucs		  . #xF4F9)	; 
+      )
+     ((ucs		  . #xF56A)	; 
+      ))
     (chinese-cns11643-2 . #x212E)	; ø»“Œ­
     (chinese-big5	. #xC94E)	; øº¡¥’
     ))
@@ -593,6 +628,7 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
+    (ideographic-cdp	. 58)
     (shinjigen-1	. 22)
     (shinjigen-2	. 22)
     (japanese-jisx0208-1978	. #x336E)	; ø»‚—©
@@ -613,6 +649,17 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
+    (ideographic-cdp	. 54)
+    (ideographic-structure
+     (:cdp-combinator	2
+      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+		 (ucs		     . #x2FF1)	; ⿱
+		 )
+      )
+     ((ucs		  . #x4E0D)	; 不
+      )
+     ((ucs		  . #x4E00)	; 一
+      ))
     (shinjigen-1	. 26)
     (shinjigen-2	. 26)
     (japanese-jisx0208-1978	. #x5023)	; ø»ƒ„
@@ -633,6 +680,7 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
+    (ideographic-cdp	. 53)
     (shinjigen-1	. 23)
     (shinjigen-2	. 23)
     (japanese-jisx0208-1978	. #x4024)	; ø»‚©¥
@@ -686,6 +734,7 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
+    (ideographic-cdp	. 62)
     (shinjigen-1	. 20)
     (shinjigen-2	. 20)
     (japanese-jisx0208-1978	. #x3556)	; ø»‚š
@@ -718,6 +767,17 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
+    (ideographic-cdp	. 61)
+    (ideographic-structure
+     (:cdp-combinator	2
+      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+		 (ucs		     . #x2FF1)	; ⿱
+		 )
+      )
+     ((ucs		  . #x4E00)	; 一
+      )
+     ((ucs		  . #xF58E)	; 
+      ))
     (shinjigen-1	. 27)
     (shinjigen-2	. 27)
     (japanese-jisx0208-1978	. #x4A3A)	; ø»‚¸§
@@ -853,6 +913,17 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
+    (ideographic-cdp	. 88)
+    (ideographic-structure
+     (:cdp-combinator	2
+      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+		 (ucs		     . #x2FF1)	; ⿱
+		 )
+      )
+     ((ucs		  . #x6C36)	; æ°¶
+      )
+     ((ucs		  . #x4E00)	; 一
+      ))
     (shinjigen-1	. 29)
     (shinjigen-2	. 29)
     (japanese-jisx0208-1978	. #x3E67)	; ø»‚§¬
@@ -873,6 +944,17 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 5)
     (total-strokes	 . 6)
+    (ideographic-cdp	. 3564)
+    (ideographic-structure
+     (:cdp-combinator	2
+      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+		 (ucs		     . #x2FF1)	; ⿱
+		 )
+      )
+     ((ucs		  . #x4E00)	; 一
+      )
+     ((ucs		  . #x53BB)	; 去
+      ))
     (japanese-jisx0212	. #x3026)	; ø»Šº—
     (chinese-cns11643-1 . #x4723)	; ø»‘º’
     (ideograph-gt-pj-2	. #x303B)	; ý¡€€€½
@@ -1135,6 +1217,17 @@
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
+    (ideographic-cdp	. 2111)
+    (ideographic-structure
+     (:cdp-combinator	2
+      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+		 (ucs		     . #x2FF1)	; ⿱
+		 )
+      )
+     ((ucs		  . #xF4E5)	; 
+      )
+     ((ucs		  . #xF4FA)	; 
+      ))
     (shinjigen-1	. 5732)
     (shinjigen-2	. 5732)
     (japanese-jisx0208-1978	. #x4A42)	; ø»‚¸¯
diff --git a/lisp/utf-2000/Ideograph-R002-Line.el b/lisp/utf-2000/Ideograph-R002-Line.el
index 723e6f4..a5270b7 100644
--- a/lisp/utf-2000/Ideograph-R002-Line.el
+++ b/lisp/utf-2000/Ideograph-R002-Line.el
@@ -65,6 +65,7 @@
   '((ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
+    (ideographic-cdp	. 160)
     (shinjigen-1	. 32)
     (shinjigen-2	. 32)
     (chinese-gb2312		. #x513E)	; ø»…
@@ -105,6 +106,7 @@
   '((ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
+    (ideographic-cdp	. 164)
     (shinjigen-1	. 34)
     (shinjigen-2	. 34)
     (japanese-jisx0208-1978	. #x4366)	; ø»‚¯
@@ -125,6 +127,17 @@
   '((ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
+    (ideographic-cdp	. 322)
+    (ideographic-structure
+     (:cdp-combinator	3
+      :char	((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+		 (ucs		     . #x2FF9)	; ⿹
+		 )
+      )
+     ((ucs		  . #xF617)	; 
+      )
+     ((ucs		  . #xF569)	; 
+      ))
     (japanese-jisx0212		. #x302B)	; ø»Šºœ
     (chinese-cns11643-2		. #x2130)	; ø»“Œ¯
     (japanese-jisx0213-2	. #x2127)	; ø»¤†
@@ -170,6 +183,7 @@
     (ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
+    (ideographic-cdp	. 161)
     (chinese-cns11643-1 . #x4464)	; ø»‘¶¹
     (chinese-big5	. #xA4A5)	; øºŸ£š
     ))
@@ -184,6 +198,7 @@
   '((ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 4)
     (total-strokes	 . 5)
+    (ideographic-cdp	. 342)
     (shinjigen-1	. 36)
     (shinjigen-2	. 36)
     (japanese-jisx0208-1978	. #x5025)	; ø»ƒ†
@@ -221,6 +236,7 @@
   '((ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 6)
     (total-strokes	 . 7)
+    (ideographic-cdp	. 173)
     (shinjigen-1	. 38)
     (shinjigen-2	. 38)
     (japanese-jisx0208-1978	. #x367A)	; ø»‚œ
@@ -259,6 +275,7 @@
   '((ideographic-radical . 2)	; ⼁
     (ideographic-strokes . 7)
     (total-strokes	 . 8)
+    (ideographic-cdp	. 175)
     (chinese-cns11643-2 . #x2531)	; ø»“’¨
     (ideograph-gt-pj-2	. #x305E)	; ý¡€€µ
     (chinese-big5	. #xCBB1)	; øº¡«
-- 
1.7.10.4