Sync with r21-2-44-utf-2000-m0_18-mh-r009.

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index de357b6..3d7bc6d 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,62 @@
+2003-05-16  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * Ideograph-R114-Track.el (U-00020398): Use
+       ideographic-{radical|strokes}@{ucs|cns} and
+       `ideographic-radical@{ucs|cns}*sources' instead of `ideographic-'.
+
+       * Ideograph-R009-Man.el: Add some missing mappings to Daikanwa's
+       HO numbers.
+       (U-00020398): Use ideographic-{radical|strokes}@{ucs|cns} and
+       `ideographic-radical@{ucs|cns}*sources' instead of `ideographic-'.
+
+2003-05-15  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+       * Ideograph-R070-Square.el (M-13627): New character.
+       (U+3AC4): Relate to M-13627.
+
+2003-05-15  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+       * Ideograph-R006-Hook.el (MH-0006): New character.
+       (U+4E8A): Unify MH-0007.
+
+       * Ideograph-R005-Second.el (U-000200CC): Unify GT-00301 and
+       MH-0006.
+
+2003-05-15  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * char-db-util.el (insert-char-attributes): Add settings for
+       `ideographic-{radicals|strokes}@{ucs|daikanwa|cns}' and
+       `ideographic-radicals@{ucs|daikanwa|cns}*sources'.
+
+       * Ideograph-R017-Open-Box.el (M-01822): Add
+       `ideographic-structure'.
+       (U+342B): Relate to MH-0008 instead of M-01822; moved to
+       Ideograph-R008-Lid.el.
+
+       * Ideograph-R008-Lid.el (BC-8C5E): Unify MH-0008.
+       (U+342B): Relate to MH-0008.
+
+       * ideograph-util.el (char-ideographic-radical): Support
+       `ideographic-radical@{ucs|daikanwa|cns}'.
+       (char-ideographic-strokes): Support
+       `ideographic-strokes@{ucs|daikanwa|cns}'.
+       (update-ideograph-radical-table): Search
+       `ideographic-radical@{ucs|daikanwa|cns}'.
+
+2003-05-14  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * Ideograph-R004-Slash.el (U-000200C0): Unify MH-0005.
+
+2003-05-13  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+       * Ideograph-R001-One.el (GT-00081): Unify MH-0002; map to
+       U-00020030.
+       (U-00020030): Relate to MH-0002.
+       (GT-00088): Unify MH-0003.
+       (U-0002003C): Map to MH-0003.
+       (U-00020050): Unify MH-0004.
+       (GT-00096): Map to U-00020050 and MH-0004.
+
 2003-05-12  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * Ideograph-R212-Dragon.el, Ideograph-R213-Turtle.el,

diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el
index ac09aa7..2aa5570 100644 (file)
--- a/lisp/utf-2000/Ideograph-R001-One.el
+++ b/lisp/utf-2000/Ideograph-R001-One.el
@@ -1963,25 +1963,27 @@
     (=gt               . 00145)        ; ������
     ))
 (define-char
-  '((ideographic-radical . 1)  ; ⼀
+  '((=>ucs             . #x20030)      ; 𠀰
+    (morohashi-daikanwa        ho 2)
+    (ideographic-radical . 1)  ; ⼀
     (ideographic-strokes . 7)
     (total-strokes      . 8)
-    (hanyu-dazidian    1 22 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
       )
-     ((=big5-cdp         . #x8A65)     ; ������
+     ((=ucs              . #x4E0D)     ; 不
       )
-     ((=big5-cdp         . #x8CC6)     ; ������
+     ((=jis-x0208        . #x3E2F)     ; �����
+      (=ks-x1001         . #x6134)     ; �����
+      (=daikanwa         . 07475)      ; �����
       ))
-    (=gb2312           . #x4925)       ; �����
-    (=iso-ir165                . #x4925)       ; �����
-    (=hanziku-1                . #xA8AE)       ; ������
-    (=ucs              . #x4E27)       ; 丧
+    (=gt-pj-11         . #x4349)       ; ������
+    (=gt               . 00081)        ; ������
     ))
 (define-char
-  '((ideographic-radical . 1)  ; ⼀
+  '((morohashi-daikanwa        ho 2 0)
+    (ideographic-radical . 1)  ; ⼀
     (ideographic-strokes . 7)
     (total-strokes      . 8)
     (hanyu-dazidian    1 24 6)
@@ -2000,6 +2002,24 @@
   '((ideographic-radical . 1)  ; ⼀
     (ideographic-strokes . 7)
     (total-strokes      . 8)
+    (hanyu-dazidian    1 22 1)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=big5-cdp         . #x8A65)     ; ������
+      )
+     ((=big5-cdp         . #x8CC6)     ; ������
+      ))
+    (=gb2312           . #x4925)       ; �����
+    (=iso-ir165                . #x4925)       ; �����
+    (=hanziku-1                . #xA8AE)       ; ������
+    (=ucs              . #x4E27)       ; 丧
+    ))
+(define-char
+  '((ideographic-radical . 1)  ; ⼀
+    (ideographic-strokes . 7)
+    (total-strokes      . 8)
     (hanyu-dazidian    1 25 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -2030,13 +2050,6 @@
   '((ideographic-radical . 1)  ; ⼀
     (ideographic-strokes . 7)
     (total-strokes      . 8)
-    (=gt-pj-11         . #x4349)       ; ������
-    (=gt               . 00081)        ; ������
-    ))
-(define-char
-  '((ideographic-radical . 1)  ; ⼀
-    (ideographic-strokes . 7)
-    (total-strokes      . 8)
     (hanyu-dazidian    1 24 5)
     (=big5-cdp         . #x8CB7)       ; ������
     ))
@@ -2049,6 +2062,42 @@
     (=gt               . 00090)        ; ������
     ))
 (define-char
+  '((=>ucs             . #x2003C)      ; 𠀼
+    (morohashi-daikanwa        ho 3)
+    (ideographic-radical . 1)  ; ⼀
+    (ideographic-strokes . 8)
+    (total-strokes      . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=ucs              . #x268FB)    ; 𦣻
+      )
+     ((=jis-x0208        . #x5029)     ; �����
+      (=ks-x1001         . #x6751)     ; �����
+      (=daikanwa         . 00111)      ; �����
+      ))
+    (=gt-pj-11         . #x4358)       ; ������
+    (=gt               . 00088)        ; ������
+    ))
+(define-char
+  '((morohashi-daikanwa        ho 3 0)
+    (ideographic-radical . 1)  ; ⼀
+    (ideographic-strokes . 8)
+    (total-strokes      . 9)
+    (hanyu-dazidian    1 25 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=ucs              . #x268FB)    ; 𦣻
+      )
+     ((=ucs              . #x4E42)     ; 乂
+      ))
+    (=hanziku-1                . #xA958)       ; ������
+    (=ucs              . #x2003C)      ; 𠀼
+    ))
+(define-char
   '((ideographic-radical . 1)  ; ⼀
     (ideographic-strokes . 8)
     (total-strokes      . 9)
@@ -2145,40 +2194,6 @@
     ))
 (define-char
   '((ideographic-radical . 1)  ; ⼀
-    (ideographic-strokes . 8)
-    (total-strokes      . 9)
-    (hanyu-dazidian    1 25 10)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs              . #x2FF1)     ; ⿱
-      )
-     ((=ucs              . #x268FB)    ; 𦣻
-      )
-     ((=ucs              . #x4E42)     ; 乂
-      ))
-    (=hanziku-1                . #xA958)       ; ������
-    (=ucs              . #x2003C)      ; 𠀼
-    ))
-(define-char
-  '((=>ucs             . #x2003C)      ; 𠀼
-    (ideographic-radical . 1)  ; ⼀
-    (ideographic-strokes . 8)
-    (total-strokes      . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs              . #x2FF1)     ; ⿱
-      )
-     ((=ucs              . #x268FB)    ; 𦣻
-      )
-     ((=jis-x0208        . #x5029)     ; �����
-      (=ks-x1001         . #x6751)     ; �����
-      (=daikanwa         . 00111)      ; �����
-      ))
-    (=gt-pj-11         . #x4358)       ; ������
-    (=gt               . 00088)        ; ������
-    ))
-(define-char
-  '((ideographic-radical . 1)  ; ⼀
     (ideographic-strokes . 9)
     (total-strokes      . 10)
     (hanyu-dazidian    1 262 17)
@@ -2346,6 +2361,24 @@
     (=ucs              . #x2004A)      ; 𠁊
     ))
 (define-char
+  '((morohashi-daikanwa        ho 4)
+    (ideographic-radical . 1)  ; ⼀
+    (ideographic-strokes . 13)
+    (total-strokes      . 14)
+    (hanyu-dazidian    8 7 8)
+    (=hanziku-12       . #xEB47)       ; ������
+    (=ucs              . #x20050)      ; 𠁐
+    ))
+(define-char
+  '((=>ucs             . #x20050)      ; 𠁐
+    (morohashi-daikanwa        ho 4 0)
+    (ideographic-radical . 1)  ; ⼀
+    (ideographic-strokes . 13)
+    (total-strokes      . 14)
+    (=gt-pj-11         . #x454C)       ; ������
+    (=gt               . 00096)        ; ������
+    ))
+(define-char
   '((ideographic-radical . 1)  ; ⼀
     (ideographic-strokes . 13)
     (total-strokes      . 14)
@@ -2364,21 +2397,6 @@
     (=ucs              . #x2004F)      ; 𠁏
     ))
 (define-char
-  '((ideographic-radical . 1)  ; ⼀
-    (ideographic-strokes . 13)
-    (total-strokes      . 14)
-    (hanyu-dazidian    8 7 8)
-    (=hanziku-12       . #xEB47)       ; ������
-    (=ucs              . #x20050)      ; 𠁐
-    ))
-(define-char
-  '((ideographic-radical . 1)  ; ⼀
-    (ideographic-strokes . 13)
-    (total-strokes      . 14)
-    (=gt-pj-11         . #x454C)       ; ������
-    (=gt               . 00096)        ; ������
-    ))
-(define-char
   '((=>ucs             . #x20055)      ; 𠁕
     (ideographic-radical . 1)  ; ⼀
     (ideographic-strokes . 15)

diff --git a/lisp/utf-2000/Ideograph-R004-Slash.el b/lisp/utf-2000/Ideograph-R004-Slash.el
index a2a7f7c..e44aa2a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R004-Slash.el
+++ b/lisp/utf-2000/Ideograph-R004-Slash.el
@@ -1629,7 +1629,8 @@
     (=ucs              . #x20B61)      ; 𠭡
     ))
 (define-char
-  '((ideographic-radical . 4)  ; ⼃
+  '((morohashi-daikanwa        ho 5)
+    (ideographic-radical . 4)  ; ⼃
     (ideographic-strokes . 10)
     (total-strokes      . 11)
     (hanyu-dazidian    1 41 7)

diff --git a/lisp/utf-2000/Ideograph-R005-Second.el b/lisp/utf-2000/Ideograph-R005-Second.el
index 193da69..208c352 100644 (file)
--- a/lisp/utf-2000/Ideograph-R005-Second.el
+++ b/lisp/utf-2000/Ideograph-R005-Second.el
@@ -82,6 +82,22 @@
     (=big5-cdp         . #x8AAC)       ; ������
     ))
 (define-char
+  '((morohashi-daikanwa        ho 6)
+    (ideographic-radical@ucs . 5)      ; ⼄
+    (ideographic-strokes@ucs . 0)
+    (ideographic-radical@daikanwa . 6) ; ⼅
+    (ideographic-strokes@daikanwa . 0)
+    (ideographic-radical@daikanwa*sources
+     daikanwa gt)
+    (total-strokes      . 1)
+    (hanyu-dazidian    1 48 2)
+    (=gt-pj-11         . #x4329)       ; ������
+    (=big5-cdp         . #x8B61)       ; ������
+    (=gt-k             . 00023)        ; ������
+    (=gt               . 00301)        ; ������
+    (=ucs              . #x200CC)      ; 𠃌
+    ))
+(define-char
   '((ideographic-radical . 5)  ; ⼄
     (ideographic-strokes . 0)
     (total-strokes      . 1)
@@ -109,16 +125,6 @@
     ))
 (define-char
   '((ideographic-radical . 5)  ; ⼄
-    (ideographic-strokes . 0)
-    (total-strokes      . 1)
-    (hanyu-dazidian    1 48 2)
-    (=gt-pj-11         . #x4329)       ; 𠃌
-    (=big5-cdp         . #x8B61)       ; ������
-    (=gt-k             . 00023)        ; ������
-    (=ucs              . #x200CC)      ; 𠃌
-    ))
-(define-char
-  '((ideographic-radical . 5)  ; ⼄
     (ideographic-strokes . 1)
     (total-strokes      . 2)
     (hanyu-dazidian    1 49 9)

diff --git a/lisp/utf-2000/Ideograph-R006-Hook.el b/lisp/utf-2000/Ideograph-R006-Hook.el
index 9a0fd9c..5cc1f39 100644 (file)
--- a/lisp/utf-2000/Ideograph-R006-Hook.el
+++ b/lisp/utf-2000/Ideograph-R006-Hook.el
@@ -23,6 +23,22 @@
     (=ucs              . #x2010C)      ; 𠄌
     ))
 (define-char
+  '((morohashi-daikanwa        ho 6)
+    (ideographic-radical@ucs . 5)      ; ⼄
+    (ideographic-strokes@ucs . 0)
+    (ideographic-radical@daikanwa . 6) ; ⼅
+    (ideographic-strokes@daikanwa . 0)
+    (ideographic-radical@daikanwa*sources
+     daikanwa gt)
+    (total-strokes      . 1)
+    (hanyu-dazidian    1 48 2)
+    (=gt-pj-11         . #x4329)       ; ������
+    (=big5-cdp         . #x8B61)       ; ������
+    (=gt-k             . 00023)        ; ������
+    (=gt               . 00301)        ; ������
+    (=ucs              . #x200CC)      ; 𠃌
+    ))
+(define-char
   '((ideographic-radical . 6)  ; ⼅
     (ideographic-strokes . 1)
     (total-strokes      . 2)
@@ -318,7 +334,8 @@
     (=ucs              . #x20029)      ; 𠀩
     ))
 (define-char
-  '((ideographic-radical . 6)  ; ⼅
+  '((morohashi-daikanwa        ho 7)
+    (ideographic-radical . 6)  ; ⼅
     (ideographic-strokes . 6)
     (total-strokes      . 7)
     (<-vulgar-ideograph

diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el
index f3ffd77..8e6866d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R008-Lid.el
+++ b/lisp/utf-2000/Ideograph-R008-Lid.el
@@ -410,10 +410,10 @@
     ))
 (define-char
   '((=>ucs             . #x342B)       ; 㐫
+    (morohashi-daikanwa        ho 8)
     (ideographic-radical . 8)  ; ⼇
     (ideographic-strokes . 4)
     (total-strokes      . 6)
-    (hanyu-dazidian    1 283 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs              . #x2FF1)     ; ⿱
@@ -427,6 +427,23 @@
     (=jef-china3       . #x8DCD)       ; �����
     ))
 (define-char
+  '((morohashi-daikanwa        ho 8 0)
+    (ideographic-radical . 8)  ; ⼇
+    (ideographic-strokes . 4)
+    (total-strokes      . 6)
+    (hanyu-dazidian    1 283 2)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=ucs              . #x4EA0)     ; 亠
+      )
+     ((=ucs              . #x51F6)     ; 凶
+      ))
+    (=cns11643-3       . #x2323)       ; �����
+    (=ucs              . #x342B)       ; 㐫
+    ))
+(define-char
   '((ideographic-radical . 8)  ; ⼇
     (ideographic-strokes . 4)
     (total-strokes      . 6)

diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el
index decbc63..81eaefd 100644 (file)
--- a/lisp/utf-2000/Ideograph-R009-Man.el
+++ b/lisp/utf-2000/Ideograph-R009-Man.el
@@ -921,10 +921,8 @@
     (ideographic-strokes . 3)
     (total-strokes      . 5)
     (ideographic-structure
-     (:cdp-combinator  1
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-                (=ucs               . #x2FF0)  ; ⿰
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
       )
      ((name              . "CJK RADICAL PERSON")
       (=ucs              . #x2E85)     ; ⺅
@@ -1624,6 +1622,51 @@
     (=ucs              . #x201AD)      ; 𠆭
     ))
 (define-char
+  '((morohashi-daikanwa        ho 9)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 3)
+    (total-strokes      . 5)
+    (=gt-pj-9          . #x4B2B)       ; ������
+    (=gt               . 00487)        ; ������
+    ))
+(define-char
+  '((=>ucs             . #x4EED)       ; 仭
+    (morohashi-daikanwa        ho 10)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 3)
+    (total-strokes      . 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=jis-x0208        . #x5163)     ; �����
+      (=daikanwa         . 01849)      ; �����
+      ))
+    (shinjigen-1       . 136)
+    (shinjigen-2       . 136)
+    (=jis-x0208                . #x5041)       ; �����
+    (=gt-pj-1          . #x5041)       ; ������
+    (=ucs@jis          . #x4EED)       ; �����
+    (=gt               . 00506)        ; ������
+    ))
+(define-char
+  '((morohashi-daikanwa        ho 10 0)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 3)
+    (total-strokes      . 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=ucs              . #x5204)     ; 刄
+      ))
+    (=ucs              . #x4EED)       ; 仭
+    ))
+(define-char
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 3)
     (total-strokes      . 5)
@@ -1699,25 +1742,6 @@
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 3)
     (total-strokes      . 5)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs              . #x2FF0)     ; ⿰
-      )
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((=jis-x0208        . #x5163)     ; �����
-      (=daikanwa         . 01849)      ; �����
-      ))
-    (shinjigen-1       . 136)
-    (shinjigen-2       . 136)
-    (=jis-x0208                . #x5041)       ; �����
-    (=gt-pj-1          . #x5041)       ; 仭
-    (=ucs              . #x4EED)       ; 仭
-    ))
-(define-char
-  '((ideographic-radical . 9)  ; ⼈
-    (ideographic-strokes . 3)
-    (total-strokes      . 5)
     (hanyu-dazidian    1 111 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -3539,6 +3563,42 @@
     (=ucs              . #x4F28)       ; 伨
     ))
 (define-char
+  '((morohashi-daikanwa        ho 12)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 4)
+    (total-strokes      . 6)
+    (hanyu-dazidian    8 8 13)
+    (=hanziku-12       . #xEB64)       ; ������
+    (=ucs              . #x201D3)      ; 𠇓
+    ))
+(define-char
+  '((=>ucs             . #x201D0)      ; 𠇐
+    (morohashi-daikanwa        ho 13)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 4)
+    (total-strokes      . 6)
+    (=gt-pj-11         . #x4331)       ; ������
+    (=gt               . 00598)        ; ������
+    ))
+(define-char
+  '((morohashi-daikanwa        ho 13 9)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 4)
+    (total-strokes      . 6)
+    (hanyu-dazidian    1 121 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=ucs              . #x4E0E)     ; 与
+      ))
+    (=cns11643-5       . #x2226)       ; �����
+    (=hanziku-1                . #xBCCD)       ; ������
+    (=ucs              . #x201D0)      ; 𠇐
+    ))
+(define-char
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 4)
     (total-strokes      . 6)
@@ -3858,23 +3918,6 @@
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 4)
     (total-strokes      . 6)
-    (hanyu-dazidian    1 121 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs              . #x2FF0)     ; ⿰
-      )
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((=ucs              . #x4E0E)     ; 与
-      ))
-    (=cns11643-5       . #x2226)       ; �����
-    (=hanziku-1                . #xBCCD)       ; ������
-    (=ucs              . #x201D0)      ; 𠇐
-    ))
-(define-char
-  '((ideographic-radical . 9)  ; ⼈
-    (ideographic-strokes . 4)
-    (total-strokes      . 6)
     (hanyu-dazidian    1 124 8)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -5934,6 +5977,23 @@
     (=ucs              . #x201F1)      ; 𠇱
     ))
 (define-char
+  '((morohashi-daikanwa        ho 14)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 5)
+    (total-strokes      . 7)
+    (hanyu-dazidian    1 134 2)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=ucs              . #x518B)     ; 冋
+      ))
+    (=hanziku-1                . #xBF72)       ; ������
+    (=ucs              . #x201F6)      ; 𠇶
+    ))
+(define-char
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 5)
     (total-strokes      . 7)
@@ -8420,6 +8480,59 @@
     (=ucs              . #x20222)      ; 𠈢
     ))
 (define-char
+  '((morohashi-daikanwa        ho 15)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 6)
+    (total-strokes      . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=ucs              . #x5C3D)     ; 尽
+      ))
+    (=jis-x0208-1978   . #x5056)       ; �����
+    (=jis-x0208-1983   . #x4B79)       ; �����
+    (=jis-x0208-1990   . #x4B79)       ; �����
+    (=gt-pj-1          . #x4B79)       ; 侭
+    (=ucs              . #x4FAD)       ; 侭
+    ))
+(define-char
+  '((=>ucs             . #x4FAB)       ; 侫
+    (morohashi-daikanwa        ho 16)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 6)
+    (total-strokes      . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=daikanwa         . 06063)      ; �����
+      ))
+    (=jis-x0208                . #x5525)       ; �����
+    (=gt-pj-1          . #x5525)       ; �����
+    (=cbeta            . 00126)        ; �����
+    (=ucs@jis          . #x4FAB)       ; �����
+    ))
+(define-char
+  '((morohashi-daikanwa        ho 16 1)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 6)
+    (total-strokes      . 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=ucs              . #x5984)     ; 妄
+      ))
+    (=ucs              . #x4FAB)       ; 侫
+    ))
+(define-char
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 6)
     (total-strokes      . 8)
@@ -8563,38 +8676,6 @@
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 6)
     (total-strokes      . 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs              . #x2FF0)     ; ⿰
-      )
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((=ucs              . #x5984)     ; 妄
-      ))
-    (=ucs              . #x4FAB)       ; 侫
-    ))
-(define-char
-  '((=>ucs             . #x4FAB)       ; 侫
-    (ideographic-radical . 9)  ; ⼈
-    (ideographic-strokes . 6)
-    (total-strokes      . 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs              . #x2FF0)     ; ⿰
-      )
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((=daikanwa         . 06063)      ; �����
-      ))
-    (=jis-x0208                . #x5525)       ; �����
-    (=gt-pj-1          . #x5525)       ; �����
-    (=cbeta            . 00126)        ; �����
-    (=ucs@jis          . #x4FAB)       ; �����
-    ))
-(define-char
-  '((ideographic-radical . 9)  ; ⼈
-    (ideographic-strokes . 6)
-    (total-strokes      . 8)
     (hanyu-dazidian    1 154 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -8620,24 +8701,6 @@
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 6)
     (total-strokes      . 8)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs              . #x2FF0)     ; ⿰
-      )
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((=ucs              . #x5C3D)     ; 尽
-      ))
-    (=jis-x0208-1978   . #x5056)       ; �����
-    (=jis-x0208-1983   . #x4B79)       ; �����
-    (=jis-x0208-1990   . #x4B79)       ; �����
-    (=gt-pj-1          . #x4B79)       ; 侭
-    (=ucs              . #x4FAD)       ; 侭
-    ))
-(define-char
-  '((ideographic-radical . 9)  ; ⼈
-    (ideographic-strokes . 6)
-    (total-strokes      . 8)
     (=cns11643-5       . #x2526)       ; �����
     (=ucs              . #x20215)      ; 𠈕
     ))
@@ -14445,62 +14508,147 @@
     (=ucs              . #x2028B)      ; 𠊋
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((=>ucs             . #x20294)      ; 𠊔
+    (morohashi-daikanwa        ho 17)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 8)
     (total-strokes      . 10)
-    (hanyu-dazidian    1 170 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-       (=ucs               . #x2FF1)   ; ⿱
-       )
-       ((=big5-cdp         . #x8B77)   ; ������
-       (=jef-china3        . #x72FD)   ; �����
-       )
-       ((=ucs              . #x8D1D)   ; 贝
-       ))
+     ((=jis-x0208        . #x3563)     ; �����
+      (=ks-x1001         . #x6B68)     ; �����
+      (=daikanwa         . 17309)      ; �����
       ))
-    (=gb2312           . #x552E)       ; �����
-    (=iso-ir165                . #x552E)       ; �����
-    (=hanziku-1                . #xC968)       ; ������
-    (=ucs              . #x503A)       ; 债
+    (=gt-pj-11         . #x4372)       ; ������
+    (=gt               . 00945)        ; ������
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((morohashi-daikanwa        ho 17 0)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 8)
     (total-strokes      . 10)
-    (hanyu-dazidian    1 171 8)
+    (hanyu-dazidian    1 184 2)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((=ucs              . #x76F4)     ; 直
+     ((=ucs              . #x6CE3)     ; 泣
       ))
-    (=gb2312           . #x5635)       ; �����
-    (=iso-ir165                . #x5635)       ; �����
-    (=cns11643-1       . #x542B)       ; �����
-    (=big5             . #xADC8)       ; ������
-    (=ucs              . #x503C)       ; 值
+    (=cns11643-5       . #x2B68)       ; �����
+    (=hanziku-1                . #xCC51)       ; ������
+    (=ucs              . #x20294)      ; 𠊔
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((=>ucs             . #x20293)      ; 𠊓
+    (morohashi-daikanwa        ho 18)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 8)
     (total-strokes      . 10)
-    (hanyu-dazidian    1 180 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
      ((=ucs              . #x4EBB)     ; 亻
       )
-     ((=ucs              . #x820D)     ; 舍
+     ((=daikanwa         . 13627)      ; �����
+      ))
+    (=gt-pj-11         . #x4373)       ; ������
+    (=gt               . 01039)        ; ������
+    ))
+(define-char
+  '((morohashi-daikanwa        ho 18 0)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 8)
+    (total-strokes      . 10)
+    (hanyu-dazidian    1 183 3)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+       (=ucs               . #x2FF1)   ; ⿱
+       )
+       ((=ucs              . #x4EA0)   ; 亠
+       )
+       ((ideographic-structure
+        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+         (=ucs               . #x2FF9) ; ⿹
+         )
+        ((=ucs               . #x52F9) ; 勹
+         )
+        ((=ucs               . #x65B9) ; 方
+         ))
+       ))
+      ))
+    (=hanziku-1                . #xCBF1)       ; ������
+    (=ucs              . #x20293)      ; 𠊓
+    ))
+(define-char
+  '((ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 8)
+    (total-strokes      . 10)
+    (hanyu-dazidian    1 170 2)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+       (=ucs               . #x2FF1)   ; ⿱
+       )
+       ((=big5-cdp         . #x8B77)   ; ������
+       (=jef-china3        . #x72FD)   ; �����
+       )
+       ((=ucs              . #x8D1D)   ; 贝
+       ))
+      ))
+    (=gb2312           . #x552E)       ; �����
+    (=iso-ir165                . #x552E)       ; �����
+    (=hanziku-1                . #xC968)       ; ������
+    (=ucs              . #x503A)       ; 债
+    ))
+(define-char
+  '((ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 8)
+    (total-strokes      . 10)
+    (hanyu-dazidian    1 171 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=ucs              . #x76F4)     ; 直
+      ))
+    (=gb2312           . #x5635)       ; �����
+    (=iso-ir165                . #x5635)       ; �����
+    (=cns11643-1       . #x542B)       ; �����
+    (=big5             . #xADC8)       ; ������
+    (=ucs              . #x503C)       ; 值
+    ))
+(define-char
+  '((ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 8)
+    (total-strokes      . 10)
+    (hanyu-dazidian    1 180 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=ucs              . #x820D)     ; 舍
       ))
     (=hanziku-1                . #xCB71)       ; ������
     (=ucs              . #x503D)       ; 倽
@@ -14550,23 +14698,6 @@
     (=ucs              . #x20276)      ; 𠉶
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
-    (ideographic-strokes . 8)
-    (total-strokes      . 10)
-    (hanyu-dazidian    1 184 2)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs              . #x2FF0)     ; ⿰
-      )
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((=ucs              . #x6CE3)     ; 泣
-      ))
-    (=cns11643-5       . #x2B68)       ; �����
-    (=hanziku-1                . #xCC51)       ; ������
-    (=ucs              . #x20294)      ; 𠊔
-    ))
-(define-char
   '((=>ucs             . #x3464)       ; 㑤
     (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 9)
@@ -17511,7 +17642,27 @@
     (=ucs              . #x202DD)      ; 𠋝
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((=>ucs             . #x503B)       ; 倻
+    (morohashi-daikanwa        ho 19)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 9)
+    (total-strokes      . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=cns11643-1       . #x5326)     ; �����
+      (=daikanwa         . 29008)      ; �����
+      ))
+    (=jis-x0212                . #x3176)       ; �����
+    (=jis-x0213-1-2000 . #x2E42)       ; �����
+    (=jef-china3       . #x93DE)       ; �����
+    ))
+(define-char
+  '((morohashi-daikanwa        ho 19 0)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 9)
     (total-strokes      . 10)
     (hanyu-dazidian    1 171 3)
@@ -17524,13 +17675,28 @@
      ((=ucs              . #x8036)     ; 耶
       ))
     (=ks-x1001         . #x6526)       ; �����
-    (=jis-x0212                . #x3176)       ; �����
-    (=jis-x0213-1-2000 . #x2E42)       ; �����
     (=hanziku-1                . #xC9AB)       ; ������
-    (=jef-china3       . #x93DE)       ; �����
     (=ucs              . #x503B)       ; 倻
     ))
 (define-char
+  '((morohashi-daikanwa        ho 20)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 9)
+    (total-strokes      . 11)
+    (hanyu-dazidian    1 188 1)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=ucs              . #x67EC)     ; 柬
+      ))
+    (=cns11643-5       . #x307A)       ; �����
+    (=hanziku-1                . #xCCF2)       ; ������
+    (=ucs              . #x202D6)      ; 𠋖
+    ))
+(define-char
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 9)
     (total-strokes      . 11)
@@ -17606,23 +17772,6 @@
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 9)
     (total-strokes      . 11)
-    (hanyu-dazidian    1 188 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs              . #x2FF0)     ; ⿰
-      )
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((=ucs              . #x67EC)     ; 柬
-      ))
-    (=cns11643-5       . #x307A)       ; �����
-    (=hanziku-1                . #xCCF2)       ; ������
-    (=ucs              . #x202D6)      ; 𠋖
-    ))
-(define-char
-  '((ideographic-radical . 9)  ; ⼈
-    (ideographic-strokes . 9)
-    (total-strokes      . 11)
     (hanyu-dazidian    1 189 3)
     (ideographic-structure
      (:cdp-combinator  4)
@@ -19908,10 +20057,11 @@
     (=ucs              . #x20309)      ; 𠌉
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((=>ucs             . #x347A)       ; 㑺
+    (morohashi-daikanwa        ho 21)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 10)
     (total-strokes      . 12)
-    (hanyu-dazidian    1 203 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
@@ -19922,20 +20072,20 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
        (=ucs               . #x2FF1)   ; ⿱
        )
-       ((=ucs              . #x96B9)   ; 隹
+       ((=daikanwa         . 41937)    ; �����
        )
        ((=ucs              . #x4E43)   ; 乃
        ))
       ))
-    (=cns11643-3       . #x3974)       ; �����
-    (=hanziku-1                . #xD044)       ; ������
-    (=ucs              . #x347A)       ; 㑺
+    (=cbeta            . 01842)        ; �����
+    (=jef-china3       . #x80BE)       ; �����
     ))
 (define-char
-  '((=>ucs             . #x347A)       ; 㑺
+  '((morohashi-daikanwa        ho 21 1)
     (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 10)
     (total-strokes      . 12)
+    (hanyu-dazidian    1 203 9)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
@@ -19946,13 +20096,14 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
        (=ucs               . #x2FF1)   ; ⿱
        )
-       ((=daikanwa         . 41937)    ; �����
+       ((=ucs              . #x96B9)   ; 隹
        )
        ((=ucs              . #x4E43)   ; 乃
        ))
       ))
-    (=cbeta            . 01842)        ; �����
-    (=jef-china3       . #x80BE)       ; �����
+    (=cns11643-3       . #x3974)       ; �����
+    (=hanziku-1                . #xD044)       ; ������
+    (=ucs              . #x347A)       ; 㑺
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
@@ -24633,7 +24784,8 @@
     (=daikanwa         . 48923)        ; �����
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((morohashi-daikanwa        ho 22)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 12)
     (total-strokes      . 14)
     (ideographic-structure
@@ -24656,6 +24808,7 @@
     ))
 (define-char
   '((=>ucs             . #x50F2)       ; 僲
+    (morohashi-daikanwa        ho 22 0)
     (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 12)
     (total-strokes      . 14)
@@ -24678,6 +24831,15 @@
     (=hanziku-12       . #xEB6D)       ; ������
     ))
 (define-char
+  '((morohashi-daikanwa        ho 23)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 12)
+    (total-strokes      . 14)
+    (hanyu-dazidian    8 9 2)
+    (=hanziku-12       . #xEB6F)       ; ������
+    (=ucs              . #x203A4)      ; 𠎤
+    ))
+(define-char
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 12)
     (total-strokes      . 14)
@@ -26469,12 +26631,14 @@
     ))
 (define-char
   '((morohashi-daikanwa        24898 0 2)
-    (ideographic-      (:radical       114 ; ⽱
-                        :strokes       10
-                        :sources       (morohashi-daikanwa cns-11643))
-                       (:radical       9 ; ⼈
-                        :strokes       13
-                        :sources       (ucs)))
+    (ideographic-radical@ucs . 9)      ; ⼈
+    (ideographic-strokes@ucs . 13)
+    (ideographic-radical@ucs*sources
+     ucs)
+    (ideographic-radical@cns . 114)    ; ⽱
+    (ideographic-strokes@cns . 10)
+    (ideographic-radical@cns*sources
+     daikanwa cns-11643)
     (total-strokes      . 15)
     (hanyu-dazidian    1 215 14)
     (ideographic-structure
@@ -26490,6 +26654,23 @@
     (=ucs              . #x20398)      ; 𠎘
     ))
 (define-char
+  '((morohashi-daikanwa        ho 24)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 13)
+    (total-strokes      . 15)
+    (hanyu-dazidian    1 226 1)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=ucs              . #x9F20)     ; 鼠
+      ))
+    (=hanziku-1                . #xD4CA)       ; ������
+    (=ucs              . #x203D9)      ; 𠏙
+    ))
+(define-char
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 13)
     (total-strokes      . 15)
@@ -27478,6 +27659,63 @@
     (=ucs              . #x511E)       ; 儞
     ))
 (define-char
+  '((=>ucs             . #x20400)      ; 𠐀
+    (morohashi-daikanwa        ho 25)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 14)
+    (total-strokes      . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=daikanwa         . 16166)      ; �����
+      ))
+    (=gt-pj-11         . #x4638)       ; ������
+    (=gt               . 01566)        ; ������
+    ))
+(define-char
+  '((=>ucs             . #x20400)      ; 𠐀
+    (morohashi-daikanwa        ho 25 0)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 14)
+    (total-strokes      . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=cns11643-2       . #x4B2D)     ; �����
+      ))
+    (=cns11643-5       . #x535B)       ; �����
+    ))
+(define-char
+  '((=>ucs             . #x20400)      ; 𠐀
+    (morohashi-daikanwa        ho 25 1)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 14)
+    (total-strokes      . 16)
+    (hanyu-dazidian    1 231 7)
+    (=hanziku-1                . #xD5D3)       ; ������
+    ))
+(define-char
+  '((morohashi-daikanwa        ho 25 2)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 14)
+    (total-strokes      . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=ucs              . #x6B4B)     ; 歋
+      ))
+    (=ucs              . #x20400)      ; 𠐀
+    ))
+(define-char
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 14)
     (total-strokes      . 16)
@@ -27527,23 +27765,6 @@
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
-    (ideographic-strokes . 14)
-    (total-strokes      . 16)
-    (hanyu-dazidian    1 231 7)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs              . #x2FF0)     ; ⿰
-      )
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((=ucs              . #x6B4B)     ; 歋
-      ))
-    (=cns11643-5       . #x535B)       ; �����
-    (=hanziku-1                . #xD5D3)       ; ������
-    (=ucs              . #x20400)      ; 𠐀
-    ))
-(define-char
-  '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 15)
     (total-strokes      . 17)
     (=daikanwa         . 01053)        ; �����
@@ -28307,10 +28528,10 @@
     (=ucs              . #x20422)      ; 𠐢
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((morohashi-daikanwa        ho 26)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 15)
     (total-strokes      . 17)
-    (hanyu-dazidian    1 231 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
@@ -28318,43 +28539,38 @@
      ((=ucs              . #x4EBB)     ; 亻
       )
      ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-       (=ucs               . #x2FF1)   ; ⿱
-       )
-       ((=big5-cdp         . #x887B)   ; ������
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+       (=ucs               . #x2FF3)   ; ⿳
        )
-       ((=ucs              . #x826E)   ; 艮
-       ))
-      ))
-    (=hanziku-1                . #xD5D1)       ; ������
-    (=ucs              . #x203FE)      ; 𠏾
-    ))
-(define-char
-  '((ideographic-radical . 9)  ; ⼈
-    (ideographic-strokes . 15)
-    (total-strokes      . 17)
-    (hanyu-dazidian    1 235 14)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs              . #x2FF0)     ; ⿰
-      )
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-       (=ucs               . #x2FF1)   ; ⿱
+       ((ideographic-structure
+        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+         (=ucs               . #x2FF1) ; ⿱
+         )
+        ((=ucs               . #x5341) ; 十
+         )
+        ((=ucs               . #x5196) ; 冖
+         ))
        )
-       ((=jis-x0208        . #x555F)   ; �����
-       (=daikanwa          . 07054)    ; �����
+       ((=ucs              . #x7530)   ; 田
        )
-       ((=ucs              . #x767B)   ; 登
+       ((ideographic-structure
+        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+         (=ucs               . #x2FF1) ; ⿱
+         )
+        ((=ucs               . #x53B6) ; 厶
+         )
+        ((=big5-cdp          . #x8B68) ; ������
+         ))
        ))
       ))
-    (=hanziku-1                . #xD6BD)       ; ������
-    (=ucs              . #x2040F)      ; 𠐏
+    (=gt-pj-11         . #x4663)       ; ������
+    (=gt               . 01626)        ; ������
+    (=ucs              . #x20411)      ; 𠐑
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((=>ucs             . #x20411)      ; 𠐑
+    (morohashi-daikanwa        ho 26 9)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 15)
     (total-strokes      . 17)
     (hanyu-dazidian    1 230 4)
@@ -28390,26 +28606,45 @@
        ))
       ))
     (=hanziku-1                . #xD5B0)       ; ������
-    (=ucs              . #x20411)      ; 𠐑
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((=>ucs             . #x2041C)      ; 𠐜
+    (morohashi-daikanwa        ho 27)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 15)
     (total-strokes      . 17)
-    (hanyu-dazidian    1 232 11)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs              . #x2FF1)     ; ⿱
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
       )
-     ((=ucs              . #x4FDE)     ; 俞
+     ((=ucs              . #x4EBB)     ; 亻
       )
-     ((=ucs              . #x6797)     ; 林
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+       (=ucs               . #x2FF1)   ; ⿱
+       )
+       ((=jis-x0208        . #x5035)   ; �����
+       (=big5-cdp          . #x8B42)   ; ������
+       (=gt-k              . 00073)    ; ������
+       )
+       ((ideographic-structure
+        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+         (=ucs               . #x2FF1) ; ⿱
+         )
+        ((=ucs               . #x5171) ; 共
+         )
+        ((=jis-x0208         . #x3840) ; �����
+         (=ks-x1001          . #x656B) ; �����
+         (=daikanwa          . 35205)  ; �����
+         ))
+       ))
       ))
-    (=hanziku-1                . #xD5F7)       ; ������
-    (=ucs              . #x20419)      ; 𠐙
+    (=gt-pj-11         . #x4664)       ; ������
+    (=gt               . 01645)        ; ������
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((morohashi-daikanwa        ho 27 0)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 15)
     (total-strokes      . 17)
     (hanyu-dazidian    1 235 10)
@@ -28442,6 +28677,69 @@
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 15)
     (total-strokes      . 17)
+    (hanyu-dazidian    1 231 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+       (=ucs               . #x2FF1)   ; ⿱
+       )
+       ((=big5-cdp         . #x887B)   ; ������
+       )
+       ((=ucs              . #x826E)   ; 艮
+       ))
+      ))
+    (=hanziku-1                . #xD5D1)       ; ������
+    (=ucs              . #x203FE)      ; 𠏾
+    ))
+(define-char
+  '((ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 15)
+    (total-strokes      . 17)
+    (hanyu-dazidian    1 235 14)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+       (=ucs               . #x2FF1)   ; ⿱
+       )
+       ((=jis-x0208        . #x555F)   ; �����
+       (=daikanwa          . 07054)    ; �����
+       )
+       ((=ucs              . #x767B)   ; 登
+       ))
+      ))
+    (=hanziku-1                . #xD6BD)       ; ������
+    (=ucs              . #x2040F)      ; 𠐏
+    ))
+(define-char
+  '((ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 15)
+    (total-strokes      . 17)
+    (hanyu-dazidian    1 232 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs              . #x2FF1)     ; ⿱
+      )
+     ((=ucs              . #x4FDE)     ; 俞
+      )
+     ((=ucs              . #x6797)     ; 林
+      ))
+    (=hanziku-1                . #xD5F7)       ; ������
+    (=ucs              . #x20419)      ; 𠐙
+    ))
+(define-char
+  '((ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 15)
+    (total-strokes      . 17)
     (hanyu-dazidian    1 235 13)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -29049,7 +29347,26 @@
     (=ucs              . #x20431)      ; 𠐱
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((=>ucs             . #x20429)      ; 𠐩
+    (morohashi-daikanwa        ho 28)
+    (ideographic-radical . 9)  ; ⼈
+    (ideographic-strokes . 16)
+    (total-strokes      . 18)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
+      )
+     ((=ucs              . #x4EBB)     ; 亻
+      )
+     ((=jis-x0208        . #x6F65)     ; �����
+      (=ks-x1001         . #x6722)     ; �����
+      ))
+    (=gt-pj-11         . #x4734)       ; ������
+    (=gt               . 01659)        ; ������
+    ))
+(define-char
+  '((morohashi-daikanwa        ho 28 0)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 16)
     (total-strokes      . 18)
     (hanyu-dazidian    1 235 15)
@@ -29065,7 +29382,8 @@
     (=ucs              . #x20429)      ; 𠐩
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((morohashi-daikanwa        ho 29)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 16)
     (total-strokes      . 18)
     (hanyu-dazidian    1 236 5)
@@ -29456,7 +29774,8 @@
     (=ucs              . #x20442)      ; 𠑂
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((morohashi-daikanwa        ho 30)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 17)
     (total-strokes      . 19)
     (hanyu-dazidian    1 237 6)
@@ -29670,23 +29989,34 @@
     (=ucs              . #x2045B)      ; 𠑛
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((=>ucs             . #x20451)      ; 𠑑
+    (morohashi-daikanwa        ho 31)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 18)
     (total-strokes      . 20)
-    (hanyu-dazidian    1 238 6)
+    (hanyu-dazidian    1 238 14)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
-     ((=ucs              . #x5009)     ; 倉
+     ((=ucs              . #x4EBB)     ; 亻
       )
-     ((=ucs              . #x5009)     ; 倉
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
+       (=ucs               . #x2FF5)   ; ⿵
+       )
+       ((=ucs              . #x9580)   ; 門
+       )
+       ((=daikanwa         . 30184)    ; �����
+       ))
       ))
-    (=hanziku-1                . #xD756)       ; ������
-    (=ucs              . #x20450)      ; 𠑐
+    (=gt-pj-11         . #x476D)       ; ������
+    (=hanziku-1                . #xD75E)       ; ������
+    (=gt               . 01687)        ; ������
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((morohashi-daikanwa        ho 31 2)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 18)
     (total-strokes      . 20)
     (ideographic-structure
@@ -29708,27 +30038,20 @@
     (=ucs              . #x20451)      ; 𠑑
     ))
 (define-char
-  '((=>ucs             . #x20451)      ; 𠑑
-    (ideographic-radical . 9)  ; ⼈
+  '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 18)
     (total-strokes      . 20)
-    (hanyu-dazidian    1 238 14)
+    (hanyu-dazidian    1 238 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs              . #x2FF0)     ; ⿰
       )
-     ((=ucs              . #x4EBB)     ; 亻
+     ((=ucs              . #x5009)     ; 倉
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE")
-       (=ucs               . #x2FF5)   ; ⿵
-       )
-       ((=ucs              . #x9580)   ; 門
-       )
-       ((=daikanwa         . 30184)    ; �����
-       ))
+     ((=ucs              . #x5009)     ; 倉
       ))
-    (=hanziku-1                . #xD75E)       ; ������
+    (=hanziku-1                . #xD756)       ; ������
+    (=ucs              . #x20450)      ; 𠑐
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
@@ -30568,54 +30891,57 @@
     (=ucs              . #x20472)      ; 𠑲
     ))
 (define-char
-  '((ideographic-radical . 9)  ; ⼈
+  '((morohashi-daikanwa        ho 32)
+    (ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 27)
     (total-strokes      . 29)
-    (hanyu-dazidian    1 241 1)
+    (hanyu-dazidian    1 241 2)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs              . #x2FF3)     ; ⿳
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs              . #x2FF0)     ; ⿰
       )
-     ((=ucs              . #x5408)     ; 合
+     ((=ucs              . #x4EBB)     ; 亻
       )
      ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-       (=ucs               . #x2FF0)   ; ⿰
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+       (=ucs               . #x2FF3)   ; ⿳
        )
-       ((=ucs              . #x866B)   ; 虫
+       ((=big5-cdp         . #x8BD5)   ; ������
        )
-       ((=ucs              . #x866B)   ; 虫
+       ((=ucs              . #x57DF)   ; 域
+       )
+       ((=ucs              . #x54F2)   ; 哲
        ))
-      )
-     ((=ucs              . #x6E05)     ; 清
       ))
-    (=hanziku-1                . #xD7D3)       ; ������
-    (=ucs              . #x20474)      ; 𠑴
+    (=gt-pj-11         . #x4869)       ; ������
+    (=hanziku-1                . #xD7D4)       ; ������
+    (=gt               . 01730)        ; ������
+    (=ucs              . #x20475)      ; 𠑵
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
     (ideographic-strokes . 27)
     (total-strokes      . 29)
-    (hanyu-dazidian    1 241 2)
+    (hanyu-dazidian    1 241 1)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs              . #x2FF0)     ; ⿰
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs              . #x2FF3)     ; ⿳
       )
-     ((=ucs              . #x4EBB)     ; 亻
+     ((=ucs              . #x5408)     ; 合
       )
      ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-       (=ucs               . #x2FF3)   ; ⿳
-       )
-       ((=big5-cdp         . #x8BD5)   ; ������
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+       (=ucs               . #x2FF0)   ; ⿰
        )
-       ((=ucs              . #x57DF)   ; 域
+       ((=ucs              . #x866B)   ; 虫
        )
-       ((=ucs              . #x54F2)   ; 哲
+       ((=ucs              . #x866B)   ; 虫
        ))
+      )
+     ((=ucs              . #x6E05)     ; 清
       ))
-    (=hanziku-1                . #xD7D4)       ; ������
-    (=ucs              . #x20475)      ; 𠑵
+    (=hanziku-1                . #xD7D3)       ; ������
+    (=ucs              . #x20474)      ; 𠑴
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
@@ -30640,12 +30966,6 @@
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
-    (hanyu-dazidian    8 8 13)
-    (=hanziku-12       . #xEB64)       ; ������
-    (=ucs              . #x201D3)      ; 𠇓
-    ))
-(define-char
-  '((ideographic-radical . 9)  ; ⼈
     (hanyu-dazidian    1 136 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -30749,20 +31069,6 @@
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
-    (hanyu-dazidian    1 134 2)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs              . #x2FF0)     ; ⿰
-      )
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((=ucs              . #x518B)     ; 冋
-      ))
-    (=hanziku-1                . #xBF72)       ; ������
-    (=ucs              . #x201F6)      ; 𠇶
-    ))
-(define-char
-  '((ideographic-radical . 9)  ; ⼈
     (hanyu-dazidian    1 134 4)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -31054,22 +31360,6 @@
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
-    (hanyu-dazidian    1 183 3)
-    (ideographic-structure
-     (:cdp-combinator  4)
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((=jis-x0208        . #x5035)     ; �����
-      )
-     ((=ucs              . #x52F9)     ; 勹
-      )
-     ((=ucs              . #x65B9)     ; 方
-      ))
-    (=hanziku-1                . #xCBF1)       ; ������
-    (=ucs              . #x20293)      ; 𠊓
-    ))
-(define-char
-  '((ideographic-radical . 9)  ; ⼈
     (hanyu-dazidian    1 185 1)
     (ideographic-structure
      (:cdp-combinator  4)
@@ -31689,12 +31979,6 @@
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
-    (hanyu-dazidian    8 9 2)
-    (=hanziku-12       . #xEB6F)       ; ������
-    (=ucs              . #x203A4)      ; 𠎤
-    ))
-(define-char
-  '((ideographic-radical . 9)  ; ⼈
     (hanyu-dazidian    8 9 4)
     (=hanziku-12       . #xEB71)       ; ������
     (=ucs              . #x203A5)      ; 𠎥
@@ -31779,20 +32063,6 @@
     ))
 (define-char
   '((ideographic-radical . 9)  ; ⼈
-    (hanyu-dazidian    1 226 1)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs              . #x2FF0)     ; ⿰
-      )
-     ((=ucs              . #x4EBB)     ; 亻
-      )
-     ((=ucs              . #x9F20)     ; 鼠
-      ))
-    (=hanziku-1                . #xD4CA)       ; ������
-    (=ucs              . #x203D9)      ; 𠏙
-    ))
-(define-char
-  '((ideographic-radical . 9)  ; ⼈
     (hanyu-dazidian    1 226 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")

diff --git a/lisp/utf-2000/Ideograph-R017-Open-Box.el b/lisp/utf-2000/Ideograph-R017-Open-Box.el
index 3166fd6..3763468 100644 (file)
--- a/lisp/utf-2000/Ideograph-R017-Open-Box.el
+++ b/lisp/utf-2000/Ideograph-R017-Open-Box.el
@@ -369,23 +369,15 @@
     (ideographic-radical . 17) ; ⼐
     (ideographic-strokes . 4)
     (total-strokes      . 6)
-    (=daikanwa         . 01822)        ; �����
-    ))
-(define-char
-  '((morohashi-daikanwa        1822 0 8)
-    (ideographic-radical . 17) ; ⼐
-    (ideographic-strokes . 4)
-    (total-strokes      . 6)
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs              . #x2FF1)     ; ⿱
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW")
+      (=ucs              . #x2FF6)     ; ⿶
       )
-     ((=ucs              . #x4EA0)     ; 亠
+     ((=ucs              . #x51F5)     ; 凵
       )
-     ((=ucs              . #x51F6)     ; 凶
+     ((=jis-x0208        . #x4A38)     ; �����
       ))
-    (=cns11643-3       . #x2323)       ; �����
-    (=ucs              . #x342B)       ; 㐫
+    (=daikanwa         . 01822)        ; �����
     ))
 (define-char
   '((ideographic-radical . 17) ; ⼐

diff --git a/lisp/utf-2000/Ideograph-R070-Square.el b/lisp/utf-2000/Ideograph-R070-Square.el
index b6671fe..6b801f1 100644 (file)
--- a/lisp/utf-2000/Ideograph-R070-Square.el
+++ b/lisp/utf-2000/Ideograph-R070-Square.el
@@ -79,6 +79,21 @@
     (=ucs              . #x65BB)       ; 斻
     ))
 (define-char
+  '((=>ucs             . #x3AC4)       ; 㫄
+    (ideographic-radical . 70) ; ⽅
+    (ideographic-strokes . 4)
+    (total-strokes      . 8)
+    (=daikanwa         . 13627)        ; �����
+    ))
+(define-char
+  '((morohashi-daikanwa        13627 0 0)
+    (ideographic-radical . 70) ; ⽅
+    (ideographic-strokes . 4)
+    (total-strokes      . 8)
+    (=cns11643-6       . #x2B70)       ; �����
+    (=ucs              . #x3AC4)       ; 㫄
+    ))
+(define-char
   '((=>ucs             . #x65BC)       ; 於
     (ideographic-radical . 70) ; ⽅
     (ideographic-strokes . 4)
@@ -112,13 +127,6 @@
   '((ideographic-radical . 70) ; ⽅
     (ideographic-strokes . 4)
     (total-strokes      . 8)
-    (=cns11643-6       . #x2B70)       ; �����
-    (=ucs              . #x3AC4)       ; 㫄
-    ))
-(define-char
-  '((ideographic-radical . 70) ; ⽅
-    (ideographic-strokes . 4)
-    (total-strokes      . 8)
     (=cns11643-5       . #x2643)       ; �����
     (=ucs              . #x23B35)      ; 𣬵
     ))

diff --git a/lisp/utf-2000/Ideograph-R114-Track.el b/lisp/utf-2000/Ideograph-R114-Track.el
index 7439a5e..93b1dd2 100644 (file)
--- a/lisp/utf-2000/Ideograph-R114-Track.el
+++ b/lisp/utf-2000/Ideograph-R114-Track.el
@@ -274,12 +274,14 @@
     ))
 (define-char
   '((morohashi-daikanwa        24898 0 2)
-    (ideographic-      (:radical       114 ; ⽱
-                        :strokes       10
-                        :sources       (morohashi-daikanwa cns-11643))
-                       (:radical       9 ; ⼈
-                        :strokes       13
-                        :sources       (ucs)))
+    (ideographic-radical@ucs . 9)      ; ⼈
+    (ideographic-strokes@ucs . 13)
+    (ideographic-radical@ucs*sources
+     ucs)
+    (ideographic-radical@cns . 114)    ; ⽱
+    (ideographic-strokes@cns . 10)
+    (ideographic-radical@cns*sources
+     daikanwa cns-11643)
     (total-strokes      . 15)
     (hanyu-dazidian    1 215 14)
     (ideographic-structure

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index e93cc2b..1cf7476 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -607,6 +607,41 @@
       )
     (setq radical nil
          strokes nil)
+    (let (key)
+      (dolist (domain '(ucs daikanwa cns))
+       (setq key (intern (format "%s@%s" 'ideographic-radical domain)))
+       (when (and (memq key attributes)
+                  (setq value (get-char-attribute char key)))
+         (setq radical value)
+         (insert (format "(%s . %S)\t; %c%s"
+                         key
+                         radical
+                         (aref ideographic-radicals radical)
+                         line-breaking))
+         (setq attributes (delq key attributes))
+         )
+       (setq key (intern (format "%s@%s" 'ideographic-strokes domain)))
+       (when (and (memq key attributes)
+                  (setq value (get-char-attribute char key)))
+         (setq strokes value)
+         (insert (format "(%s . %S)%s"
+                         key
+                         strokes
+                         line-breaking))
+         (setq attributes (delq key attributes))
+         )
+       (setq key (intern (format "%s@%s*sources"
+                                 'ideographic-radical domain)))
+       (when (and (memq key attributes)
+                  (setq value (get-char-attribute char key)))
+         (insert (format "(%s%s" key line-breaking))
+         (dolist (cell value)
+           (insert (format " %s" cell)))
+         (insert ")")
+         (insert line-breaking)
+         (setq attributes (delq key attributes))
+         )
+       ))
     (when (and (memq 'ideographic-radical attributes)
               (setq value (get-char-attribute char 'ideographic-radical)))
       (setq radical value)

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 5c9bccc..adc7564 100644 (file)
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -32,6 +32,16 @@
 (defun char-ideographic-radical (char &optional radical)
   (let (ret)
     (or (catch 'tag
+         (dolist (domain '(ucs daikanwa cns))
+           (if (and (setq ret (get-char-attribute
+                               char
+                               (intern
+                                (format "%s@%s"
+                                        'ideographic-radical domain))))
+                    (or (eq ret radical)
+                        (null radical)))
+               (throw 'tag ret))))
+       (catch 'tag
          (dolist (cell (get-char-attribute char 'ideographic-))
            (if (and (setq ret (plist-get cell :radical))
                     (or (eq ret radical)
@@ -78,6 +88,21 @@
 (defun char-ideographic-strokes (char &optional radical)
   (let (ret)
     (or (catch 'tag
+         (dolist (domain '(ucs daikanwa cns))
+           (if (and (setq ret (get-char-attribute
+                               char
+                               (intern
+                                (format "%s@%s"
+                                        'ideographic-radical domain))))
+                    (or (eq ret radical)
+                        (null radical)))
+               (throw 'tag
+                      (get-char-attribute
+                       char
+                       (intern
+                        (format "%s@%s"
+                                'ideographic-strokes domain)))))))
+       (catch 'tag
          (dolist (cell (get-char-attribute char 'ideographic-))
            (if (and (setq ret (plist-get cell :radical))
                     (or (eq ret radical)
@@ -102,6 +127,20 @@
 (defun update-ideograph-radical-table ()
   (interactive)
   (let (ret radical script)
+    (dolist (domain '(ucs daikanwa cns))
+      (map-char-attribute
+       (lambda (char radical)
+        (when (and radical
+                   (or (null (setq script (get-char-attribute char 'script)))
+                       (memq 'Ideograph script)))
+          (unless (memq char
+                        (setq ret
+                              (aref ideograph-radical-chars-vector radical)))
+            (char-ideographic-strokes char)
+            (aset ideograph-radical-chars-vector radical
+                  (cons char ret))))
+        nil)
+       (intern (format "%s@%s" 'ideographic-radical domain))))
     (map-char-attribute
      (lambda (char radical)
        (when (and radical