(insert-char-data): Regard charset `mojikyo' as same as

[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 acbc639..60c70c6 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -394,33 +394,39 @@
        (while data
          (setq cell (car data))
          (cond ((setq ret (find-charset (car cell)))
-                (insert
-                 (format
-                  (if has-long-ccs-name
-                      (if (eq ret (find-charset 'ideograph-daikanwa))
-                          "(%-26s . %05d)\t; %c
-    "
-                        "(%-26s . #x%X)\t; %c
-    "
-                        )
-                    (if (eq ret (find-charset 'ideograph-daikanwa))
-                        "(%-18s . %05d)\t; %c
-    "
-                      "(%-18s . #x%X)\t; %c
-    "
-                      ))
-                  (charset-name ret)
-                  (if (= (charset-iso-graphic-plane ret) 1)
-                      (logior (cdr cell)
-                              (cond ((= (charset-dimension ret) 1)
-                                     #x80)
-                                    ((= (charset-dimension ret) 2)
-                                     #x8080)
-                                    ((= (charset-dimension ret) 3)
-                                     #x808080)
-                                    (t 0)))
-                    (cdr cell))
-                  (decode-builtin-char ret (cdr cell)))))
+                (or (string-match "^mojikyo-pj-"
+                                  (symbol-name (charset-name ret)))
+                    (insert
+                     (format
+                      (if has-long-ccs-name
+                          (if (memq ret
+                                    (list (find-charset 'ideograph-daikanwa)
+                                          (find-charset 'mojikyo)))
+                              "(%-26s . %05d)\t; %c
+    "
+                            "(%-26s . #x%X)\t; %c
+    "
+                            )
+                        (if (memq ret
+                                  (list (find-charset 'ideograph-daikanwa)
+                                        (find-charset 'mojikyo)))
+                            "(%-18s . %05d)\t; %c
+    "
+                          "(%-18s . #x%X)\t; %c
+    "
+                          ))
+                      (charset-name ret)
+                      (if (= (charset-iso-graphic-plane ret) 1)
+                          (logior (cdr cell)
+                                  (cond ((= (charset-dimension ret) 1)
+                                         #x80)
+                                        ((= (charset-dimension ret) 2)
+                                         #x8080)
+                                        ((= (charset-dimension ret) 3)
+                                         #x808080)
+                                        (t 0)))
+                        (cdr cell))
+                      (decode-builtin-char ret (cdr cell))))))
                ((string-match "^->" (symbol-name (car cell)))
                 (insert
                  (format "(%-18s %s)
@@ -440,6 +446,10 @@
                                 (car cell)
                                 (mapconcat (function prin1-to-string)
                                            (cdr cell) " "))))
+               ((eq (car cell) 'jisx0208-1978/4X)
+                (insert (format "(%-18s . #x%04X)
+    "
+                                (car cell)(cdr cell))))
                (t
                 (insert (format "(%-18s . %S)
     "
@@ -456,7 +466,8 @@
 
 (defun decode-builtin-char (charset code-point)
   (setq charset (get-charset charset))
-  (if (and (not (eq (charset-name charset) 'ideograph-daikanwa))
+  (if (and (not (memq (charset-name charset)
+                     '(ideograph-daikanwa mojikyo)))
           (or (memq (charset-name charset)
                     '(ascii latin-viscii-upper
                             latin-viscii-lower