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

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index e543f48..1ea3a95 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,124 @@
+2010-10-24  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * Ideograph-R018-Knife.el (U+5277): Add ideographic-structure.
+       (mother of JX2-233C): Unify G-JU+5277 and G-CU+5277; add
+       ideographic-structure.
+       (G-UU+5277): New abstract glyph.
+       (C3-4043): Use `<-subsumptive' for G-UU+5277.
+
+       * Ideograph-R009-Man.el (G-CU+5043): New abstract glyph.
+       (C1-5876): Use `<-subsumptive' for G-CU+5043; unify CU+5043.
+       (mother of JSP-3228): Unify G-JU+509F; add ideographic-structure.
+       (mother of C4-3639): Unify G-UU+509F; add ideographic-structure.
+       (U+50C8): Add ideographic-structure.
+       (G-CU+50C8): New abstract glyph.
+       (C2-4160): Use `<-subsumptive' for G-CU+50C8.
+       (U+3488): Add ideographic-structure.
+       (G-CU+3488): New abstract glyph.
+       (C4-422F): Use `<-subsumptive' for G-CU+3488.
+       (G-CU+348E): New abstract glyph.
+       (C4-4232): Use `<-subsumptive' for G-CU+348E.
+       (U+5123): Add ideographic-structure.
+       (JSP-3259): Use `<-denotational' for U+5123 instead of
+       `<-subsumptive' for intermediate node.
+       (C4-5565): Likewise.
+       (G-UU+5123): New abstract glyph.
+       (UU+5123): Use `<-subsumptive' for G-UU+5123.
+       (U-0002040E): Add ideographic-structure.
+       (G-IU+2040E): New abstract glyph.
+       (C7-3676): Use `<-subsumptive' for G-IU+2040E.
+       (G-JU+513C): Separate representative node.
+       (J0-5137): Separate G-JU+513C; use `<-subsumptive' for G-JU+513C.
+
+2010-10-23  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * Ideograph-R162-Walk.el (G-JU+9038): New abstract glyph.
+       (J0-306F): Use `<-subsumptive' for G-JU+9038.
+       (mother of J90-6E24): Unify G-JU+9052.
+       (G-UU+9052): New abstract glyph.
+       (G0-6559): Use `<-subsumptive' for G-UU+9052.
+
+       * Ideograph-R147-See.el (mother of IU+27882): Unify G-IU+27882.
+       (G-CU+27882): New abstract glyph.
+       (C5-6462): Unify CU+27882; use `<-subsumptive' for G-CU+27882.
+
+       * Ideograph-R124-Feather.el (U+7FC1): Add ideographic-structure.
+       (G-KU+7FC1): New abstract glyph.
+       (K0-683A): Use `<-subsumptive' for G-KU+7FC1.
+
+       * Ideograph-R094-Dog.el (G-CU+7366): New abstract glyph.
+       (C2-5848): Use `<-subsumptive' for G-CU+7366.
+
+       * Ideograph-R030-Mouth.el (U+55E1): Add ideographic-structure.
+       (B-B6E4): Unify G-UU+55E1; add ideographic-structure.
+       (G-JU+56B4): New abstract glyph.
+       (J0-536E): Use `<-subsumptive' for G-JU+56B4.
+
+       * Ideograph-R019-Power.el (U+52DC): Add ideographic-structure.
+       (mother of JSP-336F): Unify G-JU+52DC; add ideographic-structure.
+
+       * Ideograph-R005-Second.el (G-GT-00271): Unify G-IU+200FD.
+
+2010-10-22  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * Ideograph-R200-Hemp.el (mother of J0-5677): Unify G-JU+9EBC and
+       G-CU+9EBC.
+       (G-UU+9EBC): New abstract glyph.
+       (UU+9EBC): Use `<-subsumptive' for G-UU+9EBC.
+       (mother of JX2-7E59): Unify G-JU+9EBD and G-CU+9EBD.
+       (C3-4B22): Unify CU+9EBD.
+       (G-UU+9EBD): New abstract glyph.
+       (G0-7761): Use `<-subsumptive' for G-UU+9EBD.
+
+       * Ideograph-R184-Eat.el (G-KU+98EF): New abstract glyph.
+       (K0-5A79): Use `<-subsumptive' for G-KU+98EF.
+       (A-GT-59101): Unify A-UU+98EF.
+
+       * Ideograph-R142-Insect.el (G-UU+8801): New abstract glyph.
+       (C2-6339): Use `<-subsumptive' for G-UU+8801.
+
+       * Ideograph-R122-Net.el (G-M-28373): New abstract glyph.
+       (M-28373): Use `<-subsumptive' for G-M-28373.
+
+       * Ideograph-R079-Weapon.el (G-GT-21306): New abstract glyph.
+       (GT-21306): Use `<-subsumptive' for G-GT-21306.
+       (G-CU+2F8F5): New abstract glyph.
+       (C4-2D65): Use `<-subsumptive' for G-CU+2F8F5.
+       (G-M-16688): New abstract glyph.
+       (M-16688): Use `<-subsumptive' for G-M-16688.
+       (G-M-16692): New abstract glyph.
+       (M-16692): Use `<-subsumptive' for G-M-16692.
+       (G-M-16697): New abstract glyph.
+       (M-16697): Use `<-subsumptive' for G-M-16697.
+
+       * Ideograph-R078-Death.el (G-JU+6B7F): New abstract glyph.
+       (J0-5D47): Use `<-subsumptive' for G-JU+6B7F.
+
+       * Ideograph-R075-Tree.el (G-M-15667): New abstract glyph.
+       (M-15667): Use `<-subsumptive' for G-M-15667.
+       (G-UU+6B0E): New abstract glyph.
+       (UU+6B0E): Use `<-subsumptive' for G-UU+6B0E.
+
+       * Ideograph-R066-Rap.el (G-M-13267): New abstract glyph.
+       (M-13267): Use `<-subsumptive' for G-M-13267.
+
+       * Ideograph-R038-Woman.el (G-UU+5A2F): New abstract glyph.
+       (UU+5A2F): Use `<-subsumptive' for G-UU+5A2F.
+       (G-KU+5A9B): New abstract glyph.
+       (K0-6A30): Use `<-subsumptive' for G-KU+5A9B.
+       (G-GT-08278): New abstract glyph.
+       (J78-553D): Use `<-subsumptive' for G-GT-08278.
+       (mother of J90-553D): Unify G-UU+5ABE.
+
+       * Ideograph-R022-Right-Open-Box.el (mother of C7-6443): Unify
+       G-CU+2096C.
+       (C7-6443): Unify CU+2096C.
+       (G-IU+2096C): New abstract glyph.
+       (IU+2096C): Use `<-subsumptive' for G-IU+2096C.
+
+       * Ideograph-R012-Eight.el (G-KU+517C): New abstract glyph.
+       (K0-4C42): Use `<-subsumptive' for G-KU+517C; unify KU+517C.
+
 2010-10-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * Ideograph-R102-Field.el (U-00024CAB): Integrate M-21908.

diff --git a/lisp/utf-2000/Ideograph-R005-Second.el b/lisp/utf-2000/Ideograph-R005-Second.el
index 1f3366b..902e6e9 100644 (file)
--- a/lisp/utf-2000/Ideograph-R005-Second.el
+++ b/lisp/utf-2000/Ideograph-R005-Second.el
@@ -2122,6 +2122,7 @@
       )
      ((=ucs              . #x4E5A)     ; 乚
       ))
+    (=>>ucs@iso                . #x200FD)      ; &G-GT-00271;
     (=>>gt             . 00271)        ; &G-GT-00271;
     (->subsumptive
      ((ideographic-structure

diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el
index 8d2256c..8989241 100644 (file)
--- a/lisp/utf-2000/Ideograph-R009-Man.el
+++ b/lisp/utf-2000/Ideograph-R009-Man.el
@@ -19040,6 +19040,16 @@
     (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 9)
     (total-strokes      . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((name              . "CJK RADICAL PERSON")
+      (=ucs              . #x2E85)     ; ⺅
+      )
+     ((=>>ucs@cns        . #x533D)     ; &G-CU+533D;
+      ))
+    (=>>ucs@cns                . #x5043)       ; &G-CU+5043;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -19062,6 +19072,7 @@
        ((=ucs@cns          . #x533D)   ; &C2-2936;
        (=cns11643-2        . #x2936)   ; &C2-2936; [09-22]
        ))
+      (=ucs@cns                  . #x5043)     ; &C1-5876;
       (=cns11643-1       . #x5876)     ; &C1-5876; [56-86]
       ))
     ))
@@ -25336,6 +25347,16 @@
     (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 10)
     (total-strokes      . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((name              . "CJK RADICAL PERSON")
+      (=ucs              . #x2E85)     ; ⺅
+      )
+     ((=>>gt             . 36863)      ; &G-GT-36863;
+      ))
+    (=>>ucs@jis                . #x509F)       ; &G-JU+509F;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -25365,6 +25386,16 @@
     (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 10)
     (total-strokes      . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((name              . "CJK RADICAL PERSON")
+      (=ucs              . #x2E85)     ; ⺅
+      )
+     ((=>>jis-x0208      . #x3227)     ; &G-J0-3227; [18-07]
+      ))
+    (=>>ucs@unicode    . #x509F)       ; &G-UU+509F;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -28744,6 +28775,15 @@
     (ideographic-strokes . 11)
     (total-strokes      . 13)
     (hanyu-dazidian    1 211 1)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((name              . "CJK RADICAL PERSON")
+      (=ucs              . #x2E85)     ; ⺅
+      )
+     ((=ucs              . #x66FC)     ; 曼
+      ))
     (=ucs              . #x50C8)       ; 僈
     (=big5             . #xDCBB)       ; &I-B-DCBB;
     ))
@@ -28754,6 +28794,7 @@
     (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 11)
     (total-strokes      . 13)
+    (=>>ucs@cns                . #x50C8)       ; &G-CU+50C8;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -31345,6 +31386,15 @@
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((name              . "CJK RADICAL PERSON")
+      (=ucs              . #x2E85)     ; ⺅
+      )
+     ((=ucs              . #x6562)     ; 敢
+      ))
     (=ucs              . #x3488)       ; 㒈
     ))
 (define-char
@@ -31354,6 +31404,16 @@
     (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 12)
     (total-strokes      . 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((name              . "CJK RADICAL PERSON")
+      (=ucs              . #x2E85)     ; ⺅
+      )
+     ((=>jis-x0208       . #x343A)     ; &J97-343A; [20-26]
+      ))
+    (=>>ucs@cns                . #x3488)       ; &G-CU+3488;
     (->subsumptive
      ((hanyu-dazidian    1 216 13)
       (ideographic-structure
@@ -37231,6 +37291,15 @@
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((name              . "CJK RADICAL PERSON")
+      (=ucs              . #x2E85)     ; ⺅
+      )
+     ((=ucs              . #x5EE3)     ; 廣
+      ))
     (=ucs              . #x5123)       ; 儣
     ))
 (define-char
@@ -37240,40 +37309,45 @@
     (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 15)
     (total-strokes      . 17)
-    (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-       (=ucs               . #x2FF0)   ; ⿰
-       )
-       ((name              . "CJK RADICAL PERSON")
-       (=ucs               . #x2E85)   ; ⺅
-       )
-       ((=ucs@jis          . #x5EE3)   ; &GT-11938;
-       (=jis-x0208         . #x5722)   ; &GT-11938; [55-02]
-       (=ks-x1001          . #x4E46)   ; &I-K0-4E46; [46-38]
-       (=jis-x0213-1       . #x5722)   ; &I-JX1-5722; [55-02]
-       (=daikanwa          . 09493)    ; &I-M-09493;
-       ))
-      (=ucs@jis                  . #x5123)     ; &M-01253;
-      (=jis-x0212        . #x3259)     ; &M-01253; [18-57]
-      (=daikanwa         . 01253)      ; &I-M-01253;
-      (=jef-china3       . #x43C5)     ; &I-JC3-43C5;
-      (mojikyo           . 001253)     ; &MCS-600004E5;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
       )
-     ((hanyu-dazidian    1 235 11)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-       (=ucs               . #x2FF0)   ; ⿰
-       )
-       ((name              . "CJK RADICAL PERSON")
-       (=ucs               . #x2E85)   ; ⺅
-       )
-       ((=cns11643-1       . #x6C5D)   ; &C1-6C5D; [76-61]
-       ))
-      (=ucs@cns                  . #x5123)     ; &HZK01-D6BA;
-      (=cns11643-4       . #x5565)     ; &HZK01-D6BA; [53-69]
-      (=hanziku-1        . #xD6BA)     ; &I-HZK01-D6BA;
+     ((name              . "CJK RADICAL PERSON")
+      (=ucs              . #x2E85)     ; ⺅
+      )
+     ((=ucs@jis                  . #x5EE3)     ; &GT-11938;
+      (=jis-x0208        . #x5722)     ; &GT-11938; [55-02]
+      (=ks-x1001         . #x4E46)     ; &I-K0-4E46; [46-38]
+      (=jis-x0213-1      . #x5722)     ; &I-JX1-5722; [55-02]
+      (=daikanwa         . 09493)      ; &I-M-09493;
       ))
+    (=ucs@jis          . #x5123)       ; &M-01253;
+    (=jis-x0212                . #x3259)       ; &M-01253; [18-57]
+    (=daikanwa         . 01253)        ; &I-M-01253;
+    (=jef-china3       . #x43C5)       ; &I-JC3-43C5;
+    (mojikyo           . 001253)       ; &MCS-600004E5;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs              . #x5123)     ; 儣
+      ))
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 15)
+    (total-strokes      . 17)
+    (hanyu-dazidian    1 235 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((name              . "CJK RADICAL PERSON")
+      (=ucs              . #x2E85)     ; ⺅
+      )
+     ((=cns11643-1       . #x6C5D)     ; &C1-6C5D; [76-61]
+      ))
+    (=ucs@cns          . #x5123)       ; &HZK01-D6BA;
+    (=cns11643-4       . #x5565)       ; &HZK01-D6BA; [53-69]
+    (=hanziku-1                . #xD6BA)       ; &I-HZK01-D6BA;
     ))
 (define-char
   '((<-denotational
@@ -37282,6 +37356,7 @@
     (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 14)
     (total-strokes      . 16)
+    (=>>ucs@unicode    . #x5123)       ; &G-UU+5123;
     (->subsumptive
      ((mojikyo           . 059112)     ; &MCS-6000E6E8;
       )
@@ -37689,6 +37764,15 @@
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 15)
     (total-strokes      . 17)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((name              . "CJK RADICAL PERSON")
+      (=ucs              . #x2E85)     ; ⺅
+      )
+     ((=ucs              . #x8513)     ; 蔓
+      ))
     (=ucs              . #x2040E)      ; 𠐎
     ))
 (define-char
@@ -37698,6 +37782,7 @@
     (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 15)
     (total-strokes      . 17)
+    (=>>ucs@iso                . #x2040E)      ; &G-IU+2040E;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -40649,6 +40734,15 @@
     (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 20)
     (total-strokes      . 22)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((name              . "CJK RADICAL PERSON")
+      (=ucs              . #x2E85)     ; ⺅
+      )
+     ((=>>ucs@jis        . #x56B4)     ; &G-JU+56B4;
+      ))
     (=>>ucs@jis                . #x513C)       ; &G-JU+513C;
     (->subsumptive
      ((ideographic-structure

diff --git a/lisp/utf-2000/Ideograph-R012-Eight.el b/lisp/utf-2000/Ideograph-R012-Eight.el
index 9f96407..51fcc83 100644 (file)
--- a/lisp/utf-2000/Ideograph-R012-Eight.el
+++ b/lisp/utf-2000/Ideograph-R012-Eight.el
@@ -1127,6 +1127,7 @@
     (ideographic-radical . 12) ; ⼋
     (ideographic-strokes . 8)
     (total-strokes      . 10)
+    (=>>ucs@ks         . #x517C)       ; &G-KU+517C;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
@@ -1142,6 +1143,7 @@
        )
        ((=big5-cdp         . #x8CDE)   ; &CDP-8CDE;
        ))
+      (=ucs@ks           . #x517C)     ; &M-01483;
       (=ks-x1001         . #x4C42)     ; &M-01483; [44-34]
       (=daikanwa         . 01483)      ; &I-M-01483;
       (=jef-china3       . #x43E6)     ; &I-JC3-43E6;

diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el
index 5d0ebeb..40e31b4 100644 (file)
--- a/lisp/utf-2000/Ideograph-R018-Knife.el
+++ b/lisp/utf-2000/Ideograph-R018-Knife.el
@@ -6875,6 +6875,15 @@
     (ideographic-strokes . 11)
     (total-strokes      . 13)
     (hanyu-dazidian    1 354 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=>jis-x0208       . #x3B3A)     ; &J97-3B3A; [27-26]
+      )
+     ((name              . "CJK RADICAL KNIFE TWO")
+      (=ucs              . #x2E89)     ; ⺉
+      ))
     (=ucs              . #x5277)       ; 剷
     (=big5             . #xB6D0)       ; &I-B-B6D0;
     ))
@@ -6885,6 +6894,17 @@
     (ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 11)
     (total-strokes      . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x7522)     ; 產
+      )
+     ((name              . "CJK RADICAL KNIFE TWO")
+      (=ucs              . #x2E89)     ; ⺉
+      ))
+    (=>>ucs@jis                . #x5277)       ; &G-JU+5277;
+    (=>>ucs@cns                . #x5277)       ; &G-JU+5277;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -6921,11 +6941,20 @@
   '((<-denotational
      ((=ucs              . #x5277)     ; 剷
       ))
-    (=>ucs*            . #x5277)       ; 剷
     (ideographic-radical . 18) ; ⼑
     (ideographic-strokes . 11)
     (total-strokes      . 13)
-    (=ucs              . #x2F823)      ; 剷
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x7523)     ; 産
+      )
+     ((name              . "CJK RADICAL KNIFE TWO")
+      (=ucs              . #x2E89)     ; ⺉
+      ))
+    (=>>ucs@unicode    . #x5277)       ; &G-UU+5277;
+    (=>>ucs@cns                . #x2F823)      ; &G-UU+5277;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -6941,7 +6970,8 @@
        ))
       (mojikyo           . 057256)     ; &MCS-6000DFA8;
       )
-     ((ideographic-structure
+     ((=>ucs*            . #x5277)     ; 剷
+      (ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
        (=ucs               . #x2FF0)   ; ⿰
        )
@@ -6951,10 +6981,10 @@
        ((name              . "CJK RADICAL KNIFE TWO")
        (=ucs               . #x2E89)   ; ⺉
        ))
-      (=ucs@iso                  . #x2F823)    ; &C3-4043;
-      (=ucs@unicode      . #x5277)     ; &C3-4043;
-      (=ucs@cns                  . #x2F823)    ; &C3-4043;
-      (=cns11643-3       . #x4043)     ; &C3-4043; [32-35]
+      (=ucs              . #x2F823)    ; 剷
+      (=ucs@unicode      . #x5277)     ; 剷
+      (=ucs@cns                  . #x2F823)    ; 剷
+      (=cns11643-3       . #x4043)     ; &I-C3-4043; [32-35]
       ))
     ))
 (define-char

diff --git a/lisp/utf-2000/Ideograph-R019-Power.el b/lisp/utf-2000/Ideograph-R019-Power.el
index ef95fc2..3157617 100644 (file)
--- a/lisp/utf-2000/Ideograph-R019-Power.el
+++ b/lisp/utf-2000/Ideograph-R019-Power.el
@@ -2879,6 +2879,14 @@
   '((ideographic-radical . 19) ; ⼒
     (ideographic-strokes . 10)
     (total-strokes      . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x7FC1)     ; 翁
+      )
+     ((=ucs              . #x529B)     ; 力
+      ))
     (=ucs              . #x52DC)       ; 勜
     ))
 (define-char
@@ -2888,6 +2896,15 @@
     (ideographic-radical . 19) ; ⼒
     (ideographic-strokes . 10)
     (total-strokes      . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=>>gt             . 36863)      ; &G-GT-36863;
+      )
+     ((=ucs              . #x529B)     ; 力
+      ))
+    (=>>ucs@jis                . #x52DC)       ; &G-JU+52DC;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")

diff --git a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el
index 43d8a2b..5700985 100644 (file)
--- a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el
+++ b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el
@@ -1763,6 +1763,7 @@
     (ideographic-radical . 22) ; ⼕
     (ideographic-strokes . 26)
     (total-strokes      . 28)
+    (=>>ucs@cns                . #x2096C)      ; &G-CU+2096C;
     (->subsumptive
      ((=daikanwa         . 02671)      ; &M-02671;
       (<-Zhouwen
@@ -1790,6 +1791,7 @@
        shuowen yupian jiyun daikanwa)
       )
      ((hanyu-dazidian    1 91 10)
+      (=ucs@cns                  . #x2096C)    ; &HZK01-B6C1;
       (=cns11643-7       . #x6443)     ; &HZK01-B6C1; [68-35]
       (=hanziku-1        . #xB6C1)     ; &I-HZK01-B6C1;
       ))
@@ -1801,6 +1803,7 @@
     (ideographic-radical . 22) ; ⼕
     (ideographic-strokes . 26)
     (total-strokes      . 28)
+    (=>>ucs@iso                . #x2096C)      ; &G-IU+2096C;
     (->subsumptive
      ((mojikyo           . 002671)     ; &MCS-60000A6F;
       )

diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el
index 8440c69..64b3bf1 100644 (file)
--- a/lisp/utf-2000/Ideograph-R030-Mouth.el
+++ b/lisp/utf-2000/Ideograph-R030-Mouth.el
@@ -23390,6 +23390,14 @@
     (ideographic-strokes . 10)
     (total-strokes      . 13)
     (hanyu-dazidian    1 669 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x53E3)     ; 口
+      )
+     ((=ucs              . #x7FC1)     ; 翁
+      ))
     (=ucs              . #x55E1)       ; 嗡
     ))
 (define-char
@@ -23418,7 +23426,16 @@
     (ideographic-radical . 30) ; ⼝
     (ideographic-strokes . 10)
     (total-strokes      . 13)
-    (=big5             . #xB6E4)       ; &B-B6E4;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x53E3)     ; 口
+      )
+     ((=>>jis-x0208      . #x3227)     ; &G-J0-3227; [18-07]
+      ))
+    (=>>ucs@unicode    . #x55E1)       ; &G-UU+55E1;
+    (=big5             . #xB6E4)       ; &G-UU+55E1;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -36245,6 +36262,7 @@
     (ideographic-radical . 30) ; ⼝
     (ideographic-strokes . 17)
     (total-strokes      . 20)
+    (=>>ucs@jis                . #x56B4)       ; &G-JU+56B4;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")

diff --git a/lisp/utf-2000/Ideograph-R038-Woman.el b/lisp/utf-2000/Ideograph-R038-Woman.el
index af6bf39..40b91c4 100644 (file)
--- a/lisp/utf-2000/Ideograph-R038-Woman.el
+++ b/lisp/utf-2000/Ideograph-R038-Woman.el
@@ -5531,12 +5531,13 @@
   '((<-denotational
      ((=ucs              . #x5A2F)     ; 娯
       ))
-    (morohashi-daikanwa        6307 1)
     (ideographic-radical . 38) ; ⼥
     (ideographic-strokes . 7)
     (total-strokes      . 10)
+    (=>>ucs@unicode    . #x5A2F)       ; &G-UU+5A2F;
     (->subsumptive
-     ((=ucs@unicode      . #x5A2F)     ; &GT-07919;
+     ((morohashi-daikanwa      6307 1)
+      (=ucs@unicode      . #x5A2F)     ; &GT-07919;
       (=jis-x0208        . #x3864)     ; &GT-07919; [24-68]
       (=jis-x0213-1      . #x3864)     ; &I-JX1-3864; [24-68]
       (=gt               . 07919)      ; &I-GT-07919;
@@ -9436,8 +9437,10 @@
     (ideographic-radical . 38) ; ⼥
     (ideographic-strokes . 9)
     (total-strokes      . 12)
+    (=>>ucs@ks         . #x5A9B)       ; &G-KU+5A9B;
     (->subsumptive
-     ((=jis-x0208@1978   . #x4932)     ; &M-06516; [41-18]
+     ((=ucs@ks           . #x5A9B)     ; &M-06516;
+      (=jis-x0208@1978   . #x4932)     ; &M-06516; [41-18]
       (=ks-x1001         . #x6A30)     ; &I-K0-6A30; [74-16]
       (=daikanwa         . 06516)      ; &I-M-06516;
       )
@@ -10890,6 +10893,8 @@
     (ideographic-radical . 38) ; ⼥
     (ideographic-strokes . 10)
     (total-strokes      . 13)
+    (=>>gt             . 08278)        ; &G-GT-08278;
+    (=>>daikanwa       . 06597)        ; &G-GT-08278;
     (->subsumptive
      ((=jis-x0208@1978   . #x553D)     ; &GT-08278; [53-29]
       (=gt               . 08278)      ; &I-GT-08278;
@@ -10906,6 +10911,7 @@
     (ideographic-radical . 38) ; ⼥
     (ideographic-strokes . 10)
     (total-strokes      . 13)
+    (=>>ucs@unicode    . #x5ABE)       ; &G-UU+5ABE;
     (->subsumptive
      ((=jis-x0208@1983   . #x553D)     ; &J83-553D; [53-29]
       (=jef-china3       . #x49EF)     ; &I-JC3-49EF;

diff --git a/lisp/utf-2000/Ideograph-R066-Rap.el b/lisp/utf-2000/Ideograph-R066-Rap.el
index 381d76e..03a99f0 100644 (file)
--- a/lisp/utf-2000/Ideograph-R066-Rap.el
+++ b/lisp/utf-2000/Ideograph-R066-Rap.el
@@ -2327,16 +2327,17 @@
     (ideographic-radical . 66) ; ⽁
     (ideographic-strokes . 8)
     (total-strokes      . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x2F83F)    ; 周
+      )
+     ((=ucs              . #x6534)     ; 攴
+      ))
+    (=>>daikanwa       . 13267)        ; &A-M-13267;
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-       (=ucs               . #x2FF0)   ; ⿰
-       )
-       ((=ucs              . #x2F83F)  ; 周
-       )
-       ((=ucs              . #x6534)   ; 攴
-       ))
-      (=daikanwa         . 13267)      ; &M-13267;
+     ((=daikanwa         . 13267)      ; &M-13267;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")

diff --git a/lisp/utf-2000/Ideograph-R075-Tree.el b/lisp/utf-2000/Ideograph-R075-Tree.el
index abbe470..54d54e7 100644 (file)
--- a/lisp/utf-2000/Ideograph-R075-Tree.el
+++ b/lisp/utf-2000/Ideograph-R075-Tree.el
@@ -23696,9 +23696,9 @@
     (ideographic-strokes . 13)
     (total-strokes      . 17)
     (=ucs              . #x6A95)       ; 檕
+    (=big5             . #xED40)       ; &I-B-ED40;
     (->subsumptive
-     ((=big5             . #xED40)     ; &M-15666;
-      (=daikanwa         . 15666)      ; &I-M-15666;
+     ((=daikanwa         . 15666)      ; &M-15666;
       )
      ((=ucs@unicode      . #x6A95)     ; &UU+6A95;
       )
@@ -23718,6 +23718,7 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 13)
     (total-strokes      . 17)
+    (=>>daikanwa       . 15667)        ; &A-M-15667;
     (->subsumptive
      ((=daikanwa         . 15667)      ; &M-15667;
       (=jef-china3       . #x98A5)     ; &I-JC3-98A5;
@@ -28904,6 +28905,7 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 18)
     (total-strokes      . 22)
+    (=>>ucs@unicode    . #x6B0E)       ; &G-UU+6B0E;
     (->subsumptive
      ((=ucs@unicode      . #x6B0E)     ; &UU+6B0E;
       )

diff --git a/lisp/utf-2000/Ideograph-R078-Death.el b/lisp/utf-2000/Ideograph-R078-Death.el
index 4aa5658..4e678ac 100644 (file)
--- a/lisp/utf-2000/Ideograph-R078-Death.el
+++ b/lisp/utf-2000/Ideograph-R078-Death.el
@@ -492,6 +492,7 @@
     (ideographic-radical . 78) ; ⽍
     (ideographic-strokes . 4)
     (total-strokes      . 8)
+    (=>>ucs@jis                . #x6B7F)       ; &G-JU+6B7F;
     (->subsumptive
      ((=ucs@jis                  . #x6B7F)     ; &GT-21052;
       (=jis-x0208        . #x5D47)     ; &GT-21052; [61-39]
@@ -502,7 +503,6 @@
       (=gt               . 21052)      ; &I-GT-21052;
       (=gt-pj-1                  . #x5D47)     ; &I-GT-21052; [61-39]
       (=daikanwa         . 16385)      ; &I-M-16385;
-      (=shinjigen@rev    .  3964)      ; &GT-21052;
       )
      ((mojikyo           . 016385)     ; &MCS-60004001;
       ))
@@ -514,7 +514,7 @@
     (ideographic-radical . 78) ; ⽍
     (ideographic-strokes . 4)
     (total-strokes      . 8)
-    (=shinjigen@1ed    .  3964)        ; &SJG1-3964;
+    (=shinjigen                .  3964)        ; &SJG2-3964;
     ))
 (define-char
   '((<-denotational

diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el
index ecf86eb..f5ee9a2 100644 (file)
--- a/lisp/utf-2000/Ideograph-R079-Weapon.el
+++ b/lisp/utf-2000/Ideograph-R079-Weapon.el
@@ -60,6 +60,8 @@
     (ideographic-radical . 79) ; ⽎
     (ideographic-strokes . 4)
     (total-strokes      . 8)
+    (=>>gt             . 21306)        ; &G-GT-21306;
+    (=>>daikanwa       . 16616)        ; &G-GT-21306;
     (->subsumptive
      ((=gt               . 21306)      ; &GT-21306;
       (=gt-pj-4                  . #x4460)     ; &GT-21306; [36-64]

diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el
index c82f87b..dc6e333 100644 (file)
--- a/lisp/utf-2000/Ideograph-R086-Fire.el
+++ b/lisp/utf-2000/Ideograph-R086-Fire.el
@@ -5979,7 +5979,8 @@
     (total-strokes      . 12)
     (=daikanwa         . 19166)        ; &M-19166;
     (<-vulgar
-     ((=ks-x1001         . #x4C42)     ; &M-01483; [44-34]
+     ((=ucs@ks           . #x517C)     ; &M-01483;
+      (=ks-x1001         . #x4C42)     ; &M-01483; [44-34]
       (=daikanwa         . 01483)      ; &I-M-01483;
       ))
     (<-vulgar*sources

diff --git a/lisp/utf-2000/Ideograph-R094-Dog.el b/lisp/utf-2000/Ideograph-R094-Dog.el
index 450ff83..b7229d0 100644 (file)
--- a/lisp/utf-2000/Ideograph-R094-Dog.el
+++ b/lisp/utf-2000/Ideograph-R094-Dog.el
@@ -6536,6 +6536,7 @@
 (define-char
   '((ideographic-radical . 94) ; ⽝
     (=ucs              . #x7366)       ; 獦
+    (=big5             . #xEA5C)       ; &I-B-EA5C;
     (=jef-china3       . #x8FBA)       ; &I-JC3-8FBA;
     ))
 (define-char
@@ -6545,6 +6546,7 @@
     (ideographic-radical . 94) ; ⽝
     (ideographic-strokes . 13)
     (total-strokes      . 16)
+    (=>>ucs@cns                . #x7366)       ; &G-CU+7366;
     (->subsumptive
      ((=ucs@cns                  . #x7366)     ; &M-20723;
       (=cns11643-2       . #x5848)     ; &M-20723; [56-40]
@@ -6563,7 +6565,6 @@
     (=ucs@unicode      . #x7366)       ; &JX1-7771;
     (=jis-x0212                . #x4B42)       ; &JX1-7771; [43-34]
     (=jis-x0213-1      . #x7771)       ; &I-JX1-7771; [87-81]
-    (=big5             . #xEA5C)       ; &I-B-EA5C;
     ))
 (define-char
   '((ideographic-radical . 94) ; ⽝

diff --git a/lisp/utf-2000/Ideograph-R122-Net.el b/lisp/utf-2000/Ideograph-R122-Net.el
index 7606aa0..a1dbfd9 100644 (file)
--- a/lisp/utf-2000/Ideograph-R122-Net.el
+++ b/lisp/utf-2000/Ideograph-R122-Net.el
@@ -2422,6 +2422,7 @@
     (ideographic-radical . 122)        ; ⽹
     (ideographic-strokes . 12)
     (total-strokes      . 17)
+    (=>>daikanwa       . 28373)        ; &A-M-28373;
     (->subsumptive
      ((=daikanwa         . 28373)      ; &M-28373;
       )

diff --git a/lisp/utf-2000/Ideograph-R124-Feather.el b/lisp/utf-2000/Ideograph-R124-Feather.el
index f359bcb..6601102 100644 (file)
--- a/lisp/utf-2000/Ideograph-R124-Feather.el
+++ b/lisp/utf-2000/Ideograph-R124-Feather.el
@@ -519,6 +519,14 @@
   '((ideographic-radical . 124)        ; ⽻
     (ideographic-strokes . 4)
     (total-strokes      . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=ucs              . #x516C)     ; 公
+      )
+     ((=ucs              . #x7FBD)     ; 羽
+      ))
     (=ucs              . #x7FC1)       ; 翁
     (=big5             . #xAFCE)       ; &I-B-AFCE;
     ))
@@ -529,6 +537,15 @@
     (ideographic-radical . 124)        ; ⽻
     (ideographic-strokes . 4)
     (total-strokes      . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=ucs              . #x516C)     ; 公
+      )
+     ((=ks-x1001         . #x6962)     ; &GT-36832; [73-66]
+      (=daikanwa         . 28614)      ; &I-M-28614;
+      ))
     (=>>ucs@ks         . #x7FC1)       ; &G-GT-36863;
     (=>>gt             . 36863)        ; &G-GT-36863;
     (=>>daikanwa       . 28635)        ; &G-GT-36863;

diff --git a/lisp/utf-2000/Ideograph-R142-Insect.el b/lisp/utf-2000/Ideograph-R142-Insect.el
index 6045084..3b2c2bd 100644 (file)
--- a/lisp/utf-2000/Ideograph-R142-Insect.el
+++ b/lisp/utf-2000/Ideograph-R142-Insect.el
@@ -12944,6 +12944,7 @@
     (ideographic-radical . 142)        ; ⾍
     (ideographic-strokes . 12)
     (total-strokes      . 18)
+    (=>>ucs@unicode    . #x8801)       ; &G-UU+8801;
     (->subsumptive
      ((mojikyo           . 057318)     ; &MCS-6000DFE6;
       )

diff --git a/lisp/utf-2000/Ideograph-R147-See.el b/lisp/utf-2000/Ideograph-R147-See.el
index 07b7e8c..d6d0079 100644 (file)
--- a/lisp/utf-2000/Ideograph-R147-See.el
+++ b/lisp/utf-2000/Ideograph-R147-See.el
@@ -2095,6 +2095,7 @@
     (ideographic-radical . 147)        ; ⾒
     (ideographic-strokes . 11)
     (total-strokes      . 18)
+    (=>>ucs@iso                . #x27882)      ; &G-IU+27882;
     (->subsumptive
      ((=daikanwa         . 34944)      ; &M-34944;
       )

diff --git a/lisp/utf-2000/Ideograph-R162-Walk.el b/lisp/utf-2000/Ideograph-R162-Walk.el
index 3cad89d..8879560 100644 (file)
--- a/lisp/utf-2000/Ideograph-R162-Walk.el
+++ b/lisp/utf-2000/Ideograph-R162-Walk.el
@@ -9681,7 +9681,7 @@
     (=ks-x1001         . #x6C6F)       ; &I-K0-6C6F; [76-79]
     (=jis-x0213-1      . #x7C59)       ; &I-JX1-7C59; [92-57]
     (=daikanwa         . 38951)        ; &I-M-38951;
-    (=shinjigen@1ed    .  8301)        ; 逸
+    (=shinjigen                .  8301)        ; 逸
     (<-synonyms
      ((=ucs              . #x8EFC)     ; 軼
       (=daikanwa         . 38275)      ; &I-M-38275;
@@ -9730,6 +9730,7 @@
      ((=ucs              . #x9038)     ; 逸
       ))
     (ideographic-radical . 162)        ; ⾡
+    (=>>ucs@jis                . #x9038)       ; &G-JU+9038;
     (->subsumptive
      ((morohashi-daikanwa      38951 1)
       (ideographic-strokes . 8)
@@ -9739,7 +9740,7 @@
       (=jis-x0213-1      . #x306F)     ; &I-JX1-306F; [16-79]
       (=gt               . 52065)      ; &I-GT-52065;
       (=gt-pj-1                  . #x306F)     ; &I-GT-52065; [16-79]
-      (=shinjigen@1ed    .  8300)      ; &GT-52065;
+      (=shinjigen        .  8300)      ; &GT-52065;
       (mojikyo           . 050514)     ; &MCS-6000C552;
       (<-simplified@JP/Jouyou
        ((=ucs              . #xFA67)   ; 逸
@@ -11936,6 +11937,8 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 9)
     (total-strokes      . 13)
+    (=>>ucs@jis                . #x9052)       ; &G-J0-6E24;
+    (=>>jis-x0208      . #x6E24)       ; &G-J0-6E24; [78-04]
     (->subsumptive
      ((=jis-x0208@1978   . #x6E24)     ; &M-39008; [78-04]
       (=jis-x0208@1983   . #x6E24)     ; &I-J83-6E24; [78-04]
@@ -11977,6 +11980,7 @@
     (ideographic-radical . 162)        ; ⾡
     (ideographic-strokes . 9)
     (total-strokes      . 12)
+    (=>>ucs@unicode    . #x9052)       ; &G-UU+9052;
     (->subsumptive
      ((mojikyo           . 055801)     ; &MCS-6000D9F9;
       )

diff --git a/lisp/utf-2000/Ideograph-R184-Eat.el b/lisp/utf-2000/Ideograph-R184-Eat.el
index f158a31..0919ffd 100644 (file)
--- a/lisp/utf-2000/Ideograph-R184-Eat.el
+++ b/lisp/utf-2000/Ideograph-R184-Eat.el
@@ -1478,8 +1478,12 @@
     (ideographic-radical . 184)        ; ⾷
     (ideographic-strokes . 4)
     (total-strokes      . 13)
+    (=>>ucs@ks         . #x98EF)       ; &G-GT-59166;
+    (=>>gt             . 59166)        ; &G-GT-59166;
+    (=>>daikanwa       . 44064)        ; &G-GT-59166;
     (->subsumptive
-     ((=ks-x1001         . #x5A79)     ; &GT-59166; [58-89]
+     ((=ucs@ks           . #x98EF)     ; &GT-59166;
+      (=ks-x1001         . #x5A79)     ; &GT-59166; [58-89]
       (=gt               . 59166)      ; &I-GT-59166;
       (=gt-pj-8                  . #x465E)     ; &I-GT-59166; [38-62]
       (=daikanwa         . 44064)      ; &I-M-44064;
@@ -1495,6 +1499,7 @@
     (ideographic-radical . 184)        ; ⾷
     (ideographic-strokes . 4)
     (total-strokes      . 12)
+    (=>ucs@unicode     . #x98EF)       ; &A-GT-59101;
     (=>gt              . 59101)        ; &A-GT-59101;
     (->subsumptive
      ((morohashi-daikanwa      44064 1)

diff --git a/lisp/utf-2000/Ideograph-R200-Hemp.el b/lisp/utf-2000/Ideograph-R200-Hemp.el
index 38f38ec..10dee8b 100644 (file)
--- a/lisp/utf-2000/Ideograph-R200-Hemp.el
+++ b/lisp/utf-2000/Ideograph-R200-Hemp.el
@@ -147,6 +147,8 @@
     (ideographic-radical . 200)        ; ⿇
     (ideographic-strokes . 3)
     (total-strokes      . 14)
+    (=>>ucs@jis                . #x9EBC)       ; &G-JU+9EBC;
+    (=>>ucs@cns                . #x9EBC)       ; &G-JU+9EBC;
     (->subsumptive
      ((=ucs@jis                  . #x9EBC)     ; &GT-65265;
       (=jis-x0208        . #x5677)     ; &GT-65265; [54-87]
@@ -168,6 +170,7 @@
     (ideographic-radical . 200)        ; ⿇
     (ideographic-strokes . 3)
     (total-strokes      . 14)
+    (=>>ucs@unicode    . #x9EBC)       ; &G-UU+9EBC;
     (->subsumptive
      ((mojikyo           . 055221)     ; &MCS-6000D7B5;
       )
@@ -187,13 +190,16 @@
     (ideographic-radical . 200)        ; ⿇
     (ideographic-strokes . 3)
     (total-strokes      . 14)
+    (=>>ucs@jis                . #x9EBD)       ; &G-JU+9EBD;
+    (=>>ucs@cns                . #x9EBD)       ; &G-JU+9EBD;
     (->subsumptive
      ((=ucs@jis                  . #x9EBD)     ; &M-47893;
       (=jis-x0213-2      . #x7E59)     ; &M-47893; [94-57]
       (=daikanwa         . 47893)      ; &I-M-47893;
       (mojikyo           . 047893)     ; &MCS-6000BB15;
       )
-     ((=cns11643-3       . #x4B22)     ; &C3-4B22; [43-02]
+     ((=ucs@cns                  . #x9EBD)     ; &C3-4B22;
+      (=cns11643-3       . #x4B22)     ; &C3-4B22; [43-02]
       ))
     ))
 (define-char
@@ -203,6 +209,7 @@
     (ideographic-radical . 200)        ; ⿇
     (ideographic-strokes . 3)
     (total-strokes      . 14)
+    (=>>ucs@unicode    . #x9EBD)       ; &G-UU+9EBD;
     (->subsumptive
      ((mojikyo           . 053640)     ; &MCS-6000D188;
       )

diff --git a/src/ChangeLog b/src/ChangeLog
index 8e9def4..74888eb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2010-09-15  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * concord.c: Include <chise.h> if HAVE_LIBCHISE is defined.
+       (Qcharacter): New variable when HAVE_LIBCHISE is defined.
+       (Qfeature): Ditto.
+       (Fconcord_object_genre): New function.
+       (syms_of_concord):
+       - Add new builtin symbols `character' and `feature' when
+         HAVE_LIBCHISE is defined.
+       - Add Add new builtin function `concord-object-genre'.  
+       (complex_vars_of_concord): New function; assign genres `character'
+       and `feature' when HAVE_LIBCHISE is defined.
+
+2010-09-14  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * emacs.c (main_1): Call `complex_vars_of_concord' when
+       HAVE_CONCORD is defined.
+
+       * symsinit.h (complex_vars_of_concord): New prototype.
+
 2010-07-01  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * chartab.c (allocate_character): Add `static'.

diff --git a/src/concord.c b/src/concord.c
index 6d8c212..e368006 100644 (file)
--- a/src/concord.c
+++ b/src/concord.c
@@ -1,5 +1,5 @@
 /* XEmacs routines to deal with CONCORD.
-   Copyright (C) 2005,2006,2008 MORIOKA Tomohiko
+   Copyright (C) 2005,2006,2008,2010 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -28,6 +28,9 @@ Boston, MA 02111-1307, USA.  */
 #include "buffer.h"
 #include <errno.h>
 #include <concord.h>
+#ifdef HAVE_LIBCHISE
+#  include <chise.h>
+#endif
 
 
 EXFUN (Fread_from_string, 3);
@@ -40,6 +43,10 @@ EXFUN (Fconcord_object_get, 2);
 Lisp_Object Qconcord;
 Lisp_Object Qconcord_object;
 Lisp_Object Qgenre, Q_id;
+#ifdef HAVE_LIBCHISE
+Lisp_Object Qcharacter;
+Lisp_Object Qfeature;
+#endif
 
 Lisp_Object Vconcord_ds_hash_table;
 Lisp_Object Vconcord_genre_hash_table;
@@ -519,6 +526,15 @@ Return an id of Concord-object OBJECT.
   return XCONCORD_OBJECT_ID (object);
 }
 
+DEFUN ("concord-object-genre", Fconcord_object_genre, 1, 1, 0, /*
+Return genre of Concord-object OBJECT.
+*/
+       (object))
+{
+  CHECK_CONCORD_OBJECT (object);
+  return intern (concord_genre_get_name (XCONCORD_OBJECT_GENRE (object)));
+}
+
 DEFUN ("concord-decode-object", Fconcord_decode_object, 2, 4, 0, /*
 Make and return a Concord-object from FEATURE and VALUE.
 Optional argument GENRE specifies the GENRE of the object.
@@ -1093,6 +1109,10 @@ syms_of_concord (void)
   defsymbol (&Qconcord_object, "concord-object");
   defsymbol (&Qgenre, "genre");
   defsymbol (&Q_id, "=id");
+#ifdef HAVE_LIBCHISE
+  defsymbol (&Qcharacter, "character");
+  defsymbol (&Qfeature, "feature");
+#endif
 
   DEFSUBR (Fconcord_open_ds);
   DEFSUBR (Fconcord_ds_p);
@@ -1107,6 +1127,7 @@ syms_of_concord (void)
   DEFSUBR (Fconcord_make_object);
   DEFSUBR (Fconcord_object_p);
   DEFSUBR (Fconcord_object_id);
+  DEFSUBR (Fconcord_object_genre);
   DEFSUBR (Fconcord_decode_object);
   DEFSUBR (Fconcord_object_get);
   DEFSUBR (Fconcord_object_put);
@@ -1145,3 +1166,14 @@ vars_of_concord (void)
   Vconcord_genre_object_hash_table
     = make_lisp_hash_table (16, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
 }
+
+void
+complex_vars_of_concord (void)
+{
+#ifdef HAVE_LIBCHISE
+  Lisp_Object dir = build_string(chise_system_db_dir);
+
+  Fconcord_assign_genre (Qcharacter, dir);
+  Fconcord_assign_genre (Qfeature, dir);
+#endif
+}

diff --git a/src/emacs.c b/src/emacs.c
index e4335cb..4011db7 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -3,7 +3,7 @@
    Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
    Copyright (C) 2000, 2002 Ben Wing.
-   Copyright (C) 2000,2002,2005,2006 MORIOKA Tomohiko.
+   Copyright (C) 2000,2002,2005,2006,2010 MORIOKA Tomohiko.
 
 This file is part of XEmacs.
 
@@ -2187,6 +2187,11 @@ main_1 (int argc, char **argv, char **envp, int restart)
       /* Calls make_lisp_hash_table() and creates a keymap */
       complex_vars_of_event_stream ();
 
+      /* This initializes data-sources of built-in genres */
+#ifdef HAVE_CONCORD
+      complex_vars_of_concord ();
+#endif
+
 #ifdef ERROR_CHECK_GC
       {
        extern int always_gc;

diff --git a/src/symsinit.h b/src/symsinit.h
index 4c5a2ca..074a598 100644 (file)
--- a/src/symsinit.h
+++ b/src/symsinit.h
@@ -428,6 +428,7 @@ void complex_vars_of_minibuf (void);
 void reinit_complex_vars_of_minibuf (void);
 void complex_vars_of_callproc (void);
 void complex_vars_of_keymap (void);
+void complex_vars_of_concord (void);
 
 /* Reset the Lisp engine (run-time only). */