From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Thu, 4 Jan 2018 10:10:19 +0000 (+0900)
Subject: Merge branch 'master' into single-inheritance
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=20786d5469ae12d59835d5e15e6da186464b241c;hp=a66d56f0e7a02d1198cf72830bc6574413dce90f;p=chise%2Fxemacs-chise.git-

Merge branch 'master' into single-inheritance
---

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index 90454a7..cb59e3d 100644
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,5 +1,19 @@
+2017-12-30  MORIOKA Tomohiko  <tomo.git@chise.org>
+
+	* Ideograph-R055-Two-Hands.el (U-00026B20): Add
+	`ideographic-structure'.
+	(IU+26B20): Add `<-same@buddhism' for U-0002CEC0.
+
+2017-12-29  MORIOKA Tomohiko  <tomo.git@chise.org>
+
+	* Ideograph-R091-Slice.el (U+3E25): Use `->denotational' and
+	`->subsumptive'.
+
 2017-12-29  MORIOKA Tomohiko  <tomo.git@chise.org>
 
+	* Ideograph-R130-Meat.el: Use `leipian' instead of `leibian' to
+	indicate 類篇.
+
 	* Ideograph-R123-Sheep.el (A-compU+2634B): New abstract node.
 	(U-0002634B): Add `<-denotational@component' for A-compU+2634B.
 	(U-000263A7): Use A-compU+2634B instead of U-0002634B as a
diff --git a/lisp/utf-2000/Ideograph-R055-Two-Hands.el b/lisp/utf-2000/Ideograph-R055-Two-Hands.el
index b531bfa..5de0f4f 100644
--- a/lisp/utf-2000/Ideograph-R055-Two-Hands.el
+++ b/lisp/utf-2000/Ideograph-R055-Two-Hands.el
@@ -720,6 +720,14 @@
     (ideographic-radical@cns . 55)	; ⼶
     (ideographic-radical@cns*sources
      daikanwa=09598 cns11643)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x8279)	; 艹
+      )
+     ((=ucs		  . #x2F890)	; 廾
+      ))
     (=ucs		. #x26B20)	; 𦬠
     ))
 (define-char
@@ -748,6 +756,9 @@
       ))
     (<-ancient*sources
      zihui-bu daikanwa)
+    (<-same@buddhism
+     ((=ucs		  . #x2CEC0)	; 𬻀
+      ))
     (<-simplified@JP/buddhism
      ((ideographic-combination
        ((=ucs		    . #x83E9)	; 菩
@@ -756,9 +767,10 @@
 	))
       ))
     (<-simplified@JP/buddhism*sources
-     touga-13-koku daikanwa)
+     touga/13/koku daikanwa)
     (->mistakable
-     ((=ucs		  . #x26B07)	; 𦬇
+     ((=ucs@iso		  . #x26B07)	; &C6-2923;
+      (=cns11643-6	  . #x2923)	; &C6-2923; [09-03]
       (=daikanwa	  . 30687)	; &I-M-30687;
       ))
     (->mistakable*sources
diff --git a/lisp/utf-2000/Ideograph-R091-Slice.el b/lisp/utf-2000/Ideograph-R091-Slice.el
index ee261c7..8010829 100644
--- a/lisp/utf-2000/Ideograph-R091-Slice.el
+++ b/lisp/utf-2000/Ideograph-R091-Slice.el
@@ -2807,18 +2807,62 @@
     ))
 (define-char
   '((ideographic-radical . 91)	; ⽚
-    (ideographic-strokes . 17)
-    (total-strokes	 . 21)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x7247)	; 片
+      )
+     ((=ucs		  . #x6BDA)	; 毚
+      ))
+    (sound@ja/on/go	"zeN")
+    (sound@ja/on/kan	"saN")
     (=ucs		. #x3E25)	; 㸥
-    (=daikanwa		. 19908)	; &I-M-19908;
     ))
 (define-char
-  '((=>ucs		. #x3E25)	; 㸥
-    (morohashi-daikanwa	19908 0 1)
+  '((<-denotational
+     ((=ucs		  . #x3E25)	; 㸥
+      ))
     (ideographic-radical . 91)	; ⽚
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x7247)	; 片
+      )
+     ((=ucs@unicode	  . #x6BDA)	; &AJ1-17902;
+      (=adobe-japan1-5	  . 17902)	; &AJ1-17902;
+      ))
+    (=ucs@iso		. #x3E25)	; &C4-6650;
     (=cns11643-4	. #x6650)	; &C4-6650; [70-48]
+    (=daikanwa		. 19908)	; &I-M-19908;
+    (<-formed
+     ((=ucs@unicode	  . #x6B03)	; &AJ1-19473;
+      (=adobe-japan1-5	  . 19473)	; &AJ1-19473;
+      ))
+    (<-formed*sources
+     jiyun)
+    (<-same
+     ((=ucs@unicode	  . #x6B03)	; &AJ1-19473;
+      (=adobe-japan1-5	  . 19473)	; &AJ1-19473;
+      (=daikanwa	  . 15903)	; &I-M-15903;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
+    (->subsumptive
+     ((==ucs@unicode	  . #x3E25)	; &g2-M-19908;
+      (==daikanwa	  . 19908)	; &g2-M-19908;
+      (->subsumptive
+       ((===daikanwa	    . 19908)	; &R-M-19908;
+	)
+       ((===ucs@unicode	    . #x3E25)	; &R-UU+3E25;
+	))
+      )
+     ((==ucs@cns	  . #x3E25)	; &g2-CU+3E25;
+      (==cns11643-4	  . #x6650)	; &g2-CU+3E25; [70-48]
+      ))
     ))
 (define-char
   '((=>ucs		. #x24604)	; 𤘄
diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el
index 04ae862..72d94cc 100644
--- a/lisp/utf-2000/Ideograph-R130-Meat.el
+++ b/lisp/utf-2000/Ideograph-R130-Meat.el
@@ -766,7 +766,7 @@
       (=daikanwa	  . 29269)	; &I-M-29269;
       ))
     (->original*sources
-     jiyun leibian daikanwa)
+     jiyun leipian daikanwa)
     (->subsumptive
      ((==ucs@unicode	  . #x43CD)	; &g2-GT-37859;
       (==gt		  . 37859)	; &g2-GT-37859;
@@ -5179,7 +5179,9 @@
      ((=ucs		  . #x86C6)	; 蛆
       (=daikanwa	  . 32963)	; &I-M-32963;
       )
-     ((=daikanwa	  . 33488)	; &M-33488;
+     ((=ucs@iso		  . #x27405)	; &C7-3B46;
+      (=cns11643-7	  . #x3B46)	; &C7-3B46; [27-38]
+      (=daikanwa	  . 33488)	; &I-M-33488;
       ))
     (->formed*sources
      jiyun daikanwa)