From: tomo <tomo>
Date: Fri, 11 Feb 2011 23:54:29 +0000 (+0000)
Subject: Add `=decomposition' for each Adobe Japan1 code point if it is
X-Git-Tag: r21-4-22-chise-0_25-6^20~724
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ee90f03a6c2cf6b9a55ab55aff6e2f45d30efeb5;p=chise%2Fxemacs-chise.git

Add `=decomposition' for each Adobe Japan1 code point if it is
separated from the corresponding abstract UCS object.
(G-GT-K0463): Use `<-formed@component' instead of
`<-ideographic-component-forms'.
(GT-K0463): Unify AJ1-13914.
(GT-00137): Unify AJ1-13812.
---

diff --git a/lisp/utf-2000/Ideograph-R003-Dot.el b/lisp/utf-2000/Ideograph-R003-Dot.el
index 19fb4bb..3a52ddb 100644
--- a/lisp/utf-2000/Ideograph-R003-Dot.el
+++ b/lisp/utf-2000/Ideograph-R003-Dot.el
@@ -87,6 +87,11 @@
     (ideographic-radical . 3)	; ⼂
     (ideographic-strokes . 2)
     (total-strokes	 . 3)
+    (=decomposition
+     ((=ucs		  . #x4E38)	; 丸
+      )
+     ((=ucs		  . #xE0100)	; 󠄀
+      ))
     (=ucs		. #x2F801)	; 丸
     (=>>ucs@unicode	. #x4E38)	; 丸
     (=ucs@unicode	. #x4E38)	; 丸
@@ -246,15 +251,21 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 4)
     (=>>gt-k		. 00463)	; &G-GT-K00463;
-    (<-ideographic-component-forms
+    (<-formed@component
      ((=ucs		  . #x4E39)	; 丹
       ))
     (->subsumptive
      ((=gt-k		  . 00462)	; &GT-K00462;
       (=gt-pj-k2	  . #x436D)	; &GT-K00462; [35-77]
       )
-     ((=gt-k		  . 00463)	; &GT-K00463;
-      (=gt-pj-k1	  . #x3B42)	; &GT-K00463; [27-34]
+     ((=decomposition
+       ((=ucs		    . #x4E39)	; 丹
+	)
+       ((=ucs		    . #xE0101)	; 󠄁
+	))
+      (=gt-k		  . 00463)	; 丹󠄁
+      (=gt-pj-k1	  . #x3B42)	; 丹󠄁 [27-34]
+      (=adobe-japan1-4	  . 13914)	; &I-AJ1-13914;
       ))
     ))
 (define-char
@@ -280,7 +291,12 @@
     (=>>jis-x0208	. #x3C67)	; 主 [28-71]
     (=>daikanwa		. 00100)	; 主
     (->subsumptive
-     ((ideographic-structure
+     ((=decomposition
+       ((=ucs		    . #x4E3B)	; 主
+	)
+       ((=ucs		    . #xE0101)	; 󠄁
+	))
+      (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
@@ -288,15 +304,21 @@
 	)
        ((=ucs		    . #x738B)	; 王
 	))
-      (=gt		  . 00137)	; &GT-00137;
+      (=gt		  . 00137)	; 主󠄁
       (=gt-k		  . 00948)	; &I-GT-K00948;
-      (=gt-pj-2		  . #x306E)	; &GT-00137; [16-78]
+      (=gt-pj-2		  . #x306E)	; 主󠄁 [16-78]
       (=daikanwa	  . 00100)	; &I-M-00100;
-      (=shinjigen@1ed	  .  0043)	; &GT-00137;
-      (=shinjigen@rev	  .  0044)	; &GT-00137;
+      (=shinjigen@1ed	  .  0043)	; 主󠄁
+      (=shinjigen@rev	  .  0044)	; 主󠄁
       (=jef-china3	  . #x41B3)	; &I-JC3-41B3;
+      (=adobe-japan1-4	  . 13812)	; &I-AJ1-13812;
       )
-     ((hanyu-dazidian	  1 44 3)
+     ((=decomposition
+       ((=ucs		    . #x4E3B)	; 主
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (hanyu-dazidian	  1 44 3)
       (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
@@ -305,8 +327,8 @@
 	)
        ((=ucs		    . #x738B)	; 王
 	))
-      (=ucs@unicode	  . #x4E3B)	; &AJ1-02323;
-      (=jis-x0208	  . #x3C67)	; &AJ1-02323; [28-71]
+      (=ucs@unicode	  . #x4E3B)	; 主󠄀
+      (=jis-x0208	  . #x3C67)	; 主󠄀 [28-71]
       (=gb2312		  . #x5677)	; &I-G0-5677; [54-87]
       (=ks-x1001	  . #x712B)	; &I-K0-712B; [81-11]
       (=cns11643-1	  . #x4564)	; &I-C1-4564; [37-68]
@@ -315,8 +337,8 @@
       (=gt		  . 00138)	; &I-GT-00138;
       (=gt-k		  . 00949)	; &I-GT-K00949;
       (=gt-pj-1		  . #x3C67)	; &I-GT-00138; [28-71]
-      (=shinjigen@1ed	  .  0042)	; &AJ1-02323;
-      (=shinjigen@rev	  .  0043)	; &AJ1-02323;
+      (=shinjigen@1ed	  .  0042)	; 主󠄀
+      (=shinjigen@rev	  .  0043)	; 主󠄀
       (=adobe-japan1-0	  . 02323)	; &I-AJ1-02323;
       ))
     ))