Add mappings between CNS 11643-3 and UCS CJK Compatibility Ideographs

Supplement.

diff --git a/lisp/utf-2000/Ideograph-R014-Cover.el b/lisp/utf-2000/Ideograph-R014-Cover.el
index e8f9cfc..f02e762 100644 (file)
--- a/lisp/utf-2000/Ideograph-R014-Cover.el
+++ b/lisp/utf-2000/Ideograph-R014-Cover.el
@@ -41,16 +41,13 @@
     (ideographic-strokes . 2)
     (total-strokes      . 4)
     (<-vulgar-ideograph
-     (:sources (shinjigen-1)
-      :char    ((shinjigen-1        . 525)
+     (:char    ((shinjigen-1        . 525)
                 (ideograph-daikanwa . 01566)   ; �����
                 )
-      ))
+      :sources (shinjigen-1)))
     (ideographic-structure
-     (:cdp-combinator  2
-      :char    ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-                (ucs                . #x2FF1)  ; ⿱
-                )
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (ucs               . #x2FF1)     ; ⿱
       )
      ((chinese-big5-cdp          . #x8B40)     ; ������
       )
@@ -60,6 +57,7 @@
     (shinjigen-2       . 527)
     (chinese-cns11643-3 . #x214F)      ; �����
     (mojikyo           . 050943)       ; ������
+    (ucs               . #x2F817)      ; 冗
     ))
 (define-char
   '((ideographic-radical . 14) ; ⼍

diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el
index e888e1c..2758717 100644 (file)
--- a/lisp/utf-2000/Ideograph-R018-Knife.el
+++ b/lisp/utf-2000/Ideograph-R018-Knife.el
@@ -587,6 +587,7 @@
     (total-strokes      . 5)
     (chinese-cns11643-3 . #x217C)      ; �����
     (ideograph-daikanwa . 01878)       ; �����
+    (ucs               . #x2F850)      ; 切
     ))
 (define-char
   '((ideographic-radical . 18) ; ⼑

diff --git a/lisp/utf-2000/Ideograph-R024-Ten.el b/lisp/utf-2000/Ideograph-R024-Ten.el
index d9cdc28..bf08d20 100644 (file)
--- a/lisp/utf-2000/Ideograph-R024-Ten.el
+++ b/lisp/utf-2000/Ideograph-R024-Ten.el
@@ -424,15 +424,15 @@
     (ideographic-strokes . 4)
     (total-strokes      . 6)
     (->ideographic-variants
-     (:sources (shinjigen-1)
-      :char    ((shinjigen-1        . 816)
+     (:char    ((shinjigen-1        . 816)
                 (ideograph-daikanwa . 02706)   ; �����
                 )
-      ))
+      :sources (shinjigen-1)))
     (shinjigen-1       . 818)
     (shinjigen-2       . 818)
     (chinese-cns11643-3 . #x2329)      ; �����
     (ideograph-daikanwa . 02720)       ; �����
+    (ucs               . #x2F82C)      ; 卉
     ))
 (define-char
   '((ideographic-radical . 24) ; ⼗

diff --git a/lisp/utf-2000/Ideograph-R026-Seal.el b/lisp/utf-2000/Ideograph-R026-Seal.el
index cea4145..205ce1c 100644 (file)
--- a/lisp/utf-2000/Ideograph-R026-Seal.el
+++ b/lisp/utf-2000/Ideograph-R026-Seal.el
@@ -879,15 +879,15 @@
     (ideographic-strokes . 10)
     (total-strokes      . 12)
     (->ideographic-variants
-     (:sources (shinjigen-1)
-      :char    ((shinjigen-1        . 868)
+     (:char    ((shinjigen-1        . 868)
                 (ideograph-daikanwa . 02880)   ; �����
                 )
-      ))
+      :sources (shinjigen-1)))
     (shinjigen-1       . 869)
     (shinjigen-2       . 869)
     (chinese-cns11643-3 . #x3A26)      ; �����
     (ideograph-daikanwa . 02879)       ; �����
+    (ucs               . #x2F833)      ; 卿
     ))
 (define-char
   '((=>ucs             . #x537F)       ; 卿

diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el
index eafa306..5807252 100644 (file)
--- a/lisp/utf-2000/Ideograph-R030-Mouth.el
+++ b/lisp/utf-2000/Ideograph-R030-Mouth.el
@@ -1711,6 +1711,7 @@
     (total-strokes      . 6)
     (chinese-cns11643-3 . #x233C)      ; �����
     (ideograph-daikanwa . 03317)       ; �����
+    (ucs               . #x2F83B)      ; 吆
     ))
 (define-char
   '((ideographic-radical . 30) ; ⼝
@@ -9416,6 +9417,7 @@
     (total-strokes      . 10)
     (->mojikyo         . 003672)       ; ������
     (chinese-cns11643-3 . #x3023)      ; �����
+    (ucs               . #x2F841)      ; 哶
     ))
 (define-char
   '((morohashi-daikanwa        3672 0 8)

diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el
index 07de3e7..ce240bd 100644 (file)
--- a/lisp/utf-2000/Ideograph-R032-Earth.el
+++ b/lisp/utf-2000/Ideograph-R032-Earth.el
@@ -5392,6 +5392,7 @@
       ))
     (chinese-cns11643-3 . #x3470)      ; �����
     (ideograph-daikanwa . 05234)       ; �����
+    (ucs               . #x2F855)      ; 型
     ))
 (define-char
   '((script            Japanese Ideograph)

diff --git a/lisp/utf-2000/Ideograph-R040-Roof.el b/lisp/utf-2000/Ideograph-R040-Roof.el
index 62054bf..b684870 100644 (file)
--- a/lisp/utf-2000/Ideograph-R040-Roof.el
+++ b/lisp/utf-2000/Ideograph-R040-Roof.el
@@ -4927,11 +4927,12 @@
     (ucs               . #x5BF3)       ; 寳
     ))
 (define-char
-  '((morohashi-daikanwa        7366 0 0 1)
+  '((morohashi-daikanwa        7366 0 1)
     (ideographic-radical . 40) ; ⼧
     (ideographic-strokes . 16)
     (total-strokes      . 19)
     (chinese-cns11643-3 . #x5A36)      ; �����
+    (ucs               . #x2F870)      ; 寳
     ))
 (define-char
   '((=>ucs             . #x5BF4)       ; 寴

diff --git a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
index d8ee63f..983108d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
+++ b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
@@ -2025,6 +2025,7 @@
     (total-strokes      . 11)
     (=jis-x0208                . #x3D6E)       ; �����
     (korean-ksc5601    . #x5F6E)       ; �����
+    (chinese-big5      . #xB166)       ; ������
     (ideograph-daikanwa . 09373)       ; �����
     (ucs-jis           . #x5EB6)       ; �����
     ))
@@ -2036,10 +2037,17 @@
     (chinese-gb2312    . #x4A7C)       ; �����
     (chinese-isoir165  . #x4A7C)       ; �����
     (chinese-cns11643-1 . #x5A2C)      ; �����
-    (chinese-big5      . #xB166)       ; ������
     (ucs               . #x5EB6)       ; 庶
     ))
 (define-char
+  '((morohashi-daikanwa        9373 0 2)
+    (ideographic-radical . 53) ; ⼴
+    (ideographic-strokes . 8)
+    (total-strokes      . 11)
+    (chinese-cns11643-3 . #x355F)      ; �����
+    (ucs               . #x2F88D)      ; 庶
+    ))
+(define-char
   '((ideographic-radical . 53) ; ⼴
     (ideographic-strokes . 8)
     (total-strokes      . 11)
@@ -2290,12 +2298,6 @@
   '((ideographic-radical . 53) ; ⼴
     (ideographic-strokes . 8)
     (total-strokes      . 11)
-    (chinese-cns11643-3 . #x355F)      ; �����
-    ))
-(define-char
-  '((ideographic-radical . 53) ; ⼴
-    (ideographic-strokes . 8)
-    (total-strokes      . 11)
     (chinese-cns11643-6 . #x3F45)      ; �����
     ))
 (define-char

diff --git a/lisp/utf-2000/Ideograph-R060-Step.el b/lisp/utf-2000/Ideograph-R060-Step.el
index de62218..dbee751 100644 (file)
--- a/lisp/utf-2000/Ideograph-R060-Step.el
+++ b/lisp/utf-2000/Ideograph-R060-Step.el
@@ -1315,6 +1315,7 @@
     (total-strokes      . 11)
     (chinese-cns11643-3 . #x3565)      ; �����
     (ideograph-daikanwa . 10143)       ; �����
+    (ucs               . #x2F89C)      ; 徚
     ))
 (define-char
   '((=>ucs             . #x22506)      ; 𢔆

diff --git a/lisp/utf-2000/Ideograph-R061-Heart.el b/lisp/utf-2000/Ideograph-R061-Heart.el
index f814858..4356dc0 100644 (file)
--- a/lisp/utf-2000/Ideograph-R061-Heart.el
+++ b/lisp/utf-2000/Ideograph-R061-Heart.el
@@ -9896,6 +9896,7 @@
     (total-strokes      . 14)
     (chinese-cns11643-3 . #x4670)      ; �����
     (ideograph-daikanwa . 11048)       ; �����
+    (ucs               . #x2F8A6)      ; 慈
     ))
 (define-char
   '((ideographic-radical . 61) ; ⼼
@@ -14792,6 +14793,7 @@
     (ideographic-strokes . 14)
     (total-strokes      . 17)
     (chinese-cns11643-3 . #x5460)      ; �����
+    (ucs               . #x2F8AF)      ; 懞
     ))
 (define-char
   '((ideographic-radical . 61) ; ⼼

diff --git a/lisp/utf-2000/Ideograph-R062-Halberd.el b/lisp/utf-2000/Ideograph-R062-Halberd.el
index 1b43a9d..ecf0558 100644 (file)
--- a/lisp/utf-2000/Ideograph-R062-Halberd.el
+++ b/lisp/utf-2000/Ideograph-R062-Halberd.el
@@ -186,6 +186,7 @@
     (chinese-cns11643-3 . #x2627)      ; �����
     (ideograph-daikanwa . 11544)       ; �����
     (mojikyo           . 011544)       ; ������
+    (ucs               . #x2F8B2)      ; 成
     ))
 (define-char
   '((ideographic-radical . 62) ; ⼽

diff --git a/lisp/utf-2000/Ideograph-R075-Tree.el b/lisp/utf-2000/Ideograph-R075-Tree.el
index 8b1429f..c1075ec 100644 (file)
--- a/lisp/utf-2000/Ideograph-R075-Tree.el
+++ b/lisp/utf-2000/Ideograph-R075-Tree.el
@@ -4338,13 +4338,21 @@
     ))
 (define-char
   '((=>ucs             . #x6852)       ; 桒
-    (morohashi-daikanwa        14685 0 1)
+    (morohashi-daikanwa        14685 0 0)
     (ideographic-radical . 75) ; ⽊
-    (ideographic-strokes . 6)
+    (ideographic-strokes . 5)
     (total-strokes      . 9)
     (chinese-cns11643-3 . #x2D2F)      ; �����
     ))
 (define-char
+  '((morohashi-daikanwa        14685 0 1)
+    (ideographic-radical . 75) ; ⽊
+    (ideographic-strokes . 6)
+    (total-strokes      . 10)
+    (chinese-cns11643-3 . #x315C)      ; �����
+    (ucs               . #x2F8E1)      ; 桒
+    ))
+(define-char
   '((ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 5)
     (total-strokes      . 9)
@@ -6290,12 +6298,6 @@
   '((ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 6)
     (total-strokes      . 10)
-    (chinese-cns11643-3 . #x315C)      ; �����
-    ))
-(define-char
-  '((ideographic-radical . 75) ; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes      . 10)
     (chinese-cns11643-6 . #x384A)      ; �����
     ))
 (define-char
@@ -12295,10 +12297,9 @@
     (ideographic-strokes . 9)
     (total-strokes      . 13)
     (<-simplified-ideograph
-     (:sources (morohashi-daikanwa)
-      :char    ((ideograph-daikanwa . 15364)   ; �����
+     (:char    ((ideograph-daikanwa . 15364)   ; �����
                 )
-      ))
+      :sources (morohashi-daikanwa)))
     (japanese-jisx0208-1978    . #x3335)       ; �����
     (mojikyo                   . 050230)       ; ������
     ))
@@ -12317,19 +12318,19 @@
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (chinese-cns11643-1 . #x644D)      ; �����
-    (chinese-big5      . #xB7A7)       ; ������
+    (chinese-cns11643-1                . #x644D)       ; �����
+    (japanese-jisx0208-1990    . #x3335)       ; �����
+    (chinese-big5              . #xB7A7)       ; ������
+    (ucs-jis                   . #x6982)       ; �����
     ))
 (define-char
   '((=>ucs             . #x6982)       ; 概
-    (morohashi-daikanwa        15217 1 4)
+    (morohashi-daikanwa        15217 1 3)
     (ideographic-radical . 75) ; ⽊
     (ideographic-strokes . 10)
     (total-strokes      . 14)
     (->mojikyo         . 050230)       ; �����
-    (japanese-jisx0208         . #x3335)       ; �����
-    (japanese-jisx0208-1990    . #x3335)       ; �����
-    (ucs-jis                   . #x6982)       ; �����
+    (japanese-jisx0208 . #x3335)       ; �����
     ))
 (define-char
   '((ideographic-radical . 75) ; ⽊

diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el
index 262aaf2..b78c483 100644 (file)
--- a/lisp/utf-2000/Ideograph-R130-Meat.el
+++ b/lisp/utf-2000/Ideograph-R130-Meat.el
@@ -3848,6 +3848,14 @@
     (chinese-cns11643-3 . #x334E)      ; �����
     ))
 (define-char
+  '((morohashi-daikanwa        29464 0 5)
+    (ideographic-radical . 130)        ; ⾁
+    (ideographic-strokes . 6)
+    (total-strokes      . 10)
+    (chinese-cns11643-3 . #x3350)      ; �����
+    (ucs               . #x2F983)      ; 脃
+    ))
+(define-char
   '((ideographic-radical . 130)        ; ⾁
     (ideographic-strokes . 6)
     (total-strokes      . 10)
@@ -4328,12 +4336,6 @@
   '((ideographic-radical . 130)        ; ⾁
     (ideographic-strokes . 6)
     (total-strokes      . 10)
-    (chinese-cns11643-3 . #x3350)      ; �����
-    ))
-(define-char
-  '((ideographic-radical . 130)        ; ⾁
-    (ideographic-strokes . 6)
-    (total-strokes      . 10)
     (chinese-cns11643-5 . #x2F68)      ; �����
     ))
 (define-char