(char-attribute-name<): Use `charset-iso-final-char' again for ISO-IR

[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 0b4791d..ed05f01 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -3,22 +3,22 @@
 ;; Copyright (C) 1998,1999,2000,2001,2002,2003 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
-;; Keywords: UTF-2000, ISO/IEC 10646, Unicode, UCS-4, MULE.
+;; Keywords: CHISE, Character Database, ISO/IEC 10646, Unicode, UCS-4, MULE.
 
-;; This file is part of XEmacs UTF-2000.
+;; This file is part of XEmacs CHISE.
 
-;; XEmacs UTF-2000 is free software; you can redistribute it and/or
+;; XEmacs CHISE is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
 ;; published by the Free Software Foundation; either version 2, or (at
 ;; your option) any later version.
 
-;; XEmacs UTF-2000 is distributed in the hope that it will be useful,
+;; XEmacs CHISE is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with XEmacs UTF-2000; see the file COPYING.  If not, write to
+;; along with XEmacs CHISE; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
@@ -70,7 +70,7 @@
     v))
 
 (defvar char-db-feature-domains
-  '(ucs daikanwa cns gt jis jis/alt jis/a jis/b))
+  '(ucs daikanwa cns gt jis jis/alt jis/a jis/b misc unknown))
 
 (defvar char-db-ignored-attributes nil)
 
@@ -79,33 +79,31 @@
    ((find-charset ka)
     (cond
      ((find-charset kb)
-      (cond
-       ((= (charset-dimension ka)
-          (charset-dimension kb))
-       (cond ((= (charset-chars ka)(charset-chars kb))
-              (if (charset-iso-final-char ka)
-                  (cond
-                   ((>= (charset-iso-final-char ka) ?@)
-                    (if (and (charset-iso-final-char kb)
-                             (>= (charset-iso-final-char kb) ?@))
-                        (< (charset-iso-final-char ka)
-                           (charset-iso-final-char kb))
-                      t))
-                   (t
-                    (if (charset-iso-final-char kb)
-                        (if (>= (charset-iso-final-char kb) ?@)
-                            nil
-                          (< (charset-iso-final-char ka)
-                             (charset-iso-final-char kb)))
-                      t)))
-                (if (charset-iso-final-char kb)
-                    nil
-                  (< (charset-id ka)(charset-id kb)))))
-             ((<= (charset-chars ka)(charset-chars kb)))))
-       (t
-       (< (charset-dimension ka)
-          (charset-dimension kb))
-       )))
+      (if (and (charset-iso-final-char ka)
+              (>= (charset-iso-final-char ka) ?@)
+              (charset-iso-final-char kb)
+              (>= (charset-iso-final-char kb) ?@))
+         (cond
+          ((= (charset-dimension ka)
+              (charset-dimension kb))
+           (< (charset-iso-final-char ka)
+              (charset-iso-final-char kb)))
+          (t
+           (> (charset-dimension ka)
+              (charset-dimension kb))
+           ))
+       (if (< (charset-id ka) 0)
+           (if (< (charset-id kb) 0)
+               (cond
+                ((= (charset-dimension ka)
+                    (charset-dimension kb))
+                 (> (charset-id ka)(charset-id kb)))
+                (t
+                 (> (charset-dimension ka)
+                    (charset-dimension kb))
+                 ))
+             t)
+         (< (charset-id ka)(charset-id kb)))))
      ((symbolp kb)
       nil)
      (t
@@ -227,7 +225,7 @@
 (defun char-db-insert-char-spec (char &optional readable column)
   (unless column
     (setq column (current-column)))
-  (let (char-spec ret al cal key temp-char)
+  (let (char-spec al cal key temp-char)
     (setq char-spec (char-db-make-char-spec char))
     (unless (or (characterp char) ; char
                (condition-case nil
@@ -1090,8 +1088,9 @@
 
 (defun write-char-range-data-to-file (min max file
                                          &optional script excluded-script)
-  (let ((coding-system-for-write 'utf-8))
+  (let ((coding-system-for-write 'utf-8-mcs))
     (with-temp-buffer
+      (insert ";; -*- coding: utf-8-mcs -*-\n")
       (insert-char-range-data min max script excluded-script)
       (write-region (point-min)(point-max) file))))