X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Futf-2000%2FIdeograph-R027-Cliff.el;h=3e3f3eff576d5a1907ca37da9359d7d0a5a5c117;hp=4ab49504103d5feab888bacfe9338e2f2d600e25;hb=8ba3626da629f1b4ecafae24c85f3d0cb3bf8b8e;hpb=9ddc24ea8cdf6e23ecfc40a96eeb79ca000ded3e

diff --git a/lisp/utf-2000/Ideograph-R027-Cliff.el b/lisp/utf-2000/Ideograph-R027-Cliff.el
index 4ab4950..3e3f3ef 100644
--- a/lisp/utf-2000/Ideograph-R027-Cliff.el
+++ b/lisp/utf-2000/Ideograph-R027-Cliff.el
@@ -16,6 +16,33 @@
     (=gt-pj-1		. #x524C)	; &I-GT-03673; [50-44]
     (=daikanwa		. 02890)	; &I-M-02890;
     (=shinjigen		.  0873)	; 厂
+    (->subsumptive
+     ((==ucs@unicode	  . #x5382)	; &g2-AJ1-04321;
+      (==adobe-japan1-0	  . 04321)	; &g2-AJ1-04321;
+      (==gb2312		  . #x3327)	; &g2-AJ1-04321; [19-07]
+      (==jis-x0208	  . #x524C)	; &g2-AJ1-04321; [50-44]
+      (==cns11643-2	  . #x2125)	; &g2-AJ1-04321; [01-05]
+      (==jis-x0213-1	  . #x524C)	; &g2-AJ1-04321; [50-44]
+      (==gt		  . 03673)	; &g2-AJ1-04321;
+      (==gt-k		  . 00102)	; &g2-AJ1-04321;
+      (==daikanwa	  . 02890)	; &g2-AJ1-04321;
+      (==shinjigen	  .  0873)	; &g2-AJ1-04321;
+      (->subsumptive
+       ((===daikanwa	    . 02890)	; &R-M-02890;
+	)
+       ((===jis-x0208	    . #x524C)	; &R-J0-524C; [50-44]
+	(===jis-x0213-1	    . #x524C)	; &R-J0-524C; [50-44]
+	)
+       ((===adobe-japan1-0  . 04321)	; &R-AJ1-04321;
+	)
+       ((===cns11643-2	    . #x2125)	; &R-C2-2125; [01-05]
+	)
+       ((===gt		    . 03673)	; &R-GT-03673;
+	(===gt-k	    . 00102)	; &R-GT-03673;
+	)
+       ((===ucs@unicode	    . #x5382)	; &R-UU+5382;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
@@ -322,6 +349,21 @@
     (=cns11643-6	. #x224E)	; &I-C6-224E; [02-46]
     ))
 (define-char
+  '((ideographic-radical . 27)	; ⼚
+    (ideographic-strokes . 3)
+    (total-strokes	 . 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=adobe-japan1-4	  . 13834)	; &AJ1-13834;
+      )
+     ((=ucs		  . #x5382)	; 厂
+      ))
+    (=gt-k		. 01442)	; &GT-K01442;
+    (=gt-pj-k2		. #x406C)	; &GT-K01442; [32-76]
+    ))
+(define-char
   '((=>ucs		. #x3542)	; 㕂
     (ideographic-radical . 27)	; ⼚
     (ideographic-strokes . 4)
@@ -1473,6 +1515,39 @@
     (=gt-pj-1		. #x387C)	; &I-GT-03737; [24-92]
     (=daikanwa		. 02949)	; &I-M-02949;
     (=shinjigen		.  0878)	; 厚
+    (->subsumptive
+     ((==ucs@unicode	  . #x539A)	; &g2-AJ1-01968;
+      (==adobe-japan1-0	  . 01968)	; &g2-AJ1-01968;
+      (==gb2312		  . #x3A71)	; &g2-AJ1-01968; [26-81]
+      (==ks-x1001	  . #x7D27)	; &g2-AJ1-01968; [93-07]
+      (==jis-x0208	  . #x387C)	; &g2-AJ1-01968; [24-92]
+      (==cns11643-1	  . #x5034)	; &g2-AJ1-01968; [48-20]
+      (==jis-x0213-1	  . #x387C)	; &g2-AJ1-01968; [24-92]
+      (==gt		  . 03737)	; &g2-AJ1-01968;
+      (==gt-k		  . 05073)	; &g2-AJ1-01968;
+      (==daikanwa	  . 02949)	; &g2-AJ1-01968;
+      (==shinjigen	  .  0878)	; &g2-AJ1-01968;
+      (->subsumptive
+       ((===daikanwa	    . 02949)	; &R-M-02949;
+	)
+       ((===jis-x0208	    . #x387C)	; &R-J0-387C; [24-92]
+	(===jis-x0213-1	    . #x387C)	; &R-J0-387C; [24-92]
+	)
+       ((===adobe-japan1-0  . 01968)	; &R-AJ1-01968;
+	)
+       ((===cns11643-1	    . #x5034)	; &R-C1-5034; [48-20]
+	)
+       ((===gt		    . 03737)	; &R-GT-03737;
+	(===gt-k	    . 05073)	; &R-GT-03737;
+	)
+       ((===ucs@ks	    . #x539A)	; &R-K0-7D27;
+	(===ks-x1001	    . #x7D27)	; &R-K0-7D27; [93-07]
+	)
+       ((===ucs@unicode	    . #x539A)	; &R-UU+539A;
+	)
+       ((===hng-kar	    . 06310)	; &HNG018-06310;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
@@ -1911,6 +1986,39 @@
     (=gt-pj-1		. #x3836)	; &I-GT-03756; [24-22]
     (=daikanwa		. 02973)	; &I-M-02973;
     (=shinjigen		.  0882)	; 原
+    (->subsumptive
+     ((==ucs@unicode	  . #x539F)	; &g2-AJ1-01898;
+      (==adobe-japan1-0	  . 01898)	; &g2-AJ1-01898;
+      (==gb2312		  . #x542D)	; &g2-AJ1-01898; [52-13]
+      (==ks-x1001	  . #x6A2B)	; &g2-AJ1-01898; [74-11]
+      (==jis-x0208	  . #x3836)	; &g2-AJ1-01898; [24-22]
+      (==cns11643-1	  . #x544F)	; &g2-AJ1-01898; [52-47]
+      (==jis-x0213-1	  . #x3836)	; &g2-AJ1-01898; [24-22]
+      (==gt		  . 03756)	; &g2-AJ1-01898;
+      (==gt-k		  . 06422)	; &g2-AJ1-01898;
+      (==daikanwa	  . 02973)	; &g2-AJ1-01898;
+      (==shinjigen	  .  0882)	; &g2-AJ1-01898;
+      (->subsumptive
+       ((===daikanwa	    . 02973)	; &R-M-02973;
+	)
+       ((===jis-x0208	    . #x3836)	; &R-J0-3836; [24-22]
+	(===jis-x0213-1	    . #x3836)	; &R-J0-3836; [24-22]
+	)
+       ((===adobe-japan1-0  . 01898)	; &R-AJ1-01898;
+	)
+       ((===cns11643-1	    . #x544F)	; &R-C1-544F; [52-47]
+	)
+       ((===gt		    . 03756)	; &R-GT-03756;
+	(===gt-k	    . 06422)	; &R-GT-03756;
+	)
+       ((===ucs@ks	    . #x539F)	; &R-K0-6A2B;
+	(===ks-x1001	    . #x6A2B)	; &R-K0-6A2B; [74-11]
+	)
+       ((===ucs@unicode	    . #x539F)	; &R-UU+539F;
+	)
+       ((===hng-kar	    . 06300)	; &HNG018-06300;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚
@@ -2536,12 +2644,8 @@
 	)
        ((=ucs		    . #x5382)	; 厂
 	)
-       ((=ucs@unicode	    . #x771E)	; &HD-JA-6243;
-	(=jis-x0208	    . #x6243)	; &HD-JA-6243; [66-35]
-	(=ks-x1001	    . #x7258)	; &I-K0-7258; [82-56]
-	(=cns11643-3	    . #x3759)	; &I-C3-3759; [23-57]
-	(=jis-x0213-1	    . #x6243)	; &I-JX1-6243; [66-35]
-	(=daikanwa	    . 23235)	; &I-M-23235;
+       ((=ucs@unicode	    . #x771E)	; &AJ1-05816;
+	(=adobe-japan1-0    . 05816)	; &AJ1-05816;
 	))
       (=gt		  . 03801)	; &GT-03801;
       (=gt-pj-2		  . #x4B23)	; &GT-03801; [43-03]
@@ -2551,10 +2655,11 @@
 	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
 	  (=ucs		      . #x2FF8)	; ⿸
 	  )
-	 ((=ucs		      . #x5382)	; 厂
+	 ((==ucs@unicode      . #x5382)	; &g2-AJ1-04321;
+	  (==adobe-japan1-0   . 04321)	; &g2-AJ1-04321;
 	  )
-	 ((==ucs@unicode      . #x771E)	; &g2-HD-JA-6243;
-	  (==jis-x0208	      . #x6243)	; &g2-HD-JA-6243; [66-35]
+	 ((==ucs@unicode      . #x771E)	; &g2-AJ1-05816;
+	  (==adobe-japan1-0   . 05816)	; &g2-AJ1-05816;
 	  ))
 	(==gt		    . 03801)	; &g2-GT-03801;
 	(==daikanwa	    . 02998)	; &g2-GT-03801;
@@ -2595,13 +2700,18 @@
 	(=cns11643-1	    . #x5678)	; &I-C1-5678; [54-88]
 	))
       (=ucs@unicode	  . #x53A7)	; &C2-3A49;
+      (=ucs@JP/hanazono	  . nil)
       (=cns11643-2	  . #x3A49)	; &C2-3A49; [26-41]
       (=big5		  . #xD865)	; &I-B-D865;
       (->subsumptive
        ((==ucs@unicode	    . #x53A7)	; &g2-UU+53A7;
-	)
-       ((==ucs@cns	    . #x53A7)	; &g2-CU+53A7;
-	(==cns11643-2	    . #x3A49)	; &g2-CU+53A7; [26-41]
+	(==ucs@JP/hanazono  . nil)
+	(==cns11643-2	    . #x3A49)	; &g2-UU+53A7; [26-41]
+	(->subsumptive
+	 ((===ucs@unicode     . #x53A7)	; &R-UU+53A7;
+	  )
+	 ((===cns11643-2      . #x3A49)	; &R-C2-3A49; [26-41]
+	  ))
 	))
       ))
     ))
@@ -2965,7 +3075,6 @@
      ((=ucs		  . #x53A9)	; 厩
       ))
     (ideographic-radical . 27)	; ⼚
-    (hanyu-dazidian	1 75 21)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
       (=ucs		  . #x2FF8)	; ⿸
@@ -2974,6 +3083,23 @@
       )
      ((=ucs		  . #x65E2)	; 既
       ))
+    (=>ucs@unicode	. #x53A9)	; &A-UU+53A9;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@unicode	  . #x53A9)	; &A-UU+53A9;
+      ))
+    (ideographic-radical . 27)	; ⼚
+    (hanyu-dazidian	1 75 21)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs		  . #x5382)	; 厂
+      )
+     ((=ucs@unicode	  . #x65E2)	; &AJ1-01591;
+      (=adobe-japan1-0	  . 01591)	; &AJ1-01591;
+      ))
     (=ucs@unicode	. #x53A9)	; &MJ007948;
     (=ucs@JP/hanazono	. nil)
     (=mj		. 007948)	; &MJ007948;
@@ -3613,6 +3739,8 @@
        ((===ucs@unicode	    . #x53AD)	; &R-UU+53AD;
 	))
       )
+     ((===hng-kar	  . 06280)	; &HNG018-06280;
+      )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
 	(=ucs		    . #x2FF8)	; ⿸
@@ -4004,9 +4132,7 @@
      ((=ucs		  . #x5382)	; 厂
       )
      ((=ucs@cns		  . #x842C)	; &C1-655C;
-      (=ucs@ks		  . #x842C)	; &C1-655C;
-      (=ks-x1001	  . #x583F)	; &C1-655C; [56-31]
-      (=cns11643-1	  . #x655C)	; &I-C1-655C; [69-60]
+      (=cns11643-1	  . #x655C)	; &C1-655C; [69-60]
       (=daikanwa	  . 31339)	; &I-M-31339;
       ))
     (=ucs@cns		. #x53B2)	; &MJ007965;
@@ -4040,15 +4166,6 @@
 	)
        ((=ucs		    . #xE0102)	; 󠄂
 	))
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-	(=ucs		    . #x2FF8)	; ⿸
-	)
-       ((=ucs		    . #x5382)	; 厂
-	)
-       ((==ucs@ks	    . #x842C)	; &g2-K0-583F;
-	(==ks-x1001	    . #x583F)	; &g2-K0-583F; [56-31]
-	))
       (==mj		  . 007965)	; &g2-MJ007965;
       (==hanyo-denshi/ks  . 035150)	; &g2-MJ007965;
       (==shinjigen	  .  0887)	; &g2-MJ007965;
@@ -4061,6 +4178,8 @@
 	)
        ((===jef-china3	    . #x45E2)	; &R-JC3-45E2;
 	))
+      )
+     ((===hng-kar	  . 06290)	; &HNG018-06290;
       ))
     ))
 (define-char
@@ -4243,12 +4362,59 @@
 (define-char
   '((ideographic-radical . 27)	; ⼚
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
       )
-     ((=adobe-japan1-4	  . 13834)	; &AJ1-13834;
+     ((=ucs		  . #x5382)	; 厂
       )
-     ((=ucs		  . #x20A9A)	; 𠪚
+     ((=ucs		  . #x58A8)	; 墨
+      ))
+    (=ucs		. #x3553)	; 㕓
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3553)	; 㕓
+      ))
+    (ideographic-radical . 27)	; ⼚
+    (ideographic-strokes . 14)
+    (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=ucs		  . #x5382)	; 厂
+      )
+     ((=ucs@jis		  . #x58A8)	; &AJ1-03709;
+      (=adobe-japan1-0	  . 03709)	; &AJ1-03709;
+      ))
+    (=mj		. 000302)	; &MJ000302;
+    (=hanyo-denshi/ks	. 035250)	; &MJ000302;
+    (<-formed
+     ((=ucs@unicode	  . #x5EDB)	; &AJ1-04752;
+      (=adobe-japan1-0	  . 04752)	; &AJ1-04752;
+      ))
+    (<-formed*sources
+     koseki)
+    (->subsumptive
+     ((==mj		  . 000302)	; &g2-MJ000302;
+      (==hanyo-denshi/ks  . 035250)	; &g2-MJ000302;
+      (->subsumptive
+       ((===hanyo-denshi/ks . 035250)	; &R-HD-KS-035250;
+	(=hanyo-denshi/ks/mf . #x0DC5)	; &R-HD-KS-035250;
+	)
+       ((===mj		    . 000302)	; &R-MJ000302;
+	))
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 27)	; ⼚
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
+      )
+     ((=gt-k		  . 01442)	; &GT-K01442;
+      )
+     ((=ucs		  . #x6562)	; 敢
       ))
     (=ucs		. #x53B3)	; 厳
     ))
@@ -4260,20 +4426,16 @@
     (ideographic-radical . 27)	; ⼚
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
-    (=decomposition@cid
-     ((=ucs		  . #x53B3)	; 厳
-      )
-     ((=ucs		  . #xE0100)	; 󠄀
-      ))
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
       )
-     ((=adobe-japan1-4	  . 13834)	; &AJ1-13834;
+     ((=gt-k		  . 01442)	; &GT-K01442;
       )
-     ((=ucs@iso		  . #x20A9A)	; &C4-4249;
-      (=cns11643-4	  . #x4249)	; &C4-4249; [34-41]
-      (=daikanwa	  . 03019)	; &I-M-03019;
+     ((=ucs@cns		  . #x6562)	; &AJ1-01526;
+      (=ucs@jis		  . #x6562)	; &AJ1-01526;
+      (=ucs@ks		  . #x6562)	; &AJ1-01526;
+      (=adobe-japan1-0	  . 01526)	; &AJ1-01526;
       ))
     (=ucs@jis		. #x53B3)	; &AJ1-01899;
     (=adobe-japan1-0	. 01899)	; &AJ1-01899;
@@ -4291,6 +4453,34 @@
       (=adobe-japan1-0	  . 04449)	; &AJ1-04449;
       (=jis-x0208	  . #x536E)	; &I-J90-536E; [51-78]
       ))
+    (->subsumptive
+     ((=decomposition@cid
+       ((=ucs		    . #x53B3)	; 厳
+	)
+       ((=ucs		    . #xE0100)	; 󠄀
+	))
+      (==ucs@cns	  . #x53B3)	; &g2-AJ1-01899;
+      (==ucs@jis	  . #x53B3)	; &g2-AJ1-01899;
+      (==adobe-japan1-0	  . 01899)	; &g2-AJ1-01899;
+      (==jis-x0208	  . #x3837)	; &g2-AJ1-01899; [24-23]
+      (==cns11643-3	  . #x5445)	; &g2-AJ1-01899; [52-37]
+      (==jis-x0213-1	  . #x3837)	; &g2-AJ1-01899; [24-23]
+      (==gt		  . 12988)	; &g2-AJ1-01899;
+      (==daikanwa/+p	  . 03048)	; &g2-AJ1-01899;
+      (==shinjigen	  .  1285)	; &g2-AJ1-01899;
+      (->subsumptive
+       ((===daikanwa/+p	    . 03048)	; &R-M-p03048;
+	)
+       ((===jis-x0208	    . #x3837)	; &R-J0-3837; [24-23]
+	(===jis-x0213-1	    . #x3837)	; &R-J0-3837; [24-23]
+	)
+       ((===adobe-japan1-0  . 01899)	; &R-AJ1-01899;
+	)
+       ((===cns11643-3	    . #x5445)	; &R-C3-5445; [52-37]
+	)
+       ((===gt		    . 12988)	; &R-GT-12988;
+	))
+      ))
     ))
 (define-char
   '((<-denotational
@@ -4300,20 +4490,13 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 16)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+      (=ucs		  . #x2FF8)	; ⿸
       )
-     ((=adobe-japan1-4	  . 13834)	; &AJ1-13834;
+     ((=gt-k		  . 01442)	; &GT-K01442;
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-	(=ucs		    . #x2FF8)	; ⿸
-	)
-       ((=ucs		    . #x5382)	; 厂
-	)
-       ((=ucs@unicode	    . #x6562)	; &G0-3852;
-	(=gb2312	    . #x3852)	; &G0-3852; [24-50]
-	))
+     ((=ucs@unicode	  . #x6562)	; &G0-3852;
+      (=gb2312		  . #x3852)	; &G0-3852; [24-50]
       ))
     (=ucs@unicode	. #x53B3)	; &UU+53B3;
     (=ucs@JP/hanazono	. nil)
@@ -4339,20 +4522,6 @@
     (=hanziku-12	. #xEB57)	; &I-HZK12-EB57;
     ))
 (define-char
-  '((ideographic-radical . 27)	; ⼚
-    (ideographic-strokes . 15)
-    (total-strokes	 . 17)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
-      (=ucs		  . #x2FF8)	; ⿸
-      )
-     ((=ucs		  . #x5382)	; 厂
-      )
-     ((=ucs		  . #x58A8)	; 墨
-      ))
-    (=ucs		. #x3553)	; 㕓
-    ))
-(define-char
   '((<-denotational
      ((=ucs		  . #x3553)	; 㕓
       ))
@@ -4368,6 +4537,12 @@
      ((=ucs		  . #xFA3A)	; 墨
       ))
     (=ucs@unicode	. #x3553)	; &UU+3553;
+    (->subsumptive
+     ((==ucs@unicode	  . #x3553)	; &g2-UU+3553;
+      (->subsumptive
+       ((===ucs@unicode	    . #x3553)	; &R-UU+3553;
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 27)	; ⼚