(C3-2547): Separate M-47718 and J90-477E; relate to U+9EA6.

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

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 9bddea0..1fdf8ef 100644 (file)
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -50,28 +50,28 @@
     3  3  3  3  3  3  3  3  3  3
     3  4  4  4  3  4  4  4  4  4
     4  4  4  4  4  4  4  4  4  4
-    4  4  4  4  4  4  4  4  4  4
-    4  4  4  4  4  5  5  5  5  5
+    4  4  4  4  4  3  4  4  4  4
+    4  4  4  4  3  5  4  5  5  5
     ;; 100
     5  5  5  5  5  5  5  5  5  5
     5  5  5  5  5  5  5  5  6  6
     6  6  6  6  6  6  6  6  6  6
-    6  6  6  6  6  6  6  6  6  6
-    6  6  6  6  6  6  6  7  7  7
+    4  6  6  6  6  6  6  6  6  6
+    4  6  6  6  6  6  6  7  7  7
     7  7  7  7  7  7  7  7  7  7
-    7  7  4  3  7  7  7  8  8  8
-    8  8  8  8  8  8  9  9  9  9
-    9  9  9  9  9  9  9 10 10 10
+    7  7  4  3  7  7  7  8  7  8
+    3  8  8  8  8  8  9  9  9  9
+    9  9  9  9  8  9  9 10 10 10
    10 10 10 10 10 11 11 11 11 11
    ;; 200
    11 12 12 12 12 13 13 13 13 14
    14 15 16 16 17])
 
 (defun char-ideographic-strokes (char)
-  (or (get-char-attribute char 'ideographic-strokes)
+  (or (get-char-attribute char 'daikanwa-strokes)
+      (get-char-attribute char 'ideographic-strokes)
       (let ((strokes
-            (or (get-char-attribute char 'daikanwa-strokes)
-                (get-char-attribute char 'kangxi-strokes)
+            (or (get-char-attribute char 'kangxi-strokes)
                 (get-char-attribute char 'japanese-strokes)
                 (get-char-attribute char 'korean-strokes)
                 (let ((r (char-ideographic-radical char))
@@ -145,6 +145,17 @@
          (aset ideograph-radical-chars-vector radical
                (cons char ret)))
       (setq i (1+ i)))
+    (setq i 0)
+    (while (< i (* 94 60 22))
+      (setq char (decode-char 'mojikyo i))
+      (if (and (setq radical (char-ideographic-radical char))
+              (not
+               (memq char
+                     (setq ret
+                           (aref ideograph-radical-chars-vector radical)))))
+         (aset ideograph-radical-chars-vector radical
+               (cons char ret)))
+      (setq i (1+ i)))
     (while charsets
       (setq i 33)
       (while (< i 127)