(insert-char-data): Change order of `ideographic-strokes',

`kangxi-strokes', `japanese-strokes' and `cns-strokes'.

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 60c70c6..c69fb55 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -241,7 +241,8 @@
                          (mapconcat (function prin1-to-string) cell " ")))
          (setq data (del-alist 'morohashi-daikanwa data))
          )
-       (setq radical nil)
+       (setq radical nil
+             strokes nil)
        (when (setq cell (assq 'ideographic-radical data))
          (setq radical (cdr cell))
          (insert (format "(ideographic-radical . %S)\t; %c
@@ -250,6 +251,13 @@
                          (aref ideographic-radicals radical)))
          (setq data (del-alist 'ideographic-radical data))
          )
+       (when (setq cell (assq 'ideographic-strokes data))
+         (setq strokes (cdr cell))
+         (insert (format "(ideographic-strokes . %S)
+    "
+                         strokes))
+         (setq data (del-alist 'ideographic-strokes data))
+         )
        (when (setq cell (assq 'kangxi-radical data))
          (setq cell (cdr cell))
          (unless (eq cell radical)
@@ -260,16 +268,34 @@
            (setq radical cell))
          (setq data (del-alist 'kangxi-radical data))
          )
+       (when (setq cell (assq 'kangxi-strokes data))
+         (setq cell (cdr cell))
+         (unless (eq cell strokes)
+           (insert (format "(kangxi-strokes\t . %S)
+    "
+                           cell))
+           (setq strokes cell))
+         (setq data (del-alist 'kangxi-strokes data))
+         )
        (when (setq cell (assq 'japanese-radical data))
          (setq cell (cdr cell))
          (unless (eq cell radical)
-           (insert (format "(japanese-radical . %S)\t; %c
+           (insert (format "(japanese-radical\t . %S)\t; %c
     "
                            cell
                            (aref ideographic-radicals cell)))
            (setq radical cell))
          (setq data (del-alist 'japanese-radical data))
          )
+       (when (setq cell (assq 'japanese-strokes data))
+         (setq cell (cdr cell))
+         (unless (eq cell strokes)
+           (insert (format "(japanese-strokes\t . %S)
+    "
+                           cell))
+           (setq strokes cell))
+         (setq data (del-alist 'japanese-strokes data))
+         )
        (when (setq cell (assq 'cns-radical data))
          (setq cell (cdr cell))
          (insert (format "(cns-radical\t . %S)\t; %c
@@ -278,47 +304,22 @@
                          (aref ideographic-radicals cell)))
          (setq data (del-alist 'cns-radical data))
          )
-       (setq strokes nil)
-       (cond
-        ((setq cell (assq 'ideographic-strokes data))
-         (setq strokes (cdr cell))
-         (insert (format "(ideographic-strokes . %S)
-    "
-                         strokes))
-         (setq data (del-alist 'ideographic-strokes data))
-         (when (setq cell (assq 'kangxi-strokes data))
-           (setq cell (cdr cell))
-           (unless (eq cell strokes)
-             (insert (format "(kangxi-strokes\t . %S)
-    "
-                             cell))
-             (setq strokes cell))
-           (setq data (del-alist 'kangxi-strokes data))
-           )
-         (when (setq cell (assq 'japanese-strokes data))
-           (setq cell (cdr cell))
-           (unless (eq cell strokes)
-             (insert (format "(japanese-strokes\t . %S)
-    "
-                             cell))
-             (setq strokes cell))
-           (setq data (del-alist 'japanese-strokes data))
-           )
-         (when (setq cell (assq 'total-strokes data))
-           (setq cell (cdr cell))
-           (insert (format "(total-strokes\t . %S)
+       (when (setq cell (assq 'cns-strokes data))
+         (setq cell (cdr cell))
+         (unless (eq cell strokes)
+           (insert (format "(cns-strokes\t . %S)
     "
                            cell))
-           (setq data (del-alist 'total-strokes data))
-           )
+           (setq strokes cell))
+         (setq data (del-alist 'cns-strokes data))
          )
-        ((setq cell (assq 'total-strokes data))
+       (when (setq cell (assq 'total-strokes data))
          (setq cell (cdr cell))
-         (insert (format "(total-strokes\t. %S)
+         (insert (format "(total-strokes\t . %S)
     "
                          cell))
          (setq data (del-alist 'total-strokes data))
-         ))
+         )
        (when (setq cell (assq '->decomposition data))
          (setq cell (cdr cell))
          (insert (format "(->decomposition\t%s)