X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Futf-2000%2FIdeograph-R160-Bitter.el;h=726f55e9909ee7878f5665f715d8bd569a480716;hb=2a39846bc116a8304269bd5f685decda21dd70b7;hp=7379a8634207cf5e3e160a194cf5a643a89ff59a;hpb=9ad193e4cfab4245f47a0eb7ae0aa9af8ab8f709;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/Ideograph-R160-Bitter.el b/lisp/utf-2000/Ideograph-R160-Bitter.el
index 7379a86..726f55e 100644
--- a/lisp/utf-2000/Ideograph-R160-Bitter.el
+++ b/lisp/utf-2000/Ideograph-R160-Bitter.el
@@ -5,13 +5,14 @@
     (total-strokes	 . 7)
     (=ucs		. #x8F9B)	; 辛
     (->subsumptive
-     ((shinjigen-2	  . 8196)
-      (=jis-x0208	  . #x3F49)	; &GT-51557; [31-41]
+     ((=jis-x0208	  . #x3F49)	; &GT-51557; [31-41]
       (=ks-x1001	  . #x6374)	; &I-K0-6374; [67-84]
       (=gt		  . 51557)	; &I-GT-51557;
       (=gt-k		  . 02584)	; &I-GT-K02584;
       (=gt-pj-1		  . #x3F49)	; &I-GT-51557; [31-41]
       (=daikanwa	  . 38630)	; &I-M-38630;
+      (=shinjigen@1ed	  .  8196)	; &GT-51557;
+      (=shinjigen@rev	  .  8196)	; &GT-51557;
       (=ucs@jis		  . #x8F9B)	; &GT-51557;
       )
      ((=gb2312		  . #x5041)	; &C1-4B50; [48-33]
@@ -26,55 +27,70 @@
     (ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
-    (<-ideographic-component-forms
-     ((=ucs		  . #x8F9B)	; 辛
-      ))
     (=gt-k		. 02585)	; &GT-K02585;
     (=gt-pj-k1		. #x3D69)	; &GT-K02585; [29-73]
+    (<-formed@component/connect-right
+     ((=jis-x0208	  . #x3F49)	; &GT-51557; [31-41]
+      (=ks-x1001	  . #x6374)	; &I-K0-6374; [67-84]
+      (=daikanwa	  . 38630)	; &I-M-38630;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	38630 1)
+  '((=>ucs		. #x2840B)	; 𨐋
+    (morohashi-daikanwa	38630 1)
     (ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
     (=gt		. 51556)	; &GT-51556;
     (=gt-pj-7		. #x5451)	; &GT-51556; [52-49]
+    (<-same
+     ((=daikanwa	  . 25722)	; &M-25722;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
     ))
 (define-char
-  '((morohashi-daikanwa	38630 1 9)
+  '((=>daikanwa		38630 1)	; 𨐋
     (ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 0)
     (total-strokes	 . 7)
-    (=cns11643-6	. #x292B)	; &C6-292B; [09-11]
-    ))
-(define-char
-  '((=>ucs		. #x2840C)	; 𨐌
-    (ideographic-radical . 160)	; ⾟
-    (ideographic-strokes . 1)
-    (total-strokes	 . 8)
-    (=jis-x0213-2-2000	. #x7966)	; &GT-51558; [89-70]
-    (=gt		. 51558)	; &I-GT-51558;
-    (=gt-k		. 04246)	; &I-GT-K04246;
-    (=gt-pj-7		. #x5452)	; &I-GT-51558; [52-50]
-    (=daikanwa		. 38631)	; &I-M-38631;
-    (=ucs@jis		. #x2840C)	; &GT-51558;
+    (hanyu-dazidian	6 4036 2)
+    (=ucs		. #x2840B)	; 𨐋
+    (=cns11643-6	. #x292B)	; &I-C6-292B; [09-11]
+    (=hanziku-10	. #xF0FA)	; &I-HZK10-F0FA;
     ))
 (define-char
-  '((morohashi-daikanwa	38631 0 0)
-    (ideographic-radical . 160)	; ⾟
+  '((ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 1)
     (total-strokes	 . 8)
-    (hanyu-dazidian	6 4036 3)
     (=ucs		. #x2840C)	; 𨐌
-    (=cns11643-6	. #x2E36)	; &I-C6-2E36; [14-22]
-    (=hanziku-10	. #xF0FB)	; &I-HZK10-F0FB;
+    (->subsumptive
+     ((=jis-x0213-2-2000  . #x7966)	; &GT-51558; [89-70]
+      (=gt		  . 51558)	; &I-GT-51558;
+      (=gt-k		  . 04246)	; &I-GT-K04246;
+      (=gt-pj-7		  . #x5452)	; &I-GT-51558; [52-50]
+      (=daikanwa	  . 38631)	; &I-M-38631;
+      (=ucs@jis		  . #x2840C)	; &GT-51558;
+      )
+     ((hanyu-dazidian	  6 4036 3)
+      (=cns11643-6	  . #x2E36)	; &HZK10-F0FB; [14-22]
+      (=hanziku-10	  . #xF0FB)	; &I-HZK10-F0FB;
+      (=ucs@iso		  . #x2840C)	; &HZK10-F0FB;
+      ))
     ))
 (define-char
   '((ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 3)
     (total-strokes	 . 10)
-    (=cns11643-6	. #x3C48)	; &M-38632; [28-40]
-    (=daikanwa		. 38632)	; &I-M-38632;
+    (=ucs		. #x2840D)	; 𨐍
+    (->subsumptive
+     ((=daikanwa	  . 38632)	; &M-38632;
+      )
+     ((hanyu-dazidian	  6 4036 4)
+      (=cns11643-6	  . #x3C48)	; &HZK10-F0FC; [28-40]
+      (=hanziku-10	  . #xF0FC)	; &I-HZK10-F0FC;
+      (=ucs@iso		  . #x2840D)	; &HZK10-F0FC;
+      ))
     ))
 (define-char
   '((=>ucs		. #x28410)	; 𨐐
@@ -168,27 +184,29 @@
   '((ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
-    (=daikanwa		. 38635)	; &M-38635;
-    ))
-(define-char
-  '((morohashi-daikanwa	38635 0 1)
-    (ideographic-radical . 160)	; ⾟
-    (ideographic-strokes . 4)
-    (total-strokes	 . 11)
-    (=cns11643-6	. #x454F)	; &C6-454F; [37-47]
+    (=ucs		. #x2840F)	; 𨐏
+    (->subsumptive
+     ((=daikanwa	  . 38635)	; &M-38635;
+      )
+     ((hanyu-dazidian	  6 4036 5)
+      (=hanziku-10	  . #xF0FD)	; &HZK10-F0FD;
+      (=ucs@iso		  . #x2840F)	; &HZK10-F0FD;
+      )
+     ((=cns11643-6	  . #x454F)	; &C6-454F; [37-47]
+      ))
     ))
 (define-char
   '((=>ucs		. #x8F9C)	; 辜
     (ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
-    (shinjigen-2	. 8198)
     (=jis-x0208		. #x6D63)	; &GT-51563; [77-67]
     (=ks-x1001		. #x4D50)	; &I-K0-4D50; [45-48]
     (=gt		. 51563)	; &I-GT-51563;
     (=gt-k		. 09237)	; &I-GT-K09237;
     (=gt-pj-1		. #x6D63)	; &I-GT-51563; [77-67]
     (=daikanwa		. 38636)	; &I-M-38636;
+    (=shinjigen@rev	.  8198)	; &GT-51563;
     (=ucs@jis		. #x8F9C)	; &GT-51563;
     (=ucs@ks		. #x8F9C)	; &GT-51563;
     ))
@@ -232,7 +250,13 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
     (->subsumptive
-     ((<-simplified@JP/Jouyou
+     ((=jis-x0208	  . #x3C2D)	; &GT-51568; [28-13]
+      (=gt		  . 51568)	; &I-GT-51568;
+      (=gt-pj-1		  . #x3C2D)	; &I-GT-51568; [28-13]
+      (=daikanwa	  . 38638)	; &I-M-38638;
+      (=shinjigen@rev	  .  8199)	; &GT-51568;
+      (=ucs@jis		  . #x8F9E)	; &GT-51568;
+      (<-simplified@JP/Jouyou
        ((=jis-x0208	    . #x6D66)	; &GT-51611; [77-70]
 	(=ks-x1001	    . #x5E76)	; &I-K0-5E76; [62-86]
 	(=daikanwa	    . 38671)	; &I-M-38671;
@@ -244,19 +268,13 @@
 	))
       (<-vulgar@jiyun*sources
        jiyun daikanwa)
-      (<-vulgar@zhengzi-tong
+      (<-vulgar@zhengzitong
        ((=jis-x0208	    . #x6D66)	; &GT-51611; [77-70]
 	(=ks-x1001	    . #x5E76)	; &I-K0-5E76; [62-86]
 	(=daikanwa	    . 38671)	; &I-M-38671;
 	))
-      (<-vulgar@zhengzi-tong*sources
-       zhengzi-tong daikanwa)
-      (shinjigen-2	  . 8199)
-      (=jis-x0208	  . #x3C2D)	; &GT-51568; [28-13]
-      (=gt		  . 51568)	; &I-GT-51568;
-      (=gt-pj-1		  . #x3C2D)	; &I-GT-51568; [28-13]
-      (=daikanwa	  . 38638)	; &I-M-38638;
-      (=ucs@jis		  . #x8F9E)	; &GT-51568;
+      (<-vulgar@zhengzitong*sources
+       zhengzitong daikanwa)
       )
      ((=gb2312		  . #x3447)	; &C3-4477; [20-39]
       (=cns11643-3	  . #x4477)	; &I-C3-4477; [36-87]
@@ -264,28 +282,32 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x28414)	; 𨐔
-    (ideographic-radical . 160)	; ⾟
-    (ideographic-strokes . 6)
-    (total-strokes	 . 13)
-    (=daikanwa		. 38639)	; &M-38639;
-    ))
-(define-char
-  '((morohashi-daikanwa	38639 0 0)
-    (ideographic-radical . 160)	; ⾟
+  '((ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
-    (hanyu-dazidian	6 4037 6)
     (=ucs		. #x28414)	; 𨐔
-    (=cns11643-4	. #x412E)	; &I-C4-412E; [33-14]
-    (=hanziku-10	. #xF15F)	; &I-HZK10-F15F;
+    (->subsumptive
+     ((=daikanwa	  . 38639)	; &M-38639;
+      )
+     ((hanyu-dazidian	  6 4037 6)
+      (=cns11643-4	  . #x412E)	; &HZK10-F15F; [33-14]
+      (=hanziku-10	  . #xF15F)	; &I-HZK10-F15F;
+      (=ucs@iso		  . #x28414)	; &HZK10-F15F;
+      ))
     ))
 (define-char
   '((ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
-    (=cns11643-6	. #x592A)	; &M-38640; [57-10]
-    (=daikanwa		. 38640)	; &I-M-38640;
+    (=ucs		. #x28415)	; 𨐕
+    (->subsumptive
+     ((=daikanwa	  . 38640)	; &M-38640;
+      )
+     ((hanyu-dazidian	  6 4037 7)
+      (=cns11643-6	  . #x592A)	; &HZK10-F160; [57-10]
+      (=hanziku-10	  . #xF160)	; &I-HZK10-F160;
+      (=ucs@iso		  . #x28415)	; &HZK10-F160;
+      ))
     ))
 (define-char
   '((=>ucs		. #x28418)	; 𨐘
@@ -308,13 +330,18 @@
     (total-strokes	 . 13)
     (=ucs		. #x8F9F)	; 辟
     (->subsumptive
-     ((shinjigen-2	  . 8202)
-      (=jis-x0208	  . #x6D64)	; &GT-51571; [77-68]
+     ((=jis-x0208	  . #x6D64)	; &GT-51571; [77-68]
       (=gt		  . 51571)	; &I-GT-51571;
       (=gt-k		  . 10359)	; &I-GT-K10359;
       (=gt-pj-1		  . #x6D64)	; &I-GT-51571; [77-68]
       (=daikanwa	  . 38642)	; &I-M-38642;
+      (=shinjigen@1ed	  .  8202)	; &GT-51571;
+      (=shinjigen@rev	  .  8202)	; &GT-51571;
       (=ucs@jis		  . #x8F9F)	; &GT-51571;
+      (<-formed
+       ((=ks-x1001	    . #x792D)	; &M-39163; [89-13]
+	(=daikanwa	    . 39163)	; &I-M-39163;
+	))
       )
      ((=gb2312		  . #x3159)	; &C1-6728; [17-57]
       (=cns11643-1	  . #x6728)	; &I-C1-6728; [71-08]
@@ -366,12 +393,12 @@
     (ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 7)
     (total-strokes	 . 14)
-    (shinjigen-2	. 8203)
     (=jis-x0208		. #x6D65)	; &GT-51576; [77-69]
     (=ks-x1001		. #x5538)	; &I-K0-5538; [53-24]
     (=gt		. 51576)	; &I-GT-51576;
     (=gt-pj-1		. #x6D65)	; &I-GT-51576; [77-69]
     (=daikanwa		. 38646)	; &I-M-38646;
+    (=shinjigen@rev	.  8203)	; &GT-51576;
     (=ucs@jis		. #x8FA3)	; &GT-51576;
     ))
 (define-char
@@ -533,11 +560,11 @@
     (ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
-    (shinjigen-2	. 2248)
     (=jis-x0208		. #x5221)	; &GT-51593; [50-01]
     (=gt		. 51593)	; &I-GT-51593;
     (=gt-pj-1		. #x5221)	; &I-GT-51593; [50-01]
     (=daikanwa		. 38656)	; &I-M-38656;
+    (=shinjigen@rev	.  2248)	; &GT-51593;
     (=ucs@jis		. #x8FA7)	; &GT-51593;
     ))
 (define-char
@@ -806,12 +833,12 @@
     (ideographic-radical . 160)	; ⾟
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
-    (shinjigen-2	. 8200)
     (=jis-x0208		. #x6D66)	; &GT-51611; [77-70]
     (=ks-x1001		. #x5E76)	; &I-K0-5E76; [62-86]
     (=gt		. 51611)	; &I-GT-51611;
     (=gt-pj-1		. #x6D66)	; &I-GT-51611; [77-70]
     (=daikanwa		. 38671)	; &I-M-38671;
+    (=shinjigen@rev	.  8200)	; &GT-51611;
     (=ucs@jis		. #x8FAD)	; &GT-51611;
     ))
 (define-char
@@ -934,42 +961,18 @@
     ))
 (define-char
   '((ideographic-radical . 160)	; ⾟
-    (hanyu-dazidian	6 4036 2)
-    (=ucs		. #x2840B)	; 𨐋
-    (=hanziku-10	. #xF0FA)	; &I-HZK10-F0FA;
-    ))
-(define-char
-  '((ideographic-radical . 160)	; ⾟
-    (hanyu-dazidian	6 4036 4)
-    (=ucs		. #x2840D)	; 𨐍
-    (=hanziku-10	. #xF0FC)	; &I-HZK10-F0FC;
-    ))
-(define-char
-  '((ideographic-radical . 160)	; ⾟
     (hanyu-dazidian	8 41 2)
     (=ucs		. #x2840E)	; 𨐎
     (=hanziku-12	. #xF0AE)	; &I-HZK12-F0AE;
     ))
 (define-char
   '((ideographic-radical . 160)	; ⾟
-    (hanyu-dazidian	6 4036 5)
-    (=ucs		. #x2840F)	; 𨐏
-    (=hanziku-10	. #xF0FD)	; &I-HZK10-F0FD;
-    ))
-(define-char
-  '((ideographic-radical . 160)	; ⾟
     (hanyu-dazidian	6 4037 1)
     (=ucs		. #x28413)	; 𨐓
     (=hanziku-10	. #xF15A)	; &I-HZK10-F15A;
     ))
 (define-char
   '((ideographic-radical . 160)	; ⾟
-    (hanyu-dazidian	6 4037 7)
-    (=ucs		. #x28415)	; 𨐕
-    (=hanziku-10	. #xF160)	; &I-HZK10-F160;
-    ))
-(define-char
-  '((ideographic-radical . 160)	; ⾟
     (hanyu-dazidian	6 4037 5)
     (=ucs		. #x28416)	; 𨐖
     (=hanziku-10	. #xF15E)	; &I-HZK10-F15E;