From: tomo <tomo>
Date: Tue, 19 Apr 2011 16:03:40 +0000 (+0000)
Subject: (char-db-coded-charset-priority-list): Use `=daikanwa' and
X-Git-Tag: r21-4-22-chise-0_25-7^20~2
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=810067b10775cc3d0247a253d4424e8336c10ddb;p=chise%2Fxemacs-chise.git.1

(char-db-coded-charset-priority-list): Use `=daikanwa' and
`=daikanwa@rev1' instead of `ideograph-daikanwa' and
`ideograph-daikanwa-2'; add `=daikanwa@rev2'.
(char-db-insert-char-spec): Modify for `insert-char-attributes' to
specify optional argument `for-sub-node'.
(char-db-insert-alist): Likewise.
(char-db-insert-relation-feature): Likewise.
(insert-char-attributes): Add optional argument `for-sub-node'; insert
`<-subsumptive' feature if `for-sub-node' is nil.
---

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 119839e..6e36360 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -155,8 +155,9 @@
     =hanyo-denshi/ia
     =hanyo-denshi/ib
     =hanyo-denshi/hg
-    ideograph-daikanwa-2
-    ideograph-daikanwa
+    =daikanwa
+    =daikanwa@rev2
+    =daikanwa@rev1
     =cbeta
     =gt-k
     ideograph-hanziku-1
@@ -302,7 +303,8 @@
     (insert-char-attributes char
 			    readable
                             (union (mapcar #'car char-spec)
-				   required-features))
+				   required-features)
+			    nil 'for-sub-node)
     (when temp-char
       ;; undefine temporary character
       ;;   Current implementation is dirty.
@@ -343,7 +345,7 @@
 		   (insert-char-attributes ret
 					   readable
 					   (or al 'none) ; cal
-					   ))
+					   nil 'for-sub-node))
 	       (insert (prin1-to-string value)))
 	     (insert ")")
 	     (insert line-breaking))
@@ -375,7 +377,7 @@
 		     (insert-char-attributes ret
 					     readable
 					     al ; cal
-					     )
+					     nil 'for-sub-node)
 		     (setq separator lbs))
 		 (if separator
 		     (insert separator))
@@ -524,7 +526,7 @@
 	  (let ((char-db-ignored-attributes
 		 (cons '<-subsumptive
 		       char-db-ignored-attributes)))
-	    (insert-char-attributes cell readable))
+	    (insert-char-attributes cell readable nil nil 'for-sub-node))
 	  (setq separator lbs))
 	)
        ((characterp cell)
@@ -600,7 +602,8 @@
     (insert ")")
     (insert line-breaking)))
 
-(defun insert-char-attributes (char &optional readable attributes column)
+(defun insert-char-attributes (char &optional readable attributes column
+				    for-sub-node)
   (unless column
     (setq column (current-column)))
   (let (name value ; has-long-ccs-name
@@ -632,7 +635,7 @@
 		  #'char-attribute-name<)))
     (insert "(")
     (when (memq '<-subsumptive attributes)
-      (when readable
+      (when (or readable (not for-sub-node))
 	(when (setq value (get-char-attribute char '<-subsumptive))
 	  (char-db-insert-relation-feature char '<-subsumptive value
 					   line-breaking
@@ -1175,7 +1178,8 @@
 			     (insert lbs))
 			 (insert-char-attributes ret
 						 readable
-						 al cal)
+						 al ; cal
+						 nil 'for-sub-node)
 			 (setq separator lbs))
 		     (setq ret (prin1-to-string cell))
 		     (if separator