From 4da5e51f3a6e813e653016ed509d1b17794723dc Mon Sep 17 00:00:00 2001
From: tomo <tomo>
Date: Fri, 28 Oct 2011 09:41:13 +0000
Subject: [PATCH] Separate `=>ucs@unicode' to `=+>ucs@unicode' and
 `=>ucs@unicode'.

---
 lisp/utf-2000/Ideograph-R009-Man.el               |   11 +-
 lisp/utf-2000/Ideograph-R018-Knife.el             |   49 ++++---
 lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el  |    3 +-
 lisp/utf-2000/Ideograph-R029-Again.el             |   10 +-
 lisp/utf-2000/Ideograph-R030-Mouth.el             |   33 +++--
 lisp/utf-2000/Ideograph-R032-Earth.el             |    8 +-
 lisp/utf-2000/Ideograph-R037-Big.el               |   10 +-
 lisp/utf-2000/Ideograph-R038-Woman.el             |    2 +-
 lisp/utf-2000/Ideograph-R064-Hand.el              |    2 +-
 lisp/utf-2000/Ideograph-R074-Moon.el              |    9 +-
 lisp/utf-2000/Ideograph-R075-Tree.el              |   42 +++---
 lisp/utf-2000/Ideograph-R079-Weapon.el            |    4 +-
 lisp/utf-2000/Ideograph-R080-Do-Not.el            |   17 ++-
 lisp/utf-2000/Ideograph-R086-Fire.el              |    3 +-
 lisp/utf-2000/Ideograph-R094-Dog.el               |    2 +
 lisp/utf-2000/Ideograph-R104-Sickness.el          |    6 +-
 lisp/utf-2000/Ideograph-R116-Cave.el              |   18 +--
 lisp/utf-2000/Ideograph-R118-Bamboo.el            |    2 +
 lisp/utf-2000/Ideograph-R121-Jar.el               |    6 +-
 lisp/utf-2000/Ideograph-R130-Meat.el              |    8 +-
 lisp/utf-2000/Ideograph-R140-Grass.el             |  153 +++++++++++----------
 lisp/utf-2000/Ideograph-R142-Insect.el            |   13 +-
 lisp/utf-2000/Ideograph-R149-Speech.el            |    8 +-
 lisp/utf-2000/Ideograph-R150-Valley.el            |   18 +--
 lisp/utf-2000/Ideograph-R159-Cart.el              |    9 +-
 lisp/utf-2000/Ideograph-R162-Walk.el              |    2 +-
 lisp/utf-2000/Ideograph-R167-Gold.el              |    6 +-
 lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el |    7 +-
 lisp/utf-2000/Ideograph-R182-Wind.el              |    4 +-
 lisp/utf-2000/Ideograph-R184-Eat.el               |   14 +-
 30 files changed, 259 insertions(+), 220 deletions(-)

diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el
index 30995e1..9e50863 100644
--- a/lisp/utf-2000/Ideograph-R009-Man.el
+++ b/lisp/utf-2000/Ideograph-R009-Man.el
@@ -23144,12 +23144,13 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
     (hanyu-dazidian	1 186 7)
-    (=>ucs@unicode	. #x5070)	; &A-UU+5070;
-    (=big5		. #xD44C)	; &A-UU+5070;
+    (=+>ucs@unicode	. #x5070)	; &o-JX2-2167;
+    (=+>jis-x0213-2	. #x2167)	; &o-JX2-2167; [01-71]
+    (=big5		. #xD44C)	; &o-JX2-2167;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x5070)	; &A-UU+5070;
+     ((=+>jis-x0213-2	  . #x2167)	; &o-JX2-2167; [01-71]
       ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
@@ -23184,7 +23185,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x5070)	; &A-UU+5070;
+     ((=+>jis-x0213-2	  . #x2167)	; &o-JX2-2167; [01-71]
       ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
@@ -23203,7 +23204,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x5070)	; &A-UU+5070;
+     ((=+>jis-x0213-2	  . #x2167)	; &o-JX2-2167; [01-71]
       ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el
index e927edd..b8318bc 100644
--- a/lisp/utf-2000/Ideograph-R018-Knife.el
+++ b/lisp/utf-2000/Ideograph-R018-Knife.el
@@ -1164,15 +1164,26 @@
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 4)
     (total-strokes	 . 6)
+    (=>ucs@unicode	. #x34DE)	; &A-UU+34DE;
+    ))
+(define-char
+  '((<-denotational
+     ((=>ucs@unicode	  . #x34DE)	; &A-UU+34DE;
+      ))
+    (ideographic-radical . 18)	; ⼑
+    (ideographic-strokes . 4)
+    (total-strokes	 . 6)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x4E30)	; 丰
+     ((=gt-k		  . 00587)	; &GT-K00587;
       )
      ((=ucs		  . #x5200)	; 刀
       ))
-    (=>ucs@unicode	. #x34DE)	; &A-UU+34DE;
+    (=gt		. 02447)	; &GT-02447;
+    (=gt-k		. 01772)	; &I-GT-K01772;
+    (=gt-pj-9		. #x5252)	; &GT-02447; [50-50]
     ))
 (define-char
   '((<-denotational
@@ -1185,19 +1196,15 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@unicode	  . #x4E30)	; 丰󠄀
-      (=gb2312		  . #x3761)	; 丰󠄀 [23-65]
-      (=jis-x0212	  . #x302D)	; &I-JSP-302D; [16-13]
-      (=jis-x0213-1	  . #x2E26)	; &I-JX1-2E26; [14-06]
-      (=daikanwa	  . 00076)	; &I-M-00076;
+     ((=ucs		  . #x4E30)	; 丰
       )
      ((=ucs		  . #x5200)	; 刀
       ))
-    (=ucs@unicode	. #x34DE)	; &UU+34DE;
+    (=+>ucs@unicode	. #x34DE)	; &o-UU+34DE;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x34DE)	; &A-UU+34DE;
+     ((=+>ucs@unicode	  . #x34DE)	; &o-UU+34DE;
       ))
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 4)
@@ -1206,17 +1213,19 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@cns		  . #x4E30)	; &C1-4464;
-      (=cns11643-1	  . #x4464)	; &C1-4464; [36-68]
+     ((=ucs@unicode	  . #x4E30)	; 丰󠄀
+      (=gb2312		  . #x3761)	; 丰󠄀 [23-65]
+      (=jis-x0212	  . #x302D)	; &I-JSP-302D; [16-13]
+      (=jis-x0213-1	  . #x2E26)	; &I-JX1-2E26; [14-06]
+      (=daikanwa	  . 00076)	; &I-M-00076;
       )
      ((=ucs		  . #x5200)	; 刀
       ))
-    (=ucs@cns		. #x34DE)	; &C5-2230;
-    (=cns11643-5	. #x2230)	; &C5-2230; [02-16]
+    (=ucs@unicode	. #x34DE)	; &UU+34DE;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x34DE)	; &A-UU+34DE;
+     ((=+>ucs@unicode	  . #x34DE)	; &o-UU+34DE;
       ))
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 4)
@@ -1225,17 +1234,17 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=gt-k		  . 00587)	; &GT-K00587;
+     ((=ucs@cns		  . #x4E30)	; &C1-4464;
+      (=cns11643-1	  . #x4464)	; &C1-4464; [36-68]
       )
      ((=ucs		  . #x5200)	; 刀
       ))
-    (=gt		. 02447)	; &GT-02447;
-    (=gt-k		. 01772)	; &I-GT-K01772;
-    (=gt-pj-9		. #x5252)	; &GT-02447; [50-50]
+    (=ucs@cns		. #x34DE)	; &C5-2230;
+    (=cns11643-5	. #x2230)	; &C5-2230; [02-16]
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x34DE)	; &A-UU+34DE;
+     ((=+>ucs@unicode	  . #x34DE)	; &o-UU+34DE;
       ))
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 4)
@@ -7163,7 +7172,7 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (=ucs		. #x2F822)	; 割
-    (=>ucs@unicode	. #x5272)	; 割
+    (=+>ucs@unicode	. #x5272)	; 割
     (=+>ucs@cns		. #x2F822)	; 割
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
index acb8774..728037f 100644
--- a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
@@ -1075,8 +1075,9 @@
       )
      ((=ucs		  . #x82E5)	; 若
       ))
-    (=>ucs@unicode	. #x533F)	; &o-J0-463F;
+    (=+>ucs@unicode	. #x533F)	; &o-J0-463F;
     (=+>jis-x0208	. #x463F)	; &o-J0-463F; [38-31]
+    (=+>jis-x0213-1	. #x463F)	; &o-J0-463F; [38-31]
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el
index 14b4d2e..1f9d8ec 100644
--- a/lisp/utf-2000/Ideograph-R029-Again.el
+++ b/lisp/utf-2000/Ideograph-R029-Again.el
@@ -1842,12 +1842,14 @@
       )
      ((=ucs		  . #x53C8)	; 又
       ))
-    (=>ucs@unicode	. #x53DF)	; &A-UU+53DF;
-    (=big5		. #xADEE)	; &A-UU+53DF;
+    (=+>ucs@unicode	. #x53DF)	; &o-J0-5257;
+    (=+>jis-x0208	. #x5257)	; &o-J0-5257; [50-55]
+    (=+>jis-x0213-1	. #x5257)	; &o-J0-5257; [50-55]
+    (=big5		. #xADEE)	; &o-J0-5257;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x53DF)	; &A-UU+53DF;
+     ((=+>jis-x0208	  . #x5257)	; &o-J0-5257; [50-55]
       ))
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 8)
@@ -1900,7 +1902,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x53DF)	; &A-UU+53DF;
+     ((=+>jis-x0208	  . #x5257)	; &o-J0-5257; [50-55]
       ))
     (ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 7)
diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el
index 2765914..aa8c59d 100644
--- a/lisp/utf-2000/Ideograph-R030-Mouth.el
+++ b/lisp/utf-2000/Ideograph-R030-Mouth.el
@@ -22025,12 +22025,12 @@
       )
      ((=>>ucs@unicode	  . #x5951)	; &G-UU+5951;
       ))
-    (=>ucs@unicode	. #x55AB)	; &A-UU+55AB;
-    (=big5		. #xB3F0)	; &A-UU+55AB;
+    (=+>ucs@unicode	. #x55AB)	; &o-UU+55AB;
+    (=big5		. #xB3F0)	; &o-UU+55AB;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x55AB)	; &A-UU+55AB;
+     ((=+>ucs@unicode	  . #x55AB)	; &o-UU+55AB;
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
@@ -22052,7 +22052,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x55AB)	; &A-UU+55AB;
+     ((=+>ucs@unicode	  . #x55AB)	; &o-UU+55AB;
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
@@ -22071,7 +22071,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x55AB)	; &A-UU+55AB;
+     ((=+>ucs@unicode	  . #x55AB)	; &o-UU+55AB;
       ))
     (=decomposition@hanyo-denshi
      ((=ucs		  . #x55AB)	; 喫
@@ -22083,7 +22083,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x55AB)	; &A-UU+55AB;
+     ((=+>ucs@unicode	  . #x55AB)	; &o-UU+55AB;
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
@@ -26996,12 +26996,12 @@
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=>ucs@unicode	. #x55C2)	; &A-UU+55C2;
-    (=+>ucs@cns		. #x2F84A)	; &A-UU+55C2;
+    (=+>ucs@unicode	. #x55C2)	; &o-UU+55C2;
+    (=+>ucs@cns		. #x2F84A)	; &o-UU+55C2;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x55C2)	; &A-UU+55C2;
+     ((=+>ucs@unicode	  . #x55C2)	; &o-UU+55C2;
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 10)
@@ -27024,7 +27024,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x55C2)	; &A-UU+55C2;
+     ((=+>ucs@unicode	  . #x55C2)	; &o-UU+55C2;
       ))
     (=>ucs*		. #x55C2)	; 嗂
     (ideographic-radical . 30)	; ⼝
@@ -27458,9 +27458,8 @@
      ((=ucs		  . #x55F7)	; 嗷
       ))
     (ideographic-radical . 30)	; ⼝
-    (=>ucs@unicode	. #x55F7)	; &A-UU+55F7;
-    (=ucs@big5		. #x55F7)	; &A-UU+55F7;
-    (=big5		. #xB9C8)	; &A-UU+55F7;
+    (=+>ucs@unicode	. #x55F7)	; &o-UU+55F7;
+    (=big5		. #xB9C8)	; &o-UU+55F7;
     (->subsumptive
      ((ideographic-strokes . 10)
       (total-strokes	   . 13)
@@ -27519,7 +27518,7 @@
      ((=ucs		  . #x55F8)	; 嗸
       ))
     (ideographic-radical . 30)	; ⼝
-    (=>ucs@unicode	. #x55F8)	; &A-UU+55F8;
+    (=+>ucs@unicode	. #x55F8)	; &o-UU+55F8;
     (->subsumptive
      ((ideographic-strokes . 11)
       (total-strokes	   . 14)
@@ -32150,11 +32149,11 @@
       )
      ((=ucs		  . #x7232)	; 爲
       ))
-    (=>ucs@unicode	. #x5645)	; &A-UU+5645;
+    (=+>ucs@unicode	. #x5645)	; &o-UU+5645;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x5645)	; &A-UU+5645;
+     ((=+>ucs@unicode	  . #x5645)	; &o-UU+5645;
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
@@ -32175,7 +32174,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x5645)	; &A-UU+5645;
+     ((=+>ucs@unicode	  . #x5645)	; &o-UU+5645;
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el
index c62900c..e4c6a61 100644
--- a/lisp/utf-2000/Ideograph-R032-Earth.el
+++ b/lisp/utf-2000/Ideograph-R032-Earth.el
@@ -5599,7 +5599,7 @@
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=>ucs@unicode	. #x57F0)	; &A-UU+57F0;
+    (=+>ucs@unicode	. #x57F0)	; &o-UU+57F0;
     (->subsumptive
      ((hanyu-dazidian	  1 455 6)
       (=ucs@unicode	  . #x57F0)	; &UU+57F0;
@@ -11267,11 +11267,11 @@
      ((=ucs		  . #x5893)	; 墓
       ))
     (ideographic-radical . 32)	; ⼟
-    (=>ucs@unicode	. #x5893)	; &A-UU+5893;
+    (=+>ucs@unicode	. #x5893)	; &o-UU+5893;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x5893)	; &A-UU+5893;
+     ((=+>ucs@unicode	  . #x5893)	; &o-UU+5893;
       ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 11)
@@ -11284,7 +11284,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x5893)	; &A-UU+5893;
+     ((=+>ucs@unicode	  . #x5893)	; &o-UU+5893;
       ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 10)
diff --git a/lisp/utf-2000/Ideograph-R037-Big.el b/lisp/utf-2000/Ideograph-R037-Big.el
index ee2e089..dfb46bf 100644
--- a/lisp/utf-2000/Ideograph-R037-Big.el
+++ b/lisp/utf-2000/Ideograph-R037-Big.el
@@ -1439,12 +1439,12 @@
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=>ucs@unicode	. #x5951)	; &A-UU+5951;
-    (=big5		. #xABB4)	; &A-UU+5951;
+    (=+>ucs@unicode	. #x5951)	; &o-UU+5951;
+    (=big5		. #xABB4)	; &o-UU+5951;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x5951)	; &A-UU+5951;
+     ((=+>ucs@unicode	  . #x5951)	; &o-UU+5951;
       ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
@@ -1456,7 +1456,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x5951)	; &A-UU+5951;
+     ((=+>ucs@unicode	  . #x5951)	; &o-UU+5951;
       ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
@@ -1466,7 +1466,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x5951)	; &A-UU+5951;
+     ((=+>ucs@unicode	  . #x5951)	; &o-UU+5951;
       ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 6)
diff --git a/lisp/utf-2000/Ideograph-R038-Woman.el b/lisp/utf-2000/Ideograph-R038-Woman.el
index 4e17962..f7c8b69 100644
--- a/lisp/utf-2000/Ideograph-R038-Woman.el
+++ b/lisp/utf-2000/Ideograph-R038-Woman.el
@@ -14806,7 +14806,7 @@
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=>ucs@unicode	. #x5B34)	; &A-UU+5B34;
+    (=+>ucs@unicode	. #x5B34)	; &o-UU+5B34;
     (->subsumptive
      ((=decomposition@hanyo-denshi
        ((=ucs		    . #x5B34)	; 嬴
diff --git a/lisp/utf-2000/Ideograph-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el
index 734f80f..cac1b68 100644
--- a/lisp/utf-2000/Ideograph-R064-Hand.el
+++ b/lisp/utf-2000/Ideograph-R064-Hand.el
@@ -16021,7 +16021,7 @@
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=>ucs@unicode	. #x649D)	; &o-JX2-2D50;
+    (=+>ucs@unicode	. #x649D)	; &o-JX2-2D50;
     (=+>ucs@cns		. #x2F8C5)	; &o-JX2-2D50;
     (=+>jis-x0213-2	. #x2D50)	; &o-JX2-2D50; [13-48]
     ))
diff --git a/lisp/utf-2000/Ideograph-R074-Moon.el b/lisp/utf-2000/Ideograph-R074-Moon.el
index 9a73d9e..b03325d 100644
--- a/lisp/utf-2000/Ideograph-R074-Moon.el
+++ b/lisp/utf-2000/Ideograph-R074-Moon.el
@@ -900,14 +900,17 @@
     (ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=>ucs@unicode	. #x671B)	; &A-GT-18223;
-    (=+>ucs@cns		. #x2F8D9)	; &A-GT-18223;
-    (=>gt		. 18223)	; &A-GT-18223;
+    (=+>ucs@unicode	. #x671B)	; &o-J0-4B3E;
+    (=+>ucs@cns		. #x2F8D9)	; &o-J0-4B3E;
+    (=+>jis-x0208	. #x4B3E)	; &o-J0-4B3E; [43-30]
+    (=+>jis-x0213-1	. #x4B3E)	; &o-J0-4B3E; [43-30]
+    (=>gt		. 18223)	; &o-J0-4B3E;
     (->subsumptive
      ((=>>ucs@jis	  . #x671B)	; &G-GT-18223;
       (=>>ucs@ks	  . #x671B)	; &G-GT-18223;
       (=>>ucs@cns	  . #x2F8D9)	; &G-GT-18223;
       (=>>jis-x0208	  . #x4B3E)	; &G-GT-18223; [43-30]
+      (=>>jis-x0213-1	  . #x4B3E)	; &G-GT-18223; [43-30]
       (=>>gt		  . 18223)	; &G-GT-18223;
       (->subsumptive
        ((morohashi-daikanwa	14368 1)
diff --git a/lisp/utf-2000/Ideograph-R075-Tree.el b/lisp/utf-2000/Ideograph-R075-Tree.el
index e708386..6805e66 100644
--- a/lisp/utf-2000/Ideograph-R075-Tree.el
+++ b/lisp/utf-2000/Ideograph-R075-Tree.el
@@ -18181,13 +18181,13 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=>ucs@unicode	. #x69A3)	; &A-UU+69A3;
-    (=+>ucs@cns		. #x2F8E9)	; &A-UU+69A3;
-    (=>daikanwa		. 49175)	; &A-UU+69A3;
+    (=+>ucs@unicode	. #x69A3)	; &o-UU+69A3;
+    (=+>ucs@cns		. #x2F8E9)	; &o-UU+69A3;
+    (=>daikanwa		. 49175)	; &o-UU+69A3;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x69A3)	; &A-UU+69A3;
+     ((=+>ucs@unicode	  . #x69A3)	; &o-UU+69A3;
       ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
@@ -18196,7 +18196,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x69A3)	; &A-UU+69A3;
+     ((=+>ucs@unicode	  . #x69A3)	; &o-UU+69A3;
       ))
     (=>ucs*		. #x69A3)	; 榣
     (ideographic-radical . 75)	; ⽊
@@ -18889,11 +18889,13 @@
       )
      ((=ucs		  . #x6728)	; 木
       ))
-    (=>ucs@unicode	. #x69E9)	; &A-UU+69E9;
+    (=+>ucs@jis		. #x69E9)	; &o-JX1-7623;
+    (=+>ucs@cns		. #x69E9)	; &o-JX1-7623;
+    (=+>jis-x0213-1	. #x7623)	; &o-JX1-7623; [86-03]
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x69E9)	; &A-UU+69E9;
+     ((=+>jis-x0213-1	  . #x7623)	; &o-JX1-7623; [86-03]
       ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
@@ -18912,7 +18914,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x69E9)	; &A-UU+69E9;
+     ((=+>jis-x0213-1	  . #x7623)	; &o-JX1-7623; [86-03]
       ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
@@ -18922,7 +18924,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x69E9)	; &A-UU+69E9;
+     ((=+>jis-x0213-1	  . #x7623)	; &o-JX1-7623; [86-03]
       ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
@@ -18938,6 +18940,9 @@
     (=>>ucs@jis		. #x69E9)	; &G-GT-19860;
     (=>>jis-x0213-1	. #x7623)	; &G-GT-19860; [86-03]
     (=>>gt		. 19860)	; &G-GT-19860;
+    (=>>adobe-japan1	. 16912)	; &G-GT-19860;
+    (=>>hanyo-denshi/jc . #x7623)	; &G-GT-19860; [86-03]
+    (=>>hanyo-denshi/ib . #x3540)	; &G-GT-19860; [21-32]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -23490,20 +23495,22 @@
      ((=ucs		  . #x3BE3)	; 㯣
       ))
     (ideographic-radical . 75)	; ⽊
-    (=>ucs@unicode	. #x3BE3)	; &A-UU+3BE3;
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (=daikanwa		. 15610)	; &M-15610;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x3BE3)	; &A-UU+3BE3;
+     ((=ucs		  . #x3BE3)	; 㯣
       ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (=daikanwa		. 15610)	; &M-15610;
+    (=cns11643-4	. #x5064)	; &C4-5064; [48-68]
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x3BE3)	; &A-UU+3BE3;
+     ((=ucs		  . #x3BE3)	; 㯣
       ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
@@ -23511,15 +23518,6 @@
     (=ucs@unicode	. #x3BE3)	; &UU+3BE3;
     ))
 (define-char
-  '((<-denotational
-     ((=ucs		  . #x3BE3)	; 㯣
-      ))
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=cns11643-4	. #x5064)	; &C4-5064; [48-68]
-    ))
-(define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el
index d11ddbb..c0c06a5 100644
--- a/lisp/utf-2000/Ideograph-R079-Weapon.el
+++ b/lisp/utf-2000/Ideograph-R079-Weapon.el
@@ -356,10 +356,10 @@
     (ideographic-radical . 79)	; ⽎
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=>ucs@unicode	. #x6BBA)	; &o-J0-3B26;
+    (=+>ucs@unicode	. #x6BBA)	; &o-J0-3B26;
     (=+>ucs@cns		. #x2F8F5)	; &o-J0-3B26;
     (=+>jis-x0208	. #x3B26)	; &o-J0-3B26; [27-06]
-    (=>jis-x0213-1	. #x3B26)	; &o-J0-3B26; [27-06]
+    (=+>jis-x0213-1	. #x3B26)	; &o-J0-3B26; [27-06]
     (=>daikanwa		. 16629)	; &o-J0-3B26;
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R080-Do-Not.el b/lisp/utf-2000/Ideograph-R080-Do-Not.el
index 1b796c2..85d28e5 100644
--- a/lisp/utf-2000/Ideograph-R080-Do-Not.el
+++ b/lisp/utf-2000/Ideograph-R080-Do-Not.el
@@ -433,16 +433,19 @@
      ((=ucs		  . #x6BD3)	; 毓
       ))
     (ideographic-radical . 80)	; ⽏
-    (=>ucs@unicode	. #x6BD3)	; &A-UU+6BD3;
-    (=big5		. #xB7B6)	; &A-UU+6BD3;
+    (=>>ucs@unicode	. #x6BD3)	; &G-GT-21457;
+    (=>>jis-x0208	. #x5D5A)	; &G-GT-21457; [61-58]
+    (=>>jis-x0213-1	. #x5D5A)	; &G-GT-21457; [61-58]
+    (=big5		. #xB7B6)	; &G-GT-21457;
+    (=>>gt		. 21457)	; &G-GT-21457;
+    (=>>daikanwa	. 16740)	; &G-GT-21457;
     (->subsumptive
      ((ideographic-strokes . 10)
       (total-strokes	   . 14)
-      (=>>ucs@unicode	  . #x6BD3)	; &G-GT-21457;
-      (=>>jis-x0208	  . #x5D5A)	; &G-GT-21457; [61-58]
-      (=>>jis-x0213-1	  . #x5D5A)	; &G-GT-21457; [61-58]
-      (=>>gt		  . 21457)	; &G-GT-21457;
-      (=>>daikanwa	  . 16740)	; &G-GT-21457;
+      (=>>>ucs@unicode	  . #x6BD3)	; &g2-J0-5D5A;
+      (=>>>jis-x0208	  . #x5D5A)	; &g2-J0-5D5A; [61-58]
+      (=>>>jis-x0213-1	  . #x5D5A)	; &g2-J0-5D5A; [61-58]
+      (=>>>gt		  . 21457)	; &g2-J0-5D5A;
       (->subsumptive
        ((=ucs@jis	    . #x6BD3)	; &GT-21457;
 	(=jis-x0208	    . #x5D5A)	; &GT-21457; [61-58]
diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el
index 2437abc..16e511c 100644
--- a/lisp/utf-2000/Ideograph-R086-Fire.el
+++ b/lisp/utf-2000/Ideograph-R086-Fire.el
@@ -16242,9 +16242,10 @@
      ((=ucs		  . #x7228)	; 爨
       ))
     (ideographic-radical . 86)	; ⽕
-    (=>ucs@unicode	. #x7228)	; &o-J0-6026;
+    (=+>ucs@unicode	. #x7228)	; &o-J0-6026;
     (=+>ucs@cns		. #x2F920)	; &o-J0-6026;
     (=+>jis-x0208	. #x6026)	; &o-J0-6026; [64-06]
+    (=+>jis-x0213-1	. #x6026)	; &o-J0-6026; [64-06]
     (=>daikanwa		. 19648)	; &o-J0-6026;
     (->subsumptive
      ((ideographic-strokes . 25)
diff --git a/lisp/utf-2000/Ideograph-R094-Dog.el b/lisp/utf-2000/Ideograph-R094-Dog.el
index 1485348..f070ef4 100644
--- a/lisp/utf-2000/Ideograph-R094-Dog.el
+++ b/lisp/utf-2000/Ideograph-R094-Dog.el
@@ -7448,6 +7448,8 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (=ucs		. #x737A)	; 獺
+    (=>jis-x0208	. #x605C)	; 獺 [64-60]
+    (=>jis-x0213-1	. #x605C)	; 獺 [64-60]
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R104-Sickness.el b/lisp/utf-2000/Ideograph-R104-Sickness.el
index fd631f9..803ec99 100644
--- a/lisp/utf-2000/Ideograph-R104-Sickness.el
+++ b/lisp/utf-2000/Ideograph-R104-Sickness.el
@@ -4656,11 +4656,11 @@
   '((<-denotational
      ((=ucs		  . #x7610)	; 瘐
       ))
-    (=>ucs@unicode	. #x7610)	; &A-UU+7610;
+    (=+>ucs@unicode	. #x7610)	; &o-UU+7610;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x7610)	; &A-UU+7610;
+     ((=+>ucs@unicode	  . #x7610)	; &o-UU+7610;
       ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 9)
@@ -4669,7 +4669,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x7610)	; &A-UU+7610;
+     ((=+>ucs@unicode	  . #x7610)	; &o-UU+7610;
       ))
     (ideographic-strokes . 8)
     (total-strokes	 . 13)
diff --git a/lisp/utf-2000/Ideograph-R116-Cave.el b/lisp/utf-2000/Ideograph-R116-Cave.el
index 7d0d857..3276bd1 100644
--- a/lisp/utf-2000/Ideograph-R116-Cave.el
+++ b/lisp/utf-2000/Ideograph-R116-Cave.el
@@ -446,10 +446,10 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (=>ucs@unicode	. #x7A81)	; &A-JX1-7951;
-    (=>ucs@jis		. #xFA55)	; &A-JX1-7951;
-    (=>jis-x0213-1	. #x7951)	; &A-JX1-7951; [89-49]
-    (=big5		. #xACF0)	; &A-JX1-7951;
+    (=+>ucs@unicode	. #x7A81)	; &o-JX1-7951;
+    (=+>ucs@jis		. #xFA55)	; &o-JX1-7951;
+    (=+>jis-x0213-1	. #x7951)	; &o-JX1-7951; [89-49]
+    (=big5		. #xACF0)	; &o-JX1-7951;
     (->subsumptive
      ((=>>ucs@jis	  . #xFA55)	; &G-JX1-7951;
       (=>>ucs@ks	  . #x7A81)	; &G-JX1-7951;
@@ -3424,12 +3424,14 @@
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=>ucs@unicode	. #x7ABF)	; &A-UU+7ABF;
-    (=big5		. #xC14B)	; &A-UU+7ABF;
+    (=+>ucs@unicode	. #x7ABF)	; &o-J0-6363;
+    (=+>jis-x0208	. #x6363)	; &o-J0-6363; [67-67]
+    (=+>jis-x0213-1	. #x6363)	; &o-J0-6363; [67-67]
+    (=big5		. #xC14B)	; &o-J0-6363;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x7ABF)	; &A-UU+7ABF;
+     ((=+>jis-x0208	  . #x6363)	; &o-J0-6363; [67-67]
       ))
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
@@ -3454,7 +3456,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x7ABF)	; &A-UU+7ABF;
+     ((=+>jis-x0208	  . #x6363)	; &o-J0-6363; [67-67]
       ))
     (ideographic-radical . 116)	; â½³
     (ideographic-strokes . 12)
diff --git a/lisp/utf-2000/Ideograph-R118-Bamboo.el b/lisp/utf-2000/Ideograph-R118-Bamboo.el
index 26dde3e..bdacafc 100644
--- a/lisp/utf-2000/Ideograph-R118-Bamboo.el
+++ b/lisp/utf-2000/Ideograph-R118-Bamboo.el
@@ -11871,6 +11871,8 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 22)
     (=ucs		. #x7C5F)	; 籟
+    (=>jis-x0208	. #x645D)	; 籟 [68-61]
+    (=>jis-x0213-1	. #x645D)	; 籟 [68-61]
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R121-Jar.el b/lisp/utf-2000/Ideograph-R121-Jar.el
index 6b7c8e9..f37dc20 100644
--- a/lisp/utf-2000/Ideograph-R121-Jar.el
+++ b/lisp/utf-2000/Ideograph-R121-Jar.el
@@ -206,11 +206,11 @@
     (ideographic-radical . 121)	; ⽸
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
-    (=>ucs@unicode	. #x4343)	; &A-UU+4343;
+    (=+>ucs@unicode	. #x4343)	; &o-UU+4343;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x4343)	; &A-UU+4343;
+     ((=+>ucs@unicode	  . #x4343)	; &o-UU+4343;
       ))
     (ideographic-radical . 121)	; ⽸
     (ideographic-strokes . 4)
@@ -220,7 +220,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x4343)	; &A-UU+4343;
+     ((=+>ucs@unicode	  . #x4343)	; &o-UU+4343;
       ))
     (ideographic-radical . 121)	; ⽸
     (ideographic-strokes . 4)
diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el
index 364b663..9ba53ae 100644
--- a/lisp/utf-2000/Ideograph-R130-Meat.el
+++ b/lisp/utf-2000/Ideograph-R130-Meat.el
@@ -13989,11 +13989,13 @@
      ((=ucs		  . #x81C8)	; 臈
       ))
     (ideographic-radical . 130)	; ⾁
-    (=>ucs@unicode	. #x81C8)	; &A-UU+81C8;
+    (=+>ucs@unicode	. #x81C8)	; &o-J0-6745;
+    (=+>jis-x0208	. #x6745)	; &o-J0-6745; [71-37]
+    (=+>jis-x0213-1	. #x6745)	; &o-J0-6745; [71-37]
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x81C8)	; &A-UU+81C8;
+     ((=+>jis-x0208	  . #x6745)	; &o-J0-6745; [71-37]
       ))
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 13)
@@ -14009,7 +14011,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x81C8)	; &A-UU+81C8;
+     ((=+>jis-x0208	  . #x6745)	; &o-J0-6745; [71-37]
       ))
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 12)
diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el
index 637e917..5812ad4 100644
--- a/lisp/utf-2000/Ideograph-R140-Grass.el
+++ b/lisp/utf-2000/Ideograph-R140-Grass.el
@@ -2721,12 +2721,12 @@
      ((=ucs		  . #x82B1)	; 花
       ))
     (ideographic-radical . 140)	; ⾋
-    (=>ucs@unicode	. #x82B1)	; &A-UU+82B1;
-    (=>daikanwa		. 30734)	; &A-UU+82B1;
+    (=+>ucs@unicode	. #x82B1)	; &o-UU+82B1;
+    (=>daikanwa		. 30734)	; &o-UU+82B1;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x82B1)	; &A-UU+82B1;
+     ((=+>ucs@unicode	  . #x82B1)	; &o-UU+82B1;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 4)
@@ -2736,7 +2736,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x82B1)	; &A-UU+82B1;
+     ((=+>ucs@unicode	  . #x82B1)	; &o-UU+82B1;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 4)
@@ -3934,11 +3934,12 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 5)
-    (=>ucs@unicode	. #x82D2)	; &A-UU+82D2;
+    (=+>ucs@unicode	. #x82D2)	; &o-JX1-6772;
+    (=+>jis-x0213-1	. #x6772)	; &o-JX1-6772; [71-82]
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x82D2)	; &A-UU+82D2;
+     ((=+>jis-x0213-1	  . #x6772)	; &o-JX1-6772; [71-82]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 5)
@@ -3961,7 +3962,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x82D2)	; &A-UU+82D2;
+     ((=+>jis-x0213-1	  . #x6772)	; &o-JX1-6772; [71-82]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 5)
@@ -4300,12 +4301,14 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 5)
-    (=>ucs@unicode	. #x82DE)	; &A-UU+82DE;
-    (=big5		. #xAD63)	; &A-UU+82DE;
+    (=+>ucs@unicode	. #x82DE)	; &o-J0-677A;
+    (=+>jis-x0208	. #x677A)	; &o-J0-677A; [71-90]
+    (=+>jis-x0213-1	. #x677A)	; &o-J0-677A; [71-90]
+    (=big5		. #xAD63)	; &o-J0-677A;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x82DE)	; &A-UU+82DE;
+     ((=+>jis-x0208	  . #x677A)	; &o-J0-677A; [71-90]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 5)
@@ -4315,7 +4318,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x82DE)	; &A-UU+82DE;
+     ((=+>jis-x0208	  . #x677A)	; &o-J0-677A; [71-90]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 5)
@@ -9351,7 +9354,7 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 7)
-    (=>ucs@unicode	. #x8375)	; &o-J78-683B;
+    (=+>ucs@unicode	. #x8375)	; &o-J78-683B;
     (=+>jis-x0208@1978	. #x683B)	; &o-J78-683B; [72-27]
     (=big5		. #xD765)	; &o-J78-683B;
     ))
@@ -12614,11 +12617,11 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 8)
-    (=>ucs@unicode	. #x83C1)	; &A-UU+83C1;
+    (=+>ucs@unicode	. #x83C1)	; &o-UU+83C1;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x83C1)	; &A-UU+83C1;
+     ((=+>ucs@unicode	  . #x83C1)	; &o-UU+83C1;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 8)
@@ -12634,7 +12637,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x83C1)	; &A-UU+83C1;
+     ((=+>ucs@unicode	  . #x83C1)	; &o-UU+83C1;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 8)
@@ -13423,11 +13426,12 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 8)
-    (=+>ucs@jis		. #x83D4)	; &o-JU+83D4;
+    (=+>ucs@jis		. #x83D4)	; &o-JX2-763D;
+    (=+>jis-x0213-2	. #x763D)	; &o-JX2-763D; [86-29]
     ))
 (define-char
   '((<-denotational
-     ((=+>ucs@jis	  . #x83D4)	; &o-JU+83D4;
+     ((=+>jis-x0213-2	  . #x763D)	; &o-JX2-763D; [86-29]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 8)
@@ -13437,7 +13441,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=+>ucs@jis	  . #x83D4)	; &o-JU+83D4;
+     ((=+>jis-x0213-2	  . #x763D)	; &o-JX2-763D; [86-29]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 8)
@@ -13453,12 +13457,12 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 8)
-    (=>ucs@unicode	. #x83D4)	; &A-UU+83D4;
-    (=big5		. #xB5E8)	; &A-UU+83D4;
+    (=+>ucs@unicode	. #x83D4)	; &o-UU+83D4;
+    (=big5		. #xB5E8)	; &o-UU+83D4;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x83D4)	; &A-UU+83D4;
+     ((=+>ucs@unicode	  . #x83D4)	; &o-UU+83D4;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 8)
@@ -13468,7 +13472,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x83D4)	; &A-UU+83D4;
+     ((=+>ucs@unicode	  . #x83D4)	; &o-UU+83D4;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 8)
@@ -13983,11 +13987,11 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
-    (=>ucs@unicode	. #x8353)	; &A-UU+8353;
+    (=+>ucs@unicode	. #x8353)	; &o-UU+8353;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x8353)	; &A-UU+8353;
+     ((=+>ucs@unicode	  . #x8353)	; &o-UU+8353;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
@@ -13996,7 +14000,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x8353)	; &A-UU+8353;
+     ((=+>ucs@unicode	  . #x8353)	; &o-UU+8353;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
@@ -14005,7 +14009,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x8353)	; &A-UU+8353;
+     ((=+>ucs@unicode	  . #x8353)	; &o-UU+8353;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
@@ -14236,6 +14240,8 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=>>ucs@cns		. #x83E7)	; &G-CU+83E7;
+    (=>>>ucs@cns	. #x83E7)	; &G-CU+83E7;
+    (=>>daikanwa	. 31202)	; &G-CU+83E7;
     (->subsumptive
      ((=daikanwa	  . 31202)	; &M-31202;
       )
@@ -19292,12 +19298,13 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 9)
-    (=>ucs@unicode	. #x845B)	; &A-UU+845B;
-    (=big5		. #xB8AF)	; &A-UU+845B;
+    (=+>ucs@unicode	. #x845B)	; &o-J78-336B;
+    (=+>jis-x0208@1978	. #x336B)	; &o-J78-336B; [19-75]
+    (=big5		. #xB8AF)	; &o-J78-336B;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x845B)	; &A-UU+845B;
+     ((=+>jis-x0208@1978  . #x336B)	; &o-J78-336B; [19-75]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 9)
@@ -19313,7 +19320,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x845B)	; &A-UU+845B;
+     ((=+>jis-x0208@1978  . #x336B)	; &o-J78-336B; [19-75]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 9)
@@ -24894,11 +24901,11 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 10)
-    (=>ucs@unicode	. #x84CA)	; &A-UU+84CA;
+    (=+>ucs@unicode	. #x84CA)	; &o-UU+84CA;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x84CA)	; &A-UU+84CA;
+     ((=+>ucs@unicode	  . #x84CA)	; &o-UU+84CA;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 10)
@@ -24914,7 +24921,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x84CA)	; &A-UU+84CA;
+     ((=+>ucs@unicode	  . #x84CA)	; &o-UU+84CA;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 10)
@@ -26840,11 +26847,11 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 9)
-    (=>ucs@unicode	. #x84F1)	; &A-UU+84F1;
+    (=+>ucs@unicode	. #x84F1)	; &o-UU+84F1;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x84F1)	; &A-UU+84F1;
+     ((=+>ucs@unicode	  . #x84F1)	; &o-UU+84F1;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 9)
@@ -26853,7 +26860,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x84F1)	; &A-UU+84F1;
+     ((=+>ucs@unicode	  . #x84F1)	; &o-UU+84F1;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 9)
@@ -27382,11 +27389,11 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 11)
-    (=>ucs@unicode	. #x84FC)	; &A-UU+84FC;
+    (=+>ucs@unicode	. #x84FC)	; &o-UU+84FC;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x84FC)	; &A-UU+84FC;
+     ((=+>ucs@unicode	  . #x84FC)	; &o-UU+84FC;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 11)
@@ -27402,7 +27409,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x84FC)	; &A-UU+84FC;
+     ((=+>ucs@unicode	  . #x84FC)	; &o-UU+84FC;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 11)
@@ -28622,11 +28629,12 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 11)
-    (=>ucs@unicode	. #x8517)	; &A-UU+8517;
+    (=+>ucs@unicode	. #x8517)	; &o-JX1-6874;
+    (=+>jis-x0213-1	. #x6874)	; &o-JX1-6874; [72-84]
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x8517)	; &A-UU+8517;
+     ((=+>jis-x0213-1	  . #x6874)	; &o-JX1-6874; [72-84]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 11)
@@ -28647,7 +28655,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x8517)	; &A-UU+8517;
+     ((=+>jis-x0213-1	  . #x6874)	; &o-JX1-6874; [72-84]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 11)
@@ -31079,11 +31087,11 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 12)
-    (=>ucs@unicode	. #x853D)	; &A-UU+853D;
+    (=+>ucs@unicode	. #x853D)	; &o-UU+853D;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x853D)	; &A-UU+853D;
+     ((=+>ucs@unicode	  . #x853D)	; &o-UU+853D;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 12)
@@ -31092,7 +31100,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x853D)	; &A-UU+853D;
+     ((=+>ucs@unicode	  . #x853D)	; &o-UU+853D;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 12)
@@ -38378,11 +38386,11 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
-    (=>ucs@unicode	. #x85AF)	; &A-UU+85AF;
+    (=+>ucs@unicode	. #x85AF)	; &o-UU+85AF;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x85AF)	; &A-UU+85AF;
+     ((=+>ucs@unicode	  . #x85AF)	; &o-UU+85AF;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
@@ -38407,7 +38415,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x85AF)	; &A-UU+85AF;
+     ((=+>ucs@unicode	  . #x85AF)	; &o-UU+85AF;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
@@ -39811,11 +39819,11 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 14)
-    (=>ucs@unicode	. #x85CB)	; &A-UU+85CB;
+    (=+>ucs@unicode	. #x85CB)	; &o-UU+85CB;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x85CB)	; &A-UU+85CB;
+     ((=+>ucs@unicode	  . #x85CB)	; &o-UU+85CB;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 14)
@@ -39824,7 +39832,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x85CB)	; &A-UU+85CB;
+     ((=+>ucs@unicode	  . #x85CB)	; &o-UU+85CB;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 14)
@@ -43119,11 +43127,11 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 15)
-    (=>ucs@unicode	. #x85F7)	; &A-UU+85F7;
+    (=+>ucs@unicode	. #x85F7)	; &o-UU+85F7;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x85F7)	; &A-UU+85F7;
+     ((=+>ucs@unicode	  . #x85F7)	; &o-UU+85F7;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 15)
@@ -43132,7 +43140,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x85F7)	; &A-UU+85F7;
+     ((=+>ucs@unicode	  . #x85F7)	; &o-UU+85F7;
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 15)
@@ -43266,12 +43274,14 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 16)
-    (=>ucs@unicode	. #x85F9)	; &A-UU+85F9;
-    (=big5		. #xC4A7)	; &A-UU+85F9;
+    (=+>ucs@unicode	. #x85F9)	; &o-J0-693D;
+    (=+>jis-x0208	. #x693D)	; &o-J0-693D; [73-29]
+    (=+>jis-x0213-1	. #x693D)	; &o-J0-693D; [73-29]
+    (=big5		. #xC4A7)	; &o-J0-693D;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x85F9)	; &A-UU+85F9;
+     ((=+>jis-x0208	  . #x693D)	; &o-J0-693D; [73-29]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 16)
@@ -43287,7 +43297,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x85F9)	; &A-UU+85F9;
+     ((=+>jis-x0208	  . #x693D)	; &o-J0-693D; [73-29]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 16)
@@ -45753,21 +45763,12 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 17)
-    (=>ucs@unicode	. #x8624)	; &A-UU+8624;
+    (=+>ucs@unicode	. #x8624)	; &o-JX2-7731;
+    (=+>jis-x0213-2	. #x7731)	; &o-JX2-7731; [87-17]
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x8624)	; &A-UU+8624;
-      ))
-    (ideographic-radical . 140)	; ⾋
-    (ideographic-strokes . 17)
-    (=>>ucs@jis		. #x8624)	; &G-JX2-7731;
-    (=>>jis-x0213-2	. #x7731)	; &G-JX2-7731; [87-17]
-    (=>>daikanwa	. 32502)	; &G-JX2-7731;
-    ))
-(define-char
-  '((<-denotational
-     ((=>>jis-x0213-2	  . #x7731)	; &G-JX2-7731; [87-17]
+     ((=+>jis-x0213-2	  . #x7731)	; &o-JX2-7731; [87-17]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 17)
@@ -45776,23 +45777,23 @@
     ))
 (define-char
   '((<-denotational
-     ((=>>jis-x0213-2	  . #x7731)	; &G-JX2-7731; [87-17]
+     ((=+>jis-x0213-2	  . #x7731)	; &o-JX2-7731; [87-17]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
-    (=ucs@jis		. #x8624)	; &JX2-7731;
-    (=jis-x0213-2	. #x7731)	; &JX2-7731; [87-17]
-    (=hanyo-denshi/jd	. #x7731)	; &I-HD-JD-7731; [87-17]
+    (=ucs@unicode	. #x8624)	; &UU+8624;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x8624)	; &A-UU+8624;
+     ((=+>jis-x0213-2	  . #x7731)	; &o-JX2-7731; [87-17]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
-    (=ucs@unicode	. #x8624)	; &UU+8624;
+    (=ucs@jis		. #x8624)	; &JX2-7731;
+    (=jis-x0213-2	. #x7731)	; &JX2-7731; [87-17]
+    (=hanyo-denshi/jd	. #x7731)	; &I-HD-JD-7731; [87-17]
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R142-Insect.el b/lisp/utf-2000/Ideograph-R142-Insect.el
index 8bd3bc1..9a72b81 100644
--- a/lisp/utf-2000/Ideograph-R142-Insect.el
+++ b/lisp/utf-2000/Ideograph-R142-Insect.el
@@ -1329,11 +1329,14 @@
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
-    (=>ucs@unicode	. #x86A9)	; &A-UU+86A9;
+    (=+>ucs@unicode	. #x86A9)	; &o-J0-6950;
+    (=+>ucs@cns		. #x2F9B7)	; &o-J0-6950;
+    (=+>jis-x0208	. #x6950)	; &o-J0-6950; [73-48]
+    (=+>jis-x0213-1	. #x6950)	; &o-J0-6950; [73-48]
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x86A9)	; &A-UU+86A9;
+     ((=+>jis-x0208	  . #x6950)	; &o-J0-6950; [73-48]
       ))
     (=>ucs*		. #x86A9)	; 蚩
     (ideographic-radical . 142)	; ⾍
@@ -1343,6 +1346,10 @@
     (=>>ucs@jis		. #x86A9)	; 蚩
     (=>>ucs@ks		. #x86A9)	; 蚩
     (=>>ucs@cns		. #x2F9B7)	; 蚩
+    (=>>jis-x0208	. #x6950)	; 蚩 [73-48]
+    (=>>jis-x0213-1	. #x6950)	; 蚩 [73-48]
+    (=>>gt		. 44398)	; 蚩
+    (=>>daikanwa	. 32902)	; 蚩
     (->subsumptive
      ((=ucs@iso		  . #x2F9B7)	; &M-32902;
       (=ucs@jis		  . #x86A9)	; &M-32902;
@@ -1362,7 +1369,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x86A9)	; &A-UU+86A9;
+     ((=+>jis-x0208	  . #x6950)	; &o-J0-6950; [73-48]
       ))
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 4)
diff --git a/lisp/utf-2000/Ideograph-R149-Speech.el b/lisp/utf-2000/Ideograph-R149-Speech.el
index 85dfc1e..af35598 100644
--- a/lisp/utf-2000/Ideograph-R149-Speech.el
+++ b/lisp/utf-2000/Ideograph-R149-Speech.el
@@ -9950,11 +9950,13 @@
      ((=ucs		  . #x8ADB)	; 諛
       ))
     (ideographic-radical . 149)	; ⾔
-    (=>ucs@unicode	. #x8ADB)	; &A-UU+8ADB;
+    (=+>ucs@unicode	. #x8ADB)	; &o-J0-6B67;
+    (=+>jis-x0208	. #x6B67)	; &o-J0-6B67; [75-71]
+    (=+>jis-x0213-1	. #x6B67)	; &o-J0-6B67; [75-71]
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x8ADB)	; &A-UU+8ADB;
+     ((=+>jis-x0208	  . #x6B67)	; &o-J0-6B67; [75-71]
       ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 9)
@@ -9964,7 +9966,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x8ADB)	; &A-UU+8ADB;
+     ((=+>jis-x0208	  . #x6B67)	; &o-J0-6B67; [75-71]
       ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 8)
diff --git a/lisp/utf-2000/Ideograph-R150-Valley.el b/lisp/utf-2000/Ideograph-R150-Valley.el
index 8b44d5a..845e581 100644
--- a/lisp/utf-2000/Ideograph-R150-Valley.el
+++ b/lisp/utf-2000/Ideograph-R150-Valley.el
@@ -512,11 +512,13 @@
     (ideographic-radical . 150)	; ⾕
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
-    (=>ucs@unicode	. #x8C41)	; &A-UU+8C41;
+    (=+>ucs@unicode	. #x8C41)	; &o-J0-6C2F;
+    (=+>jis-x0208	. #x6C2F)	; &o-J0-6C2F; [76-15]
+    (=+>jis-x0213-1	. #x6C2F)	; &o-J0-6C2F; [76-15]
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x8C41)	; &A-UU+8C41;
+     ((=+>jis-x0208	  . #x6C2F)	; &o-J0-6C2F; [76-15]
       ))
     (ideographic-radical . 150)	; ⾕
     (ideographic-strokes . 10)
@@ -525,16 +527,16 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x8C41)	; &A-UU+8C41;
+     ((=+>jis-x0208	  . #x6C2F)	; &o-J0-6C2F; [76-15]
       ))
     (ideographic-radical . 150)	; ⾕
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
-    (=>>ucs@unicode	. #x8C41)	; &G-GT-48602;
-    (=>>>ucs@unicode	. #x8C41)	; &G-GT-48602;
-    (=>>jis-x0208	. #x6C2F)	; &G-GT-48602; [76-15]
-    (=>>jis-x0213-1	. #x6C2F)	; &G-GT-48602; [76-15]
-    (=>>gt		. 48602)	; &G-GT-48602;
+    (=>>ucs@unicode	. #x8C41)	; &g2-J0-6C2F;
+    (=>>>ucs@unicode	. #x8C41)	; &g2-J0-6C2F;
+    (=>>>jis-x0208	. #x6C2F)	; &g2-J0-6C2F; [76-15]
+    (=>>>jis-x0213-1	. #x6C2F)	; &g2-J0-6C2F; [76-15]
+    (=>>>gt		. 48602)	; &g2-J0-6C2F;
     (->subsumptive
      ((=ucs@jis		  . #x8C41)	; &GT-48602;
       (=jis-x0208	  . #x6C2F)	; &GT-48602; [76-15]
diff --git a/lisp/utf-2000/Ideograph-R159-Cart.el b/lisp/utf-2000/Ideograph-R159-Cart.el
index 9fb8f81..c00125c 100644
--- a/lisp/utf-2000/Ideograph-R159-Cart.el
+++ b/lisp/utf-2000/Ideograph-R159-Cart.el
@@ -4299,13 +4299,13 @@
     (ideographic-radical . 159)	; ⾞
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
-    (=>ucs@unicode	. #x8F44)	; &A-GT-51329;
+    (=+>ucs@unicode	. #x8F44)	; &A-GT-51329;
     (=>gt		. 51329)	; &A-GT-51329;
     (=>daikanwa		. 38482)	; &A-GT-51329;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x8F44)	; &A-GT-51329;
+     ((=+>ucs@unicode	  . #x8F44)	; &A-GT-51329;
       ))
     (ideographic-radical . 159)	; ⾞
     (ideographic-strokes . 10)
@@ -4316,7 +4316,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x8F44)	; &A-GT-51329;
+     ((=+>ucs@unicode	  . #x8F44)	; &A-GT-51329;
       ))
     (ideographic-radical . 159)	; ⾞
     (ideographic-strokes . 10)
@@ -4325,12 +4325,13 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x8F44)	; &A-GT-51329;
+     ((=+>ucs@unicode	  . #x8F44)	; &A-GT-51329;
       ))
     (ideographic-radical . 159)	; ⾞
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
     (=>>ucs@unicode	. #x8F44)	; &G-UU+8F44;
+    (=>>>ucs@unicode	. #x8F44)	; &G-UU+8F44;
     (->subsumptive
      ((=ks-x1001	  . #x795D)	; &K0-795D; [89-61]
       )
diff --git a/lisp/utf-2000/Ideograph-R162-Walk.el b/lisp/utf-2000/Ideograph-R162-Walk.el
index 4b14ce3..61c510e 100644
--- a/lisp/utf-2000/Ideograph-R162-Walk.el
+++ b/lisp/utf-2000/Ideograph-R162-Walk.el
@@ -16127,7 +16127,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=+>ucs@unicode	. 36978)
+    (=+>ucs@unicode	. #x9072)	; &o-UU+9072;
     (->subsumptive
      ((=hanyo-denshi/ft	  . #x3A3A)	; &HD-FT-3A3A; [26-26]
       )
diff --git a/lisp/utf-2000/Ideograph-R167-Gold.el b/lisp/utf-2000/Ideograph-R167-Gold.el
index 634e0ec..115242d 100644
--- a/lisp/utf-2000/Ideograph-R167-Gold.el
+++ b/lisp/utf-2000/Ideograph-R167-Gold.el
@@ -12872,11 +12872,11 @@
      ((=ucs		  . #x942F)	; 鐯
       ))
     (ideographic-radical . 167)	; ⾦
-    (=>ucs@unicode	. #x942F)	; &A-UU+942F;
+    (=+>ucs@unicode	. #x942F)	; &o-UU+942F;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x942F)	; &A-UU+942F;
+     ((=+>ucs@unicode	  . #x942F)	; &o-UU+942F;
       ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 12)
@@ -12885,7 +12885,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x942F)	; &A-UU+942F;
+     ((=+>ucs@unicode	  . #x942F)	; &o-UU+942F;
       ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 11)
diff --git a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
index 4e504b9..2b20c28 100644
--- a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
+++ b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
@@ -3162,11 +3162,12 @@
      ((=ucs		  . #x96DA)	; 雚
       ))
     (ideographic-radical . 172)	; ⾫
-    (=>ucs@unicode	. #x96DA)	; &A-UU+96DA;
+    (=+>ucs@unicode	. #x96DA)	; &o-JX2-7B73;
+    (=+>jis-x0213-2	. #x7B73)	; &o-JX2-7B73; [91-83]
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x96DA)	; &A-UU+96DA;
+     ((=+>jis-x0213-2	  . #x7B73)	; &o-JX2-7B73; [91-83]
       ))
     (ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 10)
@@ -3176,7 +3177,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x96DA)	; &A-UU+96DA;
+     ((=+>jis-x0213-2	  . #x7B73)	; &o-JX2-7B73; [91-83]
       ))
     (ideographic-radical . 172)	; ⾫
     (ideographic-strokes . 9)
diff --git a/lisp/utf-2000/Ideograph-R182-Wind.el b/lisp/utf-2000/Ideograph-R182-Wind.el
index f5e5c2d..1172eea 100644
--- a/lisp/utf-2000/Ideograph-R182-Wind.el
+++ b/lisp/utf-2000/Ideograph-R182-Wind.el
@@ -1286,7 +1286,7 @@
     (ideographic-radical . 182)	; â¾µ
     (ideographic-strokes . 7)
     (total-strokes	 . 16)
-    (=>ucs@unicode	. #x98B5)	; &A-UU+98B5;
+    (=+>ucs@unicode	. #x98B5)	; &o-UU+98B5;
     (->subsumptive
      ((=ucs@unicode	  . #x98B5)	; &UU+98B5;
       )
@@ -2146,7 +2146,7 @@
     (ideographic-radical . 182)	; â¾µ
     (ideographic-strokes . 9)
     (total-strokes	 . 18)
-    (=>ucs@unicode	. #x4B14)	; &A-UU+4B14;
+    (=+>ucs@unicode	. #x4B14)	; &o-UU+4B14;
     (->subsumptive
      ((=ucs@unicode	  . #x4B14)	; &UU+4B14;
       )
diff --git a/lisp/utf-2000/Ideograph-R184-Eat.el b/lisp/utf-2000/Ideograph-R184-Eat.el
index c88a485..95b796d 100644
--- a/lisp/utf-2000/Ideograph-R184-Eat.el
+++ b/lisp/utf-2000/Ideograph-R184-Eat.el
@@ -1524,7 +1524,7 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
-    (=>ucs@unicode	. #x98EF)	; &A-GT-59101;
+    (=+>ucs@unicode	. #x98EF)	; &A-GT-59101;
     (=>gt		. 59101)	; &A-GT-59101;
     (->subsumptive
      ((morohashi-daikanwa	44064 1)
@@ -5994,8 +5994,8 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
-    (=>ucs@unicode	. #x9929)	; &A-UU+9929;
-    (=+>ucs@cns		. #x2FA04)	; &A-UU+9929;
+    (=+>ucs@unicode	. #x9929)	; &o-UU+9929;
+    (=+>ucs@cns		. #x2FA04)	; &o-UU+9929;
     (->subsumptive
      ((=>ucs*		  . #x9929)	; 餩
       (=ucs		  . #x2FA04)	; 餩
@@ -7054,7 +7054,7 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 9)
     (total-strokes	 . 17)
-    (=>ucs@unicode	. #x4B4E)	; &A-UU+4B4E;
+    (=+>ucs@unicode	. #x4B4E)	; &o-UU+4B4E;
     (->subsumptive
      ((=ucs@unicode	  . #x4B4E)	; &UU+4B4E;
       )
@@ -10186,11 +10186,11 @@
      ((=ucs		  . #x995B)	; 饛
       ))
     (ideographic-radical . 184)	; â¾·
-    (=>ucs@unicode	. #x995B)	; &A-UU+995B;
+    (=+>ucs@unicode	. #x995B)	; &o-UU+995B;
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x995B)	; &A-UU+995B;
+     ((=+>ucs@unicode	  . #x995B)	; &o-UU+995B;
       ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 14)
@@ -10199,7 +10199,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=>ucs@unicode	  . #x995B)	; &A-UU+995B;
+     ((=+>ucs@unicode	  . #x995B)	; &o-UU+995B;
       ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 13)
-- 
1.7.10.4