Reformatted.

[chise/xemacs-chise.git] / lisp / utf-2000 / maps-conf.el

diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index 5d6eda2..8ca50c0 100644 (file)
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -105,6 +105,13 @@
    nil)
  '=gt-pj-1)
 
+(let ((i 1)
+      chr)
+  (while (<= i 67547)
+    (when (setq chr (decode-char '=gt i))
+      (put-char-attribute chr '=gt i))
+    (setq i (1+ i))))
+
 (let ((default-coded-charset-priority-list
        '(=gt-pj-1
          =gt-pj-2
@@ -232,13 +239,15 @@
            (put-char-attribute char '=ucs@jis/2004 ucs)))
        )
        (rep-char
-       (put-char-attribute rep-char '==jis-x0213-1@2000 code)
-       (remove-char-attribute rep-char '==jis-x0213-1)
-       (remove-char-attribute rep-char '==jis-x0213-1@2004)
-       (setq ucs (or (encode-char rep-char '==ucs@jis/2000)
-                     ucs))
-       (remove-char-attribute rep-char '==ucs@jis)
-       (remove-char-attribute rep-char '==ucs@jis/2004)
+       (unless (or (and (= ku 47)(= ten 64))
+                   (and (= ku 67)(= ten 14)))
+         (put-char-attribute rep-char '==jis-x0213-1@2000 code)
+         (remove-char-attribute rep-char '==jis-x0213-1)
+         (remove-char-attribute rep-char '==jis-x0213-1@2004)
+         (setq ucs (or (encode-char rep-char '==ucs@jis/2000)
+                       ucs))
+         (remove-char-attribute rep-char '==ucs@jis)
+         (remove-char-attribute rep-char '==ucs@jis/2004))
        (when (setq rep-char (decode-char '==jis-x0213-1@2004 code))
          (unless (eq (encode-char rep-char '==ucs@jis/2004) ucs)
            (put-char-attribute rep-char '==ucs@jis/2004 ucs)))
@@ -287,14 +296,23 @@
    (lambda (c v)
      (if (and (setq j-chr (decode-char '=ucs@JP v))
              (not (eq j-chr c))
-             (null (encode-char c '=ucs)))
+             (null (encode-char c '=ucs))
+             (not (eq (encode-char c '=ucs@jis)
+                      (encode-char c '=ucs@JP/hanazono))))
         (put-char-attribute c '=ucs@JP/hanazono nil))
      nil)
    '=ucs@unicode)
   (map-char-attribute
    (lambda (c v)
      (if (and (setq j-chr (decode-char '==ucs@JP v))
-             (not (eq j-chr c)))
+             (not (eq j-chr c))
+             (not (or (eq (encode-char c '==ucs@jis)
+                          (encode-char c '==ucs@JP/hanazono))
+                      (eq (encode-char c '==ucs@unicode)
+                          (encode-char c '==ucs@JP/hanazono))
+                      (eq (encode-char c '==ucs@cns)
+                          (encode-char c '==ucs@JP/hanazono))
+                      )))
         (put-char-attribute c '==ucs@JP/hanazono nil))
      nil)
    '==ucs@unicode)
@@ -347,7 +365,75 @@
       (setq dest (cons fn dest))))
   (setq dest (sort dest
                   (lambda (a b)
-                    (string< (symbol-name a)(symbol-name b)))))
+                    (cond ((eq a '==daikanwa)
+                           t)
+                          ((eq a '==daikanwa/+p)
+                           t)
+                          ((eq a '==daikanwa/ho)
+                           t)
+                          ((eq a '==jis-x0208)
+                           (cond ((memq b '(==daikanwa
+                                            ==daikanwa/+p ==daikanwa/ho))
+                                  nil)
+                                 (t)))
+                          ((eq a '==jis-x0208@1978)
+                           (cond ((memq b '(==daikanwa
+                                            ==daikanwa/+p ==daikanwa/ho
+                                            ==jis-x0208))
+                                  nil)
+                                 (t)))
+                          ((eq a '==jis-x0208@1983)
+                           (cond ((memq b '(==daikanwa
+                                            ==daikanwa/+p ==daikanwa/ho
+                                            ==jis-x0208
+                                            ==jis-x0208@1978))
+                                  nil)
+                                 (t)))
+                          ((eq a '==jis-x0208@1990)
+                           (cond ((memq b '(==daikanwa
+                                            ==daikanwa/+p ==daikanwa/ho
+                                            ==jis-x0208
+                                            ==jis-x0208@1978
+                                            ==jis-x0208@1983))
+                                  nil)
+                                 (t)))
+                          ((eq a '==jis-x0212)
+                           (cond ((memq b '(==daikanwa
+                                            ==daikanwa/+p ==daikanwa/ho
+                                            ==jis-x0208
+                                            ==jis-x0208@1978
+                                            ==jis-x0208@1983 ==jis-x0208@1990))
+                                  nil)
+                                 (t)))
+                          ((eq a '==jis-x0213-1)
+                           (cond ((memq b '(==daikanwa
+                                            ==daikanwa/+p ==daikanwa/ho
+                                            ==jis-x0208
+                                            ==jis-x0208@1978
+                                            ==jis-x0208@1983 ==jis-x0208@1990
+                                            ==jis-x0212))
+                                  nil)
+                                 (t)))
+                          ((eq a '==jis-x0213-2)
+                           (cond ((memq b '(==daikanwa
+                                            ==daikanwa/+p ==daikanwa/ho
+                                            ==jis-x0208
+                                            ==jis-x0208@1978
+                                            ==jis-x0208@1983 ==jis-x0208@1990
+                                            ==jis-x0212 ==jis-x0213-1))
+                                  nil)
+                                 (t)))
+                          (t
+                           (cond ((memq b '(==daikanwa
+                                            ==daikanwa/+p ==daikanwa/ho
+                                            ==jis-x0208
+                                            ==jis-x0208@1978
+                                            ==jis-x0208@1983 ==jis-x0208@1990
+                                            ==jis-x0212
+                                            ==jis-x0213-1 ==jis-x0213-2))
+                                  nil)
+                                 (t
+                                  (string< (symbol-name a)(symbol-name b)))))))))
   (dolist (dg-fn dest)
     (setq rep-gi-fn (intern (format "=%s" dg-fn)))
     (when (find-charset rep-gi-fn)