(U+9B13): Add `total-strokes'.

[chise/xemacs-chise.git.1] / lisp / utf-2000 / ideograph-util.el

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index c56844a..a5c9702 100644 (file)
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -85,25 +85,35 @@
    11 12 12 12 12 13 13 13 13 14
    14 15 16 16 17])
 
-(defun char-ideographic-strokes (char &optional radical)
+;;;###autoload
+(defun char-ideographic-strokes-from-domains (char domains &optional radical)
   (let (ret)
-    (or (catch 'tag
-         (dolist (domain char-db-feature-domains)
-           (if (and (setq ret (or (get-char-attribute
-                                   char
-                                   (intern
-                                    (format "%s@%s"
-                                            'ideographic-radical domain)))
-                                  (get-char-attribute
-                                   char 'ideographic-radical)))
-                    (or (eq ret radical)
-                        (null radical))
-                    (setq ret (get-char-attribute
+    (catch 'tag
+      (dolist (domain domains)
+       (if (and (setq ret (or (get-char-attribute
                                char
                                (intern
                                 (format "%s@%s"
-                                        'ideographic-strokes domain)))))
-               (throw 'tag ret))))
+                                        'ideographic-radical domain)))
+                              (get-char-attribute
+                               char 'ideographic-radical)))
+                (or (eq ret radical)
+                    (null radical))
+                (setq ret (get-char-attribute
+                           char
+                           (intern
+                            (format "%s@%s"
+                                    'ideographic-strokes domain)))))
+           (throw 'tag ret))))))
+
+;;;###autoload
+(defun char-ideographic-strokes (char &optional radical preferred-domains)
+  (let (ret)
+    (or (char-ideographic-strokes-from-domains
+        char preferred-domains radical)
+       (get-char-attribute char 'ideographic-strokes)
+       (char-ideographic-strokes-from-domains
+        char char-db-feature-domains radical)
        (catch 'tag
          (dolist (cell (get-char-attribute char 'ideographic-))
            (if (and (setq ret (plist-get cell :radical))
@@ -111,7 +121,6 @@
                         (null radical)))
                (throw 'tag (plist-get cell :strokes)))))
        (get-char-attribute char 'daikanwa-strokes)
-       (get-char-attribute char 'ideographic-strokes)
        (let ((strokes
               (or (get-char-attribute char 'kangxi-strokes)
                   (get-char-attribute char 'japanese-strokes)
@@ -126,6 +135,24 @@
            strokes)))))
 
 ;;;###autoload
+(defun char-total-strokes-from-domains (char domains)
+  (let (ret)
+    (catch 'tag
+      (dolist (domain domains)
+       (if (setq ret (get-char-attribute
+                      char
+                      (intern
+                       (format "%s@%s"
+                               'total-strokes domain))))
+           (throw 'tag ret))))))
+
+;;;###autoload
+(defun char-total-strokes (char &optional preferred-domains)
+  (or (char-total-strokes-from-domains char preferred-domains)
+      (get-char-attribute char 'total-strokes)
+      (char-total-strokes-from-domains char char-db-feature-domains)))
+
+;;;###autoload
 (defun update-ideograph-radical-table ()
   (interactive)
   (let (ret radical script)
@@ -265,12 +292,10 @@
   (unless radical
     (setq radical ideographic-radical))
   (let ((drc (char-representative-of-daikanwa char)))
-    (char-ideographic-strokes
-     (if (= (char-ideographic-radical drc radical)
-           (char-ideographic-radical char radical))
-        drc
-       char)
-     radical)))
+    (if (= (char-ideographic-radical drc radical)
+          (char-ideographic-radical char radical))
+       (setq char drc)))
+  (char-ideographic-strokes char radical '(daikanwa)))
 
 ;;;###autoload
 (defun char-daikanwa (char)
@@ -332,8 +357,9 @@
               (format "Ideograph-R%03d-%s.el" radical name)
               file))))
   (with-temp-buffer
+    (insert ";; -*- coding: utf-8-mcs -*-\n")
     (insert-ideograph-radical-char-data radical)
-    (let ((coding-system-for-write 'utf-8))
+    (let ((coding-system-for-write 'utf-8-mcs))
       (write-region (point-min)(point-max) file)
       )))