X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=c4e288fa281d7c7a59356c497776e63716b12fbb;hb=9b9ab823536976a4cbf895153f61838b8ba01441;hp=5fa93c35245a081f554579951be3d5f0ca994936;hpb=fda6a2a71c285b4067b3c3b27e453dd671e4148e;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 5fa93c3..c4e288f 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -69,6 +69,9 @@
       (setq i (1+ i)))
     v))
 
+(defvar char-db-feature-domains
+  '(ucs daikanwa cns gt))
+
 (defvar char-db-ignored-attributes nil)
 
 (defun char-attribute-name< (ka kb)
@@ -450,7 +453,8 @@
 	(line-breaking
 	 (concat "\n" (make-string (1+ column) ?\ )))
 	lbs cell separator ret
-	key al cal)
+	key al cal
+	dest-ccss)
     (insert "(")
     (when (and (memq 'name attributes)
 	       (setq value (get-char-attribute char 'name)))
@@ -485,13 +489,6 @@
 			name value (decode-char '=ucs value)
 			line-breaking))
 	(setq attributes (delq name attributes))))
-    ;; (when (and (memq '=>ucs* attributes)
-    ;;            (setq value (get-char-attribute char '=>ucs*)))
-    ;;   (insert (format "(=>ucs*\t\t. #x%04X)\t; %c%s"
-    ;;                   value (decode-char '=ucs value)
-    ;;                   line-breaking))
-    ;;   (setq attributes (delq '=>ucs* attributes))
-    ;;   )
     (dolist (name '(=>ucs@gb =>ucs@cns =>ucs@jis =>ucs@ks =>ucs@big5))
       (when (and (memq name attributes)
 		 (setq value (get-char-attribute char name)))
@@ -520,41 +517,6 @@
 				     value)
 			line-breaking))
 	(setq attributes (delq name attributes))))
-    ;; (when (and (memq '=>ucs-gb attributes)
-    ;;            (setq value (get-char-attribute char '=>ucs-gb)))
-    ;;   (insert (format "(=>ucs@gb\t\t. #x%04X)\t; %c%s"
-    ;;                   value (decode-char '=ucs@gb value)
-    ;;                   line-breaking))
-    ;;   (setq attributes (delq '=>ucs-gb attributes))
-    ;;   )
-    ;; (when (and (memq '=>ucs-cns attributes)
-    ;;            (setq value (get-char-attribute char '=>ucs-cns)))
-    ;;   (insert (format "(=>ucs@cns\t\t. #x%04X)\t; %c%s"
-    ;;                   value (decode-char '=ucs@cns value)
-    ;;                   line-breaking))
-    ;;   (setq attributes (delq '=>ucs-cns attributes))
-    ;;   )
-    ;; (when (and (memq '=>ucs-big5 attributes)
-    ;;            (setq value (get-char-attribute char '=>ucs-big5)))
-    ;;   (insert (format "(=>ucs-big5\t\t. #x%04X)\t; %c%s"
-    ;;                   value (decode-char 'ucs-big5 value)
-    ;;                   line-breaking))
-    ;;   (setq attributes (delq '=>ucs-big5 attributes))
-    ;;   )
-    ;; (when (and (memq '=>ucs-jis attributes)
-    ;;            (setq value (get-char-attribute char '=>ucs-jis)))
-    ;;   (insert (format "(=>ucs@jis\t\t. #x%04X)\t; %c%s"
-    ;;                   value (decode-char '=ucs@jis value)
-    ;;                   line-breaking))
-    ;;   (setq attributes (delq '=>ucs-jis attributes))
-    ;;   )
-    ;; (when (and (memq '=>ucs-ks attributes)
-    ;;            (setq value (get-char-attribute char '=>ucs-ks)))
-    ;;   (insert (format "(=>ucs-ks\t\t. #x%04X)\t; %c%s"
-    ;;                   value (decode-char 'ucs-ks value)
-    ;;                   line-breaking))
-    ;;   (setq attributes (delq '=>ucs-ks attributes))
-    ;;   )
     (when (and (memq '->ucs attributes)
 	       (setq value (get-char-attribute char '->ucs)))
       (insert (format (if char-db-convert-obsolete-format
@@ -657,6 +619,52 @@
 		      line-breaking))
       (setq attributes (delq 'ideographic-radical attributes))
       )
+    (let (key)
+      (dolist (domain char-db-feature-domains)
+	(setq key (intern (format "%s@%s" 'ideographic-radical domain)))
+	(when (and (memq key attributes)
+		   (setq value (get-char-attribute char key)))
+	  (setq radical value)
+	  (insert (format "(%s . %S)\t; %c%s"
+			  key
+			  radical
+			  (aref ideographic-radicals radical)
+			  line-breaking))
+	  (setq attributes (delq key attributes))
+	  )
+	(setq key (intern (format "%s@%s" 'ideographic-strokes domain)))
+	(when (and (memq key attributes)
+		   (setq value (get-char-attribute char key)))
+	  (setq strokes value)
+	  (insert (format "(%s . %S)%s"
+			  key
+			  strokes
+			  line-breaking))
+	  (setq attributes (delq key attributes))
+	  )
+	(setq key (intern (format "%s@%s" 'total-strokes domain)))
+	(when (and (memq key attributes)
+		   (setq value (get-char-attribute char key)))
+	  (insert (format "(%s       . %S)%s"
+			  key
+			  value
+			  line-breaking))
+	  (setq attributes (delq key attributes))
+	  )
+	(dolist (feature '(ideographic-radical
+			   ideographic-strokes
+			   total-strokes))
+	  (setq key (intern (format "%s@%s*sources" feature domain)))
+	  (when (and (memq key attributes)
+		     (setq value (get-char-attribute char key)))
+	    (insert (format "(%s%s" key line-breaking))
+	    (dolist (cell value)
+	      (insert (format " %s" cell)))
+	    (insert ")")
+	    (insert line-breaking)
+	    (setq attributes (delq key attributes))
+	    ))
+	))
     (when (and (memq 'ideographic-strokes attributes)
 	       (setq value (get-char-attribute char 'ideographic-strokes)))
       (setq strokes value)
@@ -839,8 +847,8 @@
       (setq attributes (delq 'hanyu-dazidian-char attributes))
       )
     (unless readable
-      (when (memq '->ucs-variants attributes)
-	(setq attributes (delq '->ucs-variants attributes))
+      (when (memq '->ucs-unified attributes)
+	(setq attributes (delq '->ucs-unified attributes))
 	)
       (when (memq 'composition attributes)
 	(setq attributes (delq 'composition attributes))
@@ -983,14 +991,15 @@
 		))
       (setq attributes (cdr attributes)))
     (while ccs-attributes
-      (setq name (car ccs-attributes))
-      (if (and (eq name (charset-name name))
-	       (setq value (get-char-attribute char name)))
+      (setq name (charset-name (car ccs-attributes)))
+      (if (and (not (memq name dest-ccss))
+	       (prog1
+		   (setq value (get-char-attribute char name))
+		 (setq dest-ccss (cons name dest-ccss))))
 	  (insert
 	   (format
-	    (cond ((memq name '(ideograph-daikanwa
-				=daikanwa-rev1
-				=daikanwa-rev2
+	    (cond ((memq name '(=daikanwa
+				=daikanwa-rev1 =daikanwa-rev2
 				=gt =gt-k =cbeta))
 		   (if has-long-ccs-name
 		       "(%-26s . %05d)\t; %c%s"
@@ -1047,7 +1056,7 @@
     ))
 
 (defun insert-char-data-with-variant (char &optional printable
-					   no-ucs-variant
+					   no-ucs-unified
 					   script excluded-script)
   (insert-char-data char printable)
   (let ((variants (or (char-variants char)
@@ -1064,7 +1073,7 @@
 	       (or (null excluded-script)
 		   (null (setq vs (get-char-attribute variant 'script)))
 		   (not (memq excluded-script vs))))
-	  (or (and no-ucs-variant (get-char-attribute variant '=ucs))
+	  (or (and no-ucs-unified (get-char-attribute variant '=ucs))
 	      (insert-char-data variant printable)))
       (setq variants (cdr variants))
       )))
@@ -1075,7 +1084,7 @@
     (while (<= code max)
       (setq char (decode-char '=ucs code))
       (if (encode-char char '=ucs 'defined-only)
-	  (insert-char-data-with-variant char nil 'no-ucs-variant
+	  (insert-char-data-with-variant char nil 'no-ucs-unified
 					 script excluded-script))
       (setq code (1+ code)))))