update.

[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 1cf7476..60a3fed 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.
 
@@ -69,6 +69,9 @@
       (setq i (1+ i)))
     v))
 
+(defvar char-db-feature-domains
+  '(ucs daikanwa cns gt jis jis/alt jis/a jis/b))
+
 (defvar char-db-ignored-attributes nil)
 
 (defun char-attribute-name< (ka kb)
@@ -607,8 +610,17 @@
       )
     (setq radical nil
          strokes nil)
+    (when (and (memq 'ideographic-radical attributes)
+              (setq value (get-char-attribute char 'ideographic-radical)))
+      (setq radical value)
+      (insert (format "(ideographic-radical . %S)\t; %c%s"
+                     radical
+                     (aref ideographic-radicals radical)
+                     line-breaking))
+      (setq attributes (delq 'ideographic-radical attributes))
+      )
     (let (key)
-      (dolist (domain '(ucs daikanwa cns))
+      (dolist (domain char-db-feature-domains)
        (setq key (intern (format "%s@%s" 'ideographic-radical domain)))
        (when (and (memq key attributes)
                   (setq value (get-char-attribute char key)))
@@ -630,27 +642,29 @@
                          line-breaking))
          (setq attributes (delq key attributes))
          )
-       (setq key (intern (format "%s@%s*sources"
-                                 'ideographic-radical domain)))
+       (setq key (intern (format "%s@%s" 'total-strokes domain)))
        (when (and (memq key attributes)
                   (setq value (get-char-attribute char key)))
-         (insert (format "(%s%s" key line-breaking))
-         (dolist (cell value)
-           (insert (format " %s" cell)))
-         (insert ")")
-         (insert line-breaking)
+         (insert (format "(%s       . %S)%s"
+                         key
+                         value
+                         line-breaking))
          (setq attributes (delq key attributes))
          )
+       (dolist (feature '(ideographic-radical
+                          ideographic-strokes
+                          total-strokes))
+         (setq key (intern (format "%s@%s*sources" feature domain)))
+         (when (and (memq key attributes)
+                    (setq value (get-char-attribute char key)))
+           (insert (format "(%s%s" key line-breaking))
+           (dolist (cell value)
+             (insert (format " %s" cell)))
+           (insert ")")
+           (insert line-breaking)
+           (setq attributes (delq key attributes))
+           ))
        ))
-    (when (and (memq 'ideographic-radical attributes)
-              (setq value (get-char-attribute char 'ideographic-radical)))
-      (setq radical value)
-      (insert (format "(ideographic-radical . %S)\t; %c%s"
-                     radical
-                     (aref ideographic-radicals radical)
-                     line-breaking))
-      (setq attributes (delq 'ideographic-radical attributes))
-      )
     (when (and (memq 'ideographic-strokes attributes)
               (setq value (get-char-attribute char 'ideographic-strokes)))
       (setq strokes value)
@@ -833,8 +847,8 @@
       (setq attributes (delq 'hanyu-dazidian-char attributes))
       )
     (unless readable
-      (when (memq '->ucs-variants attributes)
-       (setq attributes (delq '->ucs-variants attributes))
+      (when (memq '->ucs-unified attributes)
+       (setq attributes (delq '->ucs-unified attributes))
        )
       (when (memq 'composition attributes)
        (setq attributes (delq 'composition attributes))
@@ -1042,7 +1056,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)
@@ -1059,7 +1073,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))
       )))
@@ -1070,7 +1084,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)))))