From: tomo <tomo>
Date: Thu, 2 Apr 2009 14:24:40 +0000 (+0000)
Subject: Sync up with r21-4-21-chise-0_24-11.
X-Git-Tag: r21-4-21-u2km-0_24-11
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e1e05c35cd4e30e6bbecb46bebde5ea66e3f6a3;p=chise%2Fxemacs-chise.git

Sync up with r21-4-21-chise-0_24-11.
---

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index db24f9e..ac6e534 100644
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,15 @@
+2009-03-31  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* ruimoku6.el, Ideograph-R169-Gate.el (RUI6-E01D): Map to
+	U-0002B522.
+
+	* Ideograph-R066-Rap.el (U+653C): Use `->subsumptive'; integrate
+	H4-D4B6.
+
+2009-03-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R030-Mouth.el (H12-EC4A): Unify CB03767.
+
 2009-03-24  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* Ideograph-R012-Eight.el (U-0002053A): Use `->denotational'.
diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el
index 1b053be..851d180 100644
--- a/lisp/utf-2000/Ideograph-R030-Mouth.el
+++ b/lisp/utf-2000/Ideograph-R030-Mouth.el
@@ -16379,7 +16379,8 @@
       (=ks-x1001	  . #x6748)	; &I-K0-6748; [71-40]
       (=jis-x0213-1	  . #x3151)	; &I-JX1-3151; [17-49]
       ))
-    (=hanziku-12	. #xEC4A)	; &HZK12-EC4A;
+    (=hanziku-12	. #xEC4A)	; &CB03767;
+    (=cbeta		. 03767)	; &I-CB03767;
     ))
 (define-char
   '((=>ucs*		. #x5563)	; 啣
diff --git a/lisp/utf-2000/Ideograph-R066-Rap.el b/lisp/utf-2000/Ideograph-R066-Rap.el
index 0621296..15f640a 100644
--- a/lisp/utf-2000/Ideograph-R066-Rap.el
+++ b/lisp/utf-2000/Ideograph-R066-Rap.el
@@ -251,10 +251,16 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x653C)	; 攼
-    (=jis-x0212		. #x4148)	; &I-JSP-4148; [33-40]
-    (=cns11643-4	. #x243E)	; &I-C4-243E; [04-30]
-    (=daikanwa		. 13122)	; &I-M-13122;
-    (=jef-china3	. #x50C5)	; &I-JC3-50C5;
+    (->subsumptive
+     ((=jis-x0212	  . #x4148)	; &M-13122; [33-40]
+      (=daikanwa	  . 13122)	; &I-M-13122;
+      (=ucs@unicode	  . #x653C)	; &M-13122;
+      )
+     ((=hanziku-4	  . #xD4B6)	; &HZK04-D4B6;
+      )
+     ((=cns11643-4	  . #x243E)	; &C4-243E; [04-30]
+      (=jef-china3	  . #x50C5)	; &I-JC3-50C5;
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
diff --git a/lisp/utf-2000/Ideograph-R169-Gate.el b/lisp/utf-2000/Ideograph-R169-Gate.el
index 1acc470..6eaf386 100644
--- a/lisp/utf-2000/Ideograph-R169-Gate.el
+++ b/lisp/utf-2000/Ideograph-R169-Gate.el
@@ -2327,19 +2327,23 @@
   '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 7)
     (total-strokes	 . 15)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-      (=ucs		  . #x2FF5)	; ⿵
-      )
-     ((=jis-x0208	  . #x4C67)	; &GT-55423; [44-71]
-      (=ks-x1001	  . #x5A26)	; &I-K0-5A26; [58-06]
-      (=cns11643-1	  . #x4F5C)	; &I-C1-4F5C; [47-60]
-      (=jis-x0213-1	  . #x4C67)	; &I-JX1-4C67; [44-71]
-      )
-     ((=ucs		  . #x4E32)	; 串
+    (=ucs		. #x2B522)	; 𫔢
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+	(=ucs		    . #x2FF5)	; ⿵
+	)
+       ((=jis-x0208	    . #x4C67)	; &GT-55423; [44-71]
+	(=ks-x1001	    . #x5A26)	; &I-K0-5A26; [58-06]
+	(=cns11643-1	    . #x4F5C)	; &I-C1-4F5C; [47-60]
+	(=jis-x0213-1	    . #x4C67)	; &I-JX1-4C67; [44-71]
+	)
+       ((=ucs		    . #x4E32)	; 串
+	))
+      (sources		  bos=A2003-10922-00012)
+      (=ruimoku-v6	  . #xE01D)	; &RUI6-E01D;
+      (=ucs@iso		  . #x2B522)	; &RUI6-E01D;
       ))
-    (sources		bos=A2003-10922-00012)
-    (=ruimoku-v6	. #xE01D)	; &RUI6-E01D;
     ))
 (define-char
   '((=>ucs		. #x95B5)	; 閵
diff --git a/lisp/utf-2000/ruimoku6.el b/lisp/utf-2000/ruimoku6.el
index 8c7f0f2..cc0ec95 100644
--- a/lisp/utf-2000/ruimoku6.el
+++ b/lisp/utf-2000/ruimoku6.el
@@ -340,10 +340,7 @@
     (=ruimoku-v6	. #xE01C)	; &I-RUI6-E01C;
     ))
 (define-char
-  '((ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 7)
-    (total-strokes	 . 15)
-    (ideographic-structure
+  '((ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
       (=ucs		  . #x2FF5)	; ⿵
       )
@@ -356,6 +353,7 @@
       ))
     (sources		bos=A2003-10922-00012)
     (=ruimoku-v6	. #xE01D)	; &RUI6-E01D;
+    (=ucs@iso		. #x2B522)	; &RUI6-E01D;
     ))
 (define-char
   '((ideographic-radical . 79)	; ⽎