X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R123-Sheep.el;h=687f4647a209a166f11bb79d45011edd9c5c617b;hb=23ce965474178c16b0cbf76b8a105a04f9c7fdb5;hp=f20ca862631366e9c8141b00b310b0abdec0f67c;hpb=1d40afd5f5e5f52cf913d995039bce6f9124da42;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/Ideograph-R123-Sheep.el b/lisp/utf-2000/Ideograph-R123-Sheep.el
index f20ca86..687f464 100644
--- a/lisp/utf-2000/Ideograph-R123-Sheep.el
+++ b/lisp/utf-2000/Ideograph-R123-Sheep.el
@@ -720,8 +720,13 @@
     (ideographic-radical@jis . 123)	; ⽺
     (ideographic-strokes@jis . 4)
     (total-strokes	 . 10)
-    (=ucs@jis		. #x517B)	; &AJ1-18393;
-    (=jis-x0213-2	. #x7474)	; &AJ1-18393; [84-84]
+    (=decomposition@cid
+     ((=ucs		  . #x517B)	; 养
+      )
+     ((=ucs		  . #xE0100)	; 󠄀
+      ))
+    (=ucs@jis		. #x517B)	; 养󠄀
+    (=jis-x0213-2	. #x7474)	; 养󠄀 [84-84]
     (=jef-china3	. #x82AA)	; &I-JC3-82AA;
     (=adobe-japan1-5	. 18393)	; &I-AJ1-18393;
     ))
@@ -1276,31 +1281,47 @@
     (=cns11643-6	. #x4C7C)	; &C6-4C7C; [44-92]
     ))
 (define-char
-  '((=>ucs		. #x7FA1)	; 羡
+  '((ideographic-radical . 123)	; ⽺
+    (ideographic-strokes . 6)
+    (total-strokes	 . 12)
+    (=ucs		. #x7FA1)	; 羡
+    (=big5		. #xDB43)	; &I-B-DB43;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7FA1)	; 羡
+      ))
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
-    (=ucs@jis		. #x7FA1)	; &M-28493;
-    (=jis-x0212		. #x552E)	; &M-28493; [53-14]
+    (=ucs@jis		. #x7FA1)	; &AJ1-08598;
+    (=jis-x0212		. #x552E)	; &AJ1-08598; [53-14]
     (=daikanwa		. 28493)	; &I-M-28493;
+    (=adobe-japan1-2	. 08598)	; &I-AJ1-08598;
     ))
 (define-char
-  '((=>ucs		. #x7FA1)	; 羡
-    (morohashi-daikanwa	28493 0 0)
+  '((<-denotational
+     ((=ucs		  . #x7FA1)	; 羡
+      ))
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
     (=cns11643-2	. #x3F28)	; &C2-3F28; [31-08]
     ))
 (define-char
-  '((morohashi-daikanwa	28493 0 2)
+  '((<-denotational
+     ((=ucs		  . #x7FA1)	; 羡
+      ))
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
-    (=ucs		. #x7FA1)	; 羡
-    (=gb2312		. #x4F5B)	; &I-G0-4F5B; [47-59]
-    (=big5		. #xDB43)	; &I-B-DB43;
-    (=jef-china3	. #x5FF7)	; &I-JC3-5FF7;
+    (=>>ucs@unicode	. #x7FA1)	; &G-UU+7FA1;
+    (->subsumptive
+     ((=jef-china3	  . #x5FF7)	; &JC3-5FF7;
+      )
+     ((=ucs@unicode	  . #x7FA1)	; &G0-4F5B;
+      (=gb2312		  . #x4F5B)	; &G0-4F5B; [47-59]
+      ))
     ))
 (define-char
   '((=>ucs		. #x7FA2)	; ç¾¢
@@ -1582,8 +1603,8 @@
 	)
        ((=gt-k		    . 01701)	; &GT-K01701;
 	)
-       ((=ucs@jis	    . #x542B)	; &GT-04213;
-	(=jis-x0208	    . #x345E)	; &GT-04213; [20-62]
+       ((=ucs@jis	    . #x542B)	; 含󠄀
+	(=jis-x0208	    . #x345E)	; 含󠄀 [20-62]
 	(=ks-x1001	    . #x795F)	; &I-K0-795F; [89-63]
 	(=cns11643-1	    . #x4956)	; &I-C1-4956; [41-54]
 	(=jis-x0213-1	    . #x345E)	; &I-JX1-345E; [20-62]
@@ -2041,7 +2062,15 @@
     (=hanziku-8		. #xDFE7)	; &I-HZK08-DFE7;
     ))
 (define-char
-  '((=>ucs		. #x7FAD)	; ç¾­
+  '((ideographic-radical . 123)	; ⽺
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=ucs		. #x7FAD)	; ç¾­
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7FAD)	; ç¾­
+      ))
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
@@ -2050,29 +2079,22 @@
     (=jis-x0213-2	. #x7478)	; &I-JX2-7478; [84-88]
     (=daikanwa		. 28533)	; &I-M-28533;
     (=jef-china3	. #x5FFA)	; &I-JC3-5FFA;
+    (=hanyo-denshi/jb	. #x5532)	; &I-HD-JB-5532; [53-18]
     ))
 (define-char
-  '((=>ucs		. #x7FAD)	; ç¾­
-    (morohashi-daikanwa	28533 0 1)
-    (ideographic-radical . 123)	; ⽺
-    (ideographic-strokes . 9)
-    (total-strokes	 . 15)
-    (=big5		. #xE6F4)	; &B-E6F4;
-    ))
-(define-char
-  '((morohashi-daikanwa	28533 0 2)
-    (ideographic-radical . 123)	; ⽺
-    (ideographic-strokes . 9)
-    (total-strokes	 . 15)
-    (=ucs		. #x7FAD)	; ç¾­
-    ))
-(define-char
-  '((=>ucs		. #x7FAD)	; ç¾­
-    (morohashi-daikanwa	28533 0 3)
+  '((<-denotational
+     ((=ucs		  . #x7FAD)	; ç¾­
+      ))
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
-    (=cns11643-2	. #x527C)	; &C2-527C; [50-92]
+    (=>>ucs@unicode	. #x7FAD)	; &G-UU+7FAD;
+    (=big5		. #xE6F4)	; &G-UU+7FAD;
+    (->subsumptive
+     ((=ucs@unicode	  . #x7FAD)	; &UU+7FAD;
+      )
+     ((=cns11643-2	  . #x527C)	; &C2-527C; [50-92]
+      ))
     ))
 (define-char
   '((ideographic-radical . 123)	; ⽺
@@ -2143,7 +2165,20 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x7FAF)	; 羯
-    (=big5		. #xBD7E)	; &I-B-BD7E;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7FAF)	; 羯
+      ))
+    (ideographic-radical . 123)	; ⽺
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=>>ucs@unicode	. #x7FAF)	; &G-GT-36730;
+    (=>>jis-x0208	. #x663B)	; &G-GT-36730; [70-27]
+    (=>>jis-x0213-1	. #x663B)	; &G-GT-36730; [70-27]
+    (=big5		. #xBD7E)	; &G-GT-36730;
+    (=>>gt		. 36730)	; &G-GT-36730;
+    (=>>daikanwa	. 28537)	; &G-GT-36730;
     (->subsumptive
      ((=ucs@jis		  . #x7FAF)	; &GT-36730;
       (=jis-x0208	  . #x663B)	; &GT-36730; [70-27]
@@ -2159,6 +2194,20 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x7FAF)	; 羯
+      ))
+    (ideographic-radical . 123)	; ⽺
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=decomposition@hanyo-denshi
+     ((=ucs		  . #x7FAF)	; 羯
+      )
+     ((=ucs		  . #xE0103)	; 󠄃
+      ))
+    (=hanyo-denshi/ft	. #x3841)	; 羯󠄃 [24-33]
+    ))
+(define-char
   '((=>ucs		. #x263A9)	; 𦎩
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 9)
@@ -2240,8 +2289,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs@jis	    . #x4EAF)	; &CDP-8AA5;
-	(=jis-x0212	    . #x3041)	; &CDP-8AA5; [16-33]
+       ((=ucs@jis	    . #x4EAF)	; 亯󠄀
+	(=jis-x0212	    . #x3041)	; 亯󠄀 [16-33]
 	(=daikanwa	    . 00305)	; &I-M-00305;
 	)
        ((=ucs		    . #x7F8A)	; 羊
@@ -2868,42 +2917,66 @@
     (=cns11643-2	. #x6647)	; &I-C2-6647; [70-39]
     ))
 (define-char
-  '((=>ucs		. #x7FB8)	; 羸
-    (ideographic-radical . 123)	; ⽺
+  '((ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 13)
     (total-strokes	 . 19)
-    (=ucs@jis		. #x7FB8)	; &GT-36797;
-    (=jis-x0208		. #x6640)	; &GT-36797; [70-32]
-    (=jis-x0213-1	. #x6640)	; &I-JX1-6640; [70-32]
+    (=ucs		. #x7FB8)	; 羸
     (=big5		. #xC3BD)	; &I-B-C3BD;
-    (=gt		. 36797)	; &I-GT-36797;
-    (=gt-pj-1		. #x6640)	; &I-GT-36797; [70-32]
-    (=daikanwa		. 28583)	; &I-M-28583;
-    (=shinjigen@rev	.  6292)	; &GT-36797;
     ))
 (define-char
-  '((=>ucs		. #x7FB8)	; 羸
-    (morohashi-daikanwa	28583 0 1)
+  '((<-denotational
+     ((=ucs		  . #x7FB8)	; 羸
+      ))
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 13)
     (total-strokes	 . 19)
-    (=ks-x1001		. #x5768)	; &K0-5768; [55-72]
+    (=>>ucs@jis		. #x7FB8)	; &G-GT-36797;
+    (=>>jis-x0208	. #x6640)	; &G-GT-36797; [70-32]
+    (=>>jis-x0213-1	. #x6640)	; &G-GT-36797; [70-32]
+    (=>>gt		. 36797)	; &G-GT-36797;
+    (=>>daikanwa	. 28583)	; &G-GT-36797;
+    (->subsumptive
+     ((=ucs@jis		  . #x7FB8)	; &M-28583;
+      (=jis-x0208	  . #x6640)	; &M-28583; [70-32]
+      (=jis-x0213-1	  . #x6640)	; &I-JX1-6640; [70-32]
+      (=daikanwa	  . 28583)	; &I-M-28583;
+      (=shinjigen@rev	  .  6292)	; &M-28583;
+      )
+     ((=gt		  . 36797)	; &GT-36797;
+      (=gt-pj-1		  . #x6640)	; &GT-36797; [70-32]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	28583 0 2)
+  '((<-denotational
+     ((=ucs		  . #x7FB8)	; 羸
+      ))
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 13)
     (total-strokes	 . 19)
-    (=ucs		. #x7FB8)	; 羸
-    (=gb2312		. #x597A)	; &I-G0-597A; [57-90]
+    (=cns11643-1	. #x7868)	; &C1-7868; [88-72]
     ))
 (define-char
-  '((=>ucs		. #x7FB8)	; 羸
-    (morohashi-daikanwa	28583 0 3)
+  '((<-denotational
+     ((=ucs		  . #x7FB8)	; 羸
+      ))
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 13)
     (total-strokes	 . 19)
-    (=cns11643-1	. #x7868)	; &C1-7868; [88-72]
+    (=>>ucs@unicode	. #x7FB8)	; &G-HD-FT-3842;
+    (=>>hanyo-denshi/ft . #x3842)	; &G-HD-FT-3842; [24-34]
+    (->subsumptive
+     ((=ks-x1001	  . #x5768)	; &K0-5768; [55-72]
+      )
+     ((=decomposition@hanyo-denshi
+       ((=ucs		    . #x7FB8)	; 羸
+	)
+       ((=ucs		    . #xE0102)	; 󠄂
+	))
+      (=hanyo-denshi/ft	  . #x3842)	; 羸󠄂 [24-34]
+      )
+     ((=ucs@unicode	  . #x7FB8)	; &G0-597A;
+      (=gb2312		  . #x597A)	; &G0-597A; [57-90]
+      ))
     ))
 (define-char
   '((ideographic-radical . 123)	; ⽺
@@ -3037,18 +3110,6 @@
     (=hanziku-8		. #xE0C6)	; &I-HZK08-E0C6;
     ))
 (define-char
-  '((morohashi-daikanwa	36028 0 1)
-    (ideographic-radical@ucs . 149)	; ⾔
-    (ideographic-strokes@ucs . 13)
-    (ideographic-radical@ucs*sources
-     daikanwa ucs)
-    (ideographic-radical@cns . 123)	; ⽺
-    (ideographic-strokes@cns . 14)
-    (total-strokes	 . 20)
-    (=ucs		. #x8B71)	; è­±
-    (=cns11643-3	. #x5C6D)	; &I-C3-5C6D; [60-77]
-    ))
-(define-char
   '((=>ucs		. #x263DE)	; 𦏞
     (ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 14)
@@ -3064,6 +3125,73 @@
     (=cns11643-7	. #x4F30)	; &I-C7-4F30; [47-16]
     ))
 (define-char
+  '((ideographic-radical@ucs . 149)	; ⾔
+    (ideographic-strokes@ucs . 13)
+    (ideographic-radical@ucs*sources
+     daikanwa ucs)
+    (ideographic-radical@cns . 123)	; ⽺
+    (ideographic-strokes@cns . 14)
+    (total-strokes	 . 20)
+    (=ucs		. #x8B71)	; è­±
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8B71)	; è­±
+      ))
+    (ideographic-radical@ucs . 149)	; ⾔
+    (ideographic-strokes@ucs . 13)
+    (ideographic-radical@ucs*sources
+     daikanwa ucs)
+    (ideographic-radical@cns . 123)	; ⽺
+    (ideographic-strokes@cns . 14)
+    (total-strokes	 . 20)
+    (ideographic-structure
+     ((name		  . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+      (=ucs		  . #x2FFB)	; â¿»
+      )
+     ((=ucs		  . #x7F8A)	; 羊
+      )
+     ((=ucs		  . #x8AA9)	; 誩
+      ))
+    (=+>ucs@unicode	. #x8B71)	; &o-J0-6641;
+    (=+>jis-x0208	. #x6641)	; &o-J0-6641; [70-33]
+    (=+>jis-x0213-1	. #x6641)	; &o-J0-6641; [70-33]
+    (=+>gt		. 48343)	; &o-J0-6641;
+    (->subsumptive
+     ((ideographic-radical . 149)	; ⾔
+      (ideographic-strokes . 13)
+      (total-strokes	   . 20)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+	(=ucs		    . #x2FFB)	; â¿»
+	)
+       ((=ucs		    . #x7F8A)	; 羊
+	)
+       ((=ucs@jis	    . #x8AA9)	; &M-35554;
+	(=jis-x0212	    . #x5D7B)	; &M-35554; [61-91]
+	(=daikanwa	    . 35554)	; &I-M-35554;
+	))
+      (=ucs@jis		  . #x8B71)	; &GT-48343;
+      (=jis-x0208	  . #x6641)	; &GT-48343; [70-33]
+      (=jis-x0213-1	  . #x6641)	; &I-JX1-6641; [70-33]
+      (=gt		  . 48343)	; &I-GT-48343;
+      (=gt-pj-1		  . #x6641)	; &I-GT-48343; [70-33]
+      (=daikanwa	  . 36028)	; &I-M-36028;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID")
+	(=ucs		    . #x2FFB)	; â¿»
+	)
+       ((=ucs		    . #x7F8A)	; 羊
+	)
+       ((=ucs@unicode	    . #x8AA9)	; &C3-4965;
+	(=cns11643-3	    . #x4965)	; &C3-4965; [41-69]
+	))
+      (=ucs@unicode	  . #x8B71)	; &C3-5C6D;
+      (=cns11643-3	  . #x5C6D)	; &C3-5C6D; [60-77]
+      ))
+    ))
+(define-char
   '((ideographic-radical . 123)	; ⽺
     (ideographic-strokes . 14)
     (total-strokes	 . 20)