Sync up with r21-4-22-chise-0_25-7.

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index 7d6b2dd..aceaf5f 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,25 @@
+2011-04-19  MORIOKA Tomohiko  <tomo@zinbun.kyoto-u.ac.jp>
+
+       * ruimoku6.el: Don't omit `<-subsumptive' features of
+       `=ruimoku-v6' characters.
+
+2011-04-18  MORIOKA Tomohiko  <tomo@zinbun.kyoto-u.ac.jp>
+
+       * char-db-util.el (char-db-coded-charset-priority-list): Use
+       `=daikanwa' and `=daikanwa@rev1' instead of `ideograph-daikanwa'
+       and `ideograph-daikanwa-2'; add `=daikanwa@rev2'.
+       (char-db-insert-char-spec): Modify for `insert-char-attributes' to
+       specify optional argument `for-sub-node'.
+       (char-db-insert-alist): Likewise.
+       (char-db-insert-relation-feature): Likewise.
+       (insert-char-attributes): Add optional argument `for-sub-node';
+       insert `<-subsumptive' feature if `for-sub-node' is nil.
+
+2011-04-18  MORIOKA Tomohiko  <tomo@zinbun.kyoto-u.ac.jp>
+
+       * Ideograph-R010-Legs.el (AJ1-21177): Add `ideographic-strokes'
+       and `total-strokes'.
+
 2011-04-07  MORIOKA Tomohiko  <tomo@zinbun.kyoto-u.ac.jp>
 
        * Oracle-Bones.el (ZOB-{2297 - 2317}): New characters.

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 119839e..6e36360 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -155,8 +155,9 @@
     =hanyo-denshi/ia
     =hanyo-denshi/ib
     =hanyo-denshi/hg
-    ideograph-daikanwa-2
-    ideograph-daikanwa
+    =daikanwa
+    =daikanwa@rev2
+    =daikanwa@rev1
     =cbeta
     =gt-k
     ideograph-hanziku-1
@@ -302,7 +303,8 @@
     (insert-char-attributes char
                            readable
                             (union (mapcar #'car char-spec)
-                                  required-features))
+                                  required-features)
+                           nil 'for-sub-node)
     (when temp-char
       ;; undefine temporary character
       ;;   Current implementation is dirty.
@@ -343,7 +345,7 @@
                   (insert-char-attributes ret
                                           readable
                                           (or al 'none) ; cal
-                                          ))
+                                          nil 'for-sub-node))
               (insert (prin1-to-string value)))
             (insert ")")
             (insert line-breaking))
@@ -375,7 +377,7 @@
                     (insert-char-attributes ret
                                             readable
                                             al ; cal
-                                            )
+                                            nil 'for-sub-node)
                     (setq separator lbs))
                 (if separator
                     (insert separator))
@@ -524,7 +526,7 @@
          (let ((char-db-ignored-attributes
                 (cons '<-subsumptive
                       char-db-ignored-attributes)))
-           (insert-char-attributes cell readable))
+           (insert-char-attributes cell readable nil nil 'for-sub-node))
          (setq separator lbs))
        )
        ((characterp cell)
@@ -600,7 +602,8 @@
     (insert ")")
     (insert line-breaking)))
 
