(insert-char-attributes): Support `ancient-ideograph-of'.
[chise/xemacs-chise.git-] / lisp / utf-2000 / char-db-util.el
index 67e947c..3a29c5f 100644 (file)
@@ -1,8 +1,8 @@
 ;;; char-db-util.el --- Character Database utility
 
-;; Copyright (C) 1998, 1999 MORIOKA Tomohiko.
+;; Copyright (C) 1998,1999,2000,2001 MORIOKA Tomohiko.
 
-;; Author: MORIOKA Tomohiko <tomo@m17n.org>
+;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: UTF-2000, ISO/IEC 10646, Unicode, UCS-4, MULE.
 
 ;; This file is part of UTF-2000.
    ((symbolp kb)
     nil)))
 
-(defun insert-char-data (char)
-  (let ((data (char-attribute-alist char))
-       cell ret has-long-ccs-name rest)
-    (when data
-      (save-restriction
-       (narrow-to-region (point)(point))
-       (insert "(define-char
-  '(")
-       (when (setq cell (assq 'name data))
-         (setq cell (cdr cell))
-         (insert (format
-                  (if (> (length cell) 47)
-                      "(name . %S)
-    "
-                    "(name\t\t. %S)
-    ")
-                  cell))
-         (setq data (del-alist 'name data))
-         )
-       (when (setq cell (assq 'name data))
-         (setq cell (cdr cell))
-         (insert (format
-                  (if (> (length cell) 47)
-                      "(name . %S)
-    "
-                    "(name\t\t. %S)
-    ")
-                  cell))
-         (setq data (del-alist 'name data))
-         )
-       (when (setq cell (assq 'ucs data))
-         (setq cell (cdr cell))
-         (insert (format "(ucs\t\t. #x%04X)
-    "
-                         cell))
-         (setq data (del-alist 'ucs data))
-         )
-       (when (setq cell (assq '->ucs data))
-         (setq cell (cdr cell))
-         (insert (format "(->ucs\t\t. #x%04X)
-    "
-                         cell))
-         (setq data (del-alist '->ucs data))
-         )
-       (when (setq cell (assq 'general-category data))
-         (setq ret (cdr cell))
-         (insert (format
-                  "(general-category\t%s) ; %s
-    "
-                  (mapconcat (lambda (cell)
-                               (format "%S" cell))
-                             ret " ")
-                  (cond ((rassoc (cdr cell)
-                                 unidata-normative-category-alist)
-                         "Normative Category")
-                        ((rassoc (cdr cell)
-                                 unidata-informative-category-alist)
-                         "Informative Category")
-                        (t
-                         "Unknown Category"))))
-         (setq data (del-alist 'general-category data))
-         )
-       (when (setq cell (assq 'bidi-category data))
-         (setq cell (cdr cell))
-         (insert (format "(bidi-category\t. %S)
-    "
-                         cell))
-         (setq data (del-alist 'bidi-category data))
-         )
-       (when (setq cell (assq 'mirrored data))
-         (setq cell (cdr cell))
-         (insert (format "(mirrored\t\t. %S)
-    "
-                         cell))
-         (setq data (del-alist 'mirrored data))
-         )
-       (cond
-        ((setq cell (assq 'decimal-digit-value data))
-         (setq cell (cdr cell))
-         (insert (format "(decimal-digit-value . %S)
-    "
-                         cell))
-         (setq data (del-alist 'decimal-digit-value data))
-         (when (setq cell (assq 'digit-value data))
-           (setq cell (cdr cell))
-           (insert (format "(digit-value\t . %S)
-    "
-                           cell))
-           (setq data (del-alist 'digit-value data))
-           )
-         (when (setq cell (assq 'numeric-value data))
-           (setq cell (cdr cell))
-           (insert (format "(numeric-value\t . %S)
-    "
-                           cell))
-           (setq data (del-alist 'numeric-value data))
-           )
-         )
-        (t
-         (when (setq cell (assq 'digit-value data))
-           (setq cell (cdr cell))
-           (insert (format "(digit-value\t. %S)
-    "
-                           cell))
-           (setq data (del-alist 'digit-value data))
-           )
-         (when (setq cell (assq 'numeric-value data))
-           (setq cell (cdr cell))
-           (insert (format "(numeric-value\t. %S)
-    "
-                           cell))
-           (setq data (del-alist 'numeric-value data))
-           )))
-       (when (setq cell (assq 'iso-10646-comment data))
-         (setq cell (cdr cell))
-         (insert (format "(iso-10646-comment\t. %S)
-    "
-                         cell))
-         (setq data (del-alist 'iso-10646-comment data))
-         )
-       (when (setq cell (assq 'morohashi-daikanwa data))
-         (setq cell (cdr cell))
-         (insert (format "(morohashi-daikanwa\t%s)
-    "
-                         (mapconcat (function prin1-to-string) cell " ")))
-         (setq data (del-alist 'morohashi-daikanwa data))
-         )
-       (when (setq cell (assq 'ideographic-radical data))
-         (setq cell (cdr cell))
-         (insert (format "(ideographic-radical . %S)\t; %c
-    "
-                         cell
-                         (aref ideographic-radicals cell)))
-         (setq data (del-alist 'ideographic-radical data))
-         )
-       (cond
-        ((setq cell (assq 'ideographic-strokes data))
-         (setq cell (cdr cell))
-         (insert (format "(ideographic-strokes . %S)
-    "
-                         cell))
-         (setq data (del-alist 'ideographic-strokes data))
-         (when (setq cell (assq 'total-strokes data))
-           (setq cell (cdr cell))
-           (insert (format "(total-strokes\t . %S)
-    "
-                           cell))
-           (setq data (del-alist 'total-strokes data))
-           ))
-        ((setq cell (assq 'total-strokes data))
-         (setq cell (cdr cell))
-         (insert (format "(total-strokes\t. %S)
-    "
-                         cell))
-         (setq data (del-alist 'total-strokes data))
-         ))
-       (when (setq cell (assq '->decomposition data))
-         (setq cell (cdr cell))
-         (insert (format "(->decomposition\t%s)
-    "
-                         (mapconcat (lambda (code)
-                                      (cond ((symbolp code)
-                                             (symbol-name code))
-                                            ((integerp code)
-                                             (format "#x%04X" code))
-                                            (t
-                                             (format "\n     %S" code))))
-                                    cell " ")))
-         (setq data (del-alist '->decomposition data))
-         )
-       (when (setq cell (assq '->uppercase data))
-         (setq cell (cdr cell))
-         (insert (format "(->uppercase\t%s)
-    "
-                         (mapconcat (lambda (code)
-                                      (cond ((symbolp code)
-                                             (symbol-name code))
-                                            ((integerp code)
-                                             (format "#x%04X" code))
-                                            (t
-                                             (format "\n     %S" code))))
-                                    cell " ")))
-         (setq data (del-alist '->uppercase data))
-         )
-       (when (setq cell (assq '->lowercase data))
-         (setq cell (cdr cell))
-         (insert (format "(->lowercase\t%s)
-    "
-                         (mapconcat (lambda (code)
-                                      (cond ((symbolp code)
-                                             (symbol-name code))
-                                            ((integerp code)
-                                             (format "#x%04X" code))
-                                            (t
-                                             (format "\n     %S" code))))
-                                    cell " ")))
-         (setq data (del-alist '->lowercase data))
-         )
-       (when (setq cell (assq '->titlecase data))
-         (setq cell (cdr cell))
-         (insert (format "(->titlecase\t%s)
-    "
-                         (mapconcat (lambda (code)
-                                      (cond ((symbolp code)
-                                             (symbol-name code))
-                                            ((integerp code)
-                                             (format "#x%04X" code))
-                                            (t
-                                             (format "\n     %S" code))))
-                                    cell " ")))
-         (setq data (del-alist '->titlecase data))
-         )
-       (setq data
-             (sort data
-                   (lambda (a b)
-                     (char-attribute-name< (car a)(car b)))))
-       (setq rest data)
-       (while (and rest
-                   (progn
-                     (setq cell (car rest))
-                     (if (setq ret (find-charset (car cell)))
-                         (if (>= (length (symbol-name (charset-name ret))) 19)
-                             (progn
-                               (setq has-long-ccs-name t)
-                               nil)
-                           t)
-                       t)))
-         (setq rest (cdr rest)))
-       (while data
-         (setq cell (car data))
-         (cond ((setq ret (find-charset (car cell)))
-                (insert
-                 (format
-                  (if has-long-ccs-name
-                      "(%-26s %s)
-    "
-                    "(%-18s %s)
-    "
-                    )
-                  (charset-name ret)
-                  (mapconcat
-                   (lambda (b)
-                     (format "#x%02X"
-                             (if (= (charset-iso-graphic-plane ret) 1)
-                                 (logior b 128)
-                               b)))
-                   (cdr cell) " "))))
-               ((string-match "^->" (symbol-name (car cell)))
+(defun char-db-insert-alist (alist &optional readable column)
+  (unless column
+    (setq column (current-column)))
+  (let ((line-breaking
+        (concat "\n" (make-string (1+ column) ?\ )))
+       name value
+       ret al cal key
+       lbs cell rest separator)
+    (insert "(")
+    (while alist
+      (setq name (car (car alist))
+           value (cdr (car alist)))
+      (cond ((eq name 'char)
+            (insert "(char . ")
+            (if (setq ret (condition-case nil
+                              (define-char value)
+                            (error nil)))
+                (progn
+                  (setq al nil
+                        cal nil)
+                  (while value
+                    (setq key (car (car value)))
+                    (if (find-charset key)
+                        (setq cal (cons key cal))
+                      (setq al (cons key al)))
+                    (setq value (cdr value)))
+                  (insert-char-attributes ret
+                                          readable
+                                          (or al 'none) cal))
+              (insert (prin1-to-string value)))
+            (insert ")")
+            (insert line-breaking))
+           ((consp value)
+            (insert (format "(%-18s " name))
+            (setq lbs (concat "\n" (make-string (current-column) ?\ )))
+            (while (consp value)
+              (setq cell (car value))
+              (if (and (consp cell)
+                       (consp (car cell))
+                       (setq ret (condition-case nil
+                                     (define-char cell)
+                                   (error nil)))
+                       )
+                  (progn
+                    (setq rest cell
+                          al nil
+                          cal nil)
+                    (while rest
+                      (setq key (car (car rest)))
+                      (if (find-charset key)
+                          (setq cal (cons key cal))
+                        (setq al (cons key al)))
+                      (setq rest (cdr rest)))
+                    (if separator
+                        (insert lbs))
+                    (insert-char-attributes ret
+                                            readable
+                                            al cal)
+                    (setq separator lbs))
+                (if separator
+                    (insert separator))
+                (insert (prin1-to-string cell))
+                (setq separator " "))
+              (setq value (cdr value)))
+            (insert ")")
+            (insert line-breaking))
+           (t
+            (insert (format "(%-18s . %S)%s"
+                            name value
+                            line-breaking))))
+      (setq alist (cdr alist))))
+  (insert ")"))
+
+(defun insert-char-attributes (char &optional readable
+                                   attributes ccs-attributes
+                                   column)
+  (setq attributes
+       (if attributes
+           (if (consp attributes)
+               (copy-sequence attributes))
+         (sort (char-attribute-list) #'char-attribute-name<)))
+  (setq ccs-attributes
+       (if ccs-attributes
+           (copy-sequence ccs-attributes)
+         (sort (charset-list) #'char-attribute-name<)))
+  (unless column
+    (setq column (current-column)))
+  (let (name value has-long-ccs-name rest
+       radical strokes
+       (line-breaking
+        (concat "\n" (make-string (1+ column) ?\ )))
+       lbs cell separator ret
+       key al cal)
+    (insert "(")
+    (when (and (memq 'name attributes)
+              (setq value (get-char-attribute char 'name)))
+      (insert (format
+              (if (> (length value) 47)
+                  "(name . %S)%s"
+                "(name\t\t. %S)%s")
+              value line-breaking))
+      (setq attributes (delq 'name attributes))
+      )
+    (when (and (memq 'script attributes)
+              (setq value (get-char-attribute char 'script)))
+      (insert (format "(script\t\t%s)%s"
+                     (mapconcat (function prin1-to-string)
+                                value " ")
+                     line-breaking))
+      (setq attributes (delq 'script 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))
+      )
+    (when (and (memq 'general-category attributes)
+              (setq value (get-char-attribute char 'general-category)))
+      (insert (format
+              "(general-category\t%s) ; %s%s"
+              (mapconcat (lambda (cell)
+                           (format "%S" cell))
+                         value " ")
+              (cond ((rassoc value unidata-normative-category-alist)
+                     "Normative Category")
+                    ((rassoc value unidata-informative-category-alist)
+                     "Informative Category")
+                    (t
+                     "Unknown Category"))
+              line-breaking))
+      (setq attributes (delq 'general-category attributes))
+      )
+    (when (and (memq 'bidi-category attributes)
+              (setq value (get-char-attribute char 'bidi-category)))
+      (insert (format "(bidi-category\t. %S)%s"
+                     value
+                     line-breaking))
+      (setq attributes (delq 'bidi-category attributes))
+      )
+    (unless (or (not (memq 'mirrored attributes))
+               (eq (setq value (get-char-attribute char 'mirrored 'empty))
+                   'empty))
+      (insert (format "(mirrored\t\t. %S)%s"
+                     value
+                     line-breaking))
+      (setq attributes (delq 'mirrored attributes))
+      )
+    (cond
+     ((and (memq 'decimal-digit-value attributes)
+          (setq value (get-char-attribute char 'decimal-digit-value)))
+      (insert (format "(decimal-digit-value . %S)%s"
+                     value
+                     line-breaking))
+      (setq attributes (delq 'decimal-digit-value attributes))
+      (when (and (memq 'digit-value attributes)
+                (setq value (get-char-attribute char 'digit-value)))
+       (insert (format "(digit-value\t . %S)%s"
+                       value
+                       line-breaking))
+       (setq attributes (delq 'digit-value attributes))
+       )
+      (when (and (memq 'numeric-value attributes)
+                (setq value (get-char-attribute char 'numeric-value)))
+       (insert (format "(numeric-value\t . %S)%s"
+                       value
+                       line-breaking))
+       (setq attributes (delq 'numeric-value attributes))
+       )
+      )
+     (t
+      (when (and (memq 'digit-value attributes)
+                (setq value (get-char-attribute char 'digit-value)))
+       (insert (format "(digit-value\t. %S)%s"
+                       value
+                       line-breaking))
+       (setq attributes (delq 'digit-value attributes))
+       )
+      (when (and (memq 'numeric-value attributes)
+                (setq value (get-char-attribute char 'numeric-value)))
+       (insert (format "(numeric-value\t. %S)%s"
+                       value
+                       line-breaking))
+       (setq attributes (delq 'numeric-value attributes))
+       )))
+    (when (and (memq 'iso-10646-comment attributes)
+              (setq value (get-char-attribute char 'iso-10646-comment)))
+      (insert (format "(iso-10646-comment\t. %S)%s"
+                     value
+                     line-breaking))
+      (setq attributes (delq 'iso-10646-comment attributes))
+      )
+    (when (and (memq 'morohashi-daikanwa attributes)
+              (setq value (get-char-attribute char 'morohashi-daikanwa)))
+      (insert (format "(morohashi-daikanwa\t%s)%s"
+                     (mapconcat (function prin1-to-string) value " ")
+                     line-breaking))
+      (setq attributes (delq 'morohashi-daikanwa attributes))
+      )
+    (setq radical nil
+         strokes nil)
+    (when (and (memq 'ideographic-radical attributes)
+              (setq value (get-char-attribute char 'ideographic-radical)))
+      (setq radical value)
+      (insert (format "(ideographic-radical . %S)\t; %c%s"
+                     radical
+                     (aref ideographic-radicals radical)
+                     line-breaking))
+      (setq attributes (delq 'ideographic-radical attributes))
+      )
+    (when (and (memq 'ideographic-strokes attributes)
+              (setq value (get-char-attribute char 'ideographic-strokes)))
+      (setq strokes value)
+      (insert (format "(ideographic-strokes . %S)%s"
+                     strokes
+                     line-breaking))
+      (setq attributes (delq 'ideographic-strokes attributes))
+      )
+    (when (and (memq 'kangxi-radical attributes)
+              (setq value (get-char-attribute char 'kangxi-radical)))
+      (unless (eq value radical)
+       (insert (format "(kangxi-radical\t . %S)\t; %c%s"
+                       value
+                       (aref ideographic-radicals value)
+                       line-breaking))
+       (or radical
+           (setq radical value)))
+      (setq attributes (delq 'kangxi-radical attributes))
+      )
+    (when (and (memq 'kangxi-strokes attributes)
+              (setq value (get-char-attribute char 'kangxi-strokes)))
+      (unless (eq value strokes)
+       (insert (format "(kangxi-strokes\t . %S)%s"
+                       value
+                       line-breaking))
+       (or strokes
+           (setq strokes value)))
+      (setq attributes (delq 'kangxi-strokes attributes))
+      )
+    (when (and (memq 'japanese-radical attributes)
+              (setq value (get-char-attribute char 'japanese-radical)))
+      (unless (eq value radical)
+       (insert (format "(japanese-radical\t . %S)\t; %c%s"
+                       value
+                       (aref ideographic-radicals value)
+                       line-breaking))
+       (or radical
+           (setq radical value)))
+      (setq attributes (delq 'japanese-radical attributes))
+      )
+    (when (and (memq 'japanese-strokes attributes)
+              (setq value (get-char-attribute char 'japanese-strokes)))
+      (unless (eq value strokes)
+       (insert (format "(japanese-strokes\t . %S)%s"
+                       value
+                       line-breaking))
+       (or strokes
+           (setq strokes value)))
+      (setq attributes (delq 'japanese-strokes attributes))
+      )
+    (when (and (memq 'cns-radical attributes)
+              (setq value (get-char-attribute char 'cns-radical)))
+      (insert (format "(cns-radical\t . %S)\t; %c%s"
+                     value
+                     (aref ideographic-radicals value)
+                     line-breaking))
+      (setq attributes (delq 'cns-radical attributes))
+      )
+    (when (and (memq 'cns-strokes attributes)
+              (setq value (get-char-attribute char 'cns-strokes)))
+      (unless (eq value strokes)
+       (insert (format "(cns-strokes\t . %S)%s"
+                       value
+                       line-breaking))
+       (or strokes
+           (setq strokes value)))
+      (setq attributes (delq 'cns-strokes attributes))
+      )
+    (when (and (memq 'shinjigen-1-radical attributes)
+              (setq value (get-char-attribute char 'shinjigen-1-radical)))
+      (unless (eq value radical)
+       (insert (format "(shinjigen-1-radical . %S)\t; %c%s"
+                       value
+                       (aref ideographic-radicals value)
+                       line-breaking))
+       (or radical
+           (setq radical value)))
+      (setq attributes (delq 'shinjigen-1-radical attributes))
+      )
+    (when (and (memq 'total-strokes attributes)
+              (setq value (get-char-attribute char 'total-strokes)))
+      (insert (format "(total-strokes       . %S)%s"
+                     value
+                     line-breaking))
+      (setq attributes (delq 'total-strokes attributes))
+      )
+    (when (and (memq '->ideograph attributes)
+              (setq value (get-char-attribute char '->ideograph)))
+      (insert (format "(->ideograph\t%s)%s"
+                     (mapconcat (lambda (code)
+                                  (cond ((symbolp code)
+                                         (symbol-name code))
+                                        ((integerp code)
+                                         (format "#x%04X" code))
+                                        (t
+                                         (format "%s%S" line-breaking code))))
+                                value " ")
+                     line-breaking))
+      (setq attributes (delq '->ideograph attributes))
+      )
+    (when (and (memq '->decomposition attributes)
+              (setq value (get-char-attribute char '->decomposition)))
+      (insert (format "(->decomposition\t%s)%s"
+                     (mapconcat (lambda (code)
+                                  (cond ((symbolp code)
+                                         (symbol-name code))
+                                        ((characterp code)
+                                         (if readable
+                                             (format "%S" code)
+                                           (format "#x%04X"
+                                                   (char-int code))
+                                           ))
+                                        ((integerp code)
+                                         (format "#x%04X" code))
+                                        (t
+                                         (format "%s%S" line-breaking code))))
+                                value " ")
+                     line-breaking))
+      (setq attributes (delq '->decomposition attributes))
+      )
+    (when (and (memq '->uppercase attributes)
+              (setq value (get-char-attribute char '->uppercase)))
+      (insert (format "(->uppercase\t%s)%s"
+                     (mapconcat (lambda (code)
+                                  (cond ((symbolp code)
+                                         (symbol-name code))
+                                        ((integerp code)
+                                         (format "#x%04X" code))
+                                        (t
+                                         (format "%s%S" line-breaking code))))
+                                value " ")
+                     line-breaking))
+      (setq attributes (delq '->uppercase attributes))
+      )
+    (when (and (memq '->lowercase attributes)
+              (setq value (get-char-attribute char '->lowercase)))
+      (insert (format "(->lowercase\t%s)%s"
+                     (mapconcat (lambda (code)
+                                  (cond ((symbolp code)
+                                         (symbol-name code))
+                                        ((integerp code)
+                                         (format "#x%04X" code))
+                                        (t
+                                         (format "%s%S" line-breaking code))))
+                                value " ")
+                     line-breaking))
+      (setq attributes (delq '->lowercase attributes))
+      )
+    (when (and (memq '->titlecase attributes)
+              (setq value (get-char-attribute char '->titlecase)))
+      (insert (format "(->titlecase\t%s)%s"
+                     (mapconcat (lambda (code)
+                                  (cond ((symbolp code)
+                                         (symbol-name code))
+                                        ((integerp code)
+                                         (format "#x%04X" code))
+                                        (t
+                                         (format "%s%S" line-breaking code))))
+                                value " ")
+                     line-breaking))
+      (setq attributes (delq '->titlecase attributes))
+      )
+    (when (and (memq '->mojikyo attributes)
+              (setq value (get-char-attribute char '->mojikyo)))
+      (insert (format "(->mojikyo\t\t. %06d)\t; %c%s"
+                     value (decode-char 'mojikyo value)
+                     line-breaking))
+      (setq attributes (delq '->mojikyo attributes))
+      )
+    (setq rest ccs-attributes)
+    (while (and rest
+               (progn
+                 (setq value (get-char-attribute char (car rest)))
+                 (if value
+                     (if (>= (length (symbol-name (car rest))) 19)
+                         (progn
+                           (setq has-long-ccs-name t)
+                           nil)
+                       t)
+                   t)))
+      (setq rest (cdr rest)))
+    (while attributes
+      (setq name (car attributes))
+      (if (setq value (get-char-attribute char name))
+         (cond ((eq name 'jisx0208-1978/4X)
+                (insert (format "(%-18s . #x%04X)%s"
+                                name value
+                                line-breaking)))
+               ((string-match "^->" (symbol-name name))
                 (insert
-                 (format "(%-18s %s)
-    "
-                         (car cell)
+                 (format "(%-18s %s)%s"
+                         name
                          (mapconcat (lambda (code)
                                       (cond ((symbolp code)
                                              (symbol-name code))
                                             ((integerp code)
                                              (format "#x%04X" code))
                                             (t
-                                             (format "\n     %S" code))))
-                                    (cdr cell) " "))))
-               ((consp (cdr cell))
-                (insert (format "(%-18s %s)
-    "
-                                (car cell)
-                                (mapconcat (function prin1-to-string)
-                                           (cdr cell) " "))))
+                                             (format "%s%S"
+                                                     line-breaking code))))
+                                    value " ")
+                         line-breaking)))
+               ((memq name '(ideograph=
+                             original-ideograph-of
+                             ancient-ideograph-of
+                             vulgar-ideograph-of))
+                (insert (format "(%-18s%s " name line-breaking))
+                (setq lbs (concat "\n" (make-string (current-column) ?\ ))
+                      separator nil)
+                (while (consp value)
+                  (setq cell (car value))
+                  (if (and (consp cell)
+                           (consp (car cell)))
+                      (progn
+                        (if separator
+                            (insert lbs))
+                        (char-db-insert-alist cell readable)
+                        (setq separator lbs))
+                    (if separator
+                        (insert separator))
+                    (insert (prin1-to-string cell))
+                    (setq separator " "))
+                  (setq value (cdr value)))
+                (insert ")")
+                (insert line-breaking))
+               ((consp value)
+                (insert (format "(%-18s " name))
+                (setq lbs (concat "\n" (make-string (current-column) ?\ ))
+                      separator nil)
+                (while (consp value)
+                  (setq cell (car value))
+                  (if (and (consp cell)
+                           (consp (car cell))
+                           (setq ret (condition-case nil
+                                         (define-char cell)
+                                       (error nil))))
+                      (progn
+                        (setq rest cell
+                              al nil
+                              cal nil)
+                        (while rest
+                          (setq key (car (car rest)))
+                          (if (find-charset key)
+                              (setq cal (cons key cal))
+                            (setq al (cons key al)))
+                          (setq rest (cdr rest)))
+                        (if separator
+                            (insert lbs))
+                        (insert-char-attributes ret
+                                                readable
+                                                al cal)
+                        (setq separator lbs))
+                    (if separator
+                        (insert separator))
+                    (insert (prin1-to-string cell))
+                    (setq separator " "))
+                  (setq value (cdr value)))
+                (insert ")")
+                (insert line-breaking))
                (t
-                (insert (format "(%-18s . %S)
-    "
-                                (car cell)(cdr cell)))
-                ))
-         (setq data (cdr data)))
-       (insert "))\n")
-       (goto-char (point-min))
-       (while (re-search-forward "[ \t]+$" nil t)
-         (replace-match ""))
-       (goto-char (point-max))
-       (tabify (point-min)(point-max))
-       ))))
+                (insert (format "(%-18s . %S)%s"
+                                name value
+                                line-breaking)))
+               ))
+      (setq attributes (cdr attributes)))
+    (while ccs-attributes
+      (setq name (car ccs-attributes))
+      (if (setq value (get-char-attribute char name))
+         (insert
+          (format
+           (if has-long-ccs-name
+               (cond ((eq name 'ideograph-daikanwa)
+                      "(%-26s . %05d)\t; %c%s"
+                      )
+                     ((eq name 'mojikyo)
+                      "(%-26s . %06d)\t; %c%s"
+                      )
+                     (t
+                      "(%-26s . #x%X)\t; %c%s"
+                      ))
+             (cond ((eq name 'ideograph-daikanwa)
+                    "(%-18s . %05d)\t; %c%s"
+                    )
+                   ((eq name 'mojikyo)
+                    "(%-18s . %06d)\t; %c%s"
+                    )
+                   (t
+                    "(%-18s . #x%X)\t; %c%s"
+                    )))
+           name
+           (if (= (charset-iso-graphic-plane name) 1)
+               (logior value
+                       (cond ((= (charset-dimension name) 1)
+                              #x80)
+                             ((= (charset-dimension name) 2)
+                              #x8080)
+                             ((= (charset-dimension name) 3)
+                              #x808080)
+                             (t 0)))
+             value)
+           (decode-builtin-char name value)
+           line-breaking)))
+      (setq ccs-attributes (cdr ccs-attributes)))
+    (insert ")")))
+
+(defun insert-char-data (char &optional readable
+                             attributes ccs-attributes)
+  (save-restriction
+    (narrow-to-region (point)(point))
+    (insert "(define-char
+  '")
+    (insert-char-attributes char readable
+                           attributes ccs-attributes)
+    (insert ")\n")
+    (goto-char (point-min))
+    (while (re-search-forward "[ \t]+$" nil t)
+      (replace-match ""))
+    (goto-char (point-max))
+    (tabify (point-min)(point-max))
+    ))
 
 ;;;###autoload
 (defun char-db-update-comment ()
                     (not (eq (car cdef) 'ideograph-daikanwa))
                     (or (memq (car cdef) '(ascii latin-viscii-upper
                                                  latin-viscii-lower
-                                                 arabic-iso8859-6))
+                                                 arabic-iso8859-6
+                                                 japanese-jisx0213-1
+                                                 japanese-jisx0213-2))
                         (= (char-int (charset-iso-final-char (car cdef)))
                            0)))
                    (apply (function make-char) cdef)
            (insert (format "\t; %c" char)))
          )))))
 
-(defun insert-char-data-with-variant (char)
-  (insert-char-data char)
-  (let ((variants (char-variants char)))
+(defun insert-char-data-with-variant (char &optional script printable
+                                          no-ucs-variant)
+  (insert-char-data char printable)
+  (let ((variants (or (char-variants char)
+                     (let ((ucs (get-char-attribute char '->ucs)))
+                       (if ucs
+                           (delete char (char-variants (int-char ucs)))))))
+       variant vs)
     (while variants
-      (insert-char-data (car variants))
+      (setq variant (car variants))
+      (if (or (null script)
+             (null (setq vs (get-char-attribute variant 'script)))
+             (memq script vs))
+         (or (and no-ucs-variant (get-char-attribute variant 'ucs))
+             (insert-char-data variant printable)))
       (setq variants (cdr variants))
       )))
 
-(defun insert-char-range-data (min max)
+(defun insert-char-range-data (min max &optional script)
   (let ((code min)
        char)
     (while (<= code max)
-      (setq char (int-char code))
-      (insert-char-data-with-variant char)
+      (setq char (decode-char 'ucs code))
+      (if (get-char-attribute char 'ucs)
+         (insert-char-data-with-variant char script nil 'no-ucs-variant))
       (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)))
+(defun write-char-range-data-to-file (min max file &optional script)
+  (let ((coding-system-for-write 'utf-8))
+    (with-temp-buffer
+      (insert-char-range-data min max script)
+      (write-region (point-min)(point-max) file))))
 
 (defvar what-character-original-window-configuration)
 
     (erase-buffer)
     (condition-case err
        (progn
-         (insert-char-data-with-variant char)
-         (char-db-update-comment)
+         (insert-char-data-with-variant char nil 'printable)
+          ;; (char-db-update-comment)
          (set-buffer-modified-p nil)
          (view-mode the-buf (lambda (buf)
                               (set-window-configuration