From: tomo <tomo>
Date: Wed, 21 Apr 2010 09:24:05 +0000 (+0000)
Subject: Sync up with r21-4-22-chise-0_24-13.
X-Git-Tag: r21-4-22-u2km-0_24-13
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=234034c224332c5a3789c885a095cc3929b4f9cd;p=chise%2Fxemacs-chise.git

Sync up with r21-4-22-chise-0_24-13.
---

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index 3bcabd2..fe7d8b8 100644
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,22 @@
+2010-04-16  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R003-Dot.el (M-00098): Unify GT-00142; add
+	`<-denotational' for <BOPOMOFO LETTER E>; use
+	`{ideographic|total}-strokes@{daikanwa|gt}' instead of
+	`{ideographic|total}-strokes'; add `<-original' for GT-00038.
+	(BC-87D2): Use `<-denotational' for U-0002007E.
+
+	* Ideograph-R001-One.el (GT-00038): Use `<-denotational' for
+	<BOPOMOFO LETTER E>.
+	(GT-K00264): Moved to Ideograph-R012-Eight.el; delete `=>daikanwa'
+	for M-00015; use U+5EFE instead of U+4E0C as the value of
+	`<-formed@component/connect-above'.
+
+	* Ideograph-R012-Eight.el (GT-K00264): Moved from
+	Ideograph-R001-One.el; delete `=>daikanwa' for M-00015; use U+5EFE
+	instead of U+4E0C as the value of
+	`<-formed@component/connect-above'.
+
 2010-04-14  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* Ideograph-R210-Even.el (U+9F4E): Use `=>jis-x0208' and
diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el
index 7f72245..f18a8f6 100644
--- a/lisp/utf-2000/Ideograph-R001-One.el
+++ b/lisp/utf-2000/Ideograph-R001-One.el
@@ -106,8 +106,11 @@
       ))
     ))
 (define-char
-  '((script		Ideograph)
-    (=>ucs		. #x311C)	; ㄜ
+  '((<-denotational
+     ((name		  . "BOPOMOFO LETTER E")
+      (=ucs		  . #x311C)	; ㄜ
+      ))
+    (script		Ideograph)
     (ideographic-radical . 1)	; ⼀
     (ideographic-strokes@daikanwa . 1)
     (total-strokes@daikanwa	  . 2)
@@ -423,25 +426,6 @@
     (mojikyo		. 000015)	; &MCS-6000000F;
     ))
 (define-char
-  '((=>daikanwa		. 00015)	; 丌
-    (ideographic-radical . 1)	; ⼀
-    (ideographic-strokes . 2)
-    (total-strokes	 . 3)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x4E00)	; 一
-      )
-     ((=gt-k		  . 00059)	; &GT-K00059;
-      ))
-    (=gt-k		. 00264)	; &GT-K00264;
-    (=gt-pj-k1		. #x3764)	; &GT-K00264; [23-68]
-    (<-formed@component/connect-above
-     ((=ucs		  . #x4E0C)	; 丌
-      ))
-    ))
-(define-char
   '((ideographic-radical . 1)	; ⼀
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
diff --git a/lisp/utf-2000/Ideograph-R003-Dot.el b/lisp/utf-2000/Ideograph-R003-Dot.el
index 7e5354c..73411e7 100644
--- a/lisp/utf-2000/Ideograph-R003-Dot.el
+++ b/lisp/utf-2000/Ideograph-R003-Dot.el
@@ -170,19 +170,24 @@
     (mojikyo		. 000097)	; &MCS-60000061;
     ))
 (define-char
-  '((ideographic-radical . 3)	; ⼂
-    (ideographic-strokes . 2)
-    (total-strokes	 . 3)
-    (=daikanwa		. 00098)	; &M-00098;
-    (mojikyo		. 000098)	; &MCS-60000062;
-    ))
-(define-char
-  '((morohashi-daikanwa	98 0 0)
+  '((<-denotational
+     ((name		  . "BOPOMOFO LETTER E")
+      (=ucs		  . #x311C)	; ㄜ
+      ))
+    (script		Ideograph)
     (ideographic-radical . 3)	; ⼂
-    (ideographic-strokes . 4)
-    (total-strokes	 . 5)
+    (ideographic-strokes@daikanwa . 2)
+    (total-strokes@daikanwa	  . 3)
+    (ideographic-strokes@gt . 4)
+    (total-strokes@gt	    . 5)
     (=gt		. 00142)	; &GT-00142;
     (=gt-pj-2		. #x306D)	; &GT-00142; [16-77]
+    (=daikanwa		. 00098)	; &I-M-00098;
+    (mojikyo		. 000098)	; &MCS-60000062;
+    (<-original
+     ((=gt		  . 00038)	; &GT-00038;
+      (=daikanwa	  . 00005)	; &I-M-00005;
+      ))
     ))
 (define-char
   '((ideographic-radical@ucs . 3)	; ⼂
@@ -196,8 +201,9 @@
     (=daikanwa		. 02840)	; &I-M-02840;
     ))
 (define-char
-  '((=>ucs		. #x2007E)	; 𠁾
-    (=>daikanwa		. 02840)	; 𠁾
+  '((<-denotational
+     ((=ucs		  . #x2007E)	; 𠁾
+      ))
     (ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
diff --git a/lisp/utf-2000/Ideograph-R012-Eight.el b/lisp/utf-2000/Ideograph-R012-Eight.el
index 5fad268..36d7c9c 100644
--- a/lisp/utf-2000/Ideograph-R012-Eight.el
+++ b/lisp/utf-2000/Ideograph-R012-Eight.el
@@ -56,6 +56,24 @@
     ))
 (define-char
   '((ideographic-radical . 12)	; ⼋
+    (ideographic-strokes . 1)
+    (total-strokes	 . 3)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E00)	; 一
+      )
+     ((=gt-k		  . 00059)	; &GT-K00059;
+      ))
+    (=gt-k		. 00264)	; &GT-K00264;
+    (=gt-pj-k1		. #x3764)	; &GT-K00264; [23-68]
+    (<-formed@component/connect-above
+     ((=ucs		  . #x5EFE)	; 廾
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 12)	; ⼋
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
     (=ucs		. #x516C)	; 公