(char-attribute-name<): Prefer `=ucs@FOO' as same as =ucs.

(char-db-make-char-spec): Add `=ucs@FOO'.

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index dea1a15..907dff1 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -156,40 +156,21 @@
    ((find-charset ka)
     (if (find-charset kb)
        (let (a-ir b-ir)
-         (if (and (setq a-ir (charset-property ka 'iso-ir))
-                  (if (= a-ir 177)
-                      (if (= (charset-id ka) -177)
-                          t
-                        (setq a-ir nil))
-                    t))
-             (if (and (setq b-ir (charset-property kb 'iso-ir))
-                      (if (= b-ir 177)
-                          (if (= (charset-id kb) -177)
-                              t
-                            (setq b-ir nil))
-                        t))
+         (if (setq a-ir (charset-property ka 'iso-ir))
+             (if (setq b-ir (charset-property kb 'iso-ir))
                  (cond
                   ((= a-ir b-ir)
                    (< (charset-id ka)(charset-id kb))
                    )
-                   ;; ((= a-ir 177)
-                   ;;  t)
-                   ;; ((= b-ir 177)
-                   ;;  nil)
-                  ((= (charset-dimension ka)
-                      (charset-dimension kb))
-                   (< a-ir b-ir)
-                   )
-                  ((> (charset-dimension ka)
-                      (charset-dimension kb))
+                  ((= a-ir 177)
+                   t)
+                  ((= b-ir 177)
+                   nil)
+                  ((< a-ir
+                      b-ir)
                    ))
                t)
-           (if (and (setq b-ir (charset-property kb 'iso-ir))
-                    (if (= b-ir 177)
-                        (if (= (charset-id kb) -177)
-                            t
-                          (setq b-ir nil))
-                      t))
+           (if (charset-property kb 'iso-ir)
                nil
              (< (charset-id ka)(charset-id kb)))))
       nil)
@@ -298,8 +279,7 @@
                                         ;; =gt-k
                                         =jis-x0208@1997
                                         ))
-                                 ;; (string-match "=ucs@" (symbol-name ccs))
-                                )
+                                (string-match "=ucs@" (symbol-name ccs)))
                             (setq ccs (charset-name ccs))
                             (null (assq ccs char-spec))
                             (setq ret (encode-char char ccs 'defined-only)))