X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=94d17bdc8533d7b019ffff58ac7dd97265a39f56;hb=0890e7b014750623a1e2a91182a351b1e67ff2e1;hp=50996cb86e12ab3ec47ac2d119be85ca82529d31;hpb=1a457ecfa8bbb121c48cccd70779a0a23cf95e46;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 50996cb..94d17bd 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -415,6 +415,13 @@
 		      line-breaking))
       (setq attributes (delq '=>ucs* 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 value)
+		      line-breaking))
+      (setq attributes (delq '=>ucs-jis attributes))
+      )
     (when (and (memq '->ucs attributes)
 	       (setq value (get-char-attribute char '->ucs)))
       (insert (format (if char-db-convert-obsolete-format
@@ -815,8 +822,10 @@
 	       (setq value (get-char-attribute char name)))
 	  (insert
 	   (format
-	    (cond ((memq name '(ideograph-daikanwa ideograph-gt
-						   ideograph-cbeta))
+	    (cond ((memq name '(ideograph-daikanwa-2
+				ideograph-daikanwa
+				ideograph-gt
+				ideograph-cbeta))
 		   (if has-long-ccs-name
 		       "(%-26s . %05d)\t; %c%s"
 		     "(%-18s . %05d)\t; %c%s"))
@@ -958,7 +967,13 @@
 	  (insert-char-data-with-variant char 'printable)
 	  (unless (char-attribute-alist char)
 	    (insert (format ";; = %c\n"
-			    (apply #'make-char (split-char char)))))
+			    (let* ((rest (split-char char))
+				   (ccs (pop rest))
+				   (code (pop rest)))
+			      (while rest
+				(setq code (logior (lsh code 8)
+						   (pop rest))))
+			      (decode-char ccs code)))))
           ;; (char-db-update-comment)
 	  (set-buffer-modified-p nil)
 	  (view-mode the-buf (lambda (buf)