Reformatted.

[chise/xemacs-chise.git.1] / 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 b07da54..a1adfef 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -857,12 +857,9 @@
       (setq attributes (delq 'hanyu-dazidian-char attributes))
       )
     (unless readable
-      (when (memq '->ucs-unified attributes)
-       (setq attributes (delq '->ucs-unified attributes))
-       )
-      (when (memq 'composition attributes)
-       (setq attributes (delq 'composition attributes))
-       ))
+      (dolist (ignored '(composition
+                        ->denotational <-subsumptive ->ucs-unified))
+       (setq attributes (delq ignored attributes))))
     (setq rest ccs-attributes)
     (while (and rest
                (progn
@@ -897,11 +894,11 @@
                   (setq cell (car value))
                    (if (integerp cell)
                       (setq cell (decode-char '=ucs cell)))
-                  (cond ((eq name '->unified)
+                  (cond ((eq name '->subsumptive)
                          (if separator
                              (insert lbs))
                          (let ((char-db-ignored-attributes
-                                (cons '<-unified
+                                (cons '<-subsumptive
                                       char-db-ignored-attributes)))
                            (insert-char-attributes cell readable))
                          (setq separator lbs))
@@ -1008,9 +1005,15 @@
                                                 readable
                                                 al cal)
                         (setq separator lbs))
+                    (setq ret (prin1-to-string cell))
                     (if separator
-                        (insert separator))
-                    (insert (prin1-to-string cell))
+                        (if (< (+ (current-column)
+                                  (length ret)
+                                  (length separator))
+                               76)
+                            (insert separator)
+                          (insert lbs)))
+                    (insert ret)
                     (setq separator " "))
                   (setq value (cdr value)))
                 (insert ")")