X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=aacb226f1a7fc6f32cddff9804077fdc3d6f6cdd;hb=6f8a91966f78f32c2150f434d378f7ac4d858bc0;hp=c2b5117c126d89d636f75ea01b31a6c3082f14ac;hpb=d8792057c6b6aad6d00a01796e703f7113d093e4;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index c2b5117..aacb226 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -512,7 +512,7 @@
     ;;                   line-breaking))
     ;;   (setq attributes (delq '=>ucs* attributes))
     ;;   )
-    (dolist (name '(=>ucs@gb =>ucs@cns))
+    (dolist (name '(=>ucs@gb =>ucs@cns =>ucs@jis =>ucs@ks =>ucs@big5))
       (when (and (memq name attributes)
 		 (setq value (get-char-attribute char name)))
 	(insert (format "(%-18s . #x%04X)\t; %c%s"
@@ -525,41 +525,56 @@
 			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))
-      )
+    (dolist (name '(=>ucs-gb =>ucs-cns =>ucs-jis =>ucs-ks =>ucs-big5))
+      (when (and (memq name attributes)
+		 (setq value (get-char-attribute char name)))
+	(insert (format "(%-18s . #x%04X)\t; %c%s"
+			(intern
+			 (concat "=>ucs@"
+				 (substring (symbol-name name) 6)))
+			value
+			(decode-char (intern
+				      (concat "=ucs@"
+					      (substring
+					       (symbol-name name) 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