(insert-char-data): Print GR value for GR-set.

[chise/xemacs-chise.git-] / lisp / utf-2000 / char-db-util.el

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 1f58691..bfb0e90 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -286,10 +286,13 @@
     "
                                   )
                                 (charset-name ret)
-                                (mapconcat (lambda (b)
-                                             (format "#x%02X" b)
-                                             )
-                                           (cdr cell) " "))))
+                                (mapconcat
+                                 (lambda (b)
+                                   (format "#x%02X"
+                                           (if (= (charset-graphic ret) 1)
+                                               (logior b #x80)
+                                             b)))
+                                 (cdr cell) " "))))
                ((string-match "^->" (symbol-name (car cell)))
                 (insert
                  (format "(%-18s %s)
@@ -321,25 +324,6 @@
        (tabify (point-min)(point-max))
        ))))
 
-(defun insert-char-range-data (min max)
-  (let ((code min)
-       char
-       variants)
-    (while (<= code max)
-      (setq char (int-char code))
-      (insert-char-data char)
-      (setq variants (char-variants char))
-      (while variants
-       (insert-char-data (car variants))
-       (setq variants (cdr variants)))
-      (setq code (1+ code))
-      )))
-
-(defun write-char-range-data-to-file (min max file)
-  (with-temp-buffer
-    (insert-char-range-data min max)
-    (write-region (point-min)(point-max) file)))
-
 ;;;###autoload
 (defun char-db-update-comment ()
   (interactive)
@@ -353,7 +337,8 @@
          (goto-char (match-end 0))
          (setq char
                (if (or (memq (car cdef) '(ascii latin-viscii-upper
-                                                latin-viscii-lower))
+                                                latin-viscii-lower
+                                                arabic-iso8859-6))
                        (= (char-int (charset-final (car cdef))) 0))
                    (apply (function make-char) cdef)
                  (if (setq table (charset-mapping-table (car cdef)))
@@ -363,12 +348,35 @@
                    (if table
                        (set-charset-mapping-table (car cdef) table)))))
          (when (not (or (< (char-int char) 32)
-                        (and (<= (char-int char) 128)
+                        (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)
+  (insert-char-data char)
+  (let ((variants (char-variants char)))
+    (while variants
+      (insert-char-data (car variants))
+      (setq variants (cdr variants))
+      )))
+
+(defun insert-char-range-data (min max)
+  (let ((code min)
+       char
+       variants)
+    (while (<= code max)
+      (setq char (int-char code))
+      (insert-char-data-with-variant char)
+      (setq code (1+ code))
+      )))
+
+(defun write-char-range-data-to-file (min max file)
+  (with-temp-buffer
+    (insert-char-range-data min max)
+    (write-region (point-min)(point-max) file)))
+
 ;;;###autoload
 (defun what-char-definition (char)
   (interactive (list (char-after)))
@@ -382,7 +390,8 @@
     (erase-buffer)
     (condition-case err
        (progn
-         (insert-char-data char)
+         (insert-char-data-with-variant char)
+         (char-db-update-comment)
          (set-buffer-modified-p nil)
          (view-mode the-buf (lambda (buf)
                               (set-window-configuration