From: tomo <tomo>
Date: Sun, 30 Sep 2001 03:55:20 +0000 (+0000)
Subject: Merge GB 12345 code points.
X-Git-Tag: r21-2-41-utf-2000-0_18-1~444
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=af3f111671c1490f0399a7ad14a077e982124163;p=chise%2Fxemacs-chise.git

Merge GB 12345 code points.
---

diff --git a/lisp/utf-2000/Ideograph-R170-Mound.el b/lisp/utf-2000/Ideograph-R170-Mound.el
index 17d9725..8ab685f 100644
--- a/lisp/utf-2000/Ideograph-R170-Mound.el
+++ b/lisp/utf-2000/Ideograph-R170-Mound.el
@@ -1099,6 +1099,7 @@
     (japanese-jisx0212		. #x6658)	; ø»ŒŠ
     (chinese-cns11643-1		. #x5867)	; ø»’””
     (japanese-jisx0213-1	. #x7D5B)	; ø»¤š¾
+    (chinese-gb12345		. #x5A6A)	; 陘
     (ideograph-daikanwa		. 41650)	; ø¸ŠŠ²
     (ucs			. #x9658)	; 陘
     ))
@@ -1175,17 +1176,25 @@
     (ucs			. #x965C)	; 陜
     ))
 (define-char
-  '((ideographic-radical . 170)	; ⾩
+  '((=>ucs		. #x965D)	; 陝
+    (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (shinjigen-2	. 8882)
     (japanese-jisx0208-1978	. #x7021)	; ø»ƒ°‚
     (japanese-jisx0208		. #x7021)	; ø»ˆ„Š
     (korean-ksc5601		. #x606D)	; ø»‰·º
-    (chinese-cns11643-1		. #x5865)	; ø»’”’
     (japanese-jisx0208-1990	. #x7021)	; ø½‹©¾
     (ideograph-daikanwa		. 41657)	; ø¸ŠŠ¹
-    (ucs			. #x965D)	; 陝
+    ))
+(define-char
+  '((morohashi-daikanwa	41657 0 0)
+    (ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (chinese-cns11643-1 . #x5865)	; ø»’”’
+    (chinese-gb12345	. #x4942)	; 陝
+    (ucs		. #x965D)	; 陝
     ))
 (define-char
   '((ideographic-radical . 170)	; ⾩
@@ -1299,6 +1308,7 @@
     (korean-ksc5601		. #x7266)	; ø»Š’
     (chinese-cns11643-1		. #x5862)	; ø»’”
     (japanese-jisx0208-1990	. #x3F58)	; ø½Š¢·
+    (chinese-gb12345		. #x5573)	; 陣
     (ideograph-daikanwa		. 41667)	; ø¸Š‹ƒ
     (ucs			. #x9663)	; 陣
     ))
@@ -1586,7 +1596,8 @@
     (ucs		. #x966F)	; 陯
     ))
 (define-char
-  '((ideographic-radical . 170)	; ⾩
+  '((=>ucs		. #x9670)	; 陰
+    (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (shinjigen-2	. 8888)
@@ -1596,7 +1607,14 @@
     (chinese-cns11643-1		. #x5D75)	; ø»’›¸
     (japanese-jisx0208-1990	. #x3122)	; ø½Š
     (ideograph-daikanwa		. 41691)	; ø¸Š‹›
-    (ucs			. #x9670)	; 陰
+    ))
+(define-char
+  '((morohashi-daikanwa	41691 0 0)
+    (ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-gb12345	. #x5275)	; 陰
+    (ucs		. #x9670)	; 陰
     ))
 (define-char
   '((ideographic-radical . 170)	; ⾩
@@ -1674,6 +1692,7 @@
     (korean-ksc5601		. #x7267)	; ø»Š’
     (chinese-cns11643-1		. #x5D73)	; ø»’›¶
     (japanese-jisx0208-1990	. #x4444)	; ø½Š©¹
+    (chinese-gb12345		. #x3342)	; 陳
     (ideograph-daikanwa		. 41698)	; ø¸Š‹¢
     (ucs			. #x9673)	; 陳
     ))
@@ -1770,17 +1789,32 @@
     (ucs			. #x9677)	; 陷
     ))
 (define-char
-  '((ideographic-radical . 170)	; ⾩
+  '((=>ucs		. #x9678)	; 陸
+    (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (shinjigen-2	. 8899)
     (japanese-jisx0208-1978	. #x4E26)	; ø»‚¾‹
     (japanese-jisx0208		. #x4E26)	; ø»‡’“
     (korean-ksc5601		. #x5741)	; ø»‰ª€
-    (chinese-cns11643-1		. #x5D74)	; ø»’›·
     (japanese-jisx0208-1990	. #x4E26)	; ø½Š¸‡
     (ideograph-daikanwa		. 41708)	; ø¸Š‹¬
-    (ucs			. #x9678)	; 陸
+    ))
+(define-char
+  '((=>ucs		. #x9678)	; 陸
+    (morohashi-daikanwa	41708 0 0)
+    (ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-cns11643-1 . #x5D74)	; ø»’›·
+    ))
+(define-char
+  '((morohashi-daikanwa	41708 0 1)
+    (ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (chinese-gb12345	. #x423D)	; 陸
+    (ucs		. #x9678)	; 陸
     ))
 (define-char
   '((ideographic-radical . 170)	; ⾩
@@ -1911,6 +1945,7 @@
     (korean-ksc5601		. #x6555)	; ø»‰¾¸
     (chinese-cns11643-1		. #x626C)	; ø»’£…
     (japanese-jisx0208-1990	. #x4D5B)	; ø½Š·ž
+    (chinese-gb12345		. #x5174)	; 陽
     (ideograph-daikanwa		. 41725)	; ø¸Š‹½
     (ucs			. #x967D)	; 陽
     ))
@@ -2127,25 +2162,49 @@
     (ucs			. #x9688)	; 隈
     ))
 (define-char
-  '((ideographic-radical . 170)	; ⾩
+  '((=>ucs		. #x9689)	; 隉
+    (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (japanese-jisx0212	. #x6664)	; ø»ŒŠ©
     (chinese-cns11643-2 . #x4146)	; ø»“¼…
     (ideograph-daikanwa . 41749)	; ø¸ŠŒ•
+    ))
+(define-char
+  '((morohashi-daikanwa	41749 0 2)
+    (ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (japanese-jisx0212	. #x6664)	; ø»ŒŠ©
+    (chinese-gb12345	. #x5A6D)	; 隉
     (ucs		. #x9689)	; 隉
     ))
 (define-char
-  '((ideographic-radical . 170)	; ⾩
+  '((=>ucs		. #x968A)	; 隊
+    (ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (korean-ksc5601	. #x5369)	; ø»‰¤°
+    (ideograph-daikanwa . 41750)	; ø¸ŠŒ–
+    ))
+(define-char
+  '((=>ucs		. #x968A)	; 隊
+    (morohashi-daikanwa	41750 0 2)
+    (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (japanese-jisx0208-1978	. #x4262)	; ø»‚­Ÿ
     (japanese-jisx0208		. #x4262)	; ø»‡§
-    (korean-ksc5601		. #x5369)	; ø»‰¤°
-    (chinese-cns11643-1		. #x6269)	; ø»’£‚
     (japanese-jisx0208-1990	. #x4262)	; ø½Š§›
-    (ideograph-daikanwa		. 41750)	; ø¸ŠŒ–
-    (ucs			. #x968A)	; 隊
+    ))
+(define-char
+  '((morohashi-daikanwa	41750 0 3)
+    (ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (chinese-cns11643-1 . #x6269)	; ø»’£‚
+    (chinese-gb12345	. #x3653)	; 隊
+    (ucs		. #x968A)	; 隊
     ))
 (define-char
   '((ideographic-radical . 170)	; ⾩
@@ -2201,6 +2260,7 @@
     (korean-ksc5601		. #x4D2D)	; ø»‰›€
     (chinese-cns11643-1		. #x626A)	; ø»’£ƒ
     (japanese-jisx0208-1990	. #x332C)	; ø½Š£
+    (chinese-gb12345		. #x3D57)	; 階
     (ideograph-daikanwa		. 41755)	; ø¸ŠŒ›
     (ucs			. #x968E)	; 階
     ))
@@ -2498,6 +2558,7 @@
     (korean-ksc5601		. #x6A22)	; ø»Š…›
     (chinese-cns11643-1		. #x6753)	; ø»’ª‚
     (japanese-jisx0208-1990	. #x7028)	; ø½‹ª…
+    (chinese-gb12345		. #x5449)	; 隕
     (ideograph-daikanwa		. 41785)	; ø¸ŠŒ¹
     (ucs			. #x9695)	; 隕
     ))
@@ -2841,19 +2902,34 @@
     (ucs			. #x969A)	; 隚
     ))
 (define-char
-  '((ideographic-radical . 170)	; ⾩
+  '((=>ucs		. #x969B)	; 際
+    (ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (ideograph-daikanwa . 41820)	; ø¸Šœ
+    ))
+(define-char
+  '((morohashi-daikanwa	41820 0 0)
+    (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (shinjigen-2	. 8925)
     (japanese-jisx0208-1978	. #x3A5D)	; ø»‚¡ª
     (japanese-jisx0208		. #x3A5D)	; ø»†µ²
     (korean-ksc5601		. #x7037)	; ø»ŠŽ¤
-    (chinese-cns11643-1		. #x6B63)	; ø»’°Š
     (japanese-jisx0208-1990	. #x3A5D)	; ø½Š›¦
-    (ideograph-daikanwa		. 41820)	; ø¸Šœ
+    (chinese-gb12345		. #x3C4A)	; 際
     (ucs			. #x969B)	; 際
     ))
 (define-char
+  '((=>ucs		. #x969B)	; 際
+    (morohashi-daikanwa	41820 0 1)
+    (ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (chinese-cns11643-1 . #x6B63)	; ø»’°Š
+    ))
+(define-char
   '((ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
@@ -3410,6 +3486,7 @@
     (ideographic-strokes . 12)
     (kangxi-strokes	 . 13)
     (total-strokes	 . 15)
+    (chinese-gb12345	. #x4B66)	; 隨
     (ucs		. #x96A8)	; 隨
     ))
 (define-char
@@ -3439,6 +3516,7 @@
     (korean-ksc5601		. #x7A4F)	; ø»Š¨
     (chinese-cns11643-1		. #x7272)	; ø»’º«
     (japanese-jisx0208-1990	. #x702A)	; ø½‹ª‡
+    (chinese-gb12345		. #x4F55)	; 險
     (ideograph-daikanwa		. 41874)	; ø¸ŠŽ’
     (ucs			. #x96AA)	; 險
     ))
@@ -3573,11 +3651,19 @@
     (ideograph-daikanwa		. 41891)	; ø¸ŠŽ£
     ))
 (define-char
-  '((morohashi-daikanwa	41891 0 2)
+  '((=>ucs		. #x96B1)	; 隱
+    (morohashi-daikanwa	41891 0 2)
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (chinese-cns11643-1 . #x7621)	; ø»’¿’
+    ))
+(define-char
+  '((morohashi-daikanwa	41891 0 3)
+    (ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (chinese-gb12345	. #x527E)	; 隱
     (ucs		. #x96B1)	; 隱
     ))
 (define-char
@@ -3717,6 +3803,7 @@
     (japanese-jisx0208-1978	. #x702F)	; ø»ƒ°
     (japanese-jisx0208		. #x702F)	; ø»ˆ„˜
     (japanese-jisx0208-1990	. #x702F)	; ø½‹ªŒ
+    (chinese-gb12345		. #x4224)	; 隴
     (ideograph-daikanwa		. 41904)	; ø¸ŠŽ°
     (ucs			. #x96B4)	; 隴
     ))
diff --git a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
index 60f9d91..57464f6 100644
--- a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
+++ b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
@@ -69,10 +69,17 @@
     (ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 2)
     (total-strokes	 . 10)
+    (ideograph-daikanwa . 41941)	; ø¸Š•
+    ))
+(define-char
+  '((->ucs		. #x96BB)	; 隻
+    (morohashi-daikanwa	41941 0 0)
+    (ideographic-radical . 172)	; ⾫
+    (ideographic-strokes . 2)
+    (total-strokes	 . 10)
     (japanese-jisx0208-1978	. #x4049)	; ø»‚ªŠ
     (japanese-jisx0208		. #x4049)	; ø»†¾’
     (japanese-jisx0208-1990	. #x4049)	; ø½Š¤†
-    (ideograph-daikanwa		. 41941)	; ø¸Š•
     ))
 (define-char
   '((morohashi-daikanwa	41941 0 1)
@@ -80,6 +87,7 @@
     (ideographic-strokes . 2)
     (total-strokes	 . 10)
     (chinese-cns11643-1 . #x5869)	; ø»’”–
+    (chinese-gb12345	. #x7922)	; 隻
     (ucs		. #x96BB)	; 隻
     ))
 (define-char
@@ -2438,6 +2446,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 17)
     (chinese-cns11643-1 . #x7623)	; ø»’¿”
+    (chinese-gb12345	. #x4B64)	; 雖
     (ucs		. #x96D6)	; 雖
     ))
 (define-char
@@ -2636,6 +2645,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (chinese-cns11643-1 . #x7764)	; ø»“³
+    (chinese-gb12345	. #x4B2B)	; 雙
     (ucs		. #x96D9)	; 雙
     ))
 (define-char
@@ -2712,6 +2722,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (chinese-cns11643-1 . #x7765)	; ø»“´
+    (chinese-gb12345	. #x337B)	; 雛
     (ucs		. #x96DB)	; 雛
     ))
 (define-char
@@ -2727,11 +2738,19 @@
     (ideograph-daikanwa		. 42122)	; ø¸Š’Š
     ))
 (define-char
-  '((morohashi-daikanwa	42122 0 1)
+  '((=>ucs		. #x96DC)	; 雜
+    (morohashi-daikanwa	42122 0 1)
     (ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
     (chinese-cns11643-1 . #x7763)	; ø»“²
+    ))
+(define-char
+  '((morohashi-daikanwa	42122 0 2)
+    (ideographic-radical . 172)	; ⾫
+    (ideographic-strokes . 10)
+    (total-strokes	 . 18)
+    (chinese-gb12345	. #x5453)	; 雜
     (ucs		. #x96DC)	; 雜
     ))
 (define-char
@@ -2999,14 +3018,22 @@
     (ideograph-daikanwa		. 42140)	; ø¸Š’œ
     ))
 (define-char
-  '((morohashi-daikanwa	42140 0 3)
+  '((morohashi-daikanwa	42140 0 1)
     (ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 11)
     (total-strokes	 . 19)
-    (chinese-cns11643-1 . #x7762)	; ø»“±
+    (chinese-gb12345	. #x406B)	; 離
     (ucs		. #x96E2)	; 離
     ))
 (define-char
+  '((=>ucs		. #x96E2)	; 離
+    (morohashi-daikanwa	42140 0 3)
+    (ideographic-radical . 172)	; ⾫
+    (ideographic-strokes . 11)
+    (total-strokes	 . 19)
+    (chinese-cns11643-1 . #x7762)	; ø»“±
+    ))
+(define-char
   '((ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 11)
     (total-strokes	 . 19)
@@ -3066,6 +3093,7 @@
     (ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 11)
     (total-strokes	 . 19)
+    (korean-ksc5601		. #x5171)	; ø»‰¡¼
     (japanese-jisx0213-1	. #x7D63)	; ø»¤›†
     (ideograph-daikanwa		. 42145)	; ø¸Š’¡
     ))
@@ -3076,6 +3104,7 @@
     (japanese-strokes	 . 10)
     (total-strokes	 . 19)
     (chinese-cns11643-1 . #x7945)	; ø»“„
+    (chinese-gb12345	. #x4451)	; 難
     (ucs		. #x96E3)	; 難
     ))
 (define-char
@@ -3086,7 +3115,6 @@
     (total-strokes	 . 18)
     (japanese-jisx0208-1978	. #x4671)	; ø»‚³¦
     (japanese-jisx0208		. #x4671)	; ø»‡‡®
-    (korean-ksc5601		. #x5171)	; ø»‰¡¼
     (japanese-jisx0208-1990	. #x4671)	; ø½Š­¢
     ))
 (define-char