X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=96beee973607839931390867c585722f814f1ece;hb=4f09994878627d7d0dae45c3ab83458b469b87e5;hp=2073fd175d6dd8bf8775cac721f061ec427b5fd7;hpb=b68e454dd75fa28f4fa85242fe418aac23abcb72;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 2073fd1..96beee9 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -482,20 +482,34 @@
 		      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"
+    (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 value)
 		      line-breaking))
-      (setq attributes (delq '=>ucs-jis attributes))
+      (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 value)
+		      value (decode-char 'ucs-cns value)
 		      line-breaking))
       (setq attributes (delq '=>ucs-cns 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
@@ -587,13 +601,6 @@
 		      line-breaking))
       (setq attributes (delq 'morohashi-daikanwa attributes))
       )
-    ;; (when (and (memq 'hanyu-dazidian attributes)
-    ;;            (setq value (get-char-attribute char 'hanyu-dazidian)))
-    ;;   (insert (format "(hanyu-dazidian     %s)%s"
-    ;;                   (mapconcat #'number-to-string value " ")
-    ;;                   line-breaking))
-    ;;   (setq attributes (delq 'hanyu-dazidian attributes))
-    ;;   )
     (setq radical nil
 	  strokes nil)
     (when (and (memq 'ideographic-radical attributes)
@@ -975,41 +982,6 @@
     (tabify (point-min)(point-max))
     ))
 
-;;;###autoload
-(defun char-db-update-comment ()
-  (interactive)
-  (save-excursion
-    (goto-char (point-min))
-    (let (cdef table char)
-      (while (re-search-forward "^[ \t]*\\(([^.()]+)\\)" nil t)
-	(goto-char (match-beginning 1))
-	(setq cdef (read (current-buffer)))
-	(when (find-charset (car cdef))
-	  (goto-char (match-end 0))
-	  (setq char
-		(if (and
-		     (not (eq (car cdef) 'ideograph-daikanwa))
-		     (or (memq (car cdef) '(ascii latin-viscii-upper
-						  latin-viscii-lower
-						  arabic-iso8859-6
-						  japanese-jisx0213-1
-						  japanese-jisx0213-2))
-			 (= (char-int (charset-iso-final-char (car cdef)))
-			    0)))
-		    (apply (function make-char) cdef)
-		  (if (setq table (charset-mapping-table (car cdef)))
-		      (set-charset-mapping-table (car cdef) nil))
-		  (prog1
-		      (apply (function make-char) cdef)
-		    (if table
-			(set-charset-mapping-table (car cdef) table)))))
-	  (when (not (or (< (char-int char) 32)
-			 (and (<= 128 (char-int char))
-			      (< (char-int char) 160))))
-	    (delete-region (point) (point-at-eol))
-	    (insert (format "\t; %c" char)))
-	  )))))
-
 (defun insert-char-data-with-variant (char &optional printable
 					   no-ucs-variant
 					   script excluded-script)