update.

[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 846f24f..258627b 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))
+  '(ucs daikanwa cns gt jis jis/alt jis/a jis/b))
 
 (defvar char-db-ignored-attributes nil)
 
@@ -1072,7 +1072,7 @@
     ))
 
 (defun insert-char-data-with-variant (char &optional printable
-                                          no-ucs-variant
+                                          no-ucs-unified
                                           script excluded-script)
   (insert-char-data char printable)
   (let ((variants (or (char-variants char)
@@ -1089,7 +1089,7 @@
               (or (null excluded-script)
                   (null (setq vs (get-char-attribute variant 'script)))
                   (not (memq excluded-script vs))))
-         (or (and no-ucs-variant (get-char-attribute variant '=ucs))
+         (or (and no-ucs-unified (get-char-attribute variant '=ucs))
              (insert-char-data variant printable)))
       (setq variants (cdr variants))
       )))
@@ -1100,7 +1100,7 @@
     (while (<= code max)
       (setq char (decode-char '=ucs code))
       (if (encode-char char '=ucs 'defined-only)
-         (insert-char-data-with-variant char nil 'no-ucs-variant
+         (insert-char-data-with-variant char nil 'no-ucs-unified
                                         script excluded-script))
       (setq code (1+ code)))))