From: tomo <tomo>
Date: Sat, 30 Oct 2010 15:50:31 +0000 (+0000)
Subject: Sync up with r21-4-22-chise-0_25-3.
X-Git-Tag: r21-4-22-u2km-0_25-3
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bb5a3838d1675c1bfcb0cf3d7c02c5b1d223253;p=chise%2Fxemacs-chise.git

Sync up with r21-4-22-chise-0_25-3.
---

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index 1ea3a95..d8acde4 100644
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,22 @@
+2010-10-27  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R066-Rap.el (U+6534): Use `->subsumptive' to separate
+	representative nodes.
+	(G-M-13267): Add ideographic-structure.
+	(M-13267): Modify ideographic-structure.
+
+2010-10-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R162-Walk.el (G-JU+9052): Unify G-J0-6E24.
+
+	* Ideograph-R078-Death.el (J0-5D47): Separate S2-3964.
+	(S1-3964): Unify S2-3964.
+
+	* Ideograph-R075-Tree.el (U+6A95): Unify B-ED40.
+	(M-15666): Separate B-ED40.
+
+	* Ideograph-R009-Man.el (G-CU+5043): Add ideographic-structure.
+
 2010-10-24  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* Ideograph-R018-Knife.el (U+5277): Add ideographic-structure.
diff --git a/lisp/utf-2000/Ideograph-R066-Rap.el b/lisp/utf-2000/Ideograph-R066-Rap.el
index 03a99f0..24d5577 100644
--- a/lisp/utf-2000/Ideograph-R066-Rap.el
+++ b/lisp/utf-2000/Ideograph-R066-Rap.el
@@ -4,24 +4,22 @@
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
     (=ucs		. #x6534)	; 攴
-    (=jis-x0208		. #x5A3D)	; &I-J90-5A3D; [58-29]
-    (=gb2312		. #x6A37)	; &I-G0-6A37; [74-23]
-    (=cns11643-3	. #x2167)	; &I-C3-2167; [01-71]
-    (=jis-x0213-1	. #x5A3D)	; &I-JX1-5A3D; [58-29]
-    (=big5-cdp		. #x8DA2)	; &I-CDP-8DA2;
-    (=gt		. 16576)	; &I-GT-16576;
-    (=gt-k		. 00529)	; &I-GT-K00529;
-    (=gt-pj-1		. #x5A3D)	; &I-GT-16576; [58-29]
-    (=daikanwa		. 13108)	; &I-M-13108;
-    (=cbeta		. 03002)	; &I-CB03002;
-    ))
-(define-char
-  '((=>ucs		. #x6534)	; 攴
-    (morohashi-daikanwa	13108 0 0)
-    (ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 0)
-    (total-strokes	 . 4)
-    (mojikyo		. 013108)	; &MCS-60003334;
+    (->subsumptive
+     ((=daikanwa	  . 13108)	; &M-13108;
+      (=cbeta		  . 03002)	; &I-CB03002;
+      )
+     ((=ucs@unicode	  . #x6534)	; &GT-16576;
+      (=jis-x0208	  . #x5A3D)	; &GT-16576; [58-29]
+      (=gb2312		  . #x6A37)	; &I-G0-6A37; [74-23]
+      (=cns11643-3	  . #x2167)	; &I-C3-2167; [01-71]
+      (=jis-x0213-1	  . #x5A3D)	; &I-JX1-5A3D; [58-29]
+      (=big5-cdp	  . #x8DA2)	; &I-CDP-8DA2;
+      (=gt		  . 16576)	; &I-GT-16576;
+      (=gt-k		  . 00529)	; &I-GT-K00529;
+      (=gt-pj-1		  . #x5A3D)	; &I-GT-16576; [58-29]
+      )
+     ((mojikyo		  . 013108)	; &MCS-60003334;
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -38,8 +36,7 @@
     (=gt-pj-1		. #x5A3E)	; &I-GT-16577; [58-30]
     (=daikanwa		. 13109)	; &I-M-13109;
     (<-formed@component/connect-left
-     ((=ucs		  . #x6534)	; 攴
-      (=daikanwa	  . 13108)	; &I-M-13108;
+     ((=daikanwa	  . 13108)	; &M-13108;
       ))
     (<-formed@component/connect-left*sources
      zhengzitong daikanwa)
@@ -2337,7 +2334,15 @@
       ))
     (=>>daikanwa	. 13267)	; &A-M-13267;
     (->subsumptive
-     ((=daikanwa	  . 13267)	; &M-13267;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x2F83F)	; 周
+	)
+       ((=daikanwa	    . 13108)	; &M-13108;
+	))
+      (=daikanwa	  . 13267)	; &M-13267;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")