-(defun insert-char-attributes (char &optional readable attributes column)
+(defun insert-char-attributes (char &optional readable attributes column
+                                   for-sub-node)
   (unless column
     (setq column (current-column)))
   (let (name value ; has-long-ccs-name
@@ -632,7 +635,7 @@
                  #'char-attribute-name<)))
     (insert "(")
     (when (memq '<-subsumptive attributes)
-      (when readable
+      (when (or readable (not for-sub-node))
        (when (setq value (get-char-attribute char '<-subsumptive))
          (char-db-insert-relation-feature char '<-subsumptive value
                                           line-breaking
@@ -1175,7 +1178,8 @@
                             (insert lbs))
                         (insert-char-attributes ret
                                                 readable
-                                                al cal)
+                                                al ; cal
+                                                nil 'for-sub-node)
                         (setq separator lbs))
                     (setq ret (prin1-to-string cell))
                     (if separator

diff --git a/lisp/utf-2000/ruimoku6.el b/lisp/utf-2000/ruimoku6.el
index 4c9640d..3fa1b6f 100644 (file)
--- a/lisp/utf-2000/ruimoku6.el
+++ b/lisp/utf-2000/ruimoku6.el
@@ -84,7 +84,10 @@
     (=ruimoku-v6       . #xE008)       ; &RUI6-E008;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=ucs              . #x21A5C)    ; 𡩜
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (=ucs              . #x2FF3)     ; ⿳
       )
@@ -101,7 +104,10 @@
     (=ruimoku-v6       . #xE009)       ; &RUI6-E009;
     ))
 (define-char
-  '((sources           ruimoku=A016374-00004)
+  '((<-subsumptive
+     ((=>>ucs@iso        . #x29C2C)    ; &G-IU+29C2C;
+      ))
+    (sources           ruimoku=A016374-00004)
     (=ucs@iso          . #x29C2C)      ; &RUI6-E00A;
     (=ruimoku-v6       . #xE00A)       ; &RUI6-E00A;
     ))
@@ -195,7 +201,10 @@
     (=ruimoku-v6       . #xE012)       ; &RUI6-E012;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE013)     ; &G-RUI6-E013;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
@@ -207,7 +216,10 @@
     (=ruimoku-v6       . #xE013)       ; &RUI6-E013;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE014)     ; &G-RUI6-E014;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
@@ -234,7 +246,10 @@
     (=ruimoku-v6       . #xE015)       ; &RUI6-E015;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=ucs              . #x24F08)    ; 𤼈
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
       (=ucs              . #x2FF8)     ; ⿸
       )
@@ -272,7 +287,10 @@
     (=ruimoku-v6       . #xE017)       ; &RUI6-E017;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE018)     ; &G-RUI6-E018;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
@@ -306,7 +324,10 @@
     (=ruimoku-v6       . #xE019)       ; &RUI6-E019;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ucs@iso        . #x20E04)    ; &G-IU+20E04;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
@@ -319,7 +340,10 @@
     (=ruimoku-v6       . #xE01A)       ; &RUI6-E01A;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE01B)     ; &G-RUI6-E01B;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
@@ -342,7 +366,10 @@
     (=ruimoku-v6       . #xE01C)       ; &I-RUI6-E01C;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=ucs              . #x2B522)    ; 𫔢
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
       (=ucs              . #x2FF5)     ; ⿵
       )
@@ -381,7 +408,10 @@
     (=ruimoku-v6       . #xE01E)       ; &RUI6-E01E;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE01F)     ; &G-RUI6-E01F;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
@@ -440,7 +470,10 @@
   '((=ruimoku-v6       . #xE026)       ; &RUI6-E026;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE027)     ; &G-RUI6-E027;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
@@ -518,7 +551,10 @@
     (=ruimoku-v6       . #xE02E)       ; &RUI6-E02E;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE02F)     ; &G-RUI6-E02F;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
@@ -529,7 +565,10 @@
     (=ruimoku-v6       . #xE02F)       ; &RUI6-E02F;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE030)     ; &G-RUI6-E030;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
@@ -549,7 +588,10 @@
   '((=ruimoku-v6       . #xE032)       ; &RUI6-E032;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE033)     ; &G-RUI6-E033;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
@@ -598,7 +640,10 @@
     (=ruimoku-v6       . #xE034)       ; &RUI6-E034;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE035)     ; &G-RUI6-E035;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
@@ -611,7 +656,10 @@
     (=ruimoku-v6       . #xE035)       ; &RUI6-E035;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE036)     ; &G-RUI6-E036;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
@@ -635,7 +683,10 @@
     (=ruimoku-v6       . #xE036)       ; &RUI6-E036;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE037)     ; &G-RUI6-E037;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
@@ -692,7 +743,10 @@
   '((=ruimoku-v6       . #xE03A)       ; &RUI6-E03A;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE03B)     ; &G-RUI6-E03B;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
@@ -705,7 +759,10 @@
     (=ruimoku-v6       . #xE03B)       ; &RUI6-E03B;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE03C)     ; &G-RUI6-E03C;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
@@ -791,7 +848,10 @@
     (=ruimoku-v6       . #xE03E)       ; &RUI6-E03E;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE03F)     ; &G-RUI6-E03F;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
@@ -807,7 +867,10 @@
   '((=ruimoku-v6       . #xE040)       ; &RUI6-E040;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=ucs              . #x2A894)    ; 𪢔
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
@@ -843,7 +906,10 @@
   '((=ruimoku-v6       . #xE045)       ; &RUI6-E045;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE046)     ; &G-RUI6-E046;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
@@ -877,7 +943,10 @@
     (=ruimoku-v6       . #xE046)       ; &RUI6-E046;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE047)     ; &G-RUI6-E047;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
@@ -906,7 +975,10 @@
     (=ruimoku-v6       . #xE047)       ; &RUI6-E047;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE048)     ; &G-RUI6-E048;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
@@ -1115,7 +1187,10 @@
     (=ruimoku-v6       . #xE05E)       ; &RUI6-E05E;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE05F)     ; &G-RUI6-E05F;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
       (=ucs              . #x2FF3)     ; ⿳
       )
@@ -1193,7 +1268,10 @@
     (=ruimoku-v6       . #xE064)       ; &I-RUI6-E064;
     ))
 (define-char
-  '((ideographic-structure
+  '((<-subsumptive
+     ((=>>ruimoku-v6     . #xE065)     ; &G-RUI6-E065;
+      ))
+    (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )