From: tomo <tomo>
Date: Thu, 15 Apr 2010 09:03:57 +0000 (+0000)
Subject: Sync up with r21-4-22-chise-0_24-jis-x0213-rep-diffs.
X-Git-Tag: r21-4-22-u2km-0_24-jis-x0213-rep-diffs
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c0f8b67d8bac35b737bcfb7232500f2b782951ea;p=chise%2Fxemacs-chise.git

Sync up with r21-4-22-chise-0_24-jis-x0213-rep-diffs.
---

diff --git a/ChangeLog b/ChangeLog
index ed58ec5..98f6dc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-12  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* configure.in: Check libX11.dylib if libX11.a is not found in
+	each directory of X11 library path.
+
 2007-09-05  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* etc/CHISE-VERSIONS: New file.
diff --git a/configure b/configure
index ba3a32f..b9b0460 100755
--- a/configure
+++ b/configure
@@ -4517,7 +4517,6 @@ cat > conftest.$ac_ext <<EOF
 #line 4518 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4526,7 +4525,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -4554,13 +4553,12 @@ if test "$ac_cv_sizeof_short" = 0; then
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4558: checking size of int" >&5
+echo "configure:4557: checking size of int" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4561 "configure"
+#line 4560 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4569,7 +4567,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -4591,13 +4589,12 @@ EOF
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4595: checking size of long" >&5
+echo "configure:4593: checking size of long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4598 "configure"
+#line 4596 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4606,7 +4603,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -4628,13 +4625,12 @@ EOF
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4632: checking size of long long" >&5
+echo "configure:4629: checking size of long long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4635 "configure"
+#line 4632 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4643,7 +4639,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -4665,13 +4661,12 @@ EOF
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4669: checking size of void *" >&5
+echo "configure:4665: checking size of void *" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4672 "configure"
+#line 4668 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4680,7 +4675,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_void_p=`cat conftestval`
 else
@@ -4704,7 +4699,7 @@ EOF
 
 case $opsys in
   cygwin* ) cat > conftest.$ac_ext <<EOF
-#line 4708 "configure"
+#line 4703 "configure"
 #include "confdefs.h"
 #include <cygwin/types.h>
 EOF
@@ -4729,7 +4724,7 @@ rm -f conftest*
 esac
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4733: checking for long file names" >&5
+echo "configure:4728: checking for long file names" >&5
 
 ac_cv_sys_long_file_names=yes
 # Test for long file names in all the places we know might matter:
@@ -4775,10 +4770,10 @@ fi
 
 
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4779: checking for sin" >&5
+echo "configure:4774: checking for sin" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4782 "configure"
+#line 4777 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -4801,7 +4796,7 @@ sin();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_sin=yes"
 else
@@ -4819,12 +4814,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4823: checking for sin in -lm" >&5
+echo "configure:4818: checking for sin in -lm" >&5
 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lm "
 cat > conftest.$ac_ext <<EOF
-#line 4828 "configure"
+#line 4823 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4835,7 +4830,7 @@ int main() {
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4879,14 +4874,14 @@ EOF
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4883 "configure"
+#line 4878 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 return atanh(1.0) + asinh(1.0) + acosh(1.0); 
 ; return 0; }
 EOF
-if { (eval echo configure:4890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_INVERSE_HYPERBOLIC
@@ -4903,14 +4898,14 @@ fi
 rm -f conftest*
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:4907: checking type of mail spool file locking" >&5
+echo "configure:4902: checking type of mail spool file locking" >&5
 for ac_func in lockf flock
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4911: checking for $ac_func" >&5
+echo "configure:4906: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4914 "configure"
+#line 4909 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4933,7 +4928,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5015,12 +5010,12 @@ test "$mail_locking" = "locking" -a "$ac_cv_func_locking" != "yes" && \
 case "$opsys" in decosf*)
   
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:5019: checking for cma_open in -lpthreads" >&5
+echo "configure:5014: checking for cma_open in -lpthreads" >&5
 ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpthreads "
 cat > conftest.$ac_ext <<EOF
-#line 5024 "configure"
+#line 5019 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5031,7 +5026,7 @@ int main() {
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:5035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5068,7 +5063,7 @@ esac
 
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:5072: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:5067: checking whether the -xildoff compiler flag is required" >&5
 if   ${CC-cc} '-###' -xildon  no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
   if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ;
     then echo "$ac_t""no" 1>&6;
@@ -5080,7 +5075,7 @@ fi
 if test "$opsys" = "sol2"; then
   if test "$os_release" -ge 506; then
     echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:5084: checking for \"-z ignore\" linker flag" >&5
+echo "configure:5079: checking for \"-z ignore\" linker flag" >&5
     case "`ld -h 2>&1`" in
       *-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6
         ld_switch_site="-z ignore $ld_switch_site" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
@@ -5091,7 +5086,7 @@ fi
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:5095: checking "for specified window system"" >&5
+echo "configure:5090: checking "for specified window system"" >&5
 
 
 GNOME_CONFIG=no
@@ -5099,7 +5094,7 @@ GTK_CONFIG=no
 
 if test "$with_gnome" != "no"; then
    echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5103: checking for GNOME configuration script" >&5
+echo "configure:5098: checking for GNOME configuration script" >&5
    for possible in gnome-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5130,7 +5125,7 @@ fi
 
 if test "$with_gtk" != "no";then
    echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5134: checking for GTK configuration script" >&5
+echo "configure:5129: checking for GTK configuration script" >&5
    for possible in gtk12-config gtk14-config gtk-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5152,18 +5147,18 @@ fi
 
 if test "${GTK_CONFIG}" != "no"; then
       echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5156: checking gtk version" >&5
+echo "configure:5151: checking gtk version" >&5
       GTK_VERSION=`${GTK_CONFIG} --version`
       echo "$ac_t""${GTK_VERSION}" 1>&6
 
       echo $ac_n "checking gtk libs""... $ac_c" 1>&6
-echo "configure:5161: checking gtk libs" >&5
+echo "configure:5156: checking gtk libs" >&5
       GTK_LIBS=`${GTK_CONFIG} --libs`
       libs_gtk="$libs_gtk ${GTK_LIBS}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi
       echo "$ac_t""${GTK_LIBS}" 1>&6
 
       echo $ac_n "checking gtk cflags""... $ac_c" 1>&6
-echo "configure:5167: checking gtk cflags" >&5
+echo "configure:5162: checking gtk cflags" >&5
       GTK_CFLAGS=`${GTK_CONFIG} --cflags`
       if test "$GCC" = "yes"; then
       	GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
@@ -5173,19 +5168,19 @@ echo "configure:5167: checking gtk cflags" >&5
 
       
 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5177: checking for main in -lgdk_imlib" >&5
+echo "configure:5172: checking for main in -lgdk_imlib" >&5
 ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgdk_imlib "
 cat > conftest.$ac_ext <<EOF
-#line 5182 "configure"
+#line 5177 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5207,12 +5202,12 @@ fi
 
       
 echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5211: checking for Imlib_init in -lImlib" >&5
+echo "configure:5206: checking for Imlib_init in -lImlib" >&5
 ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lImlib "
 cat > conftest.$ac_ext <<EOF
-#line 5216 "configure"
+#line 5211 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5223,7 +5218,7 @@ int main() {
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5246,10 +5241,10 @@ fi
       for ac_func in gdk_imlib_init
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5250: checking for $ac_func" >&5
+echo "configure:5245: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5253 "configure"
+#line 5248 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5272,7 +5267,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5351,15 +5346,15 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5355: checking for $ac_hdr" >&5
+echo "configure:5350: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5358 "configure"
+#line 5353 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5390,19 +5385,19 @@ done
 
       
 echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5394: checking for main in -lxml" >&5
+echo "configure:5389: checking for main in -lxml" >&5
 ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lxml "
 cat > conftest.$ac_ext <<EOF
-#line 5399 "configure"
+#line 5394 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5424,19 +5419,19 @@ fi
 
       
 echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5428: checking for main in -lglade" >&5
+echo "configure:5423: checking for main in -lglade" >&5
 ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lglade "
 cat > conftest.$ac_ext <<EOF
-#line 5433 "configure"
+#line 5428 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5458,19 +5453,19 @@ fi
 
       
 echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5462: checking for main in -lglade-gnome" >&5
+echo "configure:5457: checking for main in -lglade-gnome" >&5
 ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lglade-gnome "
 cat > conftest.$ac_ext <<EOF
-#line 5467 "configure"
+#line 5462 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5491,7 +5486,7 @@ fi
 
 
       cat > conftest.$ac_ext <<EOF
-#line 5495 "configure"
+#line 5490 "configure"
 #include "confdefs.h"
 #include <glade/glade-xml.h>
 EOF
@@ -5541,7 +5536,7 @@ if test "$with_x11" != "no"; then
 
   if test "$x_libraries" = "NONE"; then
     for dir in "/usr/X11/lib" "/usr/X11R6/lib" "/usr/lib/X11R6"; do
-      if test -r "$dir/libX11.a"; then x_libraries="$dir"; break; fi
+      if test -r "$dir/libX11.a" -o -r "$dir/libX11.dylib"; then x_libraries="$dir"; break; fi
     done
   fi
 
@@ -5550,7 +5545,7 @@ if test "$with_x11" != "no"; then
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:5554: checking for X" >&5
+echo "configure:5549: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5610,12 +5605,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5614 "configure"
+#line 5609 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5684,14 +5679,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5688 "configure"
+#line 5683 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -5800,17 +5795,17 @@ else
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:5804: checking whether -R must be followed by a space" >&5
+echo "configure:5799: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 5807 "configure"
+#line 5802 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -5826,14 +5821,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5830 "configure"
+#line 5825 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -5869,12 +5864,12 @@ ac_cv_lib_dnet_dnet_ntoa=no
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5873: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5868: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldnet "
 cat > conftest.$ac_ext <<EOF
-#line 5878 "configure"
+#line 5873 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5885,7 +5880,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5909,12 +5904,12 @@ fi
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       
 echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:5913: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5908: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldnet_stub "
 cat > conftest.$ac_ext <<EOF
-#line 5918 "configure"
+#line 5913 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5925,7 +5920,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5954,10 +5949,10 @@ fi
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:5958: checking for gethostbyname" >&5
+echo "configure:5953: checking for gethostbyname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5961 "configure"
+#line 5956 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -5980,7 +5975,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -6001,12 +5996,12 @@ fi
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:6005: checking for gethostbyname in -lnsl" >&5
+echo "configure:6000: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lnsl "
 cat > conftest.$ac_ext <<EOF
-#line 6010 "configure"
+#line 6005 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6017,7 +6012,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:6021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6047,10 +6042,10 @@ fi
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:6051: checking for connect" >&5
+echo "configure:6046: checking for connect" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6054 "configure"
+#line 6049 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -6073,7 +6068,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -6096,12 +6091,12 @@ fi
 xe_msg_checking="for connect in -lsocket"
 test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6100: checking "$xe_msg_checking"" >&5
+echo "configure:6095: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lsocket $X_EXTRA_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6105 "configure"
+#line 6100 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6112,7 +6107,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:6116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6136,10 +6131,10 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:6140: checking for remove" >&5
+echo "configure:6135: checking for remove" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6143 "configure"
+#line 6138 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -6162,7 +6157,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -6183,12 +6178,12 @@ fi
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6187: checking for remove in -lposix" >&5
+echo "configure:6182: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lposix "
 cat > conftest.$ac_ext <<EOF
-#line 6192 "configure"
+#line 6187 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6199,7 +6194,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:6203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6223,10 +6218,10 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6227: checking for shmat" >&5
+echo "configure:6222: checking for shmat" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6230 "configure"
+#line 6225 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -6249,7 +6244,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -6270,12 +6265,12 @@ fi
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6274: checking for shmat in -lipc" >&5
+echo "configure:6269: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lipc "
 cat > conftest.$ac_ext <<EOF
-#line 6279 "configure"
+#line 6274 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6286,7 +6281,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:6290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6322,12 +6317,12 @@ fi
 xe_msg_checking="for IceConnectionNumber in -lICE"
 test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6326: checking "$xe_msg_checking"" >&5
+echo "configure:6321: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lICE $X_EXTRA_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6331 "configure"
+#line 6326 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6338,7 +6333,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:6342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6384,15 +6379,15 @@ EOF
 
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:6388: checking for Xm/Xm.h" >&5
+echo "configure:6383: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6391 "configure"
+#line 6386 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6409,12 +6404,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:6413: checking for XmStringFree in -lXm" >&5
+echo "configure:6408: checking for XmStringFree in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 6418 "configure"
+#line 6413 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6425,7 +6420,7 @@ int main() {
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:6429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6577,7 +6572,7 @@ EOF
 
 
     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6581: checking for X defines extracted by xmkmf" >&5
+echo "configure:6576: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -6626,15 +6621,15 @@ EOF
 
     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6630: checking for X11/Intrinsic.h" >&5
+echo "configure:6625: checking for X11/Intrinsic.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6633 "configure"
+#line 6628 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6658,12 +6653,12 @@ fi
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6662: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6657: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 6667 "configure"
+#line 6662 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6674,7 +6669,7 @@ int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6699,12 +6694,12 @@ fi
 xe_msg_checking="for XGetFontProperty in -lX11"
 test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6703: checking "$xe_msg_checking"" >&5
+echo "configure:6698: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 -b i486-linuxaout"
 cat > conftest.$ac_ext <<EOF
-#line 6708 "configure"
+#line 6703 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6715,7 +6710,7 @@ int main() {
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:6719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6742,12 +6737,12 @@ fi
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6746: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6741: checking for XShapeSelectInput in -lXext" >&5
 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXext "
 cat > conftest.$ac_ext <<EOF
-#line 6751 "configure"
+#line 6746 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6758,7 +6753,7 @@ int main() {
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:6762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6781,12 +6776,12 @@ fi
 
     
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6785: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6780: checking for XtOpenDisplay in -lXt" >&5
 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXt "
 cat > conftest.$ac_ext <<EOF
-#line 6790 "configure"
+#line 6785 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6797,7 +6792,7 @@ int main() {
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6820,14 +6815,14 @@ fi
 
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6824: checking the version of X11 being used" >&5
+echo "configure:6819: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6826 "configure"
+#line 6821 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -6858,10 +6853,10 @@ EOF
   for ac_func in XConvertCase XtRegisterDrawable
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6862: checking for $ac_func" >&5
+echo "configure:6857: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6865 "configure"
+#line 6860 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6884,7 +6879,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6916,15 +6911,15 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6920: checking for $ac_hdr" >&5
+echo "configure:6915: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6923 "configure"
+#line 6918 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6957,10 +6952,10 @@ done
     for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6961: checking for $ac_func" >&5
+echo "configure:6956: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6964 "configure"
+#line 6959 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6983,7 +6978,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7011,9 +7006,9 @@ fi
 done
 
   echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:7015: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:7010: checking for standard XRegisterIMInstantiateCallback prototype" >&5
   cat > conftest.$ac_ext <<EOF
-#line 7017 "configure"
+#line 7012 "configure"
 #include "confdefs.h"
 
 #define NeedFunctionPrototypes 1
@@ -7025,7 +7020,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:7029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -7046,12 +7041,12 @@ rm -f conftest*
 
     test -z "$with_xmu" && { 
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:7050: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:7045: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
 ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXmu "
 cat > conftest.$ac_ext <<EOF
-#line 7055 "configure"
+#line 7050 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7062,7 +7057,7 @@ int main() {
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:7066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7101,19 +7096,19 @@ EOF
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:7105: checking for main in -lXbsd" >&5
+echo "configure:7100: checking for main in -lXbsd" >&5
 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXbsd "
 cat > conftest.$ac_ext <<EOF
-#line 7110 "configure"
+#line 7105 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7137,7 +7132,7 @@ fi
     if test "$unexec" = "unexaix.o" -a "$x11_release" = "6"; then
         if test "$GCC" = "yes"; then
                   echo $ac_n "checking for name of AIX gcc threads option""... $ac_c" 1>&6
-echo "configure:7141: checking for name of AIX gcc threads option" >&5
+echo "configure:7136: checking for name of AIX gcc threads option" >&5
       case `$CC -v --help 2>&1` in
         *-mthreads*) aix_threads=-mthreads ;;
                   *) aix_threads=-pthread  ;;
@@ -7151,13 +7146,12 @@ echo "configure:7141: checking for name of AIX gcc threads option" >&5
          xe_save_CC="$CC"
          CC="${CC}_r"
          echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:7155: checking size of short" >&5
+echo "configure:7150: checking size of short" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7158 "configure"
+#line 7153 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -7166,7 +7160,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:7170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -7195,22 +7189,22 @@ EOF
 fi 
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:7199: checking for MS-Windows" >&5
+echo "configure:7193: checking for MS-Windows" >&5
   
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:7202: checking for main in -lgdi32" >&5
+echo "configure:7196: checking for main in -lgdi32" >&5
 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgdi32 "
 cat > conftest.$ac_ext <<EOF
-#line 7207 "configure"
+#line 7201 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7283,12 +7277,12 @@ EOF
  fi
     fi
         cat > conftest.$ac_ext <<EOF
-#line 7287 "configure"
+#line 7281 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:7292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   need_event_unixoid=yes; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MSG_SELECT
@@ -7352,15 +7346,15 @@ fi
 if test "$with_x11" = "yes"; then
   ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
-echo "configure:7356: checking for X11/extensions/shape.h" >&5
+echo "configure:7350: checking for X11/extensions/shape.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7359 "configure"
+#line 7353 "configure"
 #include "confdefs.h"
 #include <X11/extensions/shape.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7412,7 +7406,7 @@ case "$x_libraries" in *X11R4* )
 esac
 
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7416: checking for WM_COMMAND option" >&5;
+echo "configure:7410: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_WMCOMMAND
@@ -7427,15 +7421,15 @@ fi
 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
 test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6
-echo "configure:7431: checking for X11/Xauth.h" >&5
+echo "configure:7425: checking for X11/Xauth.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7434 "configure"
+#line 7428 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7458,12 +7452,12 @@ fi
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7462: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7456: checking for XauGetAuthByAddr in -lXau" >&5
 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXau "
 cat > conftest.$ac_ext <<EOF
-#line 7467 "configure"
+#line 7461 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7474,7 +7468,7 @@ int main() {
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:7478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7519,15 +7513,15 @@ if test "$with_tooltalk" != "no" ; then
       for dir in "" "Tt/" "desktop/" ; do
     ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6
-echo "configure:7523: checking for ${dir}tt_c.h" >&5
+echo "configure:7517: checking for ${dir}tt_c.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7526 "configure"
+#line 7520 "configure"
 #include "confdefs.h"
 #include <${dir}tt_c.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7563,12 +7557,12 @@ if test "$with_tooltalk" != "no" ; then
 xe_msg_checking="for tt_message_create in -ltt"
 test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7567: checking "$xe_msg_checking"" >&5
+echo "configure:7561: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltt $extra_libs"
 cat > conftest.$ac_ext <<EOF
-#line 7572 "configure"
+#line 7566 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7579,7 +7573,7 @@ int main() {
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:7583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7636,15 +7630,15 @@ fi
 
 test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6
-echo "configure:7640: checking for Dt/Dt.h" >&5
+echo "configure:7634: checking for Dt/Dt.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7643 "configure"
+#line 7637 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7667,12 +7661,12 @@ fi
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:7671: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:7665: checking for DtDndDragStart in -lDtSvc" >&5
 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lDtSvc "
 cat > conftest.$ac_ext <<EOF
-#line 7676 "configure"
+#line 7670 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7683,7 +7677,7 @@ int main() {
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7756,7 +7750,7 @@ fi
 
 if test "$with_dragndrop" != "no" ; then
   echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:7760: checking if drag and drop API is needed" >&5
+echo "configure:7754: checking if drag and drop API is needed" >&5
   if test -n "$dragndrop_proto" ; then
     with_dragndrop=yes
     echo "$ac_t""yes (${dragndrop_proto} )" 1>&6
@@ -7776,18 +7770,18 @@ EOF
 fi
 
 echo "checking for LDAP" 1>&6
-echo "configure:7780: checking for LDAP" >&5
+echo "configure:7774: checking for LDAP" >&5
 test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
-echo "configure:7783: checking for ldap.h" >&5
+echo "configure:7777: checking for ldap.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7786 "configure"
+#line 7780 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7810,15 +7804,15 @@ fi
  }
 test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for lber.h""... $ac_c" 1>&6
-echo "configure:7814: checking for lber.h" >&5
+echo "configure:7808: checking for lber.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7817 "configure"
+#line 7811 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7843,10 +7837,10 @@ if test no != "$with_ldap";then
   if test . != "${ldap_libs+.}";then
     ldap_libs=
     echo $ac_n "checking for ldap_open""... $ac_c" 1>&6
-echo "configure:7847: checking for ldap_open" >&5
+echo "configure:7841: checking for ldap_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7850 "configure"
+#line 7844 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char ldap_open(); below.  */
@@ -7869,7 +7863,7 @@ ldap_open();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_ldap_open=yes"
 else
@@ -7889,12 +7883,12 @@ else
   echo "$ac_t""no" 1>&6
       
 echo $ac_n "checking for ldap_open in -lldap""... $ac_c" 1>&6
-echo "configure:7893: checking for ldap_open in -lldap" >&5
+echo "configure:7887: checking for ldap_open in -lldap" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap "
 cat > conftest.$ac_ext <<EOF
-#line 7898 "configure"
+#line 7892 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7905,7 +7899,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7927,12 +7921,12 @@ ldap_needs_lber=yes ldap_other_libs=-llber
 xe_msg_checking="for ldap_open in -lldap"
 test -n "$ldap_other_libs" && xe_msg_checking="$xe_msg_checking using extra libs $ldap_other_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7931: checking "$xe_msg_checking"" >&5
+echo "configure:7925: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap $ldap_other_libs"
 cat > conftest.$ac_ext <<EOF
-#line 7936 "configure"
+#line 7930 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7943,7 +7937,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7965,12 +7959,12 @@ ldap_needs_krb=yes ldap_other_libs="$ldap_other_libs -lkrb"
 xe_msg_checking="for ldap_open in -lldap"
 test -n "$ldap_other_libs" && xe_msg_checking="$xe_msg_checking using extra libs $ldap_other_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7969: checking "$xe_msg_checking"" >&5
+echo "configure:7963: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap $ldap_other_libs"
 cat > conftest.$ac_ext <<EOF
-#line 7974 "configure"
+#line 7968 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7981,7 +7975,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8003,12 +7997,12 @@ ldap_needs_des=yes ldap_other_libs="$ldap_other_libs -ldes"
 xe_msg_checking="for ldap_open in -lldap"
 test -n "$ldap_other_libs" && xe_msg_checking="$xe_msg_checking using extra libs $ldap_other_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:8007: checking "$xe_msg_checking"" >&5
+echo "configure:8001: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap $ldap_other_libs"
 cat > conftest.$ac_ext <<EOF
-#line 8012 "configure"
+#line 8006 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8019,7 +8013,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:8023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8051,10 +8045,10 @@ fi
 
       if test yes = "$with_ldap" -a yes != "$ldap_needs_lber";then
 	echo $ac_n "checking for LDAP_OPT_ON definition""... $ac_c" 1>&6
-echo "configure:8055: checking for LDAP_OPT_ON definition" >&5
+echo "configure:8049: checking for LDAP_OPT_ON definition" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8058 "configure"
+#line 8052 "configure"
 #include "confdefs.h"
 #include <lber.h>
 #include <ldap.h>
@@ -8068,7 +8062,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:8072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   xe_cv_have_LDAP_OPT_ON=yes
 else
@@ -8082,12 +8076,12 @@ rm -f conftest*
 echo "$ac_t""$xe_cv_have_LDAP_OPT_ON" 1>&6
 	if test yes = "$xe_cv_have_LDAP_OPT_ON";then
 	  echo $ac_n "checking LDAP_OPT_ON linking""... $ac_c" 1>&6
-echo "configure:8086: checking LDAP_OPT_ON linking" >&5
+echo "configure:8080: checking LDAP_OPT_ON linking" >&5
 
 xe_save_LIBS="$LIBS"
 	    LIBS="-lldap $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8091 "configure"
+#line 8085 "configure"
 #include "confdefs.h"
 #include <lber.h>
 #include <ldap.h>
@@ -8096,7 +8090,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:8100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xe_cv_LDAP_OPT_ON_links=yes
 else
@@ -8112,12 +8106,12 @@ echo "$ac_t""$xe_cv_LDAP_OPT_ON_links" 1>&6
 	  if test yes != "$xe_cv_LDAP_OPT_ON_links";then
 	    ldap_needs_lber=yes ldap_other_libs=-llber
 	    echo $ac_n "checking LDAP_OPT_ON linking with -llber""... $ac_c" 1>&6
-echo "configure:8116: checking LDAP_OPT_ON linking with -llber" >&5
+echo "configure:8110: checking LDAP_OPT_ON linking with -llber" >&5
 
 xe_save_LIBS="$LIBS"
 	      LIBS="-lldap $ldap_other_libs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8121 "configure"
+#line 8115 "configure"
 #include "confdefs.h"
 #include <lber.h>
 #include <ldap.h>
@@ -8126,7 +8120,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:8130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xe_cv_LDAP_OPT_ON_links_w_lber=yes
 else
@@ -8162,10 +8156,10 @@ fi
   else
     save_LIBS="$LIBS" LIBS="$ldap_libs $LIBS"
     echo $ac_n "checking for ldap_open""... $ac_c" 1>&6
-echo "configure:8166: checking for ldap_open" >&5
+echo "configure:8160: checking for ldap_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8169 "configure"
+#line 8163 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char ldap_open(); below.  */
@@ -8188,7 +8182,7 @@ ldap_open();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_ldap_open=yes"
 else
@@ -8228,10 +8222,10 @@ EOF
   for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8232: checking for $ac_func" >&5
+echo "configure:8226: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8235 "configure"
+#line 8229 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8254,7 +8248,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8285,20 +8279,20 @@ fi
 
 if test "$with_postgresql" != "no"; then
   echo "checking for PostgreSQL" 1>&6
-echo "configure:8289: checking for PostgreSQL" >&5
+echo "configure:8283: checking for PostgreSQL" >&5
 
   for header_dir in "" "pgsql/" "postgresql/"; do
     ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6
-echo "configure:8294: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:8288: checking for ${header_dir}libpq-fe.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8297 "configure"
+#line 8291 "configure"
 #include "confdefs.h"
 #include <${header_dir}libpq-fe.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8322,12 +8316,12 @@ fi
 
   test -n "$libpq_fe_h_file" && { 
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:8326: checking for PQconnectdb in -lpq" >&5
+echo "configure:8320: checking for PQconnectdb in -lpq" >&5
 ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpq "
 cat > conftest.$ac_ext <<EOF
-#line 8331 "configure"
+#line 8325 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8338,7 +8332,7 @@ int main() {
 PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:8342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8371,12 +8365,12 @@ EOF
 
     
 echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:8375: checking for PQconnectStart in -lpq" >&5
+echo "configure:8369: checking for PQconnectStart in -lpq" >&5
 ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpq "
 cat > conftest.$ac_ext <<EOF
-#line 8380 "configure"
+#line 8374 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8387,7 +8381,7 @@ int main() {
 PQconnectStart()
 ; return 0; }
 EOF
-if { (eval echo configure:8391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8435,7 +8429,7 @@ fi
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:8439: checking for graphics libraries" >&5
+echo "configure:8433: checking for graphics libraries" >&5
 
       libpath_xpm=
   incpath_xpm=
@@ -8462,10 +8456,10 @@ echo "configure:8439: checking for graphics libraries" >&5
     CFLAGS=""$incpath_xpm" $CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
     LDFLAGS=""$libpath_xpm" $LDFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
     echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:8466: checking for Xpm - no older than 3.4f" >&5
+echo "configure:8460: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs="$libname_xpm"
     cat > conftest.$ac_ext <<EOF
-#line 8469 "configure"
+#line 8463 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #include <X11/xpm.h>
@@ -8474,7 +8468,7 @@ echo "configure:8466: checking for Xpm - no older than 3.4f" >&5
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest dummy_arg; xpm_status=$?;
       if test "$xpm_status" = "0"; then
@@ -8518,17 +8512,17 @@ EOF
     libs_x=""$libname_xpm" $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$libname_xpm"\" to \$libs_x"; fi
     CFLAGS=""$incpath_xpm" $CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
     echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:8522: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:8516: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs="$libname_xpm"
     cat > conftest.$ac_ext <<EOF
-#line 8525 "configure"
+#line 8519 "configure"
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:8532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -8554,15 +8548,15 @@ EOF
 
     test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:8558: checking for compface.h" >&5
+echo "configure:8552: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8561 "configure"
+#line 8555 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8585,12 +8579,12 @@ fi
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8589: checking for UnGenFace in -lcompface" >&5
+echo "configure:8583: checking for UnGenFace in -lcompface" >&5
 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcompface "
 cat > conftest.$ac_ext <<EOF
-#line 8594 "configure"
+#line 8588 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8601,7 +8595,7 @@ int main() {
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8653,12 +8647,12 @@ EOF
       if test "$with_png $with_tiff" != "no no"; then
     
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:8657: checking for inflate in -lc" >&5
+echo "configure:8651: checking for inflate in -lc" >&5
 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF
-#line 8662 "configure"
+#line 8656 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8669,7 +8663,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8688,12 +8682,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:8692: checking for inflate in -lz" >&5
+echo "configure:8686: checking for inflate in -lz" >&5
 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lz "
 cat > conftest.$ac_ext <<EOF
-#line 8697 "configure"
+#line 8691 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8704,7 +8698,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8723,12 +8717,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:8727: checking for inflate in -lgz" >&5
+echo "configure:8721: checking for inflate in -lgz" >&5
 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgz "
 cat > conftest.$ac_ext <<EOF
-#line 8732 "configure"
+#line 8726 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8739,7 +8733,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8769,15 +8763,15 @@ fi
 
     test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:8773: checking for jpeglib.h" >&5
+echo "configure:8767: checking for jpeglib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8776 "configure"
+#line 8770 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8800,12 +8794,12 @@ fi
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:8804: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:8798: checking for jpeg_destroy_decompress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ljpeg "
 cat > conftest.$ac_ext <<EOF
-#line 8809 "configure"
+#line 8803 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8816,7 +8810,7 @@ int main() {
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:8820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8852,10 +8846,10 @@ EOF
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:8856: checking for pow" >&5
+echo "configure:8850: checking for pow" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8859 "configure"
+#line 8853 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -8878,7 +8872,7 @@ pow();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pow=yes"
 else
@@ -8899,15 +8893,15 @@ fi
  }
   test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:8903: checking for png.h" >&5
+echo "configure:8897: checking for png.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8906 "configure"
+#line 8900 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8930,12 +8924,12 @@ fi
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8934: checking for png_read_image in -lpng" >&5
+echo "configure:8928: checking for png_read_image in -lpng" >&5
 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpng "
 cat > conftest.$ac_ext <<EOF
-#line 8939 "configure"
+#line 8933 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8946,7 +8940,7 @@ int main() {
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:8950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8969,10 +8963,10 @@ fi
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:8973: checking for workable png version information" >&5
+echo "configure:8967: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 8976 "configure"
+#line 8970 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -8980,7 +8974,7 @@ echo "configure:8973: checking for workable png version information" >&5
     if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
     return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest dummy_arg; png_status=$?;
       if test "$png_status" = "0"; then
@@ -9023,15 +9017,15 @@ EOF
 
     test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:9027: checking for tiffio.h" >&5
+echo "configure:9021: checking for tiffio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9030 "configure"
+#line 9024 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9054,12 +9048,12 @@ fi
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:9058: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:9052: checking for TIFFClientOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltiff "
 cat > conftest.$ac_ext <<EOF
-#line 9063 "configure"
+#line 9057 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9070,7 +9064,7 @@ int main() {
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:9074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9109,15 +9103,15 @@ fi
 if test "$with_gtk" = "yes"; then
     test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:9113: checking for compface.h" >&5
+echo "configure:9107: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9116 "configure"
+#line 9110 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9140,12 +9134,12 @@ fi
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:9144: checking for UnGenFace in -lcompface" >&5
+echo "configure:9138: checking for UnGenFace in -lcompface" >&5
 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcompface "
 cat > conftest.$ac_ext <<EOF
-#line 9149 "configure"
+#line 9143 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9156,7 +9150,7 @@ int main() {
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:9160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9195,12 +9189,12 @@ fi
 
 if test "$with_x11" = "yes"; then
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:9199: checking for X11 graphics libraries" >&5
+echo "configure:9193: checking for X11 graphics libraries" >&5
 fi
 
 if test "$with_x11" = "yes"; then
   echo "checking for the Athena widgets" 1>&6
-echo "configure:9204: checking for the Athena widgets" >&5
+echo "configure:9198: checking for the Athena widgets" >&5
 
     case "$with_athena" in
         "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
@@ -9216,12 +9210,12 @@ echo "configure:9204: checking for the Athena widgets" >&5
     if test "$athena_3d" = "no"; then
     
 echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9220: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:9214: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 9225 "configure"
+#line 9219 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9232,7 +9226,7 @@ int main() {
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:9236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9248,12 +9242,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
   echo "$ac_t""yes" 1>&6
           
 echo $ac_n "checking for $athena_3d_function in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9252: checking for $athena_3d_function in -l$athena_variant" >&5
+echo "configure:9246: checking for $athena_3d_function in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'$athena_3d_function | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 9257 "configure"
+#line 9251 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9264,7 +9258,7 @@ int main() {
 $athena_3d_function()
 ; return 0; }
 EOF
-if { (eval echo configure:9268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9295,12 +9289,12 @@ fi
   else
         
 echo $ac_n "checking for $athena_3d_function in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9299: checking for $athena_3d_function in -l$athena_variant" >&5
+echo "configure:9293: checking for $athena_3d_function in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'$athena_3d_function | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 9304 "configure"
+#line 9298 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9311,7 +9305,7 @@ int main() {
 $athena_3d_function()
 ; return 0; }
 EOF
-if { (eval echo configure:9315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9329,12 +9323,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for $athena_3d_function in -lXaw""... $ac_c" 1>&6
-echo "configure:9333: checking for $athena_3d_function in -lXaw" >&5
+echo "configure:9327: checking for $athena_3d_function in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'$athena_3d_function | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 9338 "configure"
+#line 9332 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9345,7 +9339,7 @@ int main() {
 $athena_3d_function()
 ; return 0; }
 EOF
-if { (eval echo configure:9349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9376,15 +9370,15 @@ fi
     if test "$athena_3d" = "no"; then
     ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9380: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9374: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9383 "configure"
+#line 9377 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9404,15 +9398,15 @@ else
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6
-echo "configure:9408: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:9402: checking for X11/Xaw/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9411 "configure"
+#line 9405 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9438,15 +9432,15 @@ fi
   else
             ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:9442: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:9436: checking for X11/$athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9445 "configure"
+#line 9439 "configure"
 #include "confdefs.h"
 #include <X11/$athena_variant/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9463,15 +9457,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9467: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:9461: checking for X11/$athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9470 "configure"
+#line 9464 "configure"
 #include "confdefs.h"
 #include <X11/$athena_variant/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9499,15 +9493,15 @@ fi
         if test -z "$athena_h_path"; then
       ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:9503: checking for $athena_variant/XawInit.h" >&5
+echo "configure:9497: checking for $athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9506 "configure"
+#line 9500 "configure"
 #include "confdefs.h"
 #include <$athena_variant/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9524,15 +9518,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9528: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:9522: checking for $athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9531 "configure"
+#line 9525 "configure"
 #include "confdefs.h"
 #include <$athena_variant/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9561,15 +9555,15 @@ fi
         if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
       ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:9565: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:9559: checking for X11/Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9568 "configure"
+#line 9562 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9573: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9586,15 +9580,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9590: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:9584: checking for X11/Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9593 "configure"
+#line 9587 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9626,15 +9620,15 @@ fi
         if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
       ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:9630: checking for Xaw3d/XawInit.h" >&5
+echo "configure:9624: checking for Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9633 "configure"
+#line 9627 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9651,15 +9645,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9655: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:9649: checking for Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9658 "configure"
+#line 9652 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9691,15 +9685,15 @@ fi
             if test -z "$athena_h_path"; then
       ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9695: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9689: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9698 "configure"
+#line 9692 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9738,15 +9732,15 @@ fi
 if test "$with_x11" = "yes"; then
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:9742: checking for Xm/Xm.h" >&5
+echo "configure:9736: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9745 "configure"
+#line 9739 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9763,12 +9757,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:9767: checking for XmStringFree in -lXm" >&5
+echo "configure:9761: checking for XmStringFree in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 9772 "configure"
+#line 9766 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9779,7 +9773,7 @@ int main() {
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:9783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9808,9 +9802,9 @@ fi
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:9812: checking for Lesstif" >&5
+echo "configure:9806: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 9814 "configure"
+#line 9808 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -10258,15 +10252,15 @@ concord_includes_found=no
 if test "$with_concord" != "no"; then
    ac_safe=`echo "concord.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for concord.h""... $ac_c" 1>&6
-echo "configure:10262: checking for concord.h" >&5
+echo "configure:10256: checking for concord.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10265 "configure"
+#line 10259 "configure"
 #include "confdefs.h"
 #include <concord.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10294,15 +10288,15 @@ if test "$concord_includes_found" = "no" -a "$with_concord" != "no" -a \
   c_switch_site="$c_switch_site -I/usr/local/concord/include"
   ac_safe=`echo "concord.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for concord.h""... $ac_c" 1>&6
-echo "configure:10298: checking for concord.h" >&5
+echo "configure:10292: checking for concord.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10301 "configure"
+#line 10295 "configure"
 #include "confdefs.h"
 #include <concord.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10353,7 +10347,7 @@ fi
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:10357: checking for Mule-related features" >&5
+echo "configure:10351: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -10367,15 +10361,15 @@ EOF
   if test "$with_chise" != "no"; then
     ac_safe=`echo "chise.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for chise.h""... $ac_c" 1>&6
-echo "configure:10371: checking for chise.h" >&5
+echo "configure:10365: checking for chise.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10374 "configure"
+#line 10368 "configure"
 #include "confdefs.h"
 #include <chise.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10379: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10403,15 +10397,15 @@ fi
     c_switch_site="$c_switch_site -I/usr/local/chise/include"
     ac_safe=`echo "chise.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for chise.h""... $ac_c" 1>&6
-echo "configure:10407: checking for chise.h" >&5
+echo "configure:10401: checking for chise.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10410 "configure"
+#line 10404 "configure"
 #include "confdefs.h"
 #include <chise.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10490,15 +10484,15 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10494: checking for $ac_hdr" >&5
+echo "configure:10488: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10497 "configure"
+#line 10491 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10529,12 +10523,12 @@ done
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:10533: checking for strerror in -lintl" >&5
+echo "configure:10527: checking for strerror in -lintl" >&5
 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lintl "
 cat > conftest.$ac_ext <<EOF
-#line 10538 "configure"
+#line 10532 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10545,7 +10539,7 @@ int main() {
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:10549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10599,18 +10593,18 @@ EOF
   fi
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:10603: checking for Mule input methods" >&5
+echo "configure:10597: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:10606: checking for XIM" >&5
+echo "configure:10600: checking for XIM" >&5
     
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:10609: checking for XOpenIM in -lX11" >&5
+echo "configure:10603: checking for XOpenIM in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 10614 "configure"
+#line 10608 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10621,7 +10615,7 @@ int main() {
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:10625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10645,12 +10639,12 @@ fi
             if test "$need_motif $have_lesstif" = "yes no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:10649: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10643: checking for XmImMbLookupString in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 10654 "configure"
+#line 10648 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10661,7 +10655,7 @@ int main() {
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10684,12 +10678,12 @@ fi
     elif test "$have_motif $have_lesstif $with_xim" = "yes no no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:10688: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10682: checking for XmImMbLookupString in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 10693 "configure"
+#line 10687 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10700,7 +10694,7 @@ int main() {
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10765,15 +10759,15 @@ EOF
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:10769: checking for XFontSet" >&5
+echo "configure:10763: checking for XFontSet" >&5
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:10772: checking for XmbDrawString in -lX11" >&5
+echo "configure:10766: checking for XmbDrawString in -lX11" >&5
 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 10777 "configure"
+#line 10771 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10784,7 +10778,7 @@ int main() {
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:10788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10824,15 +10818,15 @@ EOF
     test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
   test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6
-echo "configure:10828: checking for wnn/jllib.h" >&5
+echo "configure:10822: checking for wnn/jllib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10831 "configure"
+#line 10825 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10855,15 +10849,15 @@ fi
  }
     test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6
-echo "configure:10859: checking for wnn/commonhd.h" >&5
+echo "configure:10853: checking for wnn/commonhd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10862 "configure"
+#line 10856 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10888,10 +10882,10 @@ fi
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10892: checking for $ac_func" >&5
+echo "configure:10886: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10895 "configure"
+#line 10889 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10914,7 +10908,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10943,12 +10937,12 @@ done
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:10947: checking for crypt in -lcrypt" >&5
+echo "configure:10941: checking for crypt in -lcrypt" >&5
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcrypt "
 cat > conftest.$ac_ext <<EOF
-#line 10952 "configure"
+#line 10946 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10959,7 +10953,7 @@ int main() {
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:10963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10994,12 +10988,12 @@ fi
     if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
     
 echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:10998: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:10992: checking for jl_dic_list_e in -lwnn" >&5
 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF
-#line 11003 "configure"
+#line 10997 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11010,7 +11004,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11028,12 +11022,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6
-echo "configure:11032: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:11026: checking for jl_dic_list_e in -lwnn4" >&5
 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn4 "
 cat > conftest.$ac_ext <<EOF
-#line 11037 "configure"
+#line 11031 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11044,7 +11038,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11062,12 +11056,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6
-echo "configure:11066: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:11060: checking for jl_dic_list_e in -lwnn6" >&5
 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn6 "
 cat > conftest.$ac_ext <<EOF
-#line 11071 "configure"
+#line 11065 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11078,7 +11072,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11096,12 +11090,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6
-echo "configure:11100: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:11094: checking for dic_list_e in -lwnn6_fromsrc" >&5
 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn6_fromsrc "
 cat > conftest.$ac_ext <<EOF
-#line 11105 "configure"
+#line 11099 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11112,7 +11106,7 @@ int main() {
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11160,12 +11154,12 @@ EOF
     if test "$with_wnn6" != "no"; then
       
 echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6
-echo "configure:11164: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:11158: checking for jl_fi_dic_list in -l$libwnn" >&5
 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$libwnn "
 cat > conftest.$ac_ext <<EOF
-#line 11169 "configure"
+#line 11163 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11176,7 +11170,7 @@ int main() {
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:11180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11211,15 +11205,15 @@ EOF
   if test "$with_canna" != "no"; then
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:11215: checking for canna/jrkanji.h" >&5
+echo "configure:11209: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11218 "configure"
+#line 11212 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11246,15 +11240,15 @@ fi
     c_switch_site="$c_switch_site -I/usr/local/canna/include"
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:11250: checking for canna/jrkanji.h" >&5
+echo "configure:11244: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11253 "configure"
+#line 11247 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11282,15 +11276,15 @@ fi
 
   test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6
-echo "configure:11286: checking for canna/RK.h" >&5
+echo "configure:11280: checking for canna/RK.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11289 "configure"
+#line 11283 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11313,12 +11307,12 @@ fi
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:11317: checking for RkBgnBun in -lRKC" >&5
+echo "configure:11311: checking for RkBgnBun in -lRKC" >&5
 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lRKC "
 cat > conftest.$ac_ext <<EOF
-#line 11322 "configure"
+#line 11316 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11329,7 +11323,7 @@ int main() {
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:11333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11352,12 +11346,12 @@ fi
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:11356: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:11350: checking for jrKanjiControl in -lcanna" >&5
 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcanna "
 cat > conftest.$ac_ext <<EOF
-#line 11361 "configure"
+#line 11355 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11368,7 +11362,7 @@ int main() {
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:11372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11417,12 +11411,12 @@ if test "$need_motif" = "yes" ; then
   libs_x="-lXm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXm\" to \$libs_x"; fi
     
 echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6
-echo "configure:11421: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:11415: checking for layout_object_getvalue in -li18n" >&5
 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -li18n "
 cat > conftest.$ac_ext <<EOF
-#line 11426 "configure"
+#line 11420 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11433,7 +11427,7 @@ int main() {
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:11437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11520,10 +11514,10 @@ fi
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11524: checking for $ac_func" >&5
+echo "configure:11518: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11527 "configure"
+#line 11521 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11546,7 +11540,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11587,10 +11581,10 @@ fi
 for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11591: checking for $ac_func" >&5
+echo "configure:11585: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11594 "configure"
+#line 11588 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11613,7 +11607,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11642,10 +11636,10 @@ done
 
 
 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:11646: checking for openpty" >&5
+echo "configure:11640: checking for openpty" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11649 "configure"
+#line 11643 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openpty(); below.  */
@@ -11668,7 +11662,7 @@ openpty();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_openpty=yes"
 else
@@ -11687,12 +11681,12 @@ else
 
   
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:11691: checking for openpty in -lutil" >&5
+echo "configure:11685: checking for openpty in -lutil" >&5
 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lutil "
 cat > conftest.$ac_ext <<EOF
-#line 11696 "configure"
+#line 11690 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11703,7 +11697,7 @@ int main() {
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:11707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11738,15 +11732,15 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11742: checking for $ac_hdr" >&5
+echo "configure:11736: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11745 "configure"
+#line 11739 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11782,15 +11776,15 @@ for ac_hdr in stropts.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11786: checking for $ac_hdr" >&5
+echo "configure:11780: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11789 "configure"
+#line 11783 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11823,10 +11817,10 @@ if test "$ac_cv_header_stropts_h" = "yes"; then
   for ac_func in isastream
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11827: checking for $ac_func" >&5
+echo "configure:11821: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11830 "configure"
+#line 11824 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11849,7 +11843,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11880,15 +11874,15 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11884: checking for $ac_hdr" >&5
+echo "configure:11878: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11887 "configure"
+#line 11881 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11925,10 +11919,10 @@ extra_objs="$extra_objs realpath.o" &&  if test "$extra_verbose" = "yes"; then
 for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11929: checking for $ac_func" >&5
+echo "configure:11923: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11932 "configure"
+#line 11926 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11951,7 +11945,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11984,15 +11978,15 @@ if test "$ac_cv_func_getloadavg" = "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11988: checking for $ac_hdr" >&5
+echo "configure:11982: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11991 "configure"
+#line 11985 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12028,12 +12022,12 @@ else
 
     
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:12032: checking for kstat_open in -lkstat" >&5
+echo "configure:12026: checking for kstat_open in -lkstat" >&5
 ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lkstat "
 cat > conftest.$ac_ext <<EOF
-#line 12037 "configure"
+#line 12031 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12044,7 +12038,7 @@ int main() {
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:12048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12079,15 +12073,15 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12083: checking for $ac_hdr" >&5
+echo "configure:12077: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12086 "configure"
+#line 12080 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12119,12 +12113,12 @@ done
 
     
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:12123: checking for kvm_read in -lkvm" >&5
+echo "configure:12117: checking for kvm_read in -lkvm" >&5
 ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lkvm "
 cat > conftest.$ac_ext <<EOF
-#line 12128 "configure"
+#line 12122 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12135,7 +12129,7 @@ int main() {
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:12139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12169,16 +12163,16 @@ fi
 fi
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:12173: checking whether netdb declares h_errno" >&5
+echo "configure:12167: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12175 "configure"
+#line 12169 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:12182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -12198,16 +12192,16 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:12202: checking for sigsetjmp" >&5
+echo "configure:12196: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12204 "configure"
+#line 12198 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:12211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -12227,11 +12221,11 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:12231: checking whether localtime caches TZ" >&5
+echo "configure:12225: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 12235 "configure"
+#line 12229 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -12266,7 +12260,7 @@ main()
   exit (0);
 }
 EOF
-if { (eval echo configure:12270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -12296,9 +12290,9 @@ fi
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:12300: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:12294: checking whether gettimeofday accepts one or two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12302 "configure"
+#line 12296 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -12319,7 +12313,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:12323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""two" 1>&6
 else
@@ -12341,19 +12335,19 @@ fi
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:12345: checking for inline" >&5
+echo "configure:12339: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 12350 "configure"
+#line 12344 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:12357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -12394,17 +12388,17 @@ if test "$__DECC" != "yes"; then
   # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:12398: checking for working alloca.h" >&5
+echo "configure:12392: checking for working alloca.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12401 "configure"
+#line 12395 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:12408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -12428,10 +12422,10 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:12432: checking for alloca" >&5
+echo "configure:12426: checking for alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12435 "configure"
+#line 12429 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -12459,7 +12453,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:12463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -12498,10 +12492,10 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:12502: checking whether alloca needs Cray hooks" >&5
+echo "configure:12496: checking whether alloca needs Cray hooks" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12505 "configure"
+#line 12499 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -12525,10 +12519,10 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12529: checking for $ac_func" >&5
+echo "configure:12523: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12532 "configure"
+#line 12526 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12551,7 +12545,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -12581,10 +12575,10 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:12585: checking stack direction for C alloca" >&5
+echo "configure:12579: checking stack direction for C alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12588 "configure"
+#line 12582 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -12603,7 +12597,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:12607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -12633,15 +12627,15 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:12637: checking for vfork.h" >&5
+echo "configure:12631: checking for vfork.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12640 "configure"
+#line 12634 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12669,10 +12663,10 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:12673: checking for working vfork" >&5
+echo "configure:12667: checking for working vfork" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12676 "configure"
+#line 12670 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -12767,7 +12761,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:12771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -12793,10 +12787,10 @@ fi
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:12797: checking for working strcoll" >&5
+echo "configure:12791: checking for working strcoll" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12800 "configure"
+#line 12794 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -12806,7 +12800,7 @@ main ()
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:12810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -12834,10 +12828,10 @@ fi
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12838: checking for $ac_func" >&5
+echo "configure:12832: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12841 "configure"
+#line 12835 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12860,7 +12854,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -12888,10 +12882,10 @@ fi
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:12892: checking whether getpgrp takes no argument" >&5
+echo "configure:12886: checking whether getpgrp takes no argument" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12895 "configure"
+#line 12889 "configure"
 #include "confdefs.h"
 
 /*
@@ -12946,7 +12940,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:12950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -12973,10 +12967,10 @@ fi
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:12977: checking for working mmap" >&5
+echo "configure:12971: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 12980 "configure"
+#line 12974 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -13009,7 +13003,7 @@ int main (int argc, char *argv[])
   return 1;
 }
 EOF
-if { (eval echo configure:13013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -13038,9 +13032,9 @@ test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && rel_alloc=no
 if test "$rel_alloc $have_mmap" = "default yes"; then
   if test "$doug_lea_malloc" = "yes"; then
         echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6
-echo "configure:13042: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:13036: checking for M_MMAP_THRESHOLD" >&5
     cat > conftest.$ac_ext <<EOF
-#line 13044 "configure"
+#line 13038 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
@@ -13052,7 +13046,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:13056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
@@ -13077,15 +13071,15 @@ EOF
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:13081: checking for termios.h" >&5
+echo "configure:13075: checking for termios.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13084 "configure"
+#line 13078 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13128,15 +13122,15 @@ else
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:13132: checking for termio.h" >&5
+echo "configure:13126: checking for termio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13135 "configure"
+#line 13129 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13168,10 +13162,10 @@ fi
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:13172: checking for socket" >&5
+echo "configure:13166: checking for socket" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13175 "configure"
+#line 13169 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -13194,7 +13188,7 @@ socket();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -13209,15 +13203,15 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
-echo "configure:13213: checking for netinet/in.h" >&5
+echo "configure:13207: checking for netinet/in.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13216 "configure"
+#line 13210 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13234,15 +13228,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
-echo "configure:13238: checking for arpa/inet.h" >&5
+echo "configure:13232: checking for arpa/inet.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13241 "configure"
+#line 13235 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13267,9 +13261,9 @@ EOF
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:13271: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:13265: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 13273 "configure"
+#line 13267 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13280,7 +13274,7 @@ int main() {
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:13284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SOCKADDR_SUN_LEN
@@ -13298,9 +13292,9 @@ else
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:13302: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:13296: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 13304 "configure"
+#line 13298 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13310,7 +13304,7 @@ int main() {
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:13314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MULTICAST
@@ -13341,10 +13335,10 @@ fi
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:13345: checking for msgget" >&5
+echo "configure:13339: checking for msgget" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13348 "configure"
+#line 13342 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -13367,7 +13361,7 @@ msgget();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_msgget=yes"
 else
@@ -13382,15 +13376,15 @@ if eval "test \"`echo '$ac_cv_func_'msgget`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
-echo "configure:13386: checking for sys/ipc.h" >&5
+echo "configure:13380: checking for sys/ipc.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13389 "configure"
+#line 13383 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13407,15 +13401,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:13411: checking for sys/msg.h" >&5
+echo "configure:13405: checking for sys/msg.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13414 "configure"
+#line 13408 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13453,15 +13447,15 @@ fi
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:13457: checking for dirent.h" >&5
+echo "configure:13451: checking for dirent.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13460 "configure"
+#line 13454 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13488,15 +13482,15 @@ else
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
-echo "configure:13492: checking for sys/dir.h" >&5
+echo "configure:13486: checking for sys/dir.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13495 "configure"
+#line 13489 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13529,15 +13523,15 @@ fi
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:13533: checking for nlist.h" >&5
+echo "configure:13527: checking for nlist.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13536 "configure"
+#line 13530 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13567,22 +13561,22 @@ fi
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:13571: checking "for sound support"" >&5
+echo "configure:13565: checking "for sound support"" >&5
 test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes
 
 if test "$with_native_sound" != "no"; then
     if test -n "$native_sound_lib"; then
     ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6
-echo "configure:13578: checking for multimedia/audio_device.h" >&5
+echo "configure:13572: checking for multimedia/audio_device.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13581 "configure"
+#line 13575 "configure"
 #include "confdefs.h"
 #include <multimedia/audio_device.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13638,12 +13632,12 @@ fi
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:13642: checking for ALopenport in -laudio" >&5
+echo "configure:13636: checking for ALopenport in -laudio" >&5
 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF
-#line 13647 "configure"
+#line 13641 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13654,7 +13648,7 @@ int main() {
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:13658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13685,12 +13679,12 @@ fi
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:13689: checking for AOpenAudio in -lAlib" >&5
+echo "configure:13683: checking for AOpenAudio in -lAlib" >&5
 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lAlib "
 cat > conftest.$ac_ext <<EOF
-#line 13694 "configure"
+#line 13688 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13701,7 +13695,7 @@ int main() {
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:13705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13746,15 +13740,15 @@ fi
     for dir in "machine" "sys" "linux"; do
       ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6
-echo "configure:13750: checking for ${dir}/soundcard.h" >&5
+echo "configure:13744: checking for ${dir}/soundcard.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13753 "configure"
+#line 13747 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13808,15 +13802,15 @@ fi
 if test "$with_nas_sound" != "no"; then
   ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6
-echo "configure:13812: checking for audio/audiolib.h" >&5
+echo "configure:13806: checking for audio/audiolib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13815 "configure"
+#line 13809 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13834,12 +13828,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   
     
 echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:13838: checking for AuOpenServer in -laudio" >&5
+echo "configure:13832: checking for AuOpenServer in -laudio" >&5
 ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF
-#line 13843 "configure"
+#line 13837 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13850,7 +13844,7 @@ int main() {
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:13854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13889,7 +13883,7 @@ EOF
  fi
     libs_x="-laudio $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-laudio\" to \$libs_x"; fi
             cat > conftest.$ac_ext <<EOF
-#line 13893 "configure"
+#line 13887 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -13920,7 +13914,7 @@ if test "$with_esd_sound" != "no"; then
   # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13924: checking for $ac_word" >&5
+echo "configure:13918: checking for $ac_word" >&5
 
 if test -n "$have_esd_config"; then
   ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test.
@@ -13949,10 +13943,10 @@ fi
     c_switch_site="$c_switch_site `esd-config --cflags`" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
     LIBS="`esd-config --libs` $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"`esd-config --libs`\" to \$LIBS"; fi
     echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6
-echo "configure:13953: checking for esd_play_stream" >&5
+echo "configure:13947: checking for esd_play_stream" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13956 "configure"
+#line 13950 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char esd_play_stream(); below.  */
@@ -13975,7 +13969,7 @@ esd_play_stream();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_esd_play_stream=yes"
 else
@@ -14026,7 +14020,7 @@ test -z "$with_tty" && with_tty=yes
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:14030: checking for TTY-related features" >&5
+echo "configure:14024: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -14042,12 +14036,12 @@ EOF
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:14046: checking for tgetent in -lncurses" >&5
+echo "configure:14040: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lncurses "
 cat > conftest.$ac_ext <<EOF
-#line 14051 "configure"
+#line 14045 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14058,7 +14052,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14091,15 +14085,15 @@ EOF
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:14095: checking for ncurses/curses.h" >&5
+echo "configure:14089: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14098 "configure"
+#line 14092 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14121,15 +14115,15 @@ fi
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:14125: checking for ncurses/term.h" >&5
+echo "configure:14119: checking for ncurses/term.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14128 "configure"
+#line 14122 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14159,15 +14153,15 @@ fi
       c_switch_site="$c_switch_site -I/usr/include/ncurses"
       ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:14163: checking for ncurses/curses.h" >&5
+echo "configure:14157: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14166 "configure"
+#line 14160 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14202,12 +14196,12 @@ fi
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:14206: checking for tgetent in -l$lib" >&5
+echo "configure:14200: checking for tgetent in -l$lib" >&5
 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$lib "
 cat > conftest.$ac_ext <<EOF
-#line 14211 "configure"
+#line 14205 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14218,7 +14212,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14243,12 +14237,12 @@ fi
     else       if test -n "$libs_termcap" -a "$opsys" = "openbsd"; then
                                 
 echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:14247: checking for tgoto in -ltermcap" >&5
+echo "configure:14241: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltermcap "
 cat > conftest.$ac_ext <<EOF
-#line 14252 "configure"
+#line 14246 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14259,7 +14253,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:14263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14304,12 +14298,12 @@ fi
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:14308: checking for tgetent in -lcurses" >&5
+echo "configure:14302: checking for tgetent in -lcurses" >&5
 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcurses "
 cat > conftest.$ac_ext <<EOF
-#line 14313 "configure"
+#line 14307 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14320,7 +14314,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14338,12 +14332,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:14342: checking for tgetent in -ltermcap" >&5
+echo "configure:14336: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltermcap "
 cat > conftest.$ac_ext <<EOF
-#line 14347 "configure"
+#line 14341 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14354,7 +14348,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14403,15 +14397,15 @@ EOF
     if test "$with_gpm" != "no"; then
     ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:14407: checking for gpm.h" >&5
+echo "configure:14401: checking for gpm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14410 "configure"
+#line 14404 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14429,12 +14423,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   
       
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:14433: checking for Gpm_Open in -lgpm" >&5
+echo "configure:14427: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgpm "
 cat > conftest.$ac_ext <<EOF
-#line 14438 "configure"
+#line 14432 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14445,7 +14439,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:14449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14504,20 +14498,20 @@ test "$with_x11" = "yes" -o "$with_tty" = "yes" -o "$need_event_unixoid" = "yes"
 
 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
   != "no no no" && echo "checking for database support" 1>&6
-echo "configure:14508: checking for database support" >&5
+echo "configure:14502: checking for database support" >&5
 
 if test "$with_database_gdbm $with_database_dbm" != "no no"; then
   ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6
-echo "configure:14513: checking for ndbm.h" >&5
+echo "configure:14507: checking for ndbm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14516 "configure"
+#line 14510 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14547,12 +14541,12 @@ fi
 if test "$with_database_gdbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:14551: checking for dbm_open in -lgdbm" >&5
+echo "configure:14545: checking for dbm_open in -lgdbm" >&5
 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgdbm "
 cat > conftest.$ac_ext <<EOF
-#line 14556 "configure"
+#line 14550 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14563,7 +14557,7 @@ int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:14567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14591,10 +14585,10 @@ fi
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:14595: checking for dbm_open" >&5
+echo "configure:14589: checking for dbm_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14598 "configure"
+#line 14592 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -14617,7 +14611,7 @@ dbm_open();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
@@ -14636,12 +14630,12 @@ else
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:14640: checking for dbm_open in -ldbm" >&5
+echo "configure:14634: checking for dbm_open in -ldbm" >&5
 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldbm "
 cat > conftest.$ac_ext <<EOF
-#line 14645 "configure"
+#line 14639 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14652,7 +14646,7 @@ int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:14656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14692,10 +14686,10 @@ EOF
 
 
 echo $ac_n "checking for u_int8_t""... $ac_c" 1>&6
-echo "configure:14696: checking for u_int8_t" >&5
+echo "configure:14690: checking for u_int8_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14699 "configure"
+#line 14693 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -14736,10 +14730,10 @@ EOF
 
 fi
 echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6
-echo "configure:14740: checking for u_int16_t" >&5
+echo "configure:14734: checking for u_int16_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14743 "configure"
+#line 14737 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -14780,10 +14774,10 @@ EOF
 
 fi
 echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6
-echo "configure:14784: checking for u_int32_t" >&5
+echo "configure:14778: checking for u_int32_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14787 "configure"
+#line 14781 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -14824,10 +14818,10 @@ EOF
 
 fi
 echo $ac_n "checking for u_int64_t""... $ac_c" 1>&6
-echo "configure:14828: checking for u_int64_t" >&5
+echo "configure:14822: checking for u_int64_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14831 "configure"
+#line 14825 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -14870,12 +14864,12 @@ fi
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:14874: checking for Berkeley db.h" >&5
+echo "configure:14868: checking for Berkeley db.h" >&5
   for header in "db/db.h" "db.h"; do
     case "$opsys" in
         *freebsd*)
     cat > conftest.$ac_ext <<EOF
-#line 14879 "configure"
+#line 14873 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14891,7 +14885,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:14895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -14902,7 +14896,7 @@ rm -f conftest*
         ;;
         *)
     cat > conftest.$ac_ext <<EOF
-#line 14906 "configure"
+#line 14900 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14932,7 +14926,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:14936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -14950,9 +14944,9 @@ rm -f conftest*
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:14954: checking for Berkeley DB version" >&5
+echo "configure:14948: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 14956 "configure"
+#line 14950 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
@@ -14964,7 +14958,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 14968 "configure"
+#line 14962 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
@@ -14991,10 +14985,10 @@ fi
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:14995: checking for $dbfunc" >&5
+echo "configure:14989: checking for $dbfunc" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14998 "configure"
+#line 14992 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -15017,7 +15011,7 @@ $dbfunc();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$dbfunc=yes"
 else
@@ -15036,12 +15030,12 @@ else
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:15040: checking for $dbfunc in -ldb" >&5
+echo "configure:15034: checking for $dbfunc in -ldb" >&5
 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF
-#line 15045 "configure"
+#line 15039 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15052,7 +15046,7 @@ int main() {
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:15056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15126,12 +15120,12 @@ fi
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:15130: checking for SOCKSinit in -lsocks" >&5
+echo "configure:15124: checking for SOCKSinit in -lsocks" >&5
 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lsocks "
 cat > conftest.$ac_ext <<EOF
-#line 15135 "configure"
+#line 15129 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15142,7 +15136,7 @@ int main() {
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:15146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15197,7 +15191,7 @@ fi
 
 if test "$with_modules" != "no"; then
   echo "checking for module support" 1>&6
-echo "configure:15201: checking for module support" >&5
+echo "configure:15195: checking for module support" >&5
 
     if test "$with_msw" = "yes"; then
     have_dl=yes;
@@ -15213,15 +15207,15 @@ EOF
  ;;
       *)          ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:15217: checking for dlfcn.h" >&5
+echo "configure:15211: checking for dlfcn.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 15220 "configure"
+#line 15214 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -15238,16 +15232,16 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
            echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:15242: checking for dlopen in -lc" >&5
+echo "configure:15236: checking for dlopen in -lc" >&5
            cat > conftest.$ac_ext <<EOF
-#line 15244 "configure"
+#line 15238 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	      dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:15251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -15256,18 +15250,18 @@ else
   rm -rf conftest*
   
                echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:15260: checking for dlopen in -ldl" >&5
+echo "configure:15254: checking for dlopen in -ldl" >&5
                ac_save_LIBS="$LIBS"
                LIBS="-ldl $LIBS"
                cat > conftest.$ac_ext <<EOF
-#line 15264 "configure"
+#line 15258 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	         dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:15271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -15296,12 +15290,12 @@ EOF
         else
            
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:15300: checking for shl_load in -ldld" >&5
+echo "configure:15294: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF
-#line 15305 "configure"
+#line 15299 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15312,7 +15306,7 @@ int main() {
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:15316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15339,12 +15333,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:15343: checking for dld_init in -ldld" >&5
+echo "configure:15337: checking for dld_init in -ldld" >&5
 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF
-#line 15348 "configure"
+#line 15342 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15355,7 +15349,7 @@ int main() {
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:15359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15402,7 +15396,7 @@ xehost=$canonical
 xealias=$internal_configuration
 
 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:15406: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:15400: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
@@ -15430,9 +15424,9 @@ if test "$GCC" = "yes"; then
   XEGCC=yes
 else
   echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:15434: checking checking whether we are using GNU C" >&5
+echo "configure:15428: checking checking whether we are using GNU C" >&5
   cat > conftest.$ac_ext <<EOF
-#line 15436 "configure"
+#line 15430 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -15454,7 +15448,7 @@ rm -f conftest*
 fi
 
 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:15458: checking how to produce PIC code" >&5
+echo "configure:15452: checking how to produce PIC code" >&5
 wl=
 
 can_build_shared=yes
@@ -15555,18 +15549,18 @@ if test -n "$dll_cflags"; then
 
   # Check to make sure the dll_cflags actually works.
   echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6
-echo "configure:15559: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:15553: checking if PIC flag ${dll_cflags} really works" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $dll_cflags -DPIC"
   cat > conftest.$ac_ext <<EOF
-#line 15563 "configure"
+#line 15557 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:15570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
@@ -15597,7 +15591,7 @@ cc_produces_so=no
 xldf=
 xcldf=
 echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:15601: checking if C compiler can produce shared libraries" >&5
+echo "configure:15595: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes -o "$__ICC" = yes; then
   xcldf="-shared"
   xldf="-shared"
@@ -15648,14 +15642,14 @@ if test -n "$xcldf"; then
   xe_libs=
   ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
   cat > conftest.$ac_ext <<EOF
-#line 15652 "configure"
+#line 15646 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:15659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cc_produces_so=yes
 else
@@ -15680,7 +15674,7 @@ if test -z "$LTLD"; then
   if test "$XEGCC" = yes; then
     # Check if gcc -print-prog-name=ld gives a path.
     echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:15684: checking for ld used by GCC" >&5
+echo "configure:15678: checking for ld used by GCC" >&5
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
@@ -15706,7 +15700,7 @@ echo "configure:15684: checking for ld used by GCC" >&5
     esac
   else
     echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:15710: checking for GNU ld" >&5
+echo "configure:15704: checking for GNU ld" >&5
   fi
 
   if test -z "$LTLD"; then
@@ -15744,7 +15738,7 @@ ld_dynamic_link_flags=
 
 # Check to see if it really is or isn't GNU ld.
 echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6
-echo "configure:15748: checking if the linker is GNU ld" >&5
+echo "configure:15742: checking if the linker is GNU ld" >&5
 # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
   xe_gnu_ld=yes
@@ -15772,7 +15766,7 @@ else
   # OK - only NOW do we futz about with ld.
   # See if the linker supports building shared libraries.
   echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6
-echo "configure:15776: checking whether the linker supports shared libraries" >&5
+echo "configure:15770: checking whether the linker supports shared libraries" >&5
   dll_ld=$CC
   dll_ldflags=$LDFLAGS
   ld_shlibs=yes
@@ -15983,10 +15977,10 @@ EOF
     for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15987: checking for $ac_func" >&5
+echo "configure:15981: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 15990 "configure"
+#line 15984 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16009,7 +16003,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16048,11 +16042,11 @@ done
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 16052 "configure"
+#line 16046 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:16056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:16050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
diff --git a/configure.in b/configure.in
index 1ff5fbe..a2cd2fb 100644
--- a/configure.in
+++ b/configure.in
@@ -2747,7 +2747,7 @@ if test "$with_x11" != "no"; then
 
   if test "$x_libraries" = "NONE"; then
     for dir in "/usr/X11/lib" "/usr/X11R6/lib" "/usr/lib/X11R6"; do
-      if test -r "$dir/libX11.a"; then x_libraries="$dir"; break; fi
+      if test -r "$dir/libX11.a" -o -r "$dir/libX11.dylib"; then x_libraries="$dir"; break; fi
     done
   fi
 
diff --git a/etc/char-data/ChangeLog b/etc/char-data/ChangeLog
index 3635c5d..b9a8720 100644
--- a/etc/char-data/ChangeLog
+++ b/etc/char-data/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-01  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* JC3-to-UCS.txt (JC3-70BA): Map to U+56CA instead of U+56A2.
+
+2009-08-25  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* JX3-JX1-rep-diff.txt: New file.
+
 2009-07-17  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* JC3-to-UCS.txt (JC3-6DDF): Map to U+9A58 instead of U+8D0F.
diff --git a/etc/char-data/JC3-to-UCS.txt b/etc/char-data/JC3-to-UCS.txt
index c5a4f1a..8f964b4 100644
--- a/etc/char-data/JC3-to-UCS.txt
+++ b/etc/char-data/JC3-to-UCS.txt
@@ -3806,7 +3806,7 @@ JC3-70B6	U+55B0
 JC3-70B7	U+54E8
 JC3-70B8	U+564C
 JC3-70B9	U+5544
-JC3-70BA	U+56A2
+JC3-70BA	U+56CA
 JC3-70BB	U+5539
 JC3-70BC	U+5533
 JC3-70BD	U+5632
diff --git a/etc/char-data/JX3-JX1-rep-diff.txt b/etc/char-data/JX3-JX1-rep-diff.txt
new file mode 100644
index 0000000..a56db6e
--- /dev/null
+++ b/etc/char-data/JX3-JX1-rep-diff.txt
@@ -0,0 +1,168 @@
+1-16-9	逢
+1-16-18	芦
+1-16-27	飴
+1-16-78	溢
+1-16-81	茨
+1-16-83	é°¯
+1-16-92	æ·«
+1-17-10	迂
+1-17-25	厩
+1-17-29	噂
+1-17-34	餌
+1-18-8	襖
+1-18-64	迦
+1-18-71	牙
+1-18-86	å»»
+1-18-90	恢
+1-19-2	晦
+1-19-10	蟹
+1-19-75	葛
+1-19-83	鞄
+1-19-88	釜
+1-20-45	ç¿°
+1-20-69	ç¿«
+1-21-11	å¾½
+1-21-32	祇
+1-21-66	æ±²
+1-21-68	灸
+1-21-72	笈
+1-22-10	卿
+1-22-34	饗
+1-22-47	僅
+1-22-84	喰
+1-22-91	櫛
+1-22-93	屑
+1-23-9	粂
+1-23-23	祁
+1-23-68	隙
+1-23-81	倦
+1-23-94	捲
+1-24-3	牽
+1-24-16	鍵
+1-24-33	諺
+1-25-11	å··
+1-25-28	梗
+1-25-49	膏
+1-25-84	éµ 
+1-25-89	甑
+1-26-21	叉
+1-26-71	榊
+1-27-7	薩
+1-27-10	鯖
+1-27-12	錆
+1-27-13	鮫
+1-27-33	餐
+1-28-61	杓
+1-28-62	灼
+1-29-22	酋
+1-29-61	楯
+1-29-82	薯
+1-29-83	藷
+1-30-5	哨
+1-30-68	鞘
+1-30-83	杖
+1-31-10	蝕
+1-31-54	訊
+1-31-64	逗
+1-32-2	摺
+1-32-81	撰
+1-32-89	煎
+1-32-90	煽
+1-32-92	ç©¿
+1-32-93	ç®­
+1-33-7	è©®
+1-33-25	噌
+1-33-44	遡
+1-34-23	揃
+1-34-29	遜
+1-34-60	腿
+1-34-93	蛸
+1-35-9	辿
+1-35-14	樽
+1-35-23	歎
+1-35-80	註
+1-35-85	瀦
+1-36-29	捗
+1-36-40	槌
+1-36-42	鎚
+1-36-52	è¾»
+1-36-82	挺
+1-37-2	鄭
+1-37-7	擢
+1-37-14	溺
+1-37-38	兎
+1-37-40	å µ
+1-37-43	å± 
+1-37-50	è³­
+1-38-52	瀞
+1-38-59	遁
+1-38-70	謎
+1-38-71	灘
+1-38-74	楢
+1-39-9	禰
+1-39-55	牌
+1-39-71	這
+1-39-73	秤
+1-39-93	駁
+1-40-4	箸
+1-40-32	叛
+1-40-52	挽
+1-40-80	誹
+1-40-85	樋
+1-41-3	稗
+1-41-15	逼
+1-41-21	謬
+1-41-31	è±¹
+1-41-32	廟
+1-41-46	瀕
+1-41-64	斧
+1-42-35	蔽
+1-42-45	瞥
+1-42-46	蔑
+1-42-51	篇
+1-42-58	娩
+1-42-60	鞭
+1-42-89	庖
+1-43-9	蓬
+1-43-80	鱒
+1-43-88	迄
+1-44-57	儲
+1-44-63	餅
+1-44-66	ç±¾
+1-44-76	爺
+1-44-90	鑓
+1-44-92	愈
+1-45-18	猷
+1-46-90	æ¼£
+1-46-91	煉
+1-46-92	ç°¾
+1-47-17	榔
+1-47-64	屡
+1-49-45	冤
+1-50-55	叟
+1-50-91	咬
+1-51-62	嘲
+1-51-83	囀
+1-55-49	徘
+1-57-8	扁
+1-59-89	棘
+1-60-84	橙
+1-64-36	狡
+1-65-17	甕
+1-65-20	甦
+1-65-54	疼
+1-67-14	崇
+1-67-62	竃
+1-68-7	ç­µ
+1-68-32	篝
+1-71-7	腱
+1-71-59	艘
+1-71-74	芒
+1-73-42	虔
+1-73-71	蜃
+1-74-4	蝿
+1-75-35	訝
+1-80-43	靄
+1-80-55	靭
+1-81-57	騙
+1-82-77	鴉
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e107e40..c977e89 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,140 @@
+2010-04-07  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-coding.el (coded-charset-entity-reference-alist): Add
+	setting for `=>gt'.
+
+2010-04-06  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-conf.el (=>gt): New abstract coded-charset for XEmacs
+	CHISE.
+
+2010-04-01  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-coding.el (coded-charset-entity-reference-alist): Add
+	setting for `=>zinbun-oracle'.
+
+	* mule/mule-conf.el (=>zinbun-oracle): New abstract coded-charset
+	for XEmacs CHISE.
+
+2010-03-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-conf.el (=jis-x0208@1978/1er-pr): New coded-charset
+	for XEmacs CHISE.
+	(=jis-x0208@1978/4-pr): Use `=jis-x0208@1978/1er-pr' instead of
+	`=jis-x0208@1978' as the mother.
+
+2010-03-02  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-coding.el: (coded-charset-entity-reference-alist):
+	- Use `=gt' instead of `ideograph-gt'.
+	- Use `=gt-k' instead of `ideograph-gt-k'.
+	- Use `=jis-x0208@1990' instead of `japanese-jisx0208-1990'.
+	- Use `=jis-x0208@1983' instead of `japanese-jisx0208'.
+	- Use `=jis-x0213-1@2000' instead of `japanese-jisx0213-1'.
+	- Use `=jis-x0213-2' instead of `japanese-jisx0213-2'.
+	- Use `=jis-x0212' instead of `japanese-jisx0212'.
+	- Use `=jis-x0208@1978' instead of `japanese-jisx0208-1978'.
+	- Use `=>>gt' instead of `<=>gt'.
+	- Use &G-GT-ddddd; instead of &aGT-ddddd for `=>>gt'.
+	- Add setting for `=>>jis-x0208@1990'.
+	- Use &G-JX1-hhhh; instead of &aJX1-hhhh; for
+	  `=>>jis-x0213-1@2000'.
+	- Use &G-JX2-hhhh; instead of &aJX2-hhhh; for `=>>jis-x0213-2'.
+	- Use &G-JX3-hhhh; instead of &aJX3-hhhh; for
+	  `=>>jis-x0213-1@2004'.
+	- Add setting for `=>>jis-x0208@1978'.
+	- Decode &A-J0-hhhh; as `=>jis-x0208@1997'.
+
+2010-02-24  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-conf.el (=>>jis-x0208@1978): New coded-charset for
+	XEmacs CHISE.
+
+2009-11-06  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-coding.el (coded-charset-entity-reference-alist): Add
+	setting for `=>>jis-x0213-2' and `=>jis-x0213-2'; use
+	`=>jis-x0208@1997', `=>jis-x0213-1@2000' and `=>jis-x0213-1@2004'
+	instead of `<=>jis-x0208@1997', `<=>jis-x0213-1@2000' and
+	`<=>jis-x0213-1@2004'.
+
+2009-09-04  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-conf.el (=>>jis-x0213-2): New coded-charset for XEmacs
+	CHISE.
+	(=>jis-x0213-2): Ditto.
+
+2009-09-01  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-coding.el (coded-charset-entity-reference-alist): Add
+	settings for `=>>jis-x0213-1@2000' and `=>>jis-x0213-1@2004'.
+
+2009-08-30  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-charset.el (default-coded-charset-priority-list): Add
+	`=>>jis-x0208', `=>>jis-x0213-1', `=>jis-x0208' and
+	`=>jis-x0213-1'.
+
+2009-08-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-conf.el (=>>jis-x0208): New coded-charset for XEmacs
+	CHISE.
+	(=>jis-x0208): Use `=>>jis-x0208' as the mother.
+
+2009-08-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-conf.el (=>>jis-x0213-1): Renamed from
+	`<==>jis-x0213-1'.
+	(=>>jis-x0213-1@2000): Renamed from `<==>jis-x0213-1@2000'.
+	(=>>jis-x0213-1@2004): Renamed from `<==>jis-x0213-1@2004'.
+	(=>jis-x0208): Renamed from `<=>jis-x0208'.
+	(<=>jis-x0208): New alias for `=>jis-x0208'.
+	(=>jis-x0208@1997): Renamed from `<=>jis-x0208@1997'.
+	(<=>jis-x0208@1997): New alias for `=>jis-x0208@1997'.
+	(=>jis-x0213-1): Renamed from `<=>jis-x0213-1'.
+	(<=>jis-x0213-1): New alias for `=>jis-x0213-1'.
+	(=>jis-x0213-1@2000): Renamed from `<=>jis-x0213-1@2000'.
+	(<=>jis-x0213-1@2000): New alias for `=>jis-x0213-1@2000'.
+	(=>jis-x0213-1@2004): Renamed from `<=>jis-x0213-1@2004'.
+	(<=>jis-x0213-1@2004): New alias for `=>jis-x0213-1@2004'.
+	(=>>gt): Renamed from `<==>gt'.
+	(<==>gt): New alias for `=>>gt'.
+
+2009-08-27  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-coding.el: (coded-charset-entity-reference-alist):
+	- Use `=jis-x0213-1@2000' instead of `japanese-jisx0213-1'
+	- Use `=jis-x0213-2' instead of `japanese-jisx0213-2'.
+	- Use `<=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	- Add settings for `<=>jis-x0213-1@2000' and
+	  `<=>jis-x0213-1@2004'.
+
+	* mule/mule-conf.el (=jis-x0208@1978/-4X): New coded-charset for
+	XEmacs CHISE.
+	(<==>jis-x0213-1): Likewise.
+	(<==>jis-x0213-1@2000): Likewise.
+	(<==>jis-x0213-1@2004): Likewise.
+	(<=>jis-x0208): Add property `=>iso-ir 168'.
+	(<=>jis-x0208@1997): Likewise.
+	(<=>jis-x0213-1): Use `<==>jis-x0213-1' instead of `=jis-x0213-1'
+	as the mother; add property `=>iso-ir 228'.
+	(<=>jis-x0213-1@2000): Modify DOC-string; fix `registry'; add
+	property `=>iso-ir 228'.
+	(<=>jis-x0213-1@2004): Modify DOC-string; fix `registry'; add
+	property `=>iso-ir 233'.
+	(<==>gt): Renamed from `<=>gt'.
+	(<=>gt): New alias for `<==>gt'.
+
+2009-08-25  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule/mule-conf.el (<=>jis-x0208): New coded-charset for XEmacs
+	CHISE.
+	(<=>jis-x0208@1997): Renamed from `=jis-x0208@1997'; use
+	`<=>jis-x0208' as the mother.
+	(<=>jis-x0213-1): New coded-charset for XEmacs CHISE.
+	(<=>jis-x0213-1@2000): Ditto.
+	(<=>jis-x0213-1@2004): Ditto.
+
 2009-06-22  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* mule/mule-coding.el (coded-charset-entity-reference-alist): Add
diff --git a/lisp/mule/mule-charset.el b/lisp/mule/mule-charset.el
index 965fd19..1f6f4ae 100644
--- a/lisp/mule/mule-charset.el
+++ b/lisp/mule/mule-charset.el
@@ -3,7 +3,8 @@
 ;; Copyright (C) 1992 Free Software Foundation, Inc.
 ;; Copyright (C) 1995 Amdahl Corporation.
 ;; Copyright (C) 1996 Sun Microsystems.
-;; Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2007 MORIOKA Tomohiko
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
+;;   2009 MORIOKA Tomohiko
 
 ;; Author: Unknown
 ;; Keywords: i18n, mule, internal
@@ -346,12 +347,16 @@ DESCRIPTION (string) is the description string of the charset."
 	  arabic-1-column
 	  arabic-2-column
 	  =cbeta
-	  ucs-bmp
 	  =jef-china3
 	  chinese-isoir165
 	  arabic-iso8859-6
 	  chinese-big5-1
 	  chinese-big5-2
+	  =>>jis-x0208
+	  =>>jis-x0213-1
+	  =>jis-x0208
+	  =>jis-x0213-1
+	  ucs-bmp
 	  ;; ucs-sip
 	  )))
 
diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el
index 11e8710..ab70299 100644
--- a/lisp/mule/mule-coding.el
+++ b/lisp/mule/mule-coding.el
@@ -4,7 +4,8 @@
 ;; Licensed to the Free Software Foundation.
 ;; Copyright (C) 1995 Amdahl Corporation.
 ;; Copyright (C) 1995 Sun Microsystems.
-;; Copyright (C) 1997,1999,2002,2003,2004,2005,2006,2008,2009 MORIOKA Tomohiko
+;; Copyright (C) 1997, 1999, 2002, 2003, 2004, 2005, 2006, 2008, 2009,
+;;   2010 MORIOKA Tomohiko
 
 ;; This file is part of XEmacs.
 
@@ -181,10 +182,10 @@
 
 (when (featurep 'utf-2000)
   (setq coded-charset-entity-reference-alist
-	'(((ideograph-gt	. isolated)     "I-GT-" 5 d)
+	'(((=gt			. isolated)     "I-GT-" 5 d)
 	  ((=ruimoku-v6		. isolated)   "I-RUI6-" 4 X)
 	  ((chinese-big5-cdp	. isolated)    "I-CDP-" 4 X)
-	  ((ideograph-gt-k	. isolated)    "I-GT-K" 5 d)
+	  ((=gt-k		. isolated)    "I-GT-K" 5 d)
 	  ((ideograph-cbeta	. isolated)      "I-CB" 5 d)
 	  ((ideograph-hanziku-1 . isolated)  "I-HZK01-" 4 X)
 	  ((ideograph-hanziku-2 . isolated)  "I-HZK02-" 4 X)
@@ -198,13 +199,13 @@
 	  ((ideograph-hanziku-10 . isolated) "I-HZK10-" 4 X)
 	  ((ideograph-hanziku-11 . isolated) "I-HZK11-" 4 X)
 	  ((ideograph-hanziku-12 . isolated) "I-HZK12-" 4 X)
-	  ((japanese-jisx0208-1990 . isolated) "I-J90-" 4 X)
-	  ((japanese-jisx0208	. isolated)    "I-J83-" 4 X)
-	  ((japanese-jisx0213-1	. isolated)    "I-JX1-" 4 X)
-	  ((japanese-jisx0213-2	. isolated)    "I-JX2-" 4 X)
+	  ((=jis-x0208@1990	. isolated)    "I-J90-" 4 X)
+	  ((=jis-x0208@1983	. isolated)    "I-J83-" 4 X)
+	  ((=jis-x0213-1@2000	. isolated)    "I-JX1-" 4 X)
+	  ((=jis-x0213-2	. isolated)    "I-JX2-" 4 X)
 	  ((=jis-x0213-1@2004	. isolated)    "I-JX3-" 4 X)
-	  ((japanese-jisx0212	. isolated)    "I-JSP-" 4 X)
-	  ((japanese-jisx0208-1978 . isolated) "I-J78-" 4 X)
+	  ((=jis-x0212		. isolated)    "I-JSP-" 4 X)
+	  ((=jis-x0208@1978	. isolated)    "I-J78-" 4 X)
 	  ((chinese-gb2312	. isolated)    	"I-G0-" 4 X)
 	  ((chinese-cns11643-1	. isolated)     "I-C1-" 4 X)
 	  ((chinese-cns11643-2	. isolated)     "I-C2-" 4 X)
@@ -238,13 +239,16 @@
 	  ((arabic-digit	. isolated) "I-MULE-ARBD-" 2 X)
 	  ((ipa			. isolated) "I-MULE-IPA-" 2 X)
 	  ((china3-jef		. isolated)    "I-JC3-" 4 X)
-	  ( ideograph-gt   		          "GT-" 5 d)
-	  (<=>gt				 "aGT-" 5 d)
+	  ( =gt					  "GT-" 5 d)
+	  (=>>gt				"G-GT-" 5 d)
+	  (=>>gt				 "aGT-" 5 d)
+	  (=>gt					"A-GT-" 5 d)
 	  ( =zinbun-oracle                       "ZOB-" 4 d)
+	  (=>zinbun-oracle                     "A-ZOB-" 4 d)
 	  ( =ruimoku-v6				"RUI6-" 4 X)
 	  ( chinese-big5-cdp		         "CDP-" 4 X)
 	  ( ideograph-daikanwa                     "M-" 5 d)
-	  ( ideograph-gt-k   		         "GT-K" 5 d)
+	  ( =gt-k				 "GT-K" 5 d)
 	  ( ideograph-cbeta   		           "CB" 5 d)
 	  ( ideograph-hanziku-1                "HZK01-" 4 X)
 	  ( ideograph-hanziku-2                "HZK02-" 4 X)
@@ -262,13 +266,26 @@
 	  ( ideograph-hanziku-1                 "HZK1-" 4 X)
 	  ((ideograph-hanziku-2 . isolated)   "I-HZK2-" 4 X)
 	  ( ideograph-hanziku-2                 "HZK2-" 4 X)
-	  ( japanese-jisx0208-1990  	         "J90-" 4 X)
-	  ( japanese-jisx0208   		 "J83-" 4 X)
-	  ( japanese-jisx0213-1   		 "JX1-" 4 X)
-	  ( japanese-jisx0213-2   		 "JX2-" 4 X)
+	  ( =jis-x0208@1990			 "J90-" 4 X)
+	  ( =jis-x0208@1983			 "J83-" 4 X)
+	  ( =jis-x0213-1@2000   		 "JX1-" 4 X)
+	  ( =jis-x0213-2	   		 "JX2-" 4 X)
 	  ( =jis-x0213-1@2004			 "JX3-" 4 X)
-	  ( japanese-jisx0212   		 "JSP-" 4 X)
-	  ( japanese-jisx0208-1978  	         "J78-" 4 X)
+	  ( =jis-x0212				 "JSP-" 4 X)
+	  ( =jis-x0208@1978			 "J78-" 4 X)
+	  (=>>jis-x0208@1990		       "G-J90-" 4 X)
+	  (=>>jis-x0213-1@2000		       "G-JX1-" 4 X)
+	  (=>>jis-x0213-2	   	       "G-JX2-" 4 X)
+	  (=>>jis-x0213-1@2004		       "G-JX3-" 4 X)
+	  (=>>jis-x0213-1@2000		        "aJX1-" 4 X)
+	  (=>>jis-x0213-2	   		"aJX2-" 4 X)
+	  (=>>jis-x0213-1@2004		        "aJX3-" 4 X)
+	  (=>>jis-x0208@1978		       "G-J78-" 4 X)
+	  ( =>jis-x0208@1997			 "J97-" 4 X)
+	  ( =>jis-x0208@1997			"A-J0-" 4 X)
+	  ( =>jis-x0213-1@2000		       "A-JX1-" 4 X)
+	  ( =>jis-x0213-2		       "A-JX2-" 4 X)
+	  ( =>jis-x0213-1@2004		       "A-JX3-" 4 X)
 	  ( chinese-cns11643-1                    "C1-" 4 X)
 	  ( chinese-cns11643-2                    "C2-" 4 X)
 	  ( chinese-cns11643-3                    "C3-" 4 X)
@@ -315,7 +332,6 @@
 	  ( =ucs@cns	                    	  "CU-" 8 X)
 	  ( =ucs@ks	                    	  "KU+" 4 X)
 	  ( =ucs@ks	                    	  "KU-" 8 X)
-	  ( =jis-x0208@1997                      "J97-" 4 X)
 	  ( =jis-x0208@1978/i1                 "J78i1-" 4 X)
 	  ( =shinjigen@rev                      "SJG2-" 4 d)
 	  ( =shinjigen@1ed                      "SJG1-" 4 d)
diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 1542db1..2e1e7de 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1995,1999 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
 ;; Copyright (C) 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2008,
-;;   2009 MORIOKA Tomohiko
+;;   2009, 2010 MORIOKA Tomohiko
 
 ;; Keywords: mule, multilingual, character set, coding system
 
@@ -61,12 +61,34 @@
 	    final ?@
 	    graphic 0))
   (make-charset
+   '=jis-x0208@1978/-4X
+   "JIS X 0208:1978, index before the 4th impression."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978
+	      =>iso-ir 42
+              ;; final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
+   '=jis-x0208@1978/1er-pr
+   "JIS X 0208:1978, fixed by errata [Nov 1978]."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978
+              =>iso-ir 42
+	      ;; final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
    '=jis-x0208@1978/4-pr
    "JIS X 0208:1978, 4th impression or later."
    '(registry "jisx0208\\.1978"
 	      dimension 2
 	      chars 94
-	      mother =jis-x0208@1978
+	      mother =jis-x0208@1978/1er-pr
               =>iso-ir 42
 	      ;; final ?@
 	      graphic 0
@@ -263,15 +285,148 @@
   (define-charset-alias 'ucs '=ucs)
   (define-charset-alias '=jis-x0208-1990 '=jis-x0208@1990)
   (define-charset-alias 'japanese-jisx0208-1990 '=jis-x0208@1990)
+
   (make-charset
-   '=jis-x0208@1997
-   "JIS X 0208 based on the unification rule of 1997 edition."
+   '=>>jis-x0208
+   "JIS X 0208 abstract glyphs (unchanged part)."
    '(registry "jisx0208\\.1990"
 	      dimension 2
 	      chars 94
 	      mother =jis-x0208
+	      =>iso-ir 168
 	      ;; final ?B
 	      graphic 0))
+  (make-charset
+   '=>>jis-x0208@1978
+   "JIS X 0208:1978 abstract glyphs (unchanged part)."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =>>jis-x0208
+	      =>iso-ir 42
+	      ;; final ?@
+	      graphic 0))
+
+  (make-charset
+   '=>>jis-x0213-1
+   "JIS X 0213 Plain 1 abstract glyphs (unchanged part)"
+   '(registry "jisx0213\\(\\.[0-9]+\\)?-1"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0213-1
+	      =>iso-ir 228
+              ;; final ?O
+	      graphic 0
+              ;; partial t
+	      ))
+  (make-charset
+   '=>>jis-x0213-1@2000
+   "JIS X 0213:2000 Plain 1 abstract glyphs"
+   '(registry "jisx0213\\(\\.2000\\)-1"
+	      dimension 2
+	      chars 94
+	      mother =>>jis-x0213-1
+	      =>iso-ir 228
+              ;; final ?O
+	      graphic 0
+	      ;; partial t
+	      ))
+  (make-charset
+   '=>>jis-x0213-2
+   "JIS X 0213 Plain 2 abstract glyphs"
+   '(registry "jisx0213\\(\\.\\(2000\\|2004\\)\\)?-2"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0213-2
+	      =>iso-ir 229
+              ;; final ?P
+	      graphic 0))
+  (make-charset
+   '=>>jis-x0213-1@2004
+   "JIS X 0213:2004 Plain 1 abstract glyphs"
+   '(registry "jisx0213\\(\\.2004\\)-1"
+	      dimension 2
+	      chars 94
+	      mother =>>jis-x0213-1
+	      =>iso-ir 233
+              ;; final ?Q
+	      graphic 0
+              ;; partial t
+	      ))
+
+  (make-charset
+   '=>jis-x0208
+   "JIS X 0208 based on the unchanged unification rules."
+   '(registry "jisx0208\\.1990"
+	      dimension 2
+	      chars 94
+	      mother =>>jis-x0208
+	      =>iso-ir 168
+	      ;; final ?B
+	      graphic 0))
+  (define-charset-alias '<=>jis-x0208 '=>jis-x0208)
+  (make-charset
+   '=>jis-x0208@1997
+   "JIS X 0208 based on the unification rule of 1997 edition."
+   '(registry "jisx0208\\.1990"
+	      dimension 2
+	      chars 94
+	      mother =>jis-x0208
+	      =>iso-ir 168
+	      ;; final ?B
+	      graphic 0))
+  (define-charset-alias '<=>jis-x0208@1997 '=>jis-x0208@1997)
+  (define-charset-alias '  =jis-x0208@1997 '=>jis-x0208@1997)
+
+  (make-charset
+   '=>jis-x0213-1
+   "JIS X 0213 Plain 1 abstract characters (unchanged part)"
+   '(registry "jisx0213\\(\\.[0-9]+\\)?-1"
+	      dimension 2
+	      chars 94
+	      mother =>>jis-x0213-1
+	      =>iso-ir 228
+              ;; final ?O
+	      graphic 0
+              ;; partial t
+	      ))
+  (define-charset-alias '<=>jis-x0213-1 '=>jis-x0213-1)
+  (make-charset
+   '=>jis-x0213-1@2000
+   "JIS X 0213:2000 Plain 1 abstract characters"
+   '(registry "jisx0213\\(\\.2000\\)-1"
+	      dimension 2
+	      chars 94
+	      mother =>jis-x0213-1
+	      =>iso-ir 228
+              ;; final ?O
+	      graphic 0
+	      ;; partial t
+	      ))
+  (define-charset-alias '<=>jis-x0213-1@2000 '=>jis-x0213-1@2000)
+  (make-charset
+   '=>jis-x0213-1@2004
+   "JIS X 0213:2004 Plain 1 abstract characters"
+   '(registry "jisx0213\\(\\.2004\\)-1"
+	      dimension 2
+	      chars 94
+	      mother =>jis-x0213-1
+	      =>iso-ir 233
+              ;; final ?Q
+	      graphic 0
+              ;; partial t
+	      ))
+  (define-charset-alias '<=>jis-x0213-1@2004 '=>jis-x0213-1@2004)
+  (make-charset
+   '=>jis-x0213-2
+   "JIS X 0213 Plain 2 abstract characters"
+   '(registry "jisx0213\\(\\.\\(2000\\|2004\\)\\)?-2"
+	      dimension 2
+	      chars 94
+	      mother =>>jis-x0213-2
+	      =>iso-ir 229
+              ;; final ?P
+	      graphic 0))
 
   (make-charset '=big5-cdp
 		"Big5 with CDP extension"
@@ -300,15 +455,26 @@
 		  max-code	,(+ (lsh #x6100 16) 67547)
 		  code-offset	,(lsh #x6100 16)))
   (define-charset-alias 'ideograph-gt '=gt)
-  (make-charset '<=>gt
-		"GT 2000 abstract characters"
-		`(long-name	"abstract GT"
+  (make-charset '=>>gt
+		"GT 2000 abstract glyphs"
+		`(long-name	"abstract GT glyphs"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  mother	=gt))
+  (define-charset-alias '<=>gt '=>>gt)
+  (define-charset-alias '<==>gt '=>>gt)
+  (make-charset '=>gt
+		"GT 2000 abstract characters"
+		`(long-name	"abstract GT characters"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>>gt))
   (make-charset '=gt-k
 		"Ideographic components of GT"
 		`(long-name	"GT components"
@@ -559,6 +725,17 @@
 		  columns	2
 		  direction	l2r))
 
+  (make-charset '=>zinbun-oracle
+		"Abstract Oracle Bones"
+		'(long-name	"Abstract characters of Zinbun Oracle Bones."
+		  chars		256
+		  dimension	2
+		  mother	=zinbun-oracle
+		  registry	"zob1968-0"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+
   (make-charset '=jef-china3
 		"JEF + CHINA3 private characters"
 		'(long-name	"JEF + CHINA3"
diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index acfdb79..3bcabd2 100644
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,2165 @@
+2010-04-14  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R210-Even.el (U+9F4E): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+
+2010-04-13  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R209-Nose.el (abstract J0-4921): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'; unify U+9F3B.
+
+	* Ideograph-R200-Hemp.el (U+9EBB): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(K0-582B): Unify GT-65256 and GT-K07879.
+	(J97-4B7B): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(M-47909): Unify JC3-6FC8.
+	(C7-4C7C): Map to U-0002A3A5.
+	(M-47910): Unify GT-65297.
+	(C7-4C7D): Map to U-0002A3A7.
+
+	* Ideograph-R196-Bird.el (U+9D08): Add `<-formed' for J0-3467.
+	(C7-2B71): Map to U-00029FD6.
+	(C7-2B7A): Map to U-00029FC4.
+	(U+9D09): Use `->denotational' and `->subsumptive'; unify abstract
+	J0-726D.
+	(M-46738): Separate C1-7029 and G1-513B; integrate GT-63596.
+	(G1-513B): Unify JX3-726D.
+	(J0-726D): Separate JX3-726D; add `<-simplified@JP/extra/design'
+	for JX3-726D; separate K0-643C.
+	(J78-3974): Unify JX3-3974.
+	(J90-3974): Separate JX3-3974; add `<-simplified@JP/extra/design'
+	for JX3-3974.
+	(U+9DD6): Use `->denotational' instead of `->subsumptive'.
+	(J97-322A): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+9D0E): Use `<-simplified@JP/extra' instead of
+	`<-simplified@JP/jis' for JX1-7E65.
+
+	* Ideograph-R172-Short-Tailed-Bird.el (J0-3467): Unify S1-8943.
+
+	* Ideograph-R086-Fire.el (J97-3975): Copied from
+	Ideograph-R203-Black.el.
+
+	* Ideograph-R203-Black.el (J97-3975): Use `=>jis-x0208@1997'
+	instead of `=jis-x0208@1997'; use
+	`ideographic-{radical|strokes}@jis/b' instead of
+	`ideographic-{radical|strokes}'; add `ideographic-radical@jis/a'.
+
+	* Ideograph-R201-Yellow.el (J97-322B): Use `=>jis-x0208@1997'
+	instead of `=jis-x0208@1997'.
+	(U+9EC3): Unify abstract JX1-7E71.
+	(C7-2C32): Map to U-0002A3B4.
+
+2010-04-09  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R199-Wheat.el (J97-396D): Use `=>jis-x0208@1997'
+	instead of `=jis-x0208@1997'.
+	(U+9EB4): Unify abstract JX1-7E6F.
+	(JX1-7E6F): Unify GT-65145.
+	(U+9EB9): Unify abstract JX1-396D.
+	(J90-396D): Unify JC3-6FC3.
+	(J97-4C4D): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+9EB5): Unify abstract JX1-7E70.
+	(JX1-7E70): Unify GT-65188.
+	(U+9EBA): Unify abstract JX1-4C4D.
+	(J90-4C4D): Unify JC3-6FC4.
+
+	* Ideograph-R197-Salt.el (J97-3834): Use `=>jis-x0208@1997'
+	instead of `=jis-x0208@1997'.
+	(J90-3834): Unify JC3-6FB5; use `<-simplified@JP/extra' instead of
+	`<-simplified@JP/jis' for U+9E7C.
+
+2010-04-08  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R195-Fish.el (U+9BAA): Use `->subsumptive'.
+	(U+9BAB): Use `->subsumptive'; unify abstract J0-3B2D.
+	(J0-3B2D): Separate JX3-3B2D.
+	(U+4C4D): Add `<-same' for U+4C6D.
+	(U+9BD6): Unify abstract J0-3B2A.
+	(J78-3B2A): Unify JX3-3B2A.
+	(J90-3B2A): Separate JX3-3B2A; add `<-simplified@JP/jis' for
+	JX3-3B2A.
+	(U+9C2F): Unify abstract J0-3073.
+	(JX1-3073): Add `<-simplified@JP/jis' for JX3-3073.
+	(M-46492): Separate J78-4B70 and GT-63238.
+	(J78-4B70): Unify JX3-4B70.
+	(J90-4B70): Separate JX3-4B70; add `<-simplified@JP/jis' for
+	JX3-4B70.
+	(C7-5D75): Map to U-00029EE1.
+	(U+4C8C): Use `->subsumptive'.
+
+	* Ideograph-R184-Eat.el (U+98EF): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(U+98F4): Likewise.
+	(JX3-303B): Add `=ucs@jis/2004' for J2004U+98F4.
+	(JX1-303B): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis' for J{1990|2000}U+98F4; unify JC3-6DC8; use
+	`<-simplified@JP/extra' instead of `<-simplified@JP/jis' for
+	JX3-303B.
+	(M-44108): Unify GT-59233 and S2-5617; add `<-original' for
+	U+79E3.
+	(S1-5617): New character.
+	(GT-59165): New character.
+	(U+98FD): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(K0-7869): Unify GT-59241.
+	(U+98FE): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(K0-635E): Unify JC3-6DB6.
+	(U+9905): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J78-4C5F): Unify JX3-4C5F; add `<-vulgar' for J0-7136.
+	(J90-4C5F): Separate JX3-4C5F; use `<-simplified@JP/extra' instead
+	of `<-simplified@JP/jis' for J78-4C5F.
+	(GT-59206): New character.
+	(U+9909): Use `->denotational'; integrate GT-59211.
+	(U+4B39): Use `->denotational' instead of `->subsumptive';
+	integrate GT-59217.
+	(U-000296CE): Use `->denotational' instead of `->subsumptive'.
+	(M-44142): Unify GT-59307.
+	(U+4B3A): Use `->denotational' instead of `->subsumptive';
+	integrate GT-59248.
+	(U+990A): Use `->subsumptive'.
+	(U+990B): Use `->denotational' and `->subsumptive'.
+	(U+990C): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(M-44146): Unify GT-59281.
+	(JX1-3142): Add `<-simplified@JP/extra' for JX1-3142.
+	(M-44147): Unify GT-59280.
+	(U-000296CF): Integrate GT-59201.
+	(U+9910): Use `->subsumptive'; unify abstract J0-3B41.
+	(K0-7349): Unify JX3-3B41 and S-9268.
+	(C1-7327): Unify GT-59369.
+	(J0-3B41): Separate JX3-3B41; separate S1-9268.
+	(U+4B3D): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+9957): Use `->denotational' and `->subsumptive'; unify abstract
+	J0-3642; unify JC3-6DCA.
+	(M-44431): Add `<-same@JP/extra/design' for JX3-3642.
+	(K0-7A44): Unify JX3-3642.
+	(J0-3642): Separate JX3-3642; add `<-simplified@JP/jis' for
+	JX3-3642.
+	(U-000297CA): Use `->denotational' instead of `->subsumptive'.
+	(U+9958): Use `->denotational' and `->subsumptive'.
+	(JX1-7E2A): Unify JC3-6DC7.
+
+	* Ideograph-R187-Horse.el (U+99C1): Use `->subsumptive'; unify
+	abstract J0-477D.
+	(J0-477D): Separate JX3-477D.
+	(C1-6B72): Unify JX3-477D.
+	(C7-4C2C): Unify U-0002991D.
+	(U+9A17): Use `->denotational'.
+	(U+9A19): Use `->denotational'; unify abstract J0-7159.
+	(C1-7952): Unify JX3-7159.
+	(J0-7159): Separate JX3-7159; add `<-simplified@JP/extra/design'
+	for JX3-7159.
+	(U+4B9E): Use `->subsumptive' to separate representative nodes.
+	(M-44851): Unify JC3-6DF0.
+	(U+9A1A): Use `->denotational' instead of `->subsumptive'.
+	(JX2-7C7D): Unify GT-60393.
+	(UU+9A1A): Unify GT-60396.
+	(C7-5A3B): Map to U-00029988.
+	(U-00029989): Use `->denotational'.
+	(M-44998): Unify GT-60594.
+	(IU-00029989): Separate C5-7233; unify GT-60595.
+	(M-44999): Unify GT-60559.
+	(M-45000): Unify GT-60582.
+	(C7-5A40): Map to U-0002998D; integrate GT-60583.
+	(J97-424D): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(J90-424D): Unify JC3-6DF8.
+
+2010-04-07  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R190-Hair.el (U+4C09): Use `->subsumptive' to separate
+	representative nodes.
+	(U+9B12): Use `->denotational'.
+	(JX2-7D39): Unify GT-61265; add `<-formed' and `<-same' for
+	U+3431.
+	(abstract GT-61266): New variant of U+9B12.
+	(M-45544): Add `<-denotational' for abstract GT-61266; unify
+	GT-61266.
+	(C7-517A): Add `<-denotational' for abstract GT-61266; unify
+	U-0002FA0A.
+	(C7-5177): Map to U-00029BA1.
+
+	* char-db-util.el (char-db-coded-charset-priority-list): Add
+	`=>gt'.
+
+	* Oracle-Bones.el (abstract ZOB-0353): New abstract character.
+	(abstract ZOB-0559): New abstract character.
+	(abstract ZOB-0644): New abstract character.
+	(abstract ZOB-0909): New abstract character.
+	(abstract ZOB-1019): New abstract character.
+	(abstract ZOB-1395): New abstract character.
+	(ZOB-1397): Use `<-denotational' for abstract ZOB-1019.
+	(ZOB-1416): Use `<-denotational' for abstract ZOB-0644.
+	(abstract ZOB-1418): New abstract character.
+	(abstract ZOB-1429): New abstract character.
+	(abstract ZOB-1441): New abstract character.
+	(abstract ZOB-1511): New abstract character.
+	(ZOB-1530): Use `<-denotational' for abstract ZOB-1429.
+	(abstract ZOB-1532): New abstract character.
+	(abstract ZOB-1627): New abstract character.
+	(abstract ZOB-1648): New abstract character.
+	(ZOB-1667): Use `<-denotational' for abstract ZOB-0353.
+	(ZOB-1733): Use `<-denotational' for abstract ZOB-1648.
+	(ZOB-1848): Use `<-denotational' for abstract ZOB-1627.
+	(ZOB-1849): Use `<-denotational' for abstract ZOB-1441.
+	(ZOB-1850): Use `<-denotational' for abstract ZOB-1395.
+	(ZOB-1851): Use `<-denotational' for abstract ZOB-1511.
+	(ZOB-1854): Use `<-denotational' for abstract ZOB-0559.
+	(ZOB-1856): Use `<-denotational' for abstract ZOB-1532.
+	(ZOB-1908): Use `<-denotational' for abstract ZOB-0909.
+	(ZOB-1951): Use `<-denotational' for abstract ZOB-0644.
+	(ZOB-2041): Use `<-denotational' for abstract ZOB-1418.
+
+2010-04-06  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R189-Tall.el (abstract J0-3962): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+
+	* Ideograph-R181-Leaf.el (J97-4B4B): Use `=>jis-x0208@1997'
+	instead of `=jis-x0208@1997'.
+	(J97-453F): Ditto.
+	(U+985A): Unify abstract JX1-7E23.
+	(GT-58556): Use U+985B instead of U+985A as the parent.
+
+	* Ideograph-R180-Sound.el (C7-514A): Map to U-0002943A.
+	(U+97FF): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(C7-562E): Map to U-0002943F.
+	(abstract JX1-7D76): New abstract character.
+
+	* Oracle-Bones.el:
+	- Introduce abstract character as root of variants.
+	(ZOB-{02207 - 02230}): New characters.
+
+2010-04-01  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R177-Leather.el (U+9771): Use `->denotational' instead
+	of `->subsumptive'.
+	(J90-7057): Separate JX3-7057.
+	(J83-7057): Unify JX3-7057.
+	(J78-3373): Unify JX3-3373.
+	(J90-3373): Separate JX3-3373; add `<-simplified@JP/jis' for
+	JX3-3373.
+	(J78-3E64): Unify JX3-3E64.
+	(J90-3E64): Separate JX3-3E64; add `<-simplified@JP/jis' for
+	JX3-3E64.
+	(U-000292EF): Use `->denotational' instead of `->subsumptive'.
+	(U+97AD): Unify abstract J0-4A5C.
+	(J0-4A5C): Separate JX3-4A5C.
+	(G0-315E): Unify JX3-4A5C.
+	(C7-4471): Map to U-000292F0.
+
+	* char-db-util.el (char-db-coded-charset-priority-list): Add
+	`=>zinbun-oracle'.
+	(char-db-insert-ccs-feature): Format `=>zinbun-oracle' as decimal.
+
+	* Ideograph-R173-Rain.el (U+9744): Unify abstract J0-704B.
+	(K0-6477): Separate J0-704B and JX1-704B.
+
+	* Ideograph-R169-Gate.el (abstract J0-313C): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(C3-3F6D): Use `=jis-x0208@1978/1pr*note' instead of
+	`=jis-x0208@1978*note'.
+	(J90-313C): Separate J78-313C; unify J78-313C_1er-pr.
+	(abstract J0-6F65): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'; unify U+95BB.
+	(J90-6F65): Separate J78-6F65; unify J78-6F65_1er-pr; don't use
+	`jisx0208-difference'.
+	(J78-6F65_1pr): Use `=jis-x0208@1978/1pr*note' instead of
+	`=jis-x0208@1978*note'.
+	(U+95C9): Use `->subsumptive' to separate representative nodes.
+	(U+95CA): Use `->subsumptive'.
+	(U+95CB): Use `->subsumptive' to separate representative nodes.
+	(C7-3D2D): Map to U-00028D6D.
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-704B.
+
+2010-03-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* char-db-util.el: (ideographic-radical):
+	- Add autoload cookie.
+	- Add DOC-string.
+
+2010-03-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R170-Mound.el (U+9686): Use `=>jis-x0208@1997' instead
+	of `=jis-x0208@1997'.
+	(U+9698): Use `->denotational' instead of `->subsumptive'.
+	(abstract J0-3764): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(G0-4F36): Unify JX3-3764.
+	(J90-3764): Unify J78-3764_-4X; separate JX3-3764.
+
+	* Ideograph-R009-Man.el (U-00020429): Add `ideographic-structure'.
+
+2010-03-24  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R167-Gold.el (U+91DC): Use `->subsumptive'; unify
+	abstract J0-3378.
+	(J0-3378): Separate JX3-3378.
+	(G0-382A): Unify JX3-3378.
+	(abstract J0-6E5F): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(J97-4F3F): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+9304): Unify abstract JX1-7D35.
+	(U+9332): Unify abstract JX1-4F3F.
+	(J78-3B2C): Unify JX3-3B2C.
+	(J90-3B2C): Separate JX3-3B2C.
+	(U+9375): Use `->subsumptive'; unify abstract J0-3830.
+	(J0-3830): Separate JX3-3830.
+	(C1-756F): Unify JX3-3830.
+	(J78-444A): Unify JX3-444A.
+	(J90-444A): Separate JX3-444A; use `<-simplified@JP/extra' for
+	JX3-444A.
+	(J78-4C7A): Unify JX3-4C7A.
+	(J90-4C7A): Separate JX3-4C7A; use `<-simplified@JP/extra' instead
+	of `<-simplified@JP/jis' for JX3-4C7A.
+
+2010-03-17  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R164-Wine.el (J78-3D36): Unify JX3-3D36.
+	(J90-3D36): Separate JX3-3D36; add `<-simplified@JP/jis' for
+	JX3-3D36.
+	(J97-3E5F): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+91AC): Unify abstract JX1-7C79.
+	(U+91A4): Unify abstract JX1-3E5F.
+	(J90-3E5F): Add `<-simplified@JP/extra' for JX1-7C79.
+	(J97-4830): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+91B1): Unify abstract JX1-7C7A.
+	(U+9197): Unify abstract JX1-4830; unify JC3-69A2.
+	(J90-4830): Add `<-simplified@JP/jis' for JX1-7C7A.
+
+	* Ideograph-R162-Walk.el (U+8FBB): Unify abstract J0-4454.
+	(M-38711): Use `=jis-x0208@1978/4-pr' instead of `jisx0208-type'
+	and `=jis-x0208@1978' for J78-4454_4-pr; unify JX3-4454.
+	(J90-4454): Use `=jis-x0208@1978/-4pr' instead of
+	`jisx0208-difference' for J78-4454_-4pr; separate JX3-4454; add
+	`<-simplified@JP/extra' for JX3-4454.
+	(J78-4329): Unify JX3-4329.
+	(J90-4329): Separate JX3-4329; add `<-simplified@JP/extra' for
+	JX3-4329.
+	(U+8FC2): Unify abstract J0-312A.
+	(J90-312A): Add `<-simplified@JP/extra' for JX3-312A.
+	(J90-4B78): Modify `=jis-x0208@1978*note'; rename
+	`=jis-x0208@1978*{note|sources}' to
+	{=jis-x0208@1978/-4pr*{note|sources}'; add `<-simplified@JP/extra'
+	for JX3-4B78.
+	(U+8FDA): Use `->denotational' instead of `->subsumptive'.
+	(U+8FE6): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J90-3260): Add `<-simplified@JP/extra' for JX3-3260.
+	(B-B06E): Unify abstract J0-6D7E.
+	(J78-3F60): Unify JX3-3F60.
+	(J90-3F60): Separate JX3-3F60; add `<-simplified@JP/extra' for
+	JX3-3F60.
+	(U+9019): Unify abstract J0-4767.
+	(J78-4767): Unify JX3-4767.
+	(J90-4767): Separate JX3-4767; add `<-simplified@JP/extra' for
+	JX3-4767.
+	(U+901F): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(K0-615C): Modify format of
+	`->Large-Seal*sources@daikanwa/fixed*note'.
+	(U+9022): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J90-3029): Omit `jisx0208-difference'; add
+	`<-simplified@JP/extra' for JX3-3029.
+	(J78-492F): Unify JX3-492F.
+	(J90-492F): Separate JX3-492F; add `<-simplified@JP/extra' for
+	JX3-492F.
+	(J78-465B): Unify JX3-465B.
+	(J90-465B): Separate JX3-465B; add `<-simplified@JP/extra' for
+	JX3-465B.
+	(B-B94C): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+9065): Delete `<-denotational' for J97-4D5A.
+	(U+9059): Delete `<-denotational' for J97-4D5A; unify abstract
+	J0-7423.
+	(J90-7423): Use `=shinjigen/+p@rev' instead of `=shinjigen@rev'
+	for S2-8352'.
+	(J97-4D5A): Abolished.
+	(J78-423D): Unify JX3-423D.
+	(J90-423D): Separate JX3-423D; add `<-simplified@JP/extra' for
+	JX3-423D.
+	(J78-414C): Unify JX3-414C.
+	(J90-414C): Separate JX3-414C; add `<-simplified@JP/extra' for
+	JX3-414C.
+	(M-39104): Map to U-000285A1.
+	(U+9082): Unify abstract JX1-6E30.
+	(M-39246): Map to U-00028646.
+
+	* Ideograph-R163-City.el (U+90A6): Use `->subsumptive'.
+	(J97-4F3A): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+90CE): Unify abstract JX1-4F3A.
+	(U+90D2): Delete `=>daikanwa' for M-39431; add `<-unknown' for
+	M-39431.
+	(U+90DE): Unify abstract JX1-7C67.
+	(J97-363F): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(J78-4522): Unify JX3-4522.
+	(J90-4522): Separate JX3-4522.
+
+	* Ideograph-R039-Child.el (U+3743): Add `ideographic-structure'.
+	(M-06988): Separate UU+3743 and C3-3054.
+
+2010-03-11  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R113-Spirit.el (U+798F): Unify J97-4A21.
+
+	* Ideograph-R009-Man.el (U-000203BB): Add `ideographic-structure'.
+
+2010-03-10  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R158-Body.el (J97-366D): Use `=>jis-x0208@1997'
+	instead of `=jis-x0208@1997'.
+	(U+8EC0): Unify abstract JX1-7C4A; use `->denotational' instead of
+	`->subsumptive'.
+	(U+8EAF): Unify abstract JX1-366D; use `->denotational' instead of
+	`->subsumptive'.
+
+	* Ideograph-R154-Shell.el (abstract J0-6C4C): Use `=>jis-x0208'
+	and `=>jis-x0213-1' instead of `=jis-x0208@1997'; unify U+8CC1.
+	(U+8CED): Unify abstract J0-4552.
+	(J78-4552): Unify JX3-4552.
+	(J90-4552): Separate JX3-4552.
+	(U+8D08): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(abstract JX1-7C3D): New abstract node of U+8D08.
+
+2010-03-08  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R125-Old.el (C1-5752): Add `=ucs@cns' for CU+8006.
+
+	* Ideograph-R046-Mountain.el (U-00021EB8): Add
+	`ideographic-structure'.
+
+	* Ideograph-R030-Mouth.el (U+55DC): Use `->subsumptive' to
+	separate representative nodes.
+	(U-00020E55): Use `->denotational'.
+
+2010-03-05  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R153-Badger.el (U+8C79): Unify abstract J0-493F.
+	(K0-787B): Unify JX3-493F.
+	(J0-493F): Separate JX3-493F; add `<-simplified@JP/extra/design'
+	for JX3-493F.
+
+	* Ideograph-R149-Speech.el (U+8A0A): Unify abstract J0-3F56.
+	(k0-6372): Unify JX3-3F56.
+	(J0-3F56): Separate JX3-3F56.
+	(U+8A1D): Unify abstract J0-6B43.
+	(M-35260): Unify JX3-6B43.
+	(J90-6B43): Separate JX3-6B43.
+	(J78-4370): Unify JX3-4370.
+	(J90-4370): Separate JX3-4370; add `<-simplified@JP/extra/design'
+	for JX3-4370.
+	(J78-4127): Unify JX3-4127.
+	(J90-4127): Separate JX3-4127; add `<-simplified@JP/jis' for
+	J78-4127.
+	(abstract J0-4062): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(C7-2871): Map to U-00027A2B.
+	(U+8AB9): Unify abstract J0-4870.
+	(J90-4870): Separate JX3-4870.
+	(J83-4870): Unify JX3-4870.
+	(U+8ACD): Unify abstract J0-6B5A.
+	(J97-3D74): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997';
+	unify U+8AF8.
+	(C7-287A): Map to U-00027A60.
+	(C7-2872): Map to U-00027A58.
+	(C7-333D): Map to U-00027A75.
+	(U+8AFA): Unify abstract J0-3841.
+	(J78-3841): Unify JX3-3841.
+	(J90-3841): Separate JX3-3841.
+	(C7-334E): Map to U-00027A78; integrate H10-E9B2.
+	(J78-4666): Unify JX3-4666.
+	(J90-4666): Separate JX3-4666; add `<-simplified@JP/extra' for
+	JX3-4666.
+	(J78-4935): Unify JX3-4935.
+	(J90-4935): Separate JX3-4935.
+
+2010-03-03  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R142-Insect.el (B-DBB2): Unify U+86E2.
+	(J78-427D): Unify JX3-427D.
+	(J90-427D): Separate JX3-427D; add `<-simplified@JP/jis' for
+	J78-427D.
+	(B-B8C0): Unify abstract J0-6968.
+	(U+8703): Unify abstract J0-6967.
+	(J0-6967): Separate K0-6371, JX3-6967, GT-44663, S1-7181 and
+	S2-7182.
+	(J78-3F2A): Unify JX3-3F2A.
+	(J90-3F2A): Separate JX3-3F2A.
+	(U+877F): Add JX3-6A24 into `<-simplified@JP/jis'.
+	(J97-4066): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(J90-4066): Unify JC3-63B3.
+	(U-00027453): Use `->subsumptive' to separate representative
+	nodes.
+	(U+87F9): Unify abstract JX1-332A.
+	(parent of J0-332A): Unify abstract J0-332A.
+	(U+880F): Unify abstract JX1-6A37.
+	(J0-6A37): Add `<-original' for J0-332A; add `<-same' for
+	JX3-332A.
+	(J90-6A24): Separate JX3-6A24.
+	(M-33700): Add `<-formed' and `<-same' for U+86D3.
+	(J97-4F39): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(J90-4F39): Unify JC3-63B5; use `<-simplified@JP/extra' instead of
+	`<-simplified@JP/jis' for JX3-7B67.
+
+	* maps-conf.el: Don't rename `=>jis-x0208@1997' to `=>jis-x0208'
+	and add `=>jis-x0213-1' for J97-332A.
+
+2010-03-02  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R146-West.el (abstract J0-4D57): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'; unify U+8981.
+	(M-34769): Map to U-000277E5.
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-6967.
+
+	* Ideograph-R140-Grass.el (U+8292): Unify abstract J0-676A.
+	(J0-676A): Separate JX3-676A; add `<-simplified@JP/extra/design'
+	for JX3-676A.
+	(U+82A4): Use `->denotational'.
+	(U+82A5): Likewise.
+	(U+82A6): Add `sound@ja/on/p={hu4|lu2}'; unify abstract J0-3032.
+	(C3-2A6B): Add `<-same@p=hu4' for C2-2479; add `<-vulgar@p=lu2'
+	for M-32425.
+	(J90-3032): Use list instead of string as the value of
+	`=jis-x0208@1978*note'; add `<-simplified@JP/jis' for JX3-3032;
+	add `<-simplified@JP/misc' for M-32425.
+	(JX3-3032): Add `<-simplified@JP/extra' for J0-6943; add
+	`<-simplified@JP/misc' for M-32425.
+	(U+8327): Use `->denotational'.
+	(C2-3257): Unify JC3-61E1.
+	(U+8328): Unify abstract J0-3071.
+	(J0-3071): Add `<-simplified@JP/extra/design' for JX3-3071.
+	(abstract J0-3755): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(U+834A): Use `->denotational' instead of `->subsumptive'.
+	(J90-3755): Add `<-same@JP/jis' for J78-3755.
+	(C1-5774): Unify JC3-61EA.
+	(U+44BB): Use `->denotational' instead of `->subsumptive'.
+	(U+8347): Use `->denotational'.
+	(C2-3250): Unify JC3-61EB.
+	(U+8348): Use `->denotational' and `->subsumptive'.
+	(U+44BC): Use `->denotational' instead of `->subsumptive'.
+	(J97-4D69): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+840A): Use `->denotational' and `->subsumptive'.
+	(U+83B1): Unify JC3-63A2.
+	(U+845B): Unify abstract J0-336B.
+	(B-B8AF): Unify abstract glyph of JX3-336B; use `->denotational'
+	instead of `->subsumptive'.
+	(U+84EC): Unify abstract J0-4B29.
+	(J78-4B29): Unify JX3-4B29.
+	(J90-4B29): Separate JX3-4B29; unify JC3-63A4; use
+	`<-simplified@JP/extra' instead of `<-simplified@JP/jis'.
+	(U+8532): Unify abstract JX1-7B34.
+	(U+8511): Unify abstract J0-4A4E; use `->denotational' instead of
+	`->subsumptive'.
+	(J0-4A4E): Separate JX3-4A4E; add `<-simplified@JP/extra/design'
+	for JX3-4A4E.
+	(J97-3E55): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(J90-3E55): Unify JC3-61B9.
+	(U+853D): Unify JC3-62FD.
+	(J78-4A43): Unify JX3-4A43.
+	(J83-4A43): Add `<-simplified@JP/jis' for JX3-4A43.
+	(J90-4A43): Separate JX3-4A43; add `<-simplified@JP/jis' for
+	JX3-4A43.
+	(U+853F): Use `->denotational' and `->subsumptive'.
+	(U+848D): Likewise.
+	(J78-3B27): Unify JX3-3B27.
+	(J90-3B27): Separate JX3-3B27; add `<-simplified@JP/jis' for
+	JX3-3B27; add `<-simplified@JP/misc' for GT-43266.
+	(U+85AF): Unify abstract J0-3D72.
+	(J78-3D72): Unify JX3-3D72.
+	(J90-3D72): Separate JX3-3D72.
+	(U+85B0): Use `->denotational'.
+	(C1-7734): Unify JC3-62E5.
+	(U+85B1): Use `->denotational'.
+	(K0-6E4B): Unify J78-3D73 and JX3-3D73.
+	(J90-3D73): Separate JX3-3D73; unify JC3-61B8; add
+	`<-simplified@JP/jis' for JX3-3D73; add `<-simplified@JP/misc' for
+	M-32391.
+	(J0-4D76): Add `<-simplified' for M-32519.
+
+2010-02-24  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R141-Tiger.el (U+8654): Unify abstract J0-694A.
+	(J0-694A): Separate JX3-694A.
+	(GT-44188): Unify JX3-694A.
+
+	* char-db-util.el (char-db-coded-charset-priority-list): Add
+	`=>>jis-x0213-1@{2000|2004}' and `=>>jis-x0208@1978'.
+
+	* Ideograph-R055-Two-Hands.el (U+8201): Add
+	`ideographic-structure'; use `=>jis-x0208' and `=>jis-x0213-1'
+	instead of `=jis-x0208@1997'.
+	(U-0002234D): Use `->subsumptive' to separate representative
+	nodes.
+	(U-0002234E): Use `->denotational' instead of `->subsumptive'.
+
+2010-02-23  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R134-Mortar.el (U+8201): Add `ideographic-structure';
+	use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+
+	* Ideograph-R137-Boat.el (U+8258): Use `->denotational' instead of
+	`->subsumptive'; unify abstract J0-675B.
+	(M-30511): Separate J0-675B, C1-717C, JX1-675B and GT-39430.
+
+	* Ideograph-R130-Meat.el (abstract J0-6726): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(B-B2E6): Unify abstract J0-4326.
+	(U+8171): Unify abstract J0-6727.
+	(J0-6727): Separate JX3-6727.
+	(G0-6B6C): Unify JX3-6727.
+	(J78-425C): Unify JX3-425C.
+	(J90-425C): Separate JX3-425C; add `<-simplified@JP/extra' for
+	J78-425C.
+	(U+818E): Use `->denotational' and `->subsumptive'.
+	(U-000267AD): Use `->subsumptive'.
+	(U+818F): Unify abstract J0-3951.
+	(K0-4D47): Separate J0-3951 and JX1-3951.
+	(abstract glyph of GT-38767): Use `=>>gt' instead of `<=>gt'.
+	(abstract glyph of GT-38769): Ditto.
+
+2010-02-17  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R133-Arrive.el (U+81F4): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+
+	* Ideograph-R124-Feather.el (GT-36835): Map to U-000263F3; unify
+	H9-B3E8.
+	(M-28761): Map to U-00026461.
+	(U+7FE9): Use `->denotational'.
+	(U+7FEB): Add `ideographic-structure'.
+	(J78-3465): Unify JX3-3465.
+	(J90-3465): Separate JX3-3465; add `<-simplified@JP/jis' for
+	J78-3465.
+	(J78-344D): Unify JX3-344D.
+	(J90-344D): Separate JX3-344D.
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-3951.
+
+2010-02-12  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R118-Bamboo.el (U+7B08): Use `->denotational' instead
+	of `->subsumptive'; unify abstract J0-3568.
+	(C2-3166): Unify JX3-3568.
+	(J0-3568): Separate JX3-3568; add `<-simplified@JP/extra/design'
+	for JX3-3568.
+	(U+7B6D): Unify S-5822; add `<-original' for U+7B97.
+	(U+7B75): Unify abstract J0-6427.
+	(J0-6427): Separate JX3-6427.
+	(U-00025B6B): Integrate M-26091.
+	(U-00025B8D): Integrate M-26108.
+	(J0-4A4F): Add `<-vulgar' for J0-6444.
+	(U-00025B90): Integrate M-26115.
+	(U+4203): Unify M-26117.
+	(U+4204): Integrate M-26119.
+	(JSP-5235): Unify H8-BD47.
+	(U-00025B94): Integrate M-26134.
+	(U-00025B95): Integrate M-26138.
+	(U-00025B96): Integrate M-26141.
+	(U-00025B97): Integrate M-26144.
+	(U-00025B99): Integrate M-26155.
+	(U-00025B9A): Integrate M-26156.
+	(U+7B9F): Use `->subsumptive'.
+	(J0-6431): Add `<-ancient' for J0-6430; add `<-formed' for S-5815.
+	(U-00025B9B): Integrate M-26159.
+	(U-00025B9C): Integrate M-26160.
+	(U-00025B9E): Unify M-26166.
+	(U+420B): Integrate M-26167.
+	(U-00025BA2): Integrate M-26172.
+	(U+7BAD): Use `->denotational' instead of `->subsumptive'; unify
+	abstract J0-407D.
+	(M-26193): Unify JX3-407D.
+	(J0-407D): Separate JX3-407D; add `<-simplified@JP/extra/design'
+	for JX3-407D.
+	(U+7BB8): Use `->denotational' instead of `->subsumptive'.
+	(J78-4824): Unify JX3-4824.
+	(J90-4824): Separate JX3-4824; add `<-simplified@JP/jis' for
+	J78-4824.
+	(U+7BC7): Use `->denotational' instead of `->subsumptive'; unify
+	abstract J0-4A53.
+	(K0-7839): Unify JX3-4A53.
+	(J0-4A53): Separate JX3-4A53; add `<-simplified@JP/extra/design'
+	for JX3-4A53.
+	(U-00025BEE): Integrate M-26269.
+	(U+7BDD): Use `->denotational' instead of `->subsumptive'; unify
+	abstract J0-6440.
+	(GT-33916): Unify JX3-6440.
+	(J0-6440): Separate JX3-6440; add `<-simplified@JP/extra/design'
+	for JX3-6440.
+	(J97-433D): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+6440): Use `->denotational' instead of `->subsumptive'; unify
+	abstract J0-4E7C.
+	(GT-34334): Unify JX3-4E7C.
+	(J0-4E7C): Separate JX3-4E7C; add `<-simplified@JP/jis' for
+	JX3-4E7C.
+
+2010-02-09  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R127-Plow.el (C1-5755): Unify S-6357.
+	(J0-394C): Unify S-6356; add `<-same' for C1-5755.
+
+	* Ideograph-R009-Man.el (M-01272): Omit `ideographic-structure'.
+
+2010-02-05  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R122-Net.el (U+7F72): Use `=>jis-x0208@1997' instead
+	of `=jis-x0208@1997'.
+
+2010-02-03  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R120-Silk.el (U-0002604B): Integrate M-27553.
+	(U-0002604C): Integrate M-27561.
+	(U+7DAA): Use `->denotational' instead of `->subsumptive'.
+	(J97-3D6F): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U-00026096): Integrate M-27632'.
+
+	* Ideograph-R113-Spirit.el:
+	- Add some mappings for Daikanwa.
+	(M-24626): Unify S-5507; add `<-ancient' for J0-6339.
+	(J78-3737): Unify JX3-3737.
+	(J90-3737): Separate JX3-3737; add `<-simplified@JP/extra' for
+	J78-3737.
+	(U-0002560D): Use `->subsumptive' to separate representative
+	nodes.
+	(U-0002560F): Use `->denotational'.
+	(J78-3540): Unify JX3-3540.
+	(J90-3540): Separate JX3-3540; add `<-simplified@JP/extra' for
+	J78-3540.
+	(U+795F): Unify abstract J0-632E.
+	(G0-4B6E): Separate J0-632E; use `->subsumptive' to separate
+	J0-632E and JX3-632E.
+	(U-00021C07): Use `->subsumptive' to integrate M-24785; use
+	`ideographic-{radical|strokes}@cns' instead of
+	`ideographic-{radical|strokes}'; add
+	`ideographic-{radical|strokes}@cns*sources' and
+	`ideographic-{radical|strokes}@ucs'.
+	(J0-4135): Unify S-5566.
+	(J78-4729): Unify JX3-4729.
+	(J90-4729): Separate JX3-4729; add `<-simplified@JP/extra' for
+	J78-4729.
+	(J97-4578): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(J90-4578): Use `<-simplified@JP/extra' instead of
+	`<-simplified@JP'.
+
+	* Ideograph-R102-Field.el:
+	- Add some mappings for Daikanwa.
+	(U-00022341): Use `->denotational' to integrate M-49332.
+	(C4-2741): Use `<-denotational' for U-00022341; unify H7-B4EB.
+	(U-00024C2B): Unify M-21769; add `<-ancient' for J0-4B2E.
+	(U+754A): Add `<-formed' for C1-5755.
+	(U+7552): Use `->subsumptive' to separate representative nodes.
+	(M-49332): Add `<-denotational' for U-00022341; add `<-original'
+	for C4-2741.
+	(JSP-4D3A): Add `<-formed' and `<-same' for J0-5436.
+	(H7-B770): Separate U-00024C67; add `<-unknown' for U-00024C67;
+	unify M-21833.
+	(U+7564): Use `->denotational' instead of `->subsumptive'.
+	(U+7567): Add `<-vulgar' for U+7565.
+	(abstract J0-305B): Unify U+7570.
+	(J0-305B): Move U+7570 to the parent; add `<-simplified@JP/misc'
+	and `<-wrong' for U-0002F938.
+	(U+7569): Use `->subsumptive' to separate representative nodes.
+	(U-00024C67): Separate H7-B770; add `<-unknown' for M-21833; use
+	`->subsumptive'.
+	(U-00024C83): Unify S-5059; add `<-original' for S-5058.
+
+	* Ideograph-R043-Lame.el (U-00021C07): Copied from
+	Ideograph-R113-Spirit.el.
+
+	* Ideograph-R115-Grain.el (J0-633E): Unify S1-5600.
+
+	* Ideograph-R085-Water.el:
+	- Add some mappings for Daikanwa.
+	(U+6C72): Unify abstract J0-3562.
+	(K0-5063): Unify JX3-3562.
+	(J0-3562): Separate JX3-3562; add `<-simplified@JP/extra/design'
+	for JX3-3562.
+	(U+6D69): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+6D78): Likewise.
+	(U+6DEB): Likewise.
+	(J90-307C): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for JX3-307C.
+	(abstract J0-4036): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(U+6E2E): Likewise.
+	(U+6E2F): Likewise.
+	(U+6E6E): Unify abstract J0-5E50.
+	(abstract J0-3C22): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'; unify U+6ECB.
+	(J0-3C22): Move U+6ECB to the parent.
+	(U+6EA2): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(JX3-306E): Add `=ucs@jis/2004' for J2004U+6EA2.
+	(JX1-306E): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis' for J{1990|2000}U+6EA2.
+	(J78-452E): Unify JX3-452E.
+	(J90-452E): Separate JX3-452E; use `<-simplified@JP/jis' instead
+	of `<-simplified@JP' for J78-452E.
+	(U+6F23): Unify abstract J0-4E7A.
+	(J78-4E7A): Unify JX3-4E7A.
+	(J90-4E7A): Separate JX3-4E7A; use `<-simplified@JP/extra' instead
+	of `<-simplified@JP'.
+	(U-00023F4A): Integrate M-18250 and S-4507.
+	(abstract J0-3442): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(U+6F97): Use `<-simplified@JP/jis' instead of `<-simplified@JP'.
+	(U+6F98): Integrate CB02958.
+	(U+3D71): Use `->subsumptive'; modify hierarchy of
+	`ideographic-structure'.
+	(J90-4654): Separate JX3-4654; use `<-simplified@JP/jis' instead
+	of `<-simplified@JP'.
+	(JSP-4927): Use `<-simplified@JP/jis' instead of
+	`<-simplified@JP'.
+	(J97-4642): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+6D9C): Use `->denotational' instead of `->subsumptive'; unify
+	abstract JX1-4642.
+	(J90-4642): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for JX1-773D.
+	(JX1-7739): Add `=ucs@jis/2004' for J2004U+6FF9.
+	(U+7015): Unify abstract J0-494E.
+	(J78-494E): Unify JX3-494E.
+	(J90-494E): Separate JX3-494E; use `<-simplified@JP/jis' instead
+	of `<-simplified@JP'.
+	(J78-4654): Unify JX3-4654.
+	(U+7026): Unify abstract J0-4375.
+	(J78-4375): Unify JX3-4375.
+	(J90-4375): Separate JX3-4375.
+	(U+7058): Unify abstract J0-4667.
+	(J78-4667): Unify JX3-4667.
+	(J90-4667): Separate JX1-4667; add `<-simplified@JP/jis' for
+	J78-4667.
+
+2010-01-29  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R119-Rice.el (U+7C7E): Use `->denotational' instead of
+	`->subsumptive'.
+	(J90-4C62): Separate JX3-4C62; add `<-simplified@JP/jis/1978' for
+	J78-4C62; add `<-simplified@JP/jis/2004' for JX3-4C62.
+	(J78-4C62): Integrate JX3-4C62.
+	(U+7C82): Use `->subsumptive' to separate representative nodes;
+	unify abstract J0-3729.
+	(J0-3729): Separate JX3-3729; separate GT-34606.
+	(JX3-3729): Unify GT-34606.
+	(J0-6463): Add `<-vulgar' for J0-633E.
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-3729.
+
+2010-01-04  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R116-Cave.el (U+7A7F): Unify abstract J0-407C;
+	integrate JX3-407C.
+	(J0-407C): Separate JX3-407C; separate K0-743E and JC3-5DD7.
+	(U-00025A36): Use `->subsumptive'; integrate M-25701.
+	(U-00025A37): Integrate M-25702.
+	(J90-635E): Separate JX3-635E and GT-33163.
+
+	* Ideograph-R086-Fire.el (U+7075): Use `->denotational' instead of
+	`->subsumptive'.
+	(JX2-6F5A): Add `<-vulgar' for J90-635E.
+
+2009-12-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R115-Grain.el (U+79C6): Add `<-formed' and `<-same'
+	for U+7A08.
+	(U+79E4): Use `->denotational' instead of `->subsumptive'.
+	(J78-4769): Unify JX3-4769.
+	(J90-4769): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-4769; add `<-simplified@JP/jis' for J78-4769.
+	(U+414E): Use `->subsumptive' to separate representative nodes.
+	(U+7A03): Use `->denotational' instead of `->subsumptive'.
+	(U+7A04): Use `->denotational' instead of `->subsumptive'.
+	(B-B57C): Unify abstract J0-4047.
+	(U+7A0E): Add `<-same' and `<-simplified@JP/misc' for K0-612A.
+	(U+7A06): Use `->denotational' instead of `->subsumptive'.
+	(U+7A07): Use `->subsumptive' to separate representative nodes.
+	(U+7A09): Likewise.
+	(J78-4923): Unify JX3-4923.
+	(J90-4923): Separate JX3-4923; add `<-simplified@JP/extra/design'
+	for J78-4923.
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-635E.
+
+2009-12-16  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-632E.
+
+	* Ideograph-R112-Stone.el (U+409B): Unify M-24058.
+	(J97-3826): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(M-24475): Use `<-denotational' for U+40E3 instead of U-0002F951.
+	(C7-396D): Unify U-0002F951 and UU+40E3.
+
+	* Ideograph-R104-Sickness.el (U+75B8): Use `->subsumptive'.
+	(U+75B9): Likewise.
+	(U+75BA): Likewise.
+	(U+75BB): Likewise.
+	(U+75BC): Likewise.
+	(K0-5459): Move B-AF6B to the abstract node; unify JX3-6156.
+	(J0-6156): Separate JX3-6156.
+	(G0-4C5B): Separate C1-566E.
+	(U+75BD): Use `->subsumptive'.
+	(abstract J0-4169): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(J90-4169): Use `<-simplified@JP/jis' instead of
+	`<-simplified@JP'.
+
+	* Ideograph-R032-Earth.el (J0-5436): Separate S2-1384.
+	(S1-1384): Unify S2-1384.
+
+2009-12-11  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R075-Tree.el:
+	- Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	  `=jis-x0208@1997' for common part of abstract JIS X 0208:1997
+	  and JIS X 0213.
+	(U-0002F8DC): Unify JX3-3C5D and J2004U+6753.
+	(J90-3C5D): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-3C5D; add `<-simplified@JP/extra/design' for U-0002F8DC.
+	(U+6754): Add `ideographic-structure'.
+	(JX2-2E40): Use GT-K00495 instead of U+6728 in
+	`ideographic-structure'.
+	(C3-2644): Add `ideographic-structure'.
+	(U+6756): Unify abstract J0-3E73.
+	(J0-3E73): Separate JX3-3E73.
+	(G0-5548): Unify JX3-3E73.
+	(U+6780): Use `->subsumptive'.
+	(U+677F): Likewise.
+	(abstract J0-5B47): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'; unify U+6785.
+	(J0-5B47): Move U+6785 to the abstract node.
+	(U+67C8): Use `->denotational'.
+	(U+67C9): Use `->subsumptive'.
+	(U+67D3): Likewise.
+	(U+67D5): Use `->subsumptive' to separate representative node.
+	(U+67D6): Use `->subsumptive'.
+	(U+67D7): Likewise.
+	(U+67FB): Add `ideographic-structure'.
+	(J0-3A3A): Omit `ideographic-structure'.
+	(G0-3269): Add `<-wrong' for J0-3A3A.
+	(U+67ED): Use `->denotational' to separate abstract glyph node.
+	(U+67F5): Use `->subsumptive' to separate representative nodes.
+	(U+681E): Add `ideographic-structure'.
+	(U+3B5C): Unify M-14720.
+	(U+6829): Use `->denotational'.
+	(U+3B5D): Integrate M-14725.
+	(U+3B5E): Integrate M-14730.
+	(U+6830): Add `ideographic-structure'.
+	(JSP-4353): Use GT-K00495 instead of U+6728 in
+	`ideographic-structure'.
+	(C3-3163): Likewise.
+	(U+3B5F): Integrate M-14733.
+	(U+6832): Use `->subsumptive' to separate representative nodes.
+	(U-00023465): Likewise.
+	(U+3B60): Unify M-14738; add `sound@ja/on'.
+	(U+3B61): Unify M-14740.
+	(U+6836): Use `->subsumptive' to separate representative nodes.
+	(U+6838): Use `->subsumptive'.
+	(U+3B62): Unify M-14756.
+	(U-0002346D): Use `->subsumptive' to separate representative node.
+	(U+685D): Add `ideographic-structure'; use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(U+6897): Use `->subsumptive'.
+	(J0-393C): Separate JX3-393C.
+	(G0-3923): Unify JX3-393C.
+	(U+3B6D): Use `->denotational' to separate abstract glyph nodes.
+	(U+6899): Use `->subsumptive' to separate representative node.
+	(U+689A): Use `->subsumptive' to separate representative nodes.
+	(U+68D7): Use `->subsumptive'.
+	(U+68D8): Use `->subsumptive' to separate representative nodes.
+	(J0-5B79): Separate JX3-5B79.
+	(K0-503E): Unify JX3-5B79.
+	(J78-466A): Unify JX3-466A.
+	(J90-466A): Separate JX3-466A; use `<-simplified@JP/jis' instead
+	of `<-simplified@JP/misc'.
+	(U+3B9B): Use `->subsumptive' to separate representative node.
+	(U+696E): Use `->denotational'.
+	(J90-3D5D): Separate JX3-3D5D.
+	(J83-3D5D): Unify JX3-3D5D.
+	(J78-4F31): Unify JX3-4F31.
+	(J90-4F31): Separate JX3-4F31; use `<-simplified@JP/jis' instead
+	of `<-simplified@JP/misc'.
+	(U+3BA9): Unify M-15255.
+	(U+69A6): Use `->subsumptive'.
+	(U+69A8): Use `->denotational' and `->subsumptive'.
+	(U+69B4): Add `<-vulgar' for U+6A4A.
+	(U+69B6): Use `->subsumptive'.
+	(U+69B7): Likewise.
+	(U+3BAE): Integrate M-15284.
+	(U+3BAF): Use `->subsumptive' to separate representative nodes.
+	(U+69B8): Use `->subsumptive' to separate representative node; add
+	`sound@ja/on'.
+	(U+69B9): Use `->denotational' to separate abstract glyph nodes.
+	(U+3BB0): Integrate M-15289.
+	(U+69BA): Use `->denotational' and `->subsumptive'.
+	(U+3BB1): Integrate M-15291.
+	(U+69BB): Use `->denotational'.
+	(U+3BB2): Integrate M-15293.
+	(U+69C0): Use `->subsumptive'.
+	(U+69C1): Likewise.
+	(U+3BB3): Integrate M-15301.
+	(U+3BB4): Integrate M-15315.
+	(J78-4448): Unify JX3-4448.
+	(J90-4448): Separate JX3-4448; use `<-simplified@JP/extra' instead
+	of `<-simplified@JP/misc' for J78-4448.
+	(U+3BB5): Integrate M-15322.
+	(U+69D1): Use `->subsumptive' to separate representative node.
+	(U+3BB7): Integrate M-15326.
+	(U+69D7): Unify S-3811; add `<-vulgar' for U+6A4B.
+	(J78-3A67): Unify JX3-3A67.
+	(J90-3A67): Separate JX3-3A67; use `<-simplified@JP/extra' instead
+	of `<-simplified@JP/misc' for J78-3A67.
+	(parent of M-15364): Integrate U-0002F8EA.
+	(J78-4875): Unify JX3-4875.
+	(J90-4875): Separate JX3-4875; use `<-simplified@JP/extra' instead
+	of `<-simplified@JP'.
+	(U+6A19): Use `->subsumptive'.
+	(U+6A1A): Add `ideographic-structure'.
+	(JX2-2F4C): Use GT-K00495 instead of U+6728 in
+	`ideographic-structure'.
+	(H4-B05B): Likewise.
+	(C3-4C4A): Likewise.
+	(U-00023629): Unify M-15444.
+	(U-00023630): Integrate M-15467.
+	(U-00023631): Integrate M-15468.
+	(U-00023632): Integrate M-15469.
+	(U-00023670): Integrate M-15473.
+	(U-00023671): Unify M-15476.
+	(U-00023673): Integrate M-15478.
+	(U-00023674): Integrate M-15479.
+	(U-00023675): Integrate M-15480.
+	(U-00023676): Integrate M-15481.
+	(U+3BE0): Add `ideographic-structure'.
+	(GT-19689): Use GT-K00495 instead of U+6728 in
+	`ideographic-structure'.
+	(C3-4C4B): Likewise.
+	(U-0002363A): New character; add `<-vulgar' for U+6A4B.
+	(J78-432E): Unify JX3-432E.
+	(J90-432E): Separate JX3-432E; use `<-simplified@JP/jis' instead
+	of `<-simplified@JP' for J78-432E.
+	(U+3BD3): Add `ideographic-structure'.
+	(M-15501): Use GT-K00495 instead of U+6728 in
+	`ideographic-structure'.
+	(C3-5142): Likewise.
+	(U+6A4A): Add `<-original' for U+69B4.
+	(U+6A59): Use `->subsumptive' to separate representative nodes.
+	(J0-5C74): Separate JX3-5C74.
+	(U+6A6E): Use `->subsumptive' to separate representative nodes.
+	(U+3BE2): Use `->subsumptive'.
+	(U+6A6F): Use `->subsumptive' to separate representative nodes.
+	(U-000236A3): Integrate M-15605.
+	(U+3BF0): Use `->denotational' to separate abstract glyph nodes.
+	(U+6A8C): Use `->subsumptive' to separate representative nodes.
+	(U+6A8D): Likewise.
+	(U+6A8F): Use `->subsumptive'.
+	(J78-367B): Unify JX3-367B.
+	(J90-367B): Separate JX3-367B; use `<-simplified@JP/jis' instead
+	of `<-simplified@JP'.
+	(U+6ADC): Use `->denotational'.
+	(U-00023799): Use `->denotational' and `->subsumptive'.
+	(U+6ADD): Use `->denotational'.
+	(U+6ADE): Use `->subsumptive'.
+	(U+6AE0): Likewise.
+	(U+3C05): Use `->denotational'.
+	(J90-3135): Use `<-simplified@JP/jis' instead of
+	`<-simplified@JP'.
+
+	* Ideograph-R030-Mouth.el (J0-527B): Use `=ucs@jis/1990' and
+	`=ucs@jis/2000' instead of `=ucs@jis'.
+	(JX3-527B): Add `=ucs@jis/2004' for J2004U+54AC.
+	(JX3-3E25): Add `=ucs@jis/2004' for J2004U+54E8.
+	(U+55B0): Add `ideographic-structure'.
+	(JX3-3674): Add `=ucs@jis/2004' for J2004U+55B0.
+	(J90-3674): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis'.
+	(U+5632): Add `ideographic-structure'.
+	(JX3-535E): Add `=ucs@jis/2004' for J2004U+5632.
+	(J90-535E): Use J0-442B instead of U+671D in
+	`ideographic-structure'.
+	(JX3-4139): Add `=ucs@jis/2004' for J2004U+564C.
+	(J90-4139): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis'.
+	(J0-5373): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis'.
+
+	* Ideograph-R014-Cover.el (U+51A4): Add `ideographic-structure'.
+	(U-0002F818): Add `=ucs@jis/2004' for J2004U+51A4.
+	(abstract glyph of JX1-514D): Add `=>>jis-x0213-1@2000'.
+
+2009-12-11  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R109-Eye.el (U+773A): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(U+77A5): Use `->denotational' instead of `->subsumptive'.
+	(J78-4A4D): Use `<-subsumptive' to integrate JX3-4A4D.
+	(G0-4633): Separate J83-4A4D, J90-4A4D, JX1-4A4D and JC3-5BE3.
+
+	* Ideograph-R091-Slice.el (J90-4757): Use `=ucs@jis/1990' and
+	`=ucs@jis/2000' instead of `=ucs@jis'.
+
+	* Ideograph-R086-Fire.el (JX3-3C5E): Add `=ucs@jis/2004' for
+	J2004U+707C.
+	(J90-3C5E): Add `<-simplified@JP/extra/design' for JX3-3C5E.
+	(J90-4E7B): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis'.
+	(JX3-4079): Add `=ucs@jis/2004' for J2004U+714E.
+	(JX3-407A): Add `=ucs@jis/2004' for J2004U+717D.
+	(J90-407A): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis'.
+	(U+71A2): Add `ideographic-structure'.
+	(K0-5C6C): Use GT-K00405 instead of J0-3250 in
+	`ideographic-structure'.
+	(UU+71A2): Likewise.
+
+	* Ideograph-R064-Hand.el (J0-4472): Use `=ucs@jis/1990' and
+	`=ucs@jis/2000' instead of `=ucs@jis'.
+	(JX3-4854): Add `=ucs@jis/2004' for J2004U+633D.
+	(J90-4854): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis'.
+	(JX3-443D): Add `=ucs@jis/2004' for J2004U+6357.
+	(JX3-377E): Add `=ucs@jis/2004' for J2004U+6372.
+	(JX3-4237): Add `=ucs@jis/2004' for J2004U+63C3.
+	(JX3-4022): Add `=ucs@jis/2004' for J2004U+647A.
+	(J90-4022): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis'.
+	(JX3-4527): Add `=ucs@jis/2004' for J2004U+64E2.
+
+	* Ideograph-R063-Door.el (JX3-5928): Add `=ucs@jis/2004' for
+	J2004U+6241.
+	(J0-5928): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis'; use `<-simplified@JP/extra/design' instead of
+	`<-simplified@JP/extra'.
+
+	* Ideograph-R061-Heart.el (M-10709): Unify U-000226BB and C5-2D59.
+	(M-10710): Unify U-000226AE.
+	(M-10711): Unify U-000226A8 and H6-DBDB.
+	(U+60A8): Use `->subsumptive' to separate representative nodes.
+	(M-10713): Map to U-000226AD.
+	(M-10714): Map to U-000226AA.
+	(M-10715): Unify U-000226AB.
+	(U+60D4): Use `->subsumptive' to separate representative nodes.
+	(M-10802): Map to U-000226DA; fix `ideographic-strokes'; add
+	`ideographic-strokes@daikanwa'.
+	(M-10804): Unify U+60D6, C3-3B55 and H6-DDF6.
+	(U+3952): Use `->denotational'.
+	(U+60D7): Use `->subsumptive' to separate representative nodes.
+	(JX3-4C7C): Add `=ucs@jis/2004' for J2004U+6108.
+
+	* Ideograph-R060-Step.el (JX3-5751): Add `=ucs@jis/2004' for
+	J2004U+5F98.
+	(J90-5751): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis'.
+	(JX3-352B): Add `=ucs@jis/2004' for J2004U+5FBD.
+
+	* Ideograph-R053-Dotted-Cliff.el (JX3-4A79): Add `=ucs@jis/2004'
+	for J2004U+5E96.
+	(J90-4A79): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis'.
+	(JX3-4940): Add `=ucs@jis/2004' for J2004U+5EDF.
+	(J90-4940): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis'; use `<-simplified@JP/extra/design' instead of
+	`<-simplified@JP/extra'.
+
+	* Ideograph-R029-Again.el (J0-3A35): Use `=ucs@jis/1990' and
+	`=ucs@jis/2000' instead of `=ucs@jis'.
+	(U+53DB): Add `ideographic-structure'.
+	(JX3-4840): Add `=ucs@jis/2004' for J2004U+53DB.
+	(J0-4840): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis'.
+	(U+53DF): Add `ideographic-structure'.
+	(JX3-5257): Add `=ucs@jis/2004' for J2004U+53DF.
+
+	* Ideograph-R010-Legs.el (JX3-4546): Add `=ucs@jis/2004' for
+	J2004U+514E.
+	(J0-4546): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis'.
+
+	* Ideograph-R009-Man.el (JX3-3771): Add `=ucs@jis/2004' for
+	J2004U+5026.
+	(J90-3771): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis'; add `<-simplified@JP/jis' for JX3-3771.
+	(U+504F): Add `ideographic-structure'.
+	(U-000202F1): Add `ideographic-structure'.
+	(U-000202F5): Likewise.
+	(U-00020422): Likewise.
+	(JX3-4C59): Add =ucs@jis/2004' for J2004U+5132.
+
+	* Ideograph-R038-Woman.el (JX3-4A5A): Unify J2004U+5A29.
+	(J90-4A5A): Use `<-simplified@JP/extra/design' instead of
+	`<-simplified@JP/extra'.
+
+2009-12-09  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R098-Tile.el (JX3-6131): Unify J2004U+7515.
+
+	* Ideograph-R076-Lack.el (JX3-4337): Unify J2004U+6B4E.
+
+	* Ideograph-R026-Seal.el (JX3-362A): Unify J2004U+537F.
+
+	* Ideograph-R044-Corpse.el (JX3-367D): Unify J2004U+5C51.
+	(JX3-454B): Unify J2004U+5C60.
+	(JX3-4F60): Unify J2004U+5C62.
+
+	* Ideograph-R032-Earth.el (JX3-4548): Unify J2004U+5835.
+
+	* maps-conf.el:
+	- Don't add `=gt-pj-1' for J90-4A4D.
+	- Remove `=ucs@jis' if JIS X0213:2000 and 2004 are different.
+	- Add `=ucs@jis/2004' to JIS X0213:2004 characters which are
+	  different from JIS X0213:2000.
+	- Use `=>jis-x0213-1' and `=>jis-x0208' instead of
+	  `<=>jis-x0213-1' and `<=>jis-x0208'.
+
+	* Ideograph-R100-Life.el (abstract J0-3B3A): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(J0-3B3A): Add `<-same' and `<-simplified@JP/misc' for M-21684.
+	(U+7526): Unify abstract J0-6134.
+	(J0-6134): Separate JX3-6134.
+	(EGB-2C75): Unify JX3-6134.
+	(M-21697): Add `<-same' for J0-6134.
+	(IU-00024BF3): Unify S-5013; add `<-formed' for J0-6134.
+
+2009-12-07  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R098-Tile.el (B-ED70): Use `->denotational' instead of
+	`->subsumptive'.
+	(J78-3979): Use `<-subsumptive' to integrate JX3-3979.
+	(J90-3979): Separate JX3-3979.
+	(M-21617): Separate J83-6131, K0-6838, J90-6131, JX1-6131,
+	GT-27757 and S-5002.
+	(K0-6838): Unify JX3-6131, GT-27757 and S-5002.
+
+	* Ideograph-R094-Dog.el (U+72E1): Use `->subsumptive'; unify
+	abstract J0-6044.
+	(J0-6044): Separate JX3-6044.
+	(J78-4D32): Use `<-subsumptive' to integrate JX3-4D32.
+	(J90-4D32): Separate JX3-4D32.
+
+	* Ideograph-R090-Half-Tree-Trunk.el (U-0002458F): Moved from
+	Ideograph-R089-Double-X.el.
+	(U-00024590): Likewise.
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-6131.
+
+2009-12-04  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R096-Jade.el (U+73E5): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+
+	* Ideograph-R093-Cow.el (U+727D): Unify abstract J0-3823.
+	(K0-4C32): Separate J0-3823 and JX1-3823.
+
+	* Ideograph-R089-Double-X.el (JC3-41A4): Use `<-denotational' for
+	U+723E.
+	(U-0002039B): Use `ideographic-{radical|strokes}@{ucs|cns}' and
+	`ideographic-{radical|strokes}@cns*sources' instead of
+	`ideographic-'; omit `ideographic-structure'; add `<-same' for
+	U-00024564.
+	(U-0002458F): Integrate M-19793; moved to
+	Ideograph-R090-Half-Tree-Trunk.el.
+	(U-00024590): Integrate M-19794; moved to
+	Ideograph-R090-Half-Tree-Trunk.el.
+
+	* Ideograph-R009-Man.el (U-0002039B): Use
+	`ideographic-{radical|strokes}@{ucs|cns}' and
+	`ideographic-{radical|strokes}@cns*sources' instead of
+	`ideographic-'; omit `ideographic-structure'; add `<-same' for
+	U-00024564.
+
+2009-12-03  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R088-Father.el (M-19729): Unify S-4712; add
+	`<-ancient' for J0-4C6C.
+	(U+3E19): Use `->denotational' instead of `->subsumptive'.
+	(U+723A): Unify abstract J0-4C6C.
+	(J0-4C6C): Separate JX3-4C6C.
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-3823.
+
+	* Ideograph-R092-Fang.el (U+7259): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+
+	* Ideograph-R091-Slice.el (U+724C): Use `->denotational' instead
+	of `->subsumptive'.
+	(J78-4757): Unify JX3-4757; move B-B550 to the parent node.
+	(J90-4757): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-4757.
+
+	* Ideograph-R086-Fire.el (U+7078): Unify abstract J0-3564.
+	(K0-4F36): Separate J0-3564 and JX1-3564; move B-A862 to U+7078.
+	(U+707C): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J78-3C5E): Unify JX3-3C5E.
+	(J90-3C5E): Use `=jis-x0213-1@2000' for JX1-3C5E.
+	(J97-316B): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(J90-316B): Use `<-simplified@JP/jis' instead of
+	`<-simplified@JP'.
+	(U+716E): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+7149): Unify abstract J0-4E7B.
+	(J78-4E7B): Unify JX3-4E7B; move B-B7D2 to the parent node.
+	(J90-4E7B): Use `=jis-x0213-1@2000' for JX1-4E7B; add
+	`<-simplified@JP/jis' for J78-4E7B.
+	(J78-4079): Unify JX3-4079.
+	(J90-4079): Use `=jis-x0213-1@2000' for JX1-4079; move B-B7CE to
+	the parent node; use `<-simplified@JP/extra/design' instead of
+	`<-simplified@JP/misc'.
+	(U+717D): Unify abstract J0-407A.
+	(K0-6043): Unify JX3-407A.
+	(J90-407A): Use `=jis-x0213-1@2000' for JX1-407A; use
+	`<-simplified@JP/extra/design' instead of `<-simplified@JP/misc'.
+	(abstract J0-5F73): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(U-0002446B): Add `ideographic-structure'.
+	(IU-0002446B): Use GT-K00405 instead of J0-3250 in
+	`ideographic-structure'.
+	(abstract glyph of GT-38767): Use `=>>gt' instead of `<=>gt'.
+	(abstract glyph of GT-38769): Likewise.
+	(CB02412): Use GT-K00405 instead of U+706B in
+	`ideographic-structure'.
+
+2009-11-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-3564.
+
+2009-11-06  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R031-Enclosure.el (U+5702): Use `->subsumptive' to
+	separate representative nodes.
+	(U+5704): Use `hanyu-dazidian' instead of
+	`hanyu-dazidian-{vol|page|char}'.
+
+2009-10-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-5B5E.
+
+2009-10-27  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R082-Fur.el (U+6C08): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-5C27.
+
+2009-10-22  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R080-Do-Not.el (J97-4B68): Use `=>jis-x0208@1997'
+	instead of `=jis-x0208@1997'.
+
+	* Ideograph-R077-Stop.el (abstract J0-3A50): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-5B79 and J90-5C74.
+
+2009-10-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R076-Lack.el (U+6B21): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(J0-3C21): Add `<-same' for K0-732D.
+	(U+6B4E): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(C1-6D45): Unify JX3-4337.
+	(J0-4337): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-4337; add `<-simplified@JP/jis' for JX3-4337.
+
+	* Ideograph-R064-Hand.el (U+62FD): Unify S-3407; add `<-formed'
+	for U+66F3.
+
+2009-10-16  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R074-Moon.el (U+670B): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(J0-4A7E): Add `<-same' for GT-18172.
+	(U+670D): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J0-497E): Add `<-same' for M-14345.
+	(U+671C): Use `->subsumptive'.
+	(U+671D): Use `->denotational'; use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(J0-442B): Add `<-same' for M-14374.
+	(U-00023379): Use `->denotational' and `->subsumptive'; integrate
+	M-14381.
+
+	* Ideograph-R072-Sun.el (abstract J0-3937): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(B-B1DF): Unify J97-4855.
+	(U+665A): Use `->subsumptive' to separate representative nodes;
+	unify abstract JX1-753C.
+	(U-000231B6): Use `->denotational' instead of `->subsumptive'.
+	(abstract J0-5A70): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(U+6666): Likewise.
+	(U+66D9): Likewise.
+	(J90-3D6C): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-3D6C.
+
+	* Ideograph-R073-Say.el (U+66F4): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(U+66F5): Add `<-wrong' for U+66F3.
+
+	* Ideograph-R066-Rap.el (U+6562): Use `->denotational' instead of
+	`->subsumptive'.
+	(M-13360): Map to U-00022FCE.
+	(M-13373): Map to U-00022FDA.
+	(U-00022FCE): Use `->subsumptive' to separate representative
+	nodes.
+	(U+657B): Omit `=>daikanwa' for M-13355.
+	(U-00022FD5): Use `->subsumptive' to separate representative
+	nodes.
+	(abstract J0-546B): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+
+2009-10-07  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R069-Axe.el (M-13537): Unify U-00023092 and H5-F67A;
+	add `sound@ja/on'.
+	(U+65A7): Use `->subsumptive'; unify abstract J0-4960.
+	(J0-4960): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-4960.
+	(G0-382B): Unify JX3-4960.
+	(U+65A8): Use `->subsumptive' to separate representative nodes.
+	(U-00023094): Use `->subsumptive'.
+	(U-00023095): Add `sound@ja/on'; add `<-ancient' for U+65AF.
+	(M-13543): Unify U-00023096 and H5-F67C; add `sound@ja/on'.
+	(M-13544): Unify U-00023097 and H5-F67D; add `sound@ja/on'.
+
+	* Ideograph-R064-Hand.el (U+62CE): Use `->subsumptive'.
+	(U+62D0): Use `->denotational' instead of `->subsumptive'; use
+	`=>jis-x0208' and `=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(U-00022AE6): Unify CB07882; add `<-original' for U+62CD.
+	(U+62F4): Use `->denotational' and `->subsumptive'.
+	(JC3-4FC0): Omit `=>daikanwa'.
+	(U+633A): Unify abstract J0-4472.
+	(J0-4472): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-4472.
+	(G0-4D26): Unify JX3-4472.
+	(B-AEBE): Use `->subsumptive' to separate representative nodes.
+	(J78-4854): Unify JX3-4854; add `<-same' for JX1-6D4E.
+	(J90-4854): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-4854; unify JC3-70BF; add `<-simplified@JP/extra/design' for
+	J78-4854.
+	(U+634A): Use `->denotational'.
+	(U+634B): Use `->denotational'.
+	(U+634C): Use `->denotational' instead of `->subsumptive'; use
+	`=>jis-x0208' and `=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(U+6357): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J78-443D): Move B-D1CA to the parent node; unify JX3-443D.
+	(J90-443D): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-443D; use `<-simplified@JP/jis' instead of `<-simplified@JP'.
+	(U+6369): Unify J97-5960.
+	(J90-5960): Add `<-simplified@JP/jis' for J78-5960.
+	(U-00022B87): Use `->denotational'.
+	(M-12202): Map to U-00022B87; unify H5-DBAC.
+	(U+636E): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+6372): Likewise.
+	(B-B1B2): Use `->denotational' instead of `->subsumptive'.
+	(J78-377E): Unify JX3-377E.
+	(J90-377E): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-377E.
+	(U+6383): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+6385): Use `->denotational' and `->subsumptive'.
+	(U+6387): Use `->subsumptive'.
+	(U+6388): Unify M-12242 and S1-2968.
+	(U+63BD): Use `->denotational'.
+	(U+63BE): Use `->subsumptive' to separate representative nodes.
+	(U+63BF): Use `->denotational'.
+	(U+63C0): Add `<-formed' for U+67EC.
+	(U+63C2): Use `->denotational' and `->subsumptive'.
+	(U+63C3): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(M-12319): Unify JX3-4237.
+	(J0-4237): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-4237; unify JC3-50BA; add `<-simplified@JP/extra/design' for
+	JX3-4237.
+	(U+640F): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J97-415F): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+6414): Use `->denotational' instead of `->subsumptive'.
+	(U+63BB): Add `<-simplified@JP/extra' for JX1-7476.
+	(U+444F): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+647A): Use `->denotational' instead of `->subsumptive'; unify
+	abstract J0-4022.
+	(J78-4022): Unify JX3-4022; separate K0-6F49, GT-15936 and
+	GT-K11156.
+	(J90-4022): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1'; add
+	`<-simplified@JP/jis' for J78-4022.
+	(U+64B0): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J78-4071): Unify JX3-4071.
+	(J90-4071): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-4071; add `<-simplified@JP/jis' for J78-4071.
+	(U+64E2): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'; use `->denotational' instead of
+	`->subsumptive'.
+	(J78-4527): Unify JX3-4527; separate K0-7677 and GT-16292.
+	(J90-4527): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-4527; add `<-simplified@JP/jis' for J78-4527.
+	(J97-5A39): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(J90-5A39): Add `<-simplified@JP/jis' for U+6522.
+	(U+651D): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+
+2009-09-29  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R061-Heart.el (U+6062): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(U+6108): Use `->denotational' instead of `->subsumptive'; unify
+	abstract J0-4C7C.
+	(J78-4C7C): Unify JX3-4C7C.
+	(J90-4C7C): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-4C7C.
+	(U+6109): Use `->denotational' and `->subsumptive'.
+	(M-11180): Map to U-0002282B; integrate H6-E56E.
+	(M-11182): Map to U-0002282D; integrate H6-E5AC.
+	(U-0002282E): Use `->subsumptive' to separate representative
+	nodes.
+	(M-11184): Unify U-0002281B and H6-E3EF.
+	(U-00022821): Use `->subsumptive'.
+	(U-0002281E): Use `->subsumptive'.
+	(U+6187): Add `ideographic-structure'.
+	(U+618E): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(B-BCA8): Unify abstract JX1-745E.
+
+2009-09-25  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R063-Door.el (U+39C1): Use `->denotational' instead of
+	`->subsumptive'.
+	(U-00022A36): Likewise.
+	(U+6241): Likewise; unify abstract J0-5928.
+	(K0-7837): Unify JX3-5928; move B-ABF3 to U+6241.
+	(J0-5928): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-5928; add `<-simplified@JP/extra' for JX3-5928.
+	(U+6249): Use `->denotational' instead of `->subsumptive'; use
+	`=>jis-x0208' and `=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(B-B476): Moved to U+6249.
+	(U+624A): Use `->denotational' instead of `->subsumptive'.
+	(B-D951): Moved to U+624A.
+
+2009-09-25  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R046-Mountain.el (U+5CFB): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(U+5D46): Omit `ideographic-structure'; use `->subsumptive' to
+	separate representative nodes.
+	(U+5D47): Use `->subsumptive' to separate representative nodes.
+	(U+37E8): Likewise.
+	(U+5D48): Use `->denotational' and `->subsumptive'.
+	(U+5D49): Use `->subsumptive' to separate representative nodes.
+	(U-00021E73): Use `->subsumptive'.
+	(U+5D4B): Use `->subsumptive' to separate representative nodes.
+	(U+5D4C): Likewise.
+	(U+5D4E): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+5D87): Likewise; use `->denotational' instead of
+	`->subsumptive'.
+	(U+5DC9): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U-00021FB0): Add `ideographic-structure'.
+	(U+5DCA): Use `->subsumptive'.
+	(abstract J0-3460): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(U+5DD3): Likewise.
+
+2009-09-24  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R059-Bristle.el (M-09978): Unify U-0002248D and
+	H3-ABE2; add `sound@ja/on'.
+	(U-0002248A): Use `->subsumptive' to separate representative
+	nodes.
+	(abstract J0-4927): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(M-09980): Unify S-2313.
+	(J0-4927): Add `<-simplified@JP' and `<-vulgar' for M-09980.
+	(abstract J0-4426): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+
+2009-09-17  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R060-Step.el (U+5F98): Unify abstract J0-5751.
+	(J83-5751): Unify JX1-5751.
+	(J90-5751): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-5751.
+	(U+5FA7): Add `ideographic-structure'.
+	(J97-4427): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+5FB4): Unify abstract JX1-4427.
+	(U+5FB5): Unify abstract JX1-7444.
+	(U+5FBD): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'; add `sound@ja/on'.
+	(J78-352B): Move B-C0B2 to the parent node; unify JX3-352B; move
+	JC3-4DC1 to J90-352B.
+	(J90-352B): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis'; use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-352B; unify JC3-4DC1; use `<-simplified@JP/jis' instead of
+	`<-simplified@JP' for J78-352B.
+
+2009-09-17  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R054-Long-Stride.el (JX2-2C2B): Unify S-2240; add
+	`<-formed' for J0-3276.
+	(U+5EFB): Unify abstract J0-3276.
+	(JX2-2C2C): Unify S-2241; add `<-vulgar' for J0-3276.
+
+2009-09-16  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R056-Shoot.el (abstract J0-5736): Use `=>jis-x0208'
+	and `=>jis-x0213-1' instead of `=jis-x0208@1997'.
+
+	* Ideograph-R038-Woman.el (U+5989): Add `ideographic-structure'.
+	(J97-552B): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997';
+	unify abstract JX1-552B.
+	(U+598D): Unify abstract JX3-552B.
+	(J0-552B): Add `<-same' and `<-simplified@JP/jis' for JX3-7E7A.
+	(JSP-393D): Add `<-original' for J83-3B50.
+	(U+59C9): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+59D9): Add `sound@ja/on'; use `->subsumptive'.
+	(U-0002171F): Add `sound@ja/on'; use `->subsumptive'.
+	(U+59DA): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U-0002171D): Use `->subsumptive'.
+	(U+59F8): Unify abstract JX3-7E7A.
+	(K0-6641): Unify JX3-7E7A.
+	(U+59F9): Add `ideographic-structure'.
+	(abstract J0-3864): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(U-00021735): Use `->subsumptive'.
+	(U+5A29): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J78-4A5A): Unify JX3-4A5A.
+	(J90-4A5A): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-4A5A; add `<-simplified@JP/extra' for J78-4A5A.
+	(U+5A2B): Use `->subsumptive'.
+	(U-00021736): Use `->subsumptive'.
+	(U-0002176A): Use `->subsumptive'.
+	(U+5A5B): Use `->subsumptive' to separate representative nodes.
+	(U+5A5C): Likewise.
+	(U+5A5D): Likewise.
+	(U+5A5E): Likewise.
+	(U+5A5F): Likewise; add `sound@ja/on/{kan|go}'.
+	(U+5A60): Use `->subsumptive'.
+	(U-0002176B): Use `->subsumptive'.
+	(U+5A61): Use `->subsumptive' to separate representative nodes.
+	(U+5A62): Likewise.
+	(U+5A63): Likewise.
+	(U+5A66): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+36EF): Use `->subsumptive'; add `sound@ja/on/pianhai' and
+	`sound@ja/on/zihui'.
+	(U+36F0): Use `->subsumptive'.
+	(U+5A88): Add `ideographic-structure'.
+	(U-0002179E): Use `->subsumptive'.
+	(U+5A8D): Use `->subsumptive'.
+	(U+5A8E): Use `->denotational' and `->subsumptive'.
+	(U+5A8F): Use `->subsumptive'; add `sound@ja/on'.
+	(U+36F6): Use `->subsumptive'; add `sound@ja/on'.
+	(U-0002179F): Use `->denotational' and `->subsumptive'.
+	(U+5A90): Use `->denotational' and `->subsumptive'.
+	(U+370E): Use `->denotational' instead of `->subsumptive'.
+	(U+5ACC): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J90-3779): Add `<-simplified@JP/jis' for J78-3779.
+	(U+5AFE): Use `->subsumptive'.
+	(UU+5AAF): Add `<-simplified' for JX2-2571.
+	(U+5B2A): Use `->subsumptive' to separate representative nodes.
+	(U+5B2B): Use `->subsumptive'.
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-564B.
+
+	* Ideograph-R030-Mouth.el (GT-K01160): Use `<-original@component'
+	instead of `<-original' for U+5B50.
+	(GT-K01881): Use `<-original@component/connect-above' instead of
+	`<-original' for U+5B50.
+
+	* Ideograph-R053-Dotted-Cliff.el (U+5E96): Unify abstract J0-4A79.
+	(J78-4A79): Unify JX3-4A79.
+	(J90-4A79): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-4A79; use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-4A79.
+	(U+5EAD): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J83-446D): Unify GT-11748 and GT-K06510.
+	(abstract glyph of GT-11749): New variant of U+5EAD to integrate
+	J90-446D, G0-4D25 and C1-553C.
+	(U+5EDD): Use `->subsumptive'.
+	(U+5EDE): Use `->subsumptive'.
+	(U+5EDF): Unify abstract J0-4940.
+	(J78-4940): Unify JX3-4940.
+	(B-BC71): Unify abstract glyph of JX1-4940.
+	(J90-4940): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-4940; use `<-simplified@JP/extra' instead of `<-simplified@JP'
+	for J78-4940.
+
+2009-09-10  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R044-Corpse.el (abstract J0-5622): Use
+	`=>jis-x0208@1997' and `=>jis-x0213-1@2000' instead of
+	`=jis-x0208@1997'.
+	(J90-5622): Use `<-simplified@JP/extra' instead of
+	`<-simplified@JP' for JX3-7E7B.
+	(U+5C51): Use `=>jis-x0208@1997' and `=>jis-x0213-1@2000' instead
+	of `=jis-x0208@1997'.
+	(J78-367D): Unify JX3-367D.
+	(J90-367D): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-367D; use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-367D.
+	(U+5C5B): Unify abstract JX3-7E7B.
+	(J78-5622): Unify JX3-7E7B and S-1938.
+	(U+5C60): Use `=>jis-x0208@1997' and `=>jis-x0213-1@2000' instead
+	of `=jis-x0208@1997'.
+	(J78-454B): Unify JX3-454B.
+	(J90-454B): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-454B; use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-454B.
+	(U-00021CA3): Use `->subsumptive' to separate glyphs.
+	(J97-3C48): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+5C61): Unify abstract JX1-3C48.
+	(J90-3C48): Use `<-simplified@JP/jis' instead of
+	`<-simplified@JP'.
+	(U+5C62): Unify abstract JX3-4F60.
+	(J78-3C48): Move B-B9F0 to abstract UCS node; use `->subsumptive'
+	to separate JX1-4F60 and JX3-4F60.
+	(U+5C64): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(B-BC68): Use `->denotational' instead of `->subsumptive'; unify
+	abstract JX1-4F61.
+	(U+5C65): Use `->denotational' instead of `->subsumptive'.
+	(B-BC69): Moved to abstract node.
+	(U-00021CD0): Use `->denotational' instead of `->subsumptive'.
+	(U+379F): Likewise.
+
+2009-09-10  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-565A.
+
+	* Ideograph-R050-Turban.el (U+5E30): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(U+5E6D): Add `ideographic-structure'.
+
+2009-09-09  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R043-Lame.el (U+5C22): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+
+	* Ideograph-R042-Small.el (U+5C12): Use `->denotational' instead
+	of `->subsumptive'.
+	(abstract J0-5575): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(C4-2173): Add `<-same' for GT-09427.
+	(S-4715): New variant of U+5C13.
+	(abstract J0-3E30): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(U+5C1A): Add `<-same' and `<-simplified@JP' for K0-5F46.
+
+	* Ideograph-R039-Child.el (U-00021983): Use `->subsumptive' to
+	separate representative nodes.
+	(U-00021984): Use `->denotational'.
+	(U-00021985): Use `->subsumptive' to separate representative
+	nodes.
+	(abstract J0-555A): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `<=>jis-x0208' and `<=>jis-x0213-1'.
+
+2009-09-08  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R037-Big.el (abstract J0-4B5B): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'; unify U+5954.
+	(J0-4B5B): Move U+5954 to the abstract node.
+	(U-00021645): Use `->denotational'.
+	(U+5960): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+
+2009-09-04  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R032-Earth.el (U+580B): Use `->denotational' instead
+	of `->subsumptive'.
+	(U+5835): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J78-4548): Unify JX3-4548.
+	(J90-4548): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-4548; use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-4548.
+	(B-D8AD): Moved to abstract node.
+	(U+5858): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+585A): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+FA10): Unify abstract JX1-2F57.
+	(JX1-2F57): Add S2-1441.
+	(U+FA7C): Unify abstract JX1-444D.
+	(U+585D): Use `->subsumptive'.
+	(J0-3A49): Unify S1-1462.
+	(U+5860): Add `ideographic-structure'.
+	(GT-06747): Use representative component in
+	`ideographic-structure'.
+	(C3-405C): Likewise.
+	(GT-06654): Likewise.
+	(J97-4536): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+5861): Unify abstract JX1-2F58.
+	(U+586B): Unify abstract JX1-4536.
+	(J90-4536): Add `<-simplified@JP/jis' for JX1-2F58.
+	(B-D8A7): Unify abstract JX2-252B.
+	(U+588D): Use `->denotational' instead of `->subsumptive';
+	integrate abstract glyph of JX2-252B.
+	(JC3-47D8): Use `<-denotational' for U+588D instead of B-D8A7;
+	omit `=>ucs' and `=>daikanwa'.
+	(U+58AB): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+
+	* Ideograph-R030-Mouth.el (U+53F2): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(B-A75D): Unify J97-465D.
+	(U+541E): Unify abstract JX3-4F7E; use `->subsumptive'.
+	(G0-4D4C): Unify JX3-4F7E.
+	(U+541F): Add `ideographic-structure'.
+	(abstract J0-3862): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(B-A764): Moved to abstract node.
+	(J0-3862): Add `<-simplified@JP' for K0-676F.
+	(abstract J0-3970): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(U+544A): Add `<-simplified@JP' for U+543F.
+	(U+5451): Add `<-simplified@JP/extra' for JX3-4F7E; add `<-wrong'
+	for JX3-4F7E.
+	(U+54AC): Add `ideographic-structure'; unify abstract J0-527B.
+	(J0-527B): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-527B.
+	(abstract glyph of JX3-527B): New variants of U+54AC; integrate
+	JX3-527B, G0-5227 and C1-5036.
+	(U+54D1): Omit `=>daikanwa' for M-03835; add `<-simplified@CN' for
+	U+555E.
+	(U+54E8): Add `ideographic-structure'; unify abstract J0-3E25.
+	(J78-3E25): Unify JX3-3E25.
+	(abstract glyph of GT-04609): New variant of U+54E8.
+	(J90-3E25): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-3E25.
+	(J97-3022): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+5533): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(B-B0E6): Moved to parent node.
+	(abstract glyph of JX1-533A): New variant of U+5533.
+	(J90-533A): Add `<-simplified@JP' for C1-594B; add
+	`<-simplified@JP/jis' for J78-533A.
+	(U+5539): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+5544): Likewise.
+	(B-B0D6): Add `ideographic-structure'.
+	(J78-426F): Add S2-1094.
+	(parent of J0-426F): Add abstract glyph of JX1-426F; add
+	`ideographic-structure'.
+	(J0-426F): Add `ideographic-structure'.
+	(JC3-70B9): Likewise.
+	(U+556E): Omit `=>daikanwa' for M-04516; add `<-simplified@CN' for
+	U+5699.
+	(abstract J0-5348): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(U+55A9): Use `->denotational' instead of `->subsumptive'.
+	(U+55BB): Likewise.
+	(U+55B0): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J78-3674): Unify JX3-3674.
+	(J90-3674): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-3674.
+	(U+5632): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J78-535E): Unify JX3-535E.
+	(J90-535E): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-535E.
+	(U+5642): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+564C): Unify abstract J0-4139.
+	(B-E4F8): Add `ideographic-structure'.
+	(J78-4139): Unify JX3-4139.
+	(J90-4139): Add `ideographic-structure'; use `=jis-x0213-1@2000'
+	instead of `=jis-x0213-1' for JX1-4139.
+	(J97-337A): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+5678): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J97-4739): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(abstract J0-536B): Use `=>jis-x0208' and `=>jis-x0213-1' instead
+	of `=jis-x0208@1997'.
+	(U+56A5): Use `->subsumptive' to separate representative nodes.
+	(U+56C0): Use `->denotational'.
+	(UU+56C0): Unify JX3-5373.
+	(J0-5373): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-5373.
+	(U+56C1): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+56CA): Omit `ideographic-structure'; unify JC3-70BA.
+
+	* char-db-util.el: (char-db-coded-charset-priority-list):
+	- Use `=>FOO' instead of `<=>FOO'.
+	- Add `=>>jis-x0213-2', `=>jis-x0213-2' and `=shinjigen'.
+
+2009-09-04  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R035-Go-Slowly.el (abstract J0-546B): Use
+	`=>jis-x0208' and `=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(U+5910): Use `->denotational' instead of `->subsumptive'.
+
+	* Ideograph-R029-Again.el (U+53C9): Add abstract J0-3A35.
+	(J0-3A35): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-3A35.
+	(G0-3266): Unify JX3-3A35.
+	(abstract glyph of J0-483F): New variants of U+53CD.
+	(J0-483F): Use `<-subsumptive' for the abstract glyph of J0-483F.
+	(G0-3734): Introduce abstract glyph layer.
+	(U+53CE): Use `=>jis-x0208' instead of `<=>jis-x0208'; use
+	`=>jis-x0213-1' instead of `<=>jis-x0213-1'.
+	(C3-2160): Don't use abstract component in `ideographic-structure'
+	of representative character.
+	(U+53DB): Add abstract J0-4840; use `->denotational' instead of
+	`->subsumptive'.
+	(abstract glyph of JX3-4840): New variant of U+53DB.
+	(K0-5A64): Unify JX3-4840.
+	(abstract glyph of JX1-4840): New variant of U+53DB.
+	(J0-4840): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-4840.
+	(C1-5035): Omit `ideographic-structure'.
+	(C0-4551): Likewise.
+	(U+53DC): Add `ideographic-structure'.
+	(M-03167): Don't use abstract component in `ideographic-structure'
+	of representative character.
+	(CB00008): Likewise; separate BC-8AC4.
+	(UU+53DC): Omit `ideographic-structure'.
+	(C3-2B4E): Don't use abstract component in `ideographic-structure'
+	of representative character.
+	(U+53DF): Use `->denotational' and `->subsumptive'.
+
+2009-09-03  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* char-db-util.el (char-db-coded-charset-priority-list): Add
+	`=>>gt'.
+
+2009-09-01  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R023-Hiding-Enclosure.el (U+5338): Use
+	`->subsumptive'.
+	(U+5339): Use `->denotational' and `->subsumptive'.
+	(U+533A): Use `->denotational' instead of `->subsumptive'.
+	(U-00020976): Use `->denotational' and `->subsumptive'.
+	(U+533E): Likewise.
+	(U+533F): Use `->denotational'.
+	(U+5340): Use `->denotational' and `->subsumptive'; use
+	`=>jis-x0208' and `=>jis-x0213-1' instead of `=jis-x0208@1997'.
+
+	* Ideograph-R018-Knife.el (J97-476D): Unify abstract JX1-476D.
+	(U+525D): Add `ideographic-structure'; unify abstract JX3-2F7E.
+	(M-02049): Separate J78-476D; delete duplicated S-0666.
+	(K0-5A4E): Unify J78-476D and JX3-2F7E.
+	(U+5265): Add `ideographic-structure'; unify abstract JX3-476D.
+	(U+5266): Add `ideographic-structure'.
+	(U+5275): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+
+	* Ideograph-R010-Legs.el (U+5146): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(U+514C): Add `ideographic-structure'.
+	(U-0002047D): Likewise.
+	(U+514D): Unify J97-4C48.
+	(parent of JX1-2E50): Add `=>jis-x0213-1' for abstract JX1-2E50.
+	(abstract JX1-4C48): New variant of U+514D.
+	(G0-4362): Use `<-subsumptive' for abstract JX1-4C48.
+	(J0-4C48): Likewise.
+	(U+514E): Unify J97-4546 and abstract JX1-4546.
+	(C3-2454): Separate K0-774D, S-0469 and H1-DDC9; omit
+	`ideographic-structure'; add `<-vulgar' for U-0002F80F.
+	(GT-01764): New variant of U+514E.
+	(S-0469): Unify JX3-4546.
+	(J0-4546): Unify K0-774D; use `=jis-x0213-1@2000' instead of
+	`=jis-x0213-1' for JX1-4546.
+	(U+5154): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+
+	* Ideograph-R009-Man.el (abstract J0-4662): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(U+4ED7): Likewise.
+	(U+3431): Add `sound@ja/on'; unify GT-00504 and GT-K01404; add
+	`->formed' for JX2-7D39.
+	(J97-4A3B): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U+4F7F): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(abstract J0-3666): Likewise; add `ideographic-structure'.
+	(U+4FF1): Modify a component in the `ideographic-structure'; use
+	`=jis-x0208@1978/-4X' instead of `jisx0208-1978/4X'; unify
+	JX3-2E21.
+	(U+5002): Add `=>jis-x0213-1' for abstract JX1-2E3C.
+	(U+5026): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(J78-3771): Unify JX3-3771.
+	(aJX1-3771): New abstract glyph of U+5026.
+	(J90-3771): Use `<-subsumptive' for aJX1-3771; modify a component
+	of the `ideographic-structure'; use `=jis-x0213-1@2000' instead of
+	`=jis-x0213-1' for JX1-3771.
+	(U+5049): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+5065): Likewise.
+	(abstract J0-5079): Likewise.
+	(U+5078): Add `ideographic-structure'.
+	(U+5077): Likewise.
+	(U+5085): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+5091): Likewise.
+	(U+50B4): Likewise; use `->denotational' instead of
+	`->subsumptive'.
+	(U+50C5): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+50E7): Use `=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	(U-0002F80A): Add `=>jis-x0213-1' for abstract glyph aJX1-414E.
+	(U+50CF): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+5132): Likewise.
+	(U+5137): Likewise.
+
+	* ideograph-util.el (int-list<): Support minus values.
+	(morohashi-daikanwa<): Support notation for abstract characters
+	and their children.
+	(char-daikanwa): New optional argument `depth'; return
+	`(nnnnn - depth)', `(nnnnn d -depth)' or `(ho nnnnn -depth)' for
+	abstract object.
+
+2009-08-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R049-Oneself.el (U+5DF7): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(J78-392B): Unify JX3-392B.
+	(J90-392B): Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+	`=ucs@jis' for J90U+5DF7; use `=jis-x0213-1@2000' instead of
+	`=jis-x0213-1' for JX1-392B; add `<-simplified@JP/jis' for
+	J78-392B.
+	(U+5DFD): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(B-B453): Moved to the parent node.
+	(J90-4327): Use `<-simplified@JP/jis' instead of `<-simplified@JP'
+	for J78-4327.
+
+	* Ideograph-R040-Roof.el (U+5BC1): Use `->subsumptive' to separate
+	representative nodes.
+	(U+5BC2): Use `->subsumptive'.
+	(U-00021A24): Use `->subsumptive'.
+	(U+5BC3): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+	(U+5BD0): Likewise.
+	(U+5BD2): Likewise.
+	(K0-794E): Unify GT-09091 and GT-K09013.
+	(abstract glyph of GT-09092): New variant of U+5BD2; use
+	`->subsumptive' to integrate J0-3428, G0-3A2E and C1-5E6D.
+
+	* Ideograph-R036-Evening.el (abstract J0-546C): Use `=>jis-x0208'
+	and `=>jis-x0213-1' instead of `=jis-x0208@1997'; unify U+591B.
+	(J0-546C): Move U+591B into the abstract node.
+	(U+5922): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+
+2009-08-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* maps-conf.el: Check "../etc/char-data/JX3-JX1-rep-diff.txt".
+
+2009-08-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* char-db-util.el (char-db-coded-charset-priority-list): Add
+	`=>>jis-x0208' and `=>>jis-x0213-1'.
+
+2009-08-27  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R027-Cliff.el, Ideograph-R026-Seal.el:
+	- Use `=>jis-x0208' instead of `<=>jis-x0208'.
+	- Use `=>jis-x0213-1' instead of `<=>jis-x0213-1'.
+
+	* Ideograph-R021-Spoon.el (B-A450): Moved to J97-5238.
+	(J97-5238): Use `=>jis-x0208' and `=>jis-x0213-1' instead of
+	`=jis-x0208@1997'.
+
+	* Ideograph-R020-Wrap.el, Ideograph-R015-Ice.el,
+	  Ideograph-R014-Cover.el:
+	- Use `=>jis-x0208' instead of `<=>jis-x0208'.
+	- Use `=>jis-x0213-1' instead of `<=>jis-x0213-1'.
+
+	* Ideograph-R013-Down-Box.el (J97-4662): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(U+5189): Likewise.
+	(J97-5A70): Likewise.
+
+	* Ideograph-R012-Eight.el (U+516C): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+
+	* Ideograph-R011-Enter.el (abstract J0-4662): Use `=>jis-x0208'
+	and `=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(GT-K05210): New variant of U+516A.
+
+	* Ideograph-R008-Lid.el (U+4EA4): Use `=>jis-x0208' and
+	`=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(J83-3872): Unify GT-00389 and GT-K01602.
+	(abstract glyph of GT-00390): New object to subsume J90-3872 and
+	G0-3D3B.
+
+	* Ideograph-R001-One.el:
+	- Use `=>jis-x0208' instead of `<=>jis-x0208'.
+	- Use `=>jis-x0213-1' instead of `<=>jis-x0213-1'.
+
+	* char-db-util.el (char-db-insert-ccs-feature): Use `=>gt' instead
+	of `<=>gt'; add setting for `=>>gt'.
+
+2009-08-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R039-Child.el (U+5B76): Use `<=>jis-x0208' instead of
+	`=jis-x0208@1997' in `<-denotational'.
+	(abstract J0-555A): Use `<=>jis-x0208' and `<=>jis-x0213-1'
+	instead of `=jis-x0208@1997'.
+	(U+5B73): Use `<=>jis-x0208' instead of `=jis-x0208@1997' in
+	`<-denotational'.
+
+	* maps-conf.el: Don't add `=gt-pj-1' for J90-552D.
+
+	* char-db-util.el: (char-db-coded-charset-priority-list):
+	- Add `=jis-x0213-1' and `=jis-x0213-1@2004'.
+	- Use `=jis-x0213-1@2000' instead of `=jis-x0213-1-2000'.
+	- Use `=jis-x0213-2' instead of `=jis-x0213-2-2000'.
+	- Add `<=>jis-x0208'.
+	- Use `<=>jis-x0208@1997' instead of `=jis-x0208@1997'.
+	- Add `<=>jis-x0213-1' and `<=>jis-x0213-1@{2000|2004}'.
+
+	* Ideograph-R015-Ice.el (U+51B4): Use `<=>jis-x0208' and
+	`<=>jis-x0213-1' instead of `=jis-x0208@1997'.
+
+	* Ideograph-R027-Cliff.el (U+53A9): Use `<=>jis-x0208' and
+	`<=>jis-x0213-1' instead of `=jis-x0208@1997'.
+
+2009-08-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R020-Wrap.el (U+52FA): Use `<=>jis-x0208' and
+	`<=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(U+5305): Likewise.
+	(abstract J0-5232): Likewise.
+
+2009-08-25  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R029-Again.el (U+53CE): Use `<=>jis-x0208' and
+	`<=>jis-x0213-1' instead of `=jis-x0208@1997'.
+
+	* Ideograph-R026-Seal.el (U+537F): Use `<=>jis-x0208' and
+	`<=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(J90-362A): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-362A.
+	(J78-362A): Unify JX3-362A.
+
+	* Ideograph-R014-Cover.el (U+51A4): Use `<=>jis-x0208' and
+	`<=>jis-x0213-1' instead of `=jis-x0208@1997'.
+	(U-0002F818): Unify JX3-514D.
+	(J90-514D): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+	JX1-514D.
+
+	* Ideograph-R001-One.el (U+4E08): Use `<=>jis-x0208' and
+	`<=>jis-x0213-1' instead of `=jis-x0208@1997'.
+
+2009-08-25  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* maps-conf.el: Add `<=>jis-x0213-1' for each object of
+	`<=>jis-x0208'.
+
 2009-08-03  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* Ideograph-R142-Insect.el: Add mappings between CJK Ext B and CNS
diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el
index 8e17f5e..7f72245 100644
--- a/lisp/utf-2000/Ideograph-R001-One.el
+++ b/lisp/utf-2000/Ideograph-R001-One.el
@@ -309,8 +309,9 @@
     (sound@ja/on/go	"dyAu")
     (sound@ja/on/kan	"tyAu")
     (=ucs		. #x4E08)	; 丈
+    (=>jis-x0208	. #x3E66)	; 丈 [30-70]
+    (=>jis-x0213-1	. #x3E66)	; 丈 [30-70]
     (=big5		. #xA456)	; &I-B-A456;
-    (=jis-x0208@1997	. #x3E66)	; 丈 [30-70]
     (->subsumptive
      ((=jis-x0208@1978	  . #x3E66)	; &GT-00018; [30-70]
       (=jis-x0208@1983	  . #x3E66)	; &I-J83-3E66; [30-70]
diff --git a/lisp/utf-2000/Ideograph-R008-Lid.el b/lisp/utf-2000/Ideograph-R008-Lid.el
index 5af0628..99a3f77 100644
--- a/lisp/utf-2000/Ideograph-R008-Lid.el
+++ b/lisp/utf-2000/Ideograph-R008-Lid.el
@@ -208,8 +208,9 @@
 			"ka-Ha+s5" "komogomo")
     (sound@ja/on	"kAu")
     (=ucs		. #x4EA4)	; 交
+    (=>jis-x0208	. #x3872)	; 交 [24-82]
+    (=>jis-x0213-1	. #x3872)	; 交 [24-82]
     (=big5		. #xA5E6)	; &I-B-A5E6;
-    (=jis-x0208@1997	. #x3872)	; 交 [24-82]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -224,44 +225,69 @@
 	(=ks-x1001	    . #x5D2B)	; &I-K0-5D2B; [61-11]
 	(=daikanwa	    . 19721)	; &I-M-19721;
 	))
-      (=jis-x0208@1978	  . #x3872)	; &M-00291; [24-82]
+      (=jis-x0208@1978	  . #x3872)	; &GT-00389; [24-82]
       (=jis-x0208@1983	  . #x3872)	; &I-J83-3872; [24-82]
       (=ks-x1001	  . #x4E5F)	; &I-K0-4E5F; [46-63]
+      (=gt		  . 00389)	; &I-GT-00389;
+      (=gt-k		  . 01602)	; &I-GT-K01602;
+      (=gt-pj-2		  . #x324B)	; &I-GT-00389; [18-43]
       (=daikanwa	  . 00291)	; &I-M-00291;
-      (=shinjigen	  .  0097)	; &M-00291;
+      (=shinjigen	  .  0097)	; &GT-00389;
       (=jef-china3	  . #x41D6)	; &I-JC3-41D6;
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=ucs@jis	    . #x4EA0)	; &GT-00376;
-	(=jis-x0208	    . #x5035)	; &GT-00376; [48-21]
-	(=jis-x0213-1	    . #x5035)	; &I-JX1-5035; [48-21]
-	)
-       ((=ucs		    . #x7236)	; 父
-	))
-      (=ucs@jis		  . #x4EA4)	; &GT-00390;
-      (=jis-x0208@1990	  . #x3872)	; &GT-00390; [24-82]
-      (=jis-x0213-1	  . #x3872)	; &I-JX1-3872; [24-82]
-      (=gt		  . 00390)	; &I-GT-00390;
-      (=gt-pj-1		  . #x3872)	; &I-GT-00390; [24-82]
-      (=shinjigen	  .  0096)	; &GT-00390;
-      )
      ((mojikyo		  . 000291)	; &MCS-60000123;
       )
-     ((hanyu-dazidian	  1 282 1)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
        ((=ucs		    . #x4EA0)	; 亠
 	)
-       ((=ucs		    . #x7236)	; 父
+       ((=ucs@unicode	    . #x7236)	; &GT-25337;
+	(=gb2312	    . #x3838)	; &GT-25337; [24-24]
+	(=cns11643-1	    . #x4558)	; &I-C1-4558; [37-56]
+	(=jis-x0213-1	    . #x4963)	; &I-JX1-4963; [41-67]
+	))
+      (=>>gt		  . 00390)	; &G-GT-00390;
+      (->subsumptive
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=ucs@jis	      . #x4EA0)	; &GT-00376;
+	  (=jis-x0208	      . #x5035)	; &GT-00376; [48-21]
+	  (=jis-x0213-1	      . #x5035)	; &I-JX1-5035; [48-21]
+	  )
+	 ((=ucs@unicode	      . #x7236)	; &GT-25337;
+	  (=gb2312	      . #x3838)	; &GT-25337; [24-24]
+	  (=cns11643-1	      . #x4558)	; &I-C1-4558; [37-56]
+	  (=jis-x0213-1	      . #x4963)	; &I-JX1-4963; [41-67]
+	  ))
+	(=ucs@jis	    . #x4EA4)	; &GT-00390;
+	(=jis-x0208@1990    . #x3872)	; &GT-00390; [24-82]
+	(=jis-x0213-1	    . #x3872)	; &I-JX1-3872; [24-82]
+	(=gt		    . 00390)	; &I-GT-00390;
+	(=gt-pj-1	    . #x3872)	; &I-GT-00390; [24-82]
+	(=shinjigen	    .  0096)	; &GT-00390;
+	)
+       ((hanyu-dazidian	    1 282 1)
+	(ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=ucs@unicode	      . #x4EA0)	; &GT-00375;
+	  (=gb2312	      . #x596F)	; &GT-00375; [57-79]
+	  (=daikanwa	      . 00286)	; &I-M-00286;
+	  )
+	 ((=ucs@unicode	      . #x7236)	; &GT-25337;
+	  (=gb2312	      . #x3838)	; &GT-25337; [24-24]
+	  (=cns11643-1	      . #x4558)	; &I-C1-4558; [37-56]
+	  (=jis-x0213-1	      . #x4963)	; &I-JX1-4963; [41-67]
+	  ))
+	(=ucs@unicode	    . #x4EA4)	; &C1-4728;
+	(=gb2312	    . #x3D3B)	; &C1-4728; [29-27]
+	(=cns11643-1	    . #x4728)	; &I-C1-4728; [39-08]
 	))
-      (=ucs@unicode	  . #x4EA4)	; &C1-4728;
-      (=gb2312		  . #x3D3B)	; &C1-4728; [29-27]
-      (=cns11643-1	  . #x4728)	; &I-C1-4728; [39-08]
       ))
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el
index f9dafdb..016a37a 100644
--- a/lisp/utf-2000/Ideograph-R009-Man.el
+++ b/lisp/utf-2000/Ideograph-R009-Man.el
@@ -861,10 +861,28 @@
     (mojikyo		. 000366)	; &MCS-6000016E;
     ))
 (define-char
+  '((ideographic-radical@ucs . 13)	; ⼌
+    (ideographic-strokes@ucs . 2)
+    (ideographic-radical@ucs*sources
+     daikanwa=01512 cns11643-6 ucs=0x5185)
+    (ideographic-radical@daikanwa . 11)	; ⼊
+    (ideographic-strokes@daikanwa . 2)
+    (ideographic-radical@daikanwa*sources
+     daikanwa=01418 cns11643-1 ucs=0x5167)
+    (ideographic-radical@cns-3 . 9)	; ⼈
+    (ideographic-strokes@cns-3 . 2)
+    (ideographic-radical@cns-3*sources
+     cns11643-3 daikanwa=366-1)
+    (total-strokes	 . 4)
+    (=ucs@big5		. #x5167)	; &J97-4662;
+    (=>jis-x0208	. #x4662)	; &J97-4662; [38-66]
+    (=>jis-x0213-1	. #x4662)	; &J97-4662; [38-66]
+    (=big5		. #xA4BA)	; &J97-4662;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x5167)	; &B-A4BA;
-      (=big5		  . #xA4BA)	; &B-A4BA;
-      (=jis-x0208@1997	  . #x4662)	; &B-A4BA; [38-66]
+     ((=ucs@big5	  . #x5167)	; &J97-4662;
+      (=>jis-x0208	  . #x4662)	; &J97-4662; [38-66]
       ))
     (ideographic-radical@ucs . 13)	; ⼌
     (ideographic-strokes@ucs . 2)
@@ -896,24 +914,6 @@
      daikanwa)
     ))
 (define-char
-  '((ideographic-radical@ucs . 13)	; ⼌
-    (ideographic-strokes@ucs . 2)
-    (ideographic-radical@ucs*sources
-     daikanwa=01512 cns11643-6 ucs=0x5185)
-    (ideographic-radical@daikanwa . 11)	; ⼊
-    (ideographic-strokes@daikanwa . 2)
-    (ideographic-radical@daikanwa*sources
-     daikanwa=01418 cns11643-1 ucs=0x5167)
-    (ideographic-radical@cns-3 . 9)	; ⼈
-    (ideographic-strokes@cns-3 . 2)
-    (ideographic-radical@cns-3*sources
-     cns11643-3 daikanwa=366-1)
-    (total-strokes	 . 4)
-    (=ucs@big5		. #x5167)	; &B-A4BA;
-    (=big5		. #xA4BA)	; &B-A4BA;
-    (=jis-x0208@1997	. #x4662)	; &B-A4BA; [38-66]
-    ))
-(define-char
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
@@ -1094,8 +1094,9 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (=ucs		. #x4ED7)	; 仗
+    (=>jis-x0208	. #x503F)	; 仗 [48-31]
+    (=>jis-x0213-1	. #x503F)	; 仗 [48-31]
     (=big5		. #xA54D)	; &I-B-A54D;
-    (=jis-x0208@1997	. #x503F)	; 仗 [48-31]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -1152,11 +1153,23 @@
       )
      ((=ucs		  . #x5F61)	; 彡
       ))
+    (sound@ja/on	"siN")
     (=ucs		. #x3431)	; 㐱
     (=cns11643-3	. #x2175)	; &I-C3-2175; [01-85]
     (=big5-cdp		. #x8BFC)	; &I-CDP-8BFC;
+    (=gt		. 00504)	; &I-GT-00504;
+    (=gt-k		. 01404)	; &I-GT-K01404;
+    (=gt-pj-2		. #x3326)	; &I-GT-00504; [19-06]
     (=daikanwa		. 00372)	; &I-M-00372;
     (mojikyo		. 000372)	; &MCS-60000174;
+    (->formed
+     ((=ucs@jis		  . #x9B12)	; &GT-61265;
+      (=jis-x0212	  . #x6A2A)	; &GT-61265; [74-10]
+      (=jis-x0213-2	  . #x7D39)	; &I-JX2-7D39; [93-25]
+      (=daikanwa	  . 45543)	; &I-M-45543;
+      ))
+    (->formed*sources
+     shuowen jiyun daikanwa)
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -4076,7 +4089,7 @@
      ((name		  . "CJK RADICAL PERSON")
       (=ucs		  . #x2E85)	; ⺅
       )
-     ((=cns11643-3	  . #x2157)	; &M-02674; [01-55]
+     ((=cns11643-3	  . #x2157)	; &GT-03428; [01-55]
       (=daikanwa	  . 02674)	; &I-M-02674;
       ))
     (=ucs@cns		. #x4F1B)	; &C4-222E;
@@ -7649,10 +7662,15 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 9)	; ⼈
+    (=ucs@big5		. #x4F75)	; &J97-4A3B;
+    (=>jis-x0208@1997	. #x4A3B)	; &J97-4A3B; [42-27]
+    (=big5		. #xA8D6)	; &J97-4A3B;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x4F75)	; &B-A8D6;
-      (=big5		  . #xA8D6)	; &B-A8D6;
-      (=jis-x0208@1997	  . #x4A3B)	; &B-A8D6; [42-27]
+     ((=ucs@big5	  . #x4F75)	; &J97-4A3B;
+      (=>jis-x0208@1997	  . #x4A3B)	; &J97-4A3B; [42-27]
       ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 6)
@@ -7684,12 +7702,6 @@
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
-    (=ucs@big5		. #x4F75)	; &B-A8D6;
-    (=big5		. #xA8D6)	; &B-A8D6;
-    (=jis-x0208@1997	. #x4A3B)	; &B-A8D6; [42-27]
-    ))
-(define-char
-  '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
     (hanyu-dazidian	1 144 1)
@@ -7938,7 +7950,7 @@
        ((name		    . "CJK RADICAL PERSON")
 	(=ucs		    . #x2E85)	; ⺅
 	)
-       ((=jis-x0208@1978    . #x3872)	; &M-00291; [24-82]
+       ((=jis-x0208@1978    . #x3872)	; &GT-00389; [24-82]
 	(=jis-x0208@1983    . #x3872)	; &I-J83-3872; [24-82]
 	(=ks-x1001	    . #x4E5F)	; &I-K0-4E5F; [46-63]
 	(=daikanwa	    . 00291)	; &I-M-00291;
@@ -8146,8 +8158,9 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
     (=ucs		. #x4F7F)	; 使
+    (=>jis-x0208	. #x3B48)	; 使 [27-40]
+    (=>jis-x0213-1	. #x3B48)	; 使 [27-40]
     (=big5		. #xA8CF)	; &I-B-A8CF;
-    (=jis-x0208@1997	. #x3B48)	; 使 [27-40]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -13401,8 +13414,24 @@
     (mojikyo		. 000723)	; &MCS-600002D3;
     ))
 (define-char
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
+      )
+     ((=ucs		  . #x5177)	; 具
+      ))
+    (=>jis-x0208@1997	. #x3666)	; &J97-3666; [22-70]
+    (=>jis-x0213-1@2000 . #x3666)	; &J97-3666; [22-70]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3666)	; &J97-3666; [22-70]
+     ((=>jis-x0208@1997	  . #x3666)	; &J97-3666; [22-70]
       ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 8)
@@ -13428,14 +13457,8 @@
     (mojikyo		. 000724)	; &MCS-600002D4;
     ))
 (define-char
-  '((ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
-    (=jis-x0208@1997	. #x3666)	; &J97-3666; [22-70]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3666)	; &J97-3666; [22-70]
+     ((=>jis-x0208@1997	  . #x3666)	; &J97-3666; [22-70]
       ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 8)
@@ -13448,13 +13471,17 @@
      ((name		  . "CJK RADICAL PERSON")
       (=ucs		  . #x2E85)	; ⺅
       )
-     ((=ucs		  . #x5177)	; 具
+     ((=ucs@unicode	  . #x5177)	; &C1-4C26;
+      (=gb2312		  . #x3E5F)	; &C1-4C26; [30-63]
+      (=ks-x1001	  . #x4E7D)	; &I-K0-4E7D; [46-93]
+      (=cns11643-1	  . #x4C26)	; &I-C1-4C26; [44-06]
       ))
-    (jisx0208-1978/4X	. #x3666)
     (=ucs		. #x4FF1)	; 俱
+    (=jis-x0208@1978/-4X . #x3666)	; 俱 [22-70]
     (=gb2312		. #x3E63)	; &I-G0-3E63; [30-67]
     (=ks-x1001		. #x4E7C)	; &I-K0-4E7C; [46-92]
     (=cns11643-1	. #x5434)	; &I-C1-5434; [52-20]
+    (=jis-x0213-1@2004	. #x2E21)	; &I-JX3-2E21; [14-01]
     (=big5		. #xADD1)	; &I-B-ADD1;
     (=shinjigen		.  0287)	; 俱
     (=jef-china3	. #x42CF)	; &I-JC3-42CF;
@@ -14129,15 +14156,15 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x4F75)	; &B-A8D6;
-      (=big5		  . #xA8D6)	; &B-A8D6;
-      (=jis-x0208@1997	  . #x4A3B)	; &B-A8D6; [42-27]
+     ((=ucs@big5	  . #x4F75)	; &J97-4A3B;
+      (=>jis-x0208@1997	  . #x4A3B)	; &J97-4A3B; [42-27]
       ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (hanyu-dazidian	1 182 6)
     (=ucs		. #x5002)	; 倂
+    (=>jis-x0213-1	. #x2E3C)	; 倂 [14-28]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -15801,7 +15828,26 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (=ucs		. #x5026)	; 倦
-    (=jis-x0208@1997	. #x3771)	; 倦 [23-81]
+    (=>jis-x0208	. #x3771)	; 倦 [23-81]
+    (=>jis-x0213-1	. #x3771)	; 倦 [23-81]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5026)	; 倦
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
+      )
+     ((=ucs		  . #x5377)	; 卷
+      ))
+    (=big5		. #xADC2)	; &B-ADC2;
     ))
 (define-char
   '((<-denotational
@@ -15823,23 +15869,16 @@
       (=jis-x0213-1	  . #x524B)	; &I-JX1-524B; [50-43]
       (=daikanwa	  . 02860)	; &I-M-02860;
       ))
+    (=ucs@jis/2004	. #x5026)	; &M-00788;
     (=jis-x0208@1978	. #x3771)	; &M-00788; [23-81]
     (=ks-x1001		. #x4F66)	; &I-K0-4F66; [47-70]
+    (=jis-x0213-1@2004	. #x3771)	; &I-JX3-3771; [23-81]
     (=daikanwa		. 00788)	; &I-M-00788;
     (=shinjigen		.  0292)	; &M-00788;
     (mojikyo		. 000788)	; &MCS-60000314;
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x5026)	; 倦
-      ))
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
-    (=big5		. #xADC2)	; &B-ADC2;
-    ))
-(define-char
-  '((<-denotational
      ((=big5		  . #xADC2)	; &B-ADC2;
       ))
     (ideographic-radical . 9)	; ⼈
@@ -15875,17 +15914,37 @@
      ((name		  . "CJK RADICAL PERSON")
       (=ucs		  . #x2E85)	; ⺅
       )
-     ((=ucs@jis		  . #x5DFB)	; &GT-11038;
-      (=jis-x0208	  . #x342C)	; &GT-11038; [20-12]
-      (=jis-x0213-1	  . #x342C)	; &I-JX1-342C; [20-12]
+     ((=ucs		  . #x5DFB)	; å·»
+      ))
+    (=>>jis-x0213-1@2000 . #x3771)	; &G-JX1-3771; [23-81]
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((name		    . "CJK RADICAL PERSON")
+	(=ucs		    . #x2E85)	; ⺅
+	)
+       ((=ucs@jis	    . #x5DFB)	; &GT-11038;
+	(=jis-x0208	    . #x342C)	; &GT-11038; [20-12]
+	(=jis-x0213-1	    . #x342C)	; &I-JX1-342C; [20-12]
+	))
+      (=ucs@jis/1990	  . #x5026)	; &GT-01087;
+      (=ucs@jis/2000	  . #x5026)	; &GT-01087;
+      (=jis-x0208@1983	  . #x3771)	; &GT-01087; [23-81]
+      (=jis-x0208@1990	  . #x3771)	; &I-J90-3771; [23-81]
+      (=jis-x0213-1@2000  . #x3771)	; &I-JX1-3771; [23-81]
+      (=gt		  . 01087)	; &I-GT-01087;
+      (=gt-pj-1		  . #x3771)	; &I-GT-01087; [23-81]
+      (=jef-china3	  . #x43CD)	; &I-JC3-43CD;
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x5026)	; &M-00788;
+	(=jis-x0208@1978    . #x3771)	; &M-00788; [23-81]
+	(=ks-x1001	    . #x4F66)	; &I-K0-4F66; [47-70]
+	(=jis-x0213-1@2004  . #x3771)	; &I-JX3-3771; [23-81]
+	(=daikanwa	    . 00788)	; &I-M-00788;
+	))
       ))
-    (=ucs@jis		. #x5026)	; &GT-01087;
-    (=jis-x0208@1983	. #x3771)	; &GT-01087; [23-81]
-    (=jis-x0208@1990	. #x3771)	; &I-J90-3771; [23-81]
-    (=jis-x0213-1	. #x3771)	; &I-JX1-3771; [23-81]
-    (=gt		. 01087)	; &I-GT-01087;
-    (=gt-pj-1		. #x3771)	; &I-GT-01087; [23-81]
-    (=jef-china3	. #x43CD)	; &I-JC3-43CD;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -16267,8 +16326,7 @@
        ((name		    . "CJK RADICAL PERSON")
 	(=ucs		    . #x2E85)	; ⺅
 	)
-       ((=ucs@big5	    . #x677E)	; &M-14516;
-	(=jis-x0208@1978    . #x3E3E)	; &M-14516; [30-30]
+       ((=jis-x0208@1978    . #x3E3E)	; &M-14516; [30-30]
 	(=jis-x0208@1983    . #x3E3E)	; &I-J83-3E3E; [30-30]
 	(=ks-x1001	    . #x6166)	; &I-K0-6166; [65-70]
 	(=daikanwa	    . 14516)	; &I-M-14516;
@@ -17895,8 +17953,9 @@
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (=ucs		. #x5049)	; 偉
+    (=>jis-x0208	. #x304E)	; 偉 [16-46]
+    (=>jis-x0213-1	. #x304E)	; 偉 [16-46]
     (=big5		. #xB0B6)	; &I-B-B0B6;
-    (=jis-x0208@1997	. #x304E)	; 偉 [16-46]
     (->subsumptive
      ((ideographic-strokes . 9)
       (total-strokes	   . 11)
@@ -18199,7 +18258,17 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
     (hanyu-dazidian	1 195 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
+      )
+     ((=ucs		  . #x6241)	; 扁
+      ))
     (=ucs		. #x504F)	; 偏
+    (=big5		. #xB0BE)	; &I-B-B0BE;
     ))
 (define-char
   '((<-denotational
@@ -18215,15 +18284,14 @@
      ((name		  . "CJK RADICAL PERSON")
       (=ucs		  . #x2E85)	; ⺅
       )
-     ((=ucs@big5	  . #x6241)	; &GT-14816;
+     ((=ucs@jis/2004	  . #x6241)	; &GT-14816;
       (=ks-x1001	  . #x7837)	; &GT-14816; [88-23]
       (=cns11643-1	  . #x5137)	; &I-C1-5137; [49-23]
+      (=jis-x0213-1@2004  . #x5928)	; &I-JX3-5928; [57-08]
       (=daikanwa	  . 11724)	; &I-M-11724;
       ))
-    (=ucs@big5		. #x504F)	; &M-00848;
     (=ks-x1001		. #x7836)	; &M-00848; [88-22]
     (=cns11643-1	. #x5923)	; &I-C1-5923; [57-03]
-    (=big5		. #xB0BE)	; &I-B-B0BE;
     (=daikanwa		. 00848)	; &I-M-00848;
     (=shinjigen		.  0350)	; &M-00848;
     (=jef-china3	. #x42EB)	; &I-JC3-42EB;
@@ -18263,9 +18331,10 @@
      ((name		  . "CJK RADICAL PERSON")
       (=ucs		  . #x2E85)	; ⺅
       )
-     ((=ucs@jis		  . #x6241)	; &GT-14817;
+     ((=ucs@jis/1990	  . #x6241)	; &GT-14817;
+      (=ucs@jis/2000	  . #x6241)	; &GT-14817;
       (=jis-x0208	  . #x5928)	; &GT-14817; [57-08]
-      (=jis-x0213-1	  . #x5928)	; &I-JX1-5928; [57-08]
+      (=jis-x0213-1@2000  . #x5928)	; &I-JX1-5928; [57-08]
       ))
     (=ucs@jis		. #x504F)	; &GT-01167;
     (=jis-x0208		. #x4A50)	; &GT-01167; [42-48]
@@ -19345,8 +19414,9 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
     (=ucs		. #x5065)	; 健
+    (=>jis-x0208	. #x3772)	; 健 [23-82]
+    (=>jis-x0213-1	. #x3772)	; 健 [23-82]
     (=big5		. #xB0B7)	; &I-B-B0B7;
-    (=jis-x0208@1997	. #x3772)	; 健 [23-82]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -20191,12 +20261,28 @@
     (mojikyo		. 000900)	; &MCS-60000384;
     ))
 (define-char
+  '((ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (=>jis-x0208	. #x5079)	; &J97-5079; [48-89]
+    (=>jis-x0213-1	. #x5079)	; &J97-5079; [48-89]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5079)	; &J97-5079; [48-89]
+     ((=>jis-x0208	  . #x5079)	; &J97-5079; [48-89]
       ))
     (ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
+      )
+     ((=ucs		  . #x516A)	; 兪
+      ))
     (=ucs		. #x5078)	; 偸
     ))
 (define-char
@@ -20231,21 +20317,6 @@
     (mojikyo		. 000901)	; &MCS-60000385;
     ))
 (define-char
-  '((ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 9)
-    (total-strokes	 . 11)
-    (=jis-x0208@1997	. #x5079)	; &J97-5079; [48-89]
-    ))
-(define-char
-  '((<-denotational
-     ((=jis-x0208@1997	  . #x5079)	; &J97-5079; [48-89]
-      ))
-    (ideographic-radical . 9)	; ⼈
-    (ideographic-strokes . 9)
-    (total-strokes	 . 11)
-    (=ucs		. #x5077)	; 偷
-    ))
-(define-char
   '((<-denotational
      ((=ucs		  . #x5078)	; 偸
       ))
@@ -20279,6 +20350,24 @@
     ))
 (define-char
   '((<-denotational
+     ((=>jis-x0208	  . #x5079)	; &J97-5079; [48-89]
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
+      )
+     ((=ucs		  . #x4FDE)	; 俞
+      ))
+    (=ucs		. #x5077)	; 偷
+    ))
+(define-char
+  '((<-denotational
      ((=ucs		  . #x5077)	; 偷
       ))
     (ideographic-radical . 9)	; ⼈
@@ -20294,6 +20383,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
     (hanyu-dazidian	1 193 2)
+    (=big5		. #xB0BD)	; &B-B0BD;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -20307,7 +20397,6 @@
 	))
       (=ucs@unicode	  . #x5077)	; &G0-4D35;
       (=gb2312		  . #x4D35)	; &G0-4D35; [45-21]
-      (=big5		  . #xB0BD)	; &I-B-B0BD;
       (=shinjigen	  .  0345)	; &G0-4D35;
       (mojikyo		  . 054504)	; &MCS-6000D4E8;
       )
@@ -21031,6 +21120,11 @@
     (mojikyo		. 000927)	; &MCS-6000039F;
     ))
 (define-char
+  '((ideographic-radical . 9)	; ⼈
+    (=ucs@big5		. #x507D)	; &B-B0B0;
+    (=big5		. #xB0B0)	; &B-B0B0;
+    ))
+(define-char
   '((<-denotational
      ((=ucs@big5	  . #x507D)	; &B-B0B0;
       (=big5		  . #xB0B0)	; &B-B0B0;
@@ -21066,11 +21160,6 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 9)	; ⼈
-    (=ucs@big5		. #x507D)	; &B-B0B0;
-    (=big5		. #xB0B0)	; &B-B0B0;
-    ))
-(define-char
   '((ideographic-radical@ucs . 9)	; ⼈
     (ideographic-strokes@ucs . 9)
     (ideographic-radical@daikanwa . 42)	; ⼩
@@ -21616,6 +21705,15 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
+      )
+     ((=ucs		  . #x5C51)	; 屑
+      ))
     (=ucs		. #x202F1)	; 𠋱
     ))
 (define-char
@@ -21633,8 +21731,10 @@
      ((name		  . "CJK RADICAL PERSON")
       (=ucs		  . #x2E85)	; ⺅
       )
-     ((=jis-x0208@1978	  . #x367D)	; &M-07709; [22-93]
+     ((=ucs@jis/2004	  . #x5C51)	; &M-07709;
+      (=jis-x0208@1978	  . #x367D)	; &M-07709; [22-93]
       (=ks-x1001	  . #x605A)	; &I-K0-605A; [64-58]
+      (=jis-x0213-1@2004  . #x367D)	; &I-JX3-367D; [22-93]
       (=daikanwa	  . 07709)	; &I-M-07709;
       ))
     (=daikanwa		. 00935)	; &M-00935;
@@ -21803,8 +21903,9 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (=ucs		. #x5085)	; 傅
+    (=>jis-x0208	. #x507C)	; 傅 [48-92]
+    (=>jis-x0213-1	. #x507C)	; 傅 [48-92]
     (=big5		. #xB3C5)	; &I-B-B3C5;
-    (=jis-x0208@1997	. #x507C)	; 傅 [48-92]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -22025,6 +22126,15 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
+      )
+     ((=ucs		  . #x8654)	; 虔
+      ))
     (=ucs		. #x202F5)	; 𠋵
     (->subsumptive
      ((ideographic-structure
@@ -22034,10 +22144,11 @@
        ((name		    . "CJK RADICAL PERSON")
 	(=ucs		    . #x2E85)	; ⺅
 	)
-       ((=ucs@jis	    . #x8654)	; &M-32686;
+       ((=ucs@jis/1990	    . #x8654)	; &M-32686;
+	(=ucs@jis/2000	    . #x8654)	; &M-32686;
 	(=jis-x0208	    . #x694A)	; &M-32686; [73-42]
 	(=ks-x1001	    . #x4B73)	; &I-K0-4B73; [43-83]
-	(=jis-x0213-1	    . #x694A)	; &I-JX1-694A; [73-42]
+	(=jis-x0213-1@2000  . #x694A)	; &I-JX1-694A; [73-42]
 	(=daikanwa	    . 32686)	; &I-M-32686;
 	))
       (=daikanwa	  . 00945)	; &M-00945;
@@ -22443,7 +22554,9 @@
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (=ucs		. #x5091)	; 傑
-    (=jis-x0208@1997	. #x3766)	; 傑 [23-70]
+    (=>jis-x0208	. #x3766)	; 傑 [23-70]
+    (=>jis-x0213-1	. #x3766)	; 傑 [23-70]
+    (=big5		. #xB3C7)	; &I-B-B3C7;
     (->subsumptive
      ((ideographic-strokes . 10)
       (total-strokes	   . 12)
@@ -22461,7 +22574,6 @@
 	))
       (=ucs@unicode	  . #x5091)	; &M-00955;
       (=iso-ir165	  . #x2C79)	; &M-00955; [12-89]
-      (=big5		  . #xB3C7)	; &I-B-B3C7;
       (=daikanwa	  . 00955)	; &I-M-00955;
       (=shinjigen	  .  0372)	; &M-00955;
       (mojikyo		  . 000955)	; &MCS-600003BB;
@@ -25304,46 +25416,60 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
     (=ucs		. #x50B4)	; 傴
-    (=jis-x0208@1997	. #x507D)	; 傴 [48-93]
-    (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((name		    . "CJK RADICAL PERSON")
-	(=ucs		    . #x2E85)	; ⺅
-	)
-       ((=ucs@unicode	    . #x5340)	; &GT-03378;
-	(=ks-x1001	    . #x4F21)	; &GT-03378; [47-01]
-	(=jis-x0208@1990    . #x523F)	; &I-J90-523F; [50-31]
-	(=jis-x0213-1	    . #x523F)	; &I-JX1-523F; [50-31]
-	))
-      (=ucs@unicode	  . #x50B4)	; &GT-01298;
-      (=jis-x0208	  . #x507D)	; &GT-01298; [48-93]
-      (=jis-x0213-1	  . #x507D)	; &I-JX1-507D; [48-93]
-      (=gb12345		  . #x5871)	; &GT-01298; [56-81]
-      (=big5		  . #xDCBA)	; &I-B-DCBA;
-      (=gt		  . 01298)	; &I-GT-01298;
-      (=gt-pj-1		  . #x507D)	; &I-GT-01298; [48-93]
-      (=daikanwa	  . 01020)	; &I-M-01020;
-      (=shinjigen	  .  0368)	; &GT-01298;
-      (mojikyo		  . 059099)	; &MCS-6000E6DB;
+    (=>jis-x0208	. #x507D)	; 傴 [48-93]
+    (=>jis-x0213-1	. #x507D)	; 傴 [48-93]
+    (=big5		. #xDCBA)	; &I-B-DCBA;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x50B4)	; 傴
+      ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((hanyu-dazidian	  1 209 4)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((name		    . "CJK RADICAL PERSON")
-	(=ucs		    . #x2E85)	; ⺅
-	)
-       ((=cns11643-1	    . #x5934)	; &M-02691; [57-20]
-	(=daikanwa	    . 02691)	; &I-M-02691;
-	))
-      (=ucs@cns		  . #x50B4)	; &C2-415F;
-      (=cns11643-2	  . #x415F)	; &C2-415F; [33-63]
-      (mojikyo		  . 001020)	; &MCS-600003FC;
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
+      )
+     ((=ucs@unicode	  . #x5340)	; &GT-03378;
+      (=ks-x1001	  . #x4F21)	; &GT-03378; [47-01]
+      (=jis-x0208@1990	  . #x523F)	; &I-J90-523F; [50-31]
+      (=jis-x0213-1	  . #x523F)	; &I-JX1-523F; [50-31]
+      ))
+    (=ucs@unicode	. #x50B4)	; &GT-01298;
+    (=jis-x0208		. #x507D)	; &GT-01298; [48-93]
+    (=jis-x0213-1	. #x507D)	; &I-JX1-507D; [48-93]
+    (=gb12345		. #x5871)	; &GT-01298; [56-81]
+    (=gt		. 01298)	; &I-GT-01298;
+    (=gt-pj-1		. #x507D)	; &I-GT-01298; [48-93]
+    (=daikanwa		. 01020)	; &I-M-01020;
+    (=shinjigen		.  0368)	; &GT-01298;
+    (mojikyo		. 059099)	; &MCS-6000E6DB;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x50B4)	; 傴
       ))
+    (ideographic-radical . 9)	; ⼈
+    (ideographic-strokes . 11)
+    (total-strokes	 . 13)
+    (hanyu-dazidian	1 209 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
+      )
+     ((=cns11643-1	  . #x5934)	; &M-02691; [57-20]
+      (=daikanwa	  . 02691)	; &I-M-02691;
+      ))
+    (=ucs@cns		. #x50B4)	; &C2-415F;
+    (=cns11643-2	. #x415F)	; &C2-415F; [33-63]
+    (mojikyo		. 001020)	; &MCS-600003FC;
     ))
 (define-char
   '((ideographic-radical . 9)	; ⼈
@@ -26273,7 +26399,8 @@
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (=ucs		. #x50C5)	; 僅
-    (=jis-x0208@1997	. #x364F)	; 僅 [22-47]
+    (=>jis-x0208	. #x364F)	; 僅 [22-47]
+    (=>jis-x0213-1	. #x364F)	; 僅 [22-47]
     ))
 (define-char
   '((<-denotational
@@ -26958,7 +27085,7 @@
        ((name		    . "CJK RADICAL PERSON")
 	(=ucs		    . #x2E85)	; ⺅
 	)
-       ((=ks-x1001	    . #x582B)	; &M-47887; [56-11]
+       ((=ks-x1001	    . #x582B)	; &GT-65256; [56-11]
 	(=daikanwa	    . 47887)	; &I-M-47887;
 	))
       (=daikanwa	  . 01065)	; &M-01065;
@@ -27186,7 +27313,7 @@
 (define-char
   '((ideographic-radical . 9)	; ⼈
     (=ucs		. #x50E7)	; 僧
-    (=jis-x0208@1997	. #x414E)	; 僧 [33-46]
+    (=>jis-x0208@1997	. #x414E)	; 僧 [33-46]
     ))
 (define-char
   '((<-denotational
@@ -27197,6 +27324,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 13)
     (=ucs		. #x2F80A)	; 僧
+    (=>jis-x0213-1	. #x414E)	; 僧 [33-46]
     ))
 (define-char
   '((<-denotational
@@ -27500,7 +27628,8 @@
        ((name		    . "CJK RADICAL PERSON")
 	(=ucs		    . #x2E85)	; ⺅
 	)
-       ((=cns11643-1	    . #x5E78)	; &C1-5E78; [62-88]
+       ((=ucs@cns	    . #x5DFD)	; &C1-5E78;
+	(=cns11643-1	    . #x5E78)	; &C1-5E78; [62-88]
 	))
       (=cns11643-1	  . #x677C)	; &C1-677C; [71-92]
       ))
@@ -27511,8 +27640,9 @@
     (total-strokes	 . 14)
     (hanyu-dazidian	1 213 3)
     (=ucs		. #x50CF)	; 像
+    (=>jis-x0208	. #x417C)	; 像 [33-92]
+    (=>jis-x0213-1	. #x417C)	; 像 [33-92]
     (=big5		. #xB9B3)	; &I-B-B9B3;
-    (=jis-x0208@1997	. #x417C)	; 像 [33-92]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -28943,7 +29073,6 @@
 	(=ucs		    . #x2E85)	; ⺅
 	)
        ((=ucs@jis	    . #x6562)	; &GT-16742;
-	(=ucs@big5	    . #x6562)	; &GT-16742;
 	(=ks-x1001	    . #x4A72)	; &GT-16742; [42-82]
 	(=jis-x0208@1990    . #x343A)	; &I-J90-343A; [20-26]
 	(=cns11643-1	    . #x5F56)	; &I-C1-5F56; [63-54]
@@ -30164,35 +30293,26 @@
     (mojikyo		. 001157)	; &MCS-60000485;
     ))
 (define-char
-  '((ideographic-	(:radical	9 ; ⼈
-			 :strokes	12
-			 :sources	(ucs))
-			(:radical	89 ; ⽘
-			 :strokes	10
-			 :sources	(morohashi-daikanwa cns-11643)))
+  '((ideographic-radical@ucs . 9)	; ⼈
+    (ideographic-strokes@ucs . 12)
+    (ideographic-radical@cns . 89)	; ⽘
+    (ideographic-strokes@cns . 10)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (ideographic-strokes@cns*sources
+     daikanwa)
     (total-strokes	 . 14)
     (hanyu-dazidian	1 216 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=big5-cdp	  . #x8AFC)	; &CDP-8AFC;
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x723B)	; 爻
-	)
-       ((=ucs		    . #x723B)	; 爻
-	))
-      )
-     ((=ucs		  . #x5140)	; 兀
-      ))
     (=ucs		. #x2039B)	; 𠎛
     (=cns11643-6	. #x5E57)	; &I-C6-5E57; [62-55]
     (=daikanwa		. 19751)	; &I-M-19751;
     (=hanziku-1		. #xD2C7)	; &I-HZK01-D2C7;
+    (<-same
+     ((=ucs		  . #x24564)	; 𤕤
+      (=daikanwa	  . 19748)	; &I-M-19748;
+      ))
+    (<-same*sources
+     ermuzi daikanwa)
     ))
 (define-char
   '((=>ucs*		. #x50CF)	; 像
@@ -31300,6 +31420,15 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 13)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
+      )
+     ((=ucs		  . #x9041)	; 遁
+      ))
     (=ucs		. #x203BB)	; 𠎻
     ))
 (define-char
@@ -31317,8 +31446,10 @@
      ((name		  . "CJK RADICAL PERSON")
       (=ucs		  . #x2E85)	; ⺅
       )
-     ((=jis-x0208@1978	  . #x465B)	; &M-38982; [38-59]
+     ((=ucs@jis/2004	  . #x9041)	; &M-38982;
+      (=jis-x0208@1978	  . #x465B)	; &M-38982; [38-59]
       (=ks-x1001	  . #x546D)	; &I-K0-546D; [52-77]
+      (=jis-x0213-1@2004  . #x465B)	; &I-JX3-465B; [38-59]
       (=daikanwa	  . 38982)	; &I-M-38982;
       ))
     (=daikanwa		. 01182)	; &M-01182;
@@ -33845,6 +33976,7 @@
       )
      ((=jis-x0208@1978	  . #x5622)	; &M-07734; [54-02]
       (=ks-x1001	  . #x5C33)	; &I-K0-5C33; [60-19]
+      (=jis-x0213-1@2004  . #x7E7B)	; &I-JX3-7E7B; [94-91]
       (=daikanwa	  . 07734)	; &I-M-07734;
       ))
     (=daikanwa		. 01053)	; &M-01053;
@@ -33997,7 +34129,7 @@
       (=jis-x0208	  . #x4A4E)	; &GT-42131; [42-46]
       (=gb2312		  . #x436F)	; &I-G0-436F; [35-79]
       (=ks-x1001	  . #x5921)	; &I-K0-5921; [57-01]
-      (=jis-x0213-1	  . #x4A4E)	; &I-JX1-4A4E; [42-46]
+      (=jis-x0213-1@2000  . #x4A4E)	; &I-JX1-4A4E; [42-46]
       ))
     (=ucs@unicode	. #x349D)	; &UU+349D;
     ))
@@ -34839,6 +34971,15 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
+      )
+     ((=ucs		  . #x7FEB)	; ç¿«
+      ))
     (=ucs		. #x20422)	; 𠐢
     ))
 (define-char
@@ -34849,17 +34990,6 @@
     (ideographic-strokes . 15)
     (total-strokes	 . 17)
     (hanyu-dazidian	1 235 16)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((name		  . "CJK RADICAL PERSON")
-      (=ucs		  . #x2E85)	; ⺅
-      )
-     ((=jis-x0208@1978	  . #x3465)	; &M-28766; [20-69]
-      (=ks-x1001	  . #x6851)	; &I-K0-6851; [72-49]
-      (=daikanwa	  . 28766)	; &I-M-28766;
-      ))
     (=daikanwa		. 01272)	; &M-01272;
     (=hanziku-1		. #xD6BF)	; &I-HZK01-D6BF;
     (mojikyo		. 001272)	; &MCS-600004F8;
@@ -34878,10 +35008,11 @@
      ((name		  . "CJK RADICAL PERSON")
       (=ucs		  . #x2E85)	; ⺅
       )
-     ((=ucs@jis		  . #x7FEB)	; &GT-37114;
+     ((=ucs@jis/1990	  . #x7FEB)	; &GT-37114;
+      (=ucs@jis/2000	  . #x7FEB)	; &GT-37114;
       (=jis-x0208@1983	  . #x3465)	; &GT-37114; [20-69]
       (=cns11643-2	  . #x527E)	; &I-C2-527E; [50-94]
-      (=jis-x0213-1	  . #x3465)	; &I-JX1-3465; [20-69]
+      (=jis-x0213-1@2000  . #x3465)	; &I-JX1-3465; [20-69]
       ))
     (=ucs@iso		. #x20422)	; &C7-3674;
     (=cns11643-7	. #x3674)	; &C7-3674; [22-84]
@@ -35546,8 +35677,9 @@
   '((ideographic-radical . 9)	; ⼈
     (hanyu-dazidian	1 235 9)
     (=ucs		. #x5132)	; 儲
+    (=>jis-x0208	. #x4C59)	; 儲 [44-57]
+    (=>jis-x0213-1	. #x4C59)	; 儲 [44-57]
     (=big5		. #xC078)	; &I-B-C078;
-    (=jis-x0208@1997	. #x4C59)	; 儲 [44-57]
     ))
 (define-char
   '((<-denotational
@@ -35566,6 +35698,7 @@
      ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA22")
       (=ucs		  . #xFA22)	; 諸
       ))
+    (=ucs@jis/2004	. #x5132)	; &GT-01660;
     (=jis-x0208@1978	. #x4C59)	; &GT-01660; [44-57]
     (=ks-x1001		. #x6E39)	; &I-K0-6E39; [78-25]
     (=jis-x0213-1@2004	. #x4C59)	; &I-JX3-4C59; [44-57]
@@ -35781,6 +35914,15 @@
   '((ideographic-radical . 9)	; ⼈
     (ideographic-strokes . 16)
     (total-strokes	 . 18)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((name		  . "CJK RADICAL PERSON")
+      (=ucs		  . #x2E85)	; ⺅
+      )
+     ((=ucs		  . #x95BB)	; 閻
+      ))
     (=ucs		. #x20429)	; 𠐩
     (->subsumptive
      ((morohashi-daikanwa	ho 28)
@@ -35793,7 +35935,7 @@
 	)
        ((=ucs@jis	    . #x95BB)	; &GT-55612;
 	(=ucs@ks	    . #x95BB)	; &GT-55612;
-	(=jis-x0208	    . #x6F65)	; &GT-55612; [79-69]
+	(=jis-x0208@1983    . #x6F65)	; &GT-55612; [79-69]
 	(=ks-x1001	    . #x6722)	; &I-K0-6722; [71-02]
 	(=jis-x0213-1	    . #x6F65)	; &I-JX1-6F65; [79-69]
 	))
@@ -36767,8 +36909,9 @@
     (ideographic-strokes . 19)
     (total-strokes	 . 21)
     (=ucs		. #x5137)	; 儷
+    (=>jis-x0208	. #x5136)	; 儷 [49-22]
+    (=>jis-x0213-1	. #x5136)	; 儷 [49-22]
     (=big5		. #xC4D7)	; &I-B-C4D7;
-    (=jis-x0208@1997	. #x5136)	; 儷 [49-22]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
diff --git a/lisp/utf-2000/Ideograph-R010-Legs.el b/lisp/utf-2000/Ideograph-R010-Legs.el
index 9f7c39e..9efc176 100644
--- a/lisp/utf-2000/Ideograph-R010-Legs.el
+++ b/lisp/utf-2000/Ideograph-R010-Legs.el
@@ -347,7 +347,8 @@
     (sound@ja/kun	"kiza+s5" "kizasi")
     (sound@ja/on/kan	"tEu")
     (=ucs		. #x5146)	; 兆
-    (=jis-x0208@1997	. #x437B)	; 兆 [35-91]
+    (=>jis-x0208	. #x437B)	; 兆 [35-91]
+    (=>jis-x0213-1	. #x437B)	; 兆 [35-91]
     (->subsumptive
      ((=jis-x0208@1978	  . #x437B)	; &M-01347; [35-91]
       (=jis-x0208@1983	  . #x437B)	; &I-J83-437B; [35-91]
@@ -632,6 +633,13 @@
     (mojikyo		. 001355)	; &MCS-6000054B;
     ))
 (define-char
+  '((ideographic-radical . 10)	; ⼉
+    (ideographic-strokes . 5)
+    (total-strokes	 . 7)
+    (=ucs@big5		. #x514C)	; &B-A749;
+    (=big5		. #xA749)	; &B-A749;
+    ))
+(define-char
   '((<-denotational
      ((=ucs@big5	  . #x514C)	; &B-A749;
       (=big5		  . #xA749)	; &B-A749;
@@ -640,6 +648,14 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
     (hanyu-dazidian	1 271 1)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x516B)	; 八
+      )
+     ((=ucs		  . #x5144)	; 兄
+      ))
     (sound@ja/on	"da")
     (=ucs		. #x514C)	; 兌
     (->subsumptive
@@ -681,7 +697,8 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x516B)	; 八
+       ((=ucs@unicode	    . #x516B)	; &G0-304B;
+	(=gb2312	    . #x304B)	; &G0-304B; [16-43]
 	)
        ((=ucs		    . #x5144)	; 兄
 	))
@@ -689,13 +706,6 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 10)	; ⼉
-    (ideographic-strokes . 5)
-    (total-strokes	 . 7)
-    (=ucs@big5		. #x514C)	; &B-A749;
-    (=big5		. #xA749)	; &B-A749;
-    ))
-(define-char
   '((<-denotational
      ((=ucs@big5	  . #x514C)	; &B-A749;
       (=big5		  . #xA749)	; &B-A749;
@@ -720,6 +730,14 @@
   '((ideographic-radical . 10)	; ⼉
     (ideographic-strokes . 5)
     (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4EA0)	; 亠
+      )
+     ((=ucs		  . #x5144)	; 兄
+      ))
     (=ucs		. #x2047D)	; 𠑽
     (->subsumptive
      ((ideographic-structure
@@ -740,7 +758,9 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
 	(=ucs		    . #x2FF1)	; ⿱
 	)
-       ((=ucs		    . #x4EA0)	; 亠
+       ((=ucs@unicode	    . #x4EA0)	; &GT-00375;
+	(=gb2312	    . #x596F)	; &GT-00375; [57-79]
+	(=daikanwa	    . 00286)	; &I-M-00286;
 	)
        ((=ucs		    . #x5144)	; 兄
 	))
@@ -755,6 +775,7 @@
     (sound@ja/kun	"manuka-r+eru" "manuga-r+eru")
     (sound@ja/on/go	"men")
     (=ucs		. #x514D)	; 免
+    (=>jis-x0208@1997	. #x4C48)	; 免 [44-40]
     (=big5		. #xA74B)	; &I-B-A74B;
     ))
 (define-char
@@ -775,6 +796,7 @@
       )
      ((=big5-cdp	  . #x8BCB)	; &CDP-8BCB;
       ))
+    (=>jis-x0213-1	. #x2E50)	; &A-JX1-2E50; [14-48]
     (->subsumptive
      ((=>ucs*		  . #x514D)	; 免
       (=ucs		  . #xFA32)	; 免
@@ -793,39 +815,42 @@
   '((<-denotational
      ((=ucs		  . #x514D)	; 免
       ))
-    (ideographic-strokes . 5)
-    (total-strokes	 . 7)
-    (hanyu-dazidian	1 270 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=big5-cdp	  . #x8B5B)	; &CDP-8B5B;
+    (ideographic-radical . 10)	; ⼉
+    (=>jis-x0213-1	. #x4C48)	; &A-JX1-4C48; [44-40]
+    (->subsumptive
+     ((ideographic-strokes . 5)
+      (total-strokes	   . 7)
+      (->subsumptive
+       ((hanyu-dazidian	    1 270 9)
+	(ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=big5-cdp	      . #x8B5B)	; &CDP-8B5B;
+	  )
+	 ((=big5-cdp	      . #x8BCB)	; &CDP-8BCB;
+	  ))
+	(=ucs@unicode	    . #x514D)	; &C1-492D;
+	(=gb2312	    . #x4362)	; &C1-492D; [35-66]
+	(=ks-x1001	    . #x5873)	; &I-K0-5873; [56-83]
+	(=cns11643-1	    . #x492D)	; &I-C1-492D; [41-13]
+	)
+       ((mojikyo	    . 001358)	; &MCS-6000054E;
+	))
       )
-     ((=big5-cdp	  . #x8BCB)	; &CDP-8BCB;
-      ))
-    (=ucs@unicode	. #x514D)	; &C1-492D;
-    (=gb2312		. #x4362)	; &C1-492D; [35-66]
-    (=ks-x1001		. #x5873)	; &I-K0-5873; [56-83]
-    (=cns11643-1	. #x492D)	; &I-C1-492D; [41-13]
-    (mojikyo		. 001358)	; &MCS-6000054E;
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x514D)	; 免
-      ))
-    (ideographic-strokes . 6)
-    (total-strokes	 . 8)
-    (=ucs@jis		. #x514D)	; &GT-01783;
-    (=jis-x0208		. #x4C48)	; &GT-01783; [44-40]
-    (=jis-x0213-1	. #x4C48)	; &I-JX1-4C48; [44-40]
-    (=gt		. 01783)	; &I-GT-01783;
-    (=gt-k		. 03837)	; &I-GT-K03837;
-    (=gt-pj-1		. #x4C48)	; &I-GT-01783; [44-40]
-    (=shinjigen		.  0470)	; &GT-01783;
-    (mojikyo		. 054386)	; &MCS-6000D472;
-    (<-simplified@JP/Jouyou
-     ((=ucs		  . #xFA32)	; 免
+     ((ideographic-strokes . 6)
+      (total-strokes	   . 8)
+      (=ucs@jis		  . #x514D)	; &GT-01783;
+      (=jis-x0208	  . #x4C48)	; &GT-01783; [44-40]
+      (=jis-x0213-1	  . #x4C48)	; &I-JX1-4C48; [44-40]
+      (=gt		  . 01783)	; &I-GT-01783;
+      (=gt-k		  . 03837)	; &I-GT-K03837;
+      (=gt-pj-1		  . #x4C48)	; &I-GT-01783; [44-40]
+      (=shinjigen	  .  0470)	; &GT-01783;
+      (mojikyo		  . 054386)	; &MCS-6000D472;
+      (<-simplified@JP/Jouyou
+       ((=ucs		    . #xFA32)	; 免
+	))
       ))
     ))
 (define-char
@@ -833,38 +858,42 @@
     (sound@ja/kun	"usagi" "u")
     (sound@ja/on/kan	"to")
     (=ucs		. #x514E)	; 兎
+    (=>jis-x0208	. #x4546)	; 兎 [37-38]
+    (=>jis-x0213-1	. #x4546)	; 兎 [37-38]
     (->subsumptive
      ((ideographic-strokes . 5)
       (total-strokes	   . 7)
-      (hanyu-dazidian	  1 270 5)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
+      (=>>jis-x0213-1@2004 . #x4546)	; &G-JX3-4546; [37-38]
+      (->subsumptive
+       ((=cns11643-3	    . #x2454)	; &M-01359; [04-52]
+	(=daikanwa	    . 01359)	; &I-M-01359;
+	(mojikyo	    . 001359)	; &MCS-6000054F;
+	(<-vulgar
+	 ((=ucs		      . #x2F80F)	; 兔
+	  (=daikanwa	      . 01368)	; &I-M-01368;
+	  ))
+	(<-vulgar*sources
+	 zhengzitong daikanwa)
 	)
-       ((=ucs		    . #x4E3F)	; 丿
+       ((=gt		    . 01764)	; &GT-01764;
+	(=gt-pj-2	    . #x3B5B)	; &GT-01764; [27-59]
 	)
-       ((ideographic-structure
-	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-	  (=ucs		      . #x2FF7)	; â¿·
-	  )
-	 ((=big5-cdp	      . #x89B9)	; &CDP-89B9;
-	  )
-	 ((=ucs		      . #x4E36)	; 丶
-	  ))
+       ((=ucs@jis/2004	    . #x514E)	; &JX3-4546;
+	(=jis-x0213-1@2004  . #x4546)	; &JX3-4546; [37-38]
+	(=shinjigen	    .  0469)	; &JX3-4546;
+	)
+       ((hanyu-dazidian	    1 270 5)
+	(=ucs@unicode	    . #x514E)	; &HZK01-DDC9;
+	(=hanziku-1	    . #xDDC9)	; &HZK01-DDC9;
 	))
-      (=ucs@unicode	  . #x514E)	; &M-01359;
-      (=ks-x1001	  . #x774D)	; &M-01359; [87-45]
-      (=cns11643-3	  . #x2454)	; &I-C3-2454; [04-52]
-      (=daikanwa	  . 01359)	; &I-M-01359;
-      (=shinjigen	  .  0469)	; &M-01359;
-      (=hanziku-1	  . #xDDC9)	; &I-HZK01-DDC9;
-      (mojikyo		  . 001359)	; &MCS-6000054F;
       )
      ((ideographic-strokes . 6)
       (total-strokes	   . 8)
-      (=ucs@jis		  . #x514E)	; &GT-01782;
+      (=ucs@jis/1990	  . #x514E)	; &GT-01782;
+      (=ucs@jis/2000	  . #x514E)	; &GT-01782;
       (=jis-x0208	  . #x4546)	; &GT-01782; [37-38]
-      (=jis-x0213-1	  . #x4546)	; &I-JX1-4546; [37-38]
+      (=ks-x1001	  . #x774D)	; &I-K0-774D; [87-45]
+      (=jis-x0213-1@2000  . #x4546)	; &I-JX1-4546; [37-38]
       (=gt		  . 01782)	; &I-GT-01782;
       (=gt-pj-1		  . #x4546)	; &I-GT-01782; [37-38]
       (=jef-china3	  . #x43DA)	; &I-JC3-43DA;
@@ -1136,7 +1165,8 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 8)
     (=ucs		. #x5154)	; 兔
-    (=jis-x0208@1997	. #x513D)	; 兔 [49-29]
+    (=>jis-x0208	. #x513D)	; 兔 [49-29]
+    (=>jis-x0213-1	. #x513D)	; 兔 [49-29]
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R011-Enter.el b/lisp/utf-2000/Ideograph-R011-Enter.el
index d1091bd..c5a276a 100644
--- a/lisp/utf-2000/Ideograph-R011-Enter.el
+++ b/lisp/utf-2000/Ideograph-R011-Enter.el
@@ -120,10 +120,28 @@
     (=hanziku-12	. #xEB63)	; &I-HZK12-EB63;
     ))
 (define-char
+  '((ideographic-radical@ucs . 13)	; ⼌
+    (ideographic-strokes@ucs . 2)
+    (ideographic-radical@ucs*sources
+     daikanwa=01512 cns11643-6 ucs=0x5185)
+    (ideographic-radical@daikanwa . 11)	; ⼊
+    (ideographic-strokes@daikanwa . 2)
+    (ideographic-radical@daikanwa*sources
+     daikanwa=01418 cns11643-1 ucs=0x5167)
+    (ideographic-radical@cns-3 . 9)	; ⼈
+    (ideographic-strokes@cns-3 . 2)
+    (ideographic-radical@cns-3*sources
+     cns11643-3 daikanwa=366-1)
+    (total-strokes	 . 4)
+    (=ucs@big5		. #x5167)	; &J97-4662;
+    (=>jis-x0208	. #x4662)	; &J97-4662; [38-66]
+    (=>jis-x0213-1	. #x4662)	; &J97-4662; [38-66]
+    (=big5		. #xA4BA)	; &J97-4662;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x5167)	; &B-A4BA;
-      (=big5		  . #xA4BA)	; &B-A4BA;
-      (=jis-x0208@1997	  . #x4662)	; &B-A4BA; [38-66]
+     ((=ucs@big5	  . #x5167)	; &J97-4662;
+      (=>jis-x0208	  . #x4662)	; &J97-4662; [38-66]
       ))
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 2)
@@ -143,28 +161,9 @@
       ))
     ))
 (define-char
-  '((ideographic-radical@ucs . 13)	; ⼌
-    (ideographic-strokes@ucs . 2)
-    (ideographic-radical@ucs*sources
-     daikanwa=01512 cns11643-6 ucs=0x5185)
-    (ideographic-radical@daikanwa . 11)	; ⼊
-    (ideographic-strokes@daikanwa . 2)
-    (ideographic-radical@daikanwa*sources
-     daikanwa=01418 cns11643-1 ucs=0x5167)
-    (ideographic-radical@cns-3 . 9)	; ⼈
-    (ideographic-strokes@cns-3 . 2)
-    (ideographic-radical@cns-3*sources
-     cns11643-3 daikanwa=366-1)
-    (total-strokes	 . 4)
-    (=ucs@big5		. #x5167)	; &B-A4BA;
-    (=big5		. #xA4BA)	; &B-A4BA;
-    (=jis-x0208@1997	. #x4662)	; &B-A4BA; [38-66]
-    ))
-(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x5167)	; &B-A4BA;
-      (=big5		  . #xA4BA)	; &B-A4BA;
-      (=jis-x0208@1997	  . #x4662)	; &B-A4BA; [38-66]
+     ((=ucs@big5	  . #x5167)	; &J97-4662;
+      (=>jis-x0208	  . #x4662)	; &J97-4662; [38-66]
       ))
     (ideographic-radical@ucs . 13)	; ⼌
     (ideographic-strokes@ucs . 2)
@@ -876,6 +875,31 @@
     (ideographic-radical . 11)	; ⼊
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=big5-cdp	  . #x8AFC)	; &CDP-8AFC;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00607)	; &GT-K00607;
+	)
+       ((=ucs		    . #x5DDC)	; 巜
+	))
+      ))
+    (=gt-k		. 05210)	; &GT-K05210;
+    (=gt-pj-k1		. #x3A39)	; &GT-K05210; [26-25]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x516A)	; 兪
+      ))
+    (ideographic-radical . 11)	; ⼊
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
     (hanyu-dazidian	1 155 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
diff --git a/lisp/utf-2000/Ideograph-R012-Eight.el b/lisp/utf-2000/Ideograph-R012-Eight.el
index 955fee9..5fad268 100644
--- a/lisp/utf-2000/Ideograph-R012-Eight.el
+++ b/lisp/utf-2000/Ideograph-R012-Eight.el
@@ -59,8 +59,9 @@
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
     (=ucs		. #x516C)	; 公
+    (=>jis-x0208	. #x3878)	; 公 [24-88]
+    (=>jis-x0213-1	. #x3878)	; 公 [24-88]
     (=big5		. #xA4BD)	; &I-B-A4BD;
-    (=jis-x0208@1997	. #x3878)	; 公 [24-88]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
diff --git a/lisp/utf-2000/Ideograph-R013-Down-Box.el b/lisp/utf-2000/Ideograph-R013-Down-Box.el
index f55c564..6980613 100644
--- a/lisp/utf-2000/Ideograph-R013-Down-Box.el
+++ b/lisp/utf-2000/Ideograph-R013-Down-Box.el
@@ -175,10 +175,28 @@
     (=daikanwa		. 01511)	; &I-M-01511;
     ))
 (define-char
+  '((ideographic-radical@ucs . 13)	; ⼌
+    (ideographic-strokes@ucs . 2)
+    (ideographic-radical@ucs*sources
+     daikanwa=01512 cns11643-6 ucs=0x5185)
+    (ideographic-radical@daikanwa . 11)	; ⼊
+    (ideographic-strokes@daikanwa . 2)
+    (ideographic-radical@daikanwa*sources
+     daikanwa=01418 cns11643-1 ucs=0x5167)
+    (ideographic-radical@cns-3 . 9)	; ⼈
+    (ideographic-strokes@cns-3 . 2)
+    (ideographic-radical@cns-3*sources
+     cns11643-3 daikanwa=366-1)
+    (total-strokes	 . 4)
+    (=ucs@big5		. #x5167)	; &J97-4662;
+    (=>jis-x0208	. #x4662)	; &J97-4662; [38-66]
+    (=>jis-x0213-1	. #x4662)	; &J97-4662; [38-66]
+    (=big5		. #xA4BA)	; &J97-4662;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x5167)	; &B-A4BA;
-      (=big5		  . #xA4BA)	; &B-A4BA;
-      (=jis-x0208@1997	  . #x4662)	; &B-A4BA; [38-66]
+     ((=ucs@big5	  . #x5167)	; &J97-4662;
+      (=>jis-x0208	  . #x4662)	; &J97-4662; [38-66]
       ))
     (ideographic-radical@ucs . 13)	; ⼌
     (ideographic-strokes@ucs . 2)
@@ -213,24 +231,6 @@
      daikanwa)
     ))
 (define-char
-  '((ideographic-radical@ucs . 13)	; ⼌
-    (ideographic-strokes@ucs . 2)
-    (ideographic-radical@ucs*sources
-     daikanwa=01512 cns11643-6 ucs=0x5185)
-    (ideographic-radical@daikanwa . 11)	; ⼊
-    (ideographic-strokes@daikanwa . 2)
-    (ideographic-radical@daikanwa*sources
-     daikanwa=01418 cns11643-1 ucs=0x5167)
-    (ideographic-radical@cns-3 . 9)	; ⼈
-    (ideographic-strokes@cns-3 . 2)
-    (ideographic-radical@cns-3*sources
-     cns11643-3 daikanwa=366-1)
-    (total-strokes	 . 4)
-    (=ucs@big5		. #x5167)	; &B-A4BA;
-    (=big5		. #xA4BA)	; &B-A4BA;
-    (=jis-x0208@1997	. #x4662)	; &B-A4BA; [38-66]
-    ))
-(define-char
   '((<-denotational
      ((=ucs		  . #x5185)	; 内
       ))
@@ -373,7 +373,8 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (=ucs		. #x5189)	; 冉
-    (=jis-x0208@1997	. #x5147)	; 冉 [49-39]
+    (=>jis-x0208	. #x5147)	; 冉 [49-39]
+    (=>jis-x0213-1	. #x5147)	; 冉 [49-39]
     ))
 (define-char
   '((<-denotational
@@ -1490,8 +1491,14 @@
       ))
     ))
 (define-char
+  '((ideographic-radical@daikanwa=01546 . 13)	; ⼌
+    (ideographic-radical@daikanwa=13950 . 72)	; ⽇
+    (=>jis-x0208	. #x5A70)	; &J97-5A70; [58-80]
+    (=>jis-x0213-1	. #x5A70)	; &J97-5A70; [58-80]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5A70)	; &J97-5A70; [58-80]
+     ((=>jis-x0208	  . #x5A70)	; &J97-5A70; [58-80]
       ))
     (ideographic-radical . 13)	; ⼌
     (=ucs		. #x20560)	; 𠕠
@@ -1519,11 +1526,6 @@
       ))
     ))
 (define-char
-  '((ideographic-radical@daikanwa=01546 . 13)	; ⼌
-    (ideographic-radical@daikanwa=13950 . 72)	; ⽇
-    (=jis-x0208@1997	. #x5A70)	; &J97-5A70; [58-80]
-    ))
-(define-char
   '((ideographic-radical . 13)	; ⼌
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
diff --git a/lisp/utf-2000/Ideograph-R014-Cover.el b/lisp/utf-2000/Ideograph-R014-Cover.el
index 2de0679..1d52313 100644
--- a/lisp/utf-2000/Ideograph-R014-Cover.el
+++ b/lisp/utf-2000/Ideograph-R014-Cover.el
@@ -604,9 +604,18 @@
     ))
 (define-char
   '((ideographic-radical . 14)	; ⼍
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x5196)	; 冖
+      )
+     ((=ucs		  . #x5154)	; 兔
+      ))
     (=ucs		. #x51A4)	; 冤
+    (=>jis-x0208	. #x514D)	; 冤 [49-45]
+    (=>jis-x0213-1	. #x514D)	; 冤 [49-45]
     (=big5		. #xADDE)	; &I-B-ADDE;
-    (=jis-x0208@1997	. #x514D)	; 冤 [49-45]
     ))
 (define-char
   '((<-denotational
@@ -625,8 +634,10 @@
      ((=ucs		  . #x2F80F)	; 兔
       ))
     (=ucs		. #x2F818)	; 冤
+    (=ucs@jis/2004	. #x51A4)	; 冤
     (=jis-x0208@1978	. #x514D)	; &I-J78-514D; [49-45]
     (=cns11643-6	. #x3544)	; &I-C6-3544; [21-36]
+    (=jis-x0213-1@2004	. #x514D)	; &I-JX3-514D; [49-45]
     (=daikanwa		. 01587)	; &I-M-01587;
     (=shinjigen		.  0529)	; 冤
     ))
@@ -635,6 +646,7 @@
      ((=ucs		  . #x51A4)	; 冤
       ))
     (ideographic-radical . 14)	; ⼍
+    (=>>jis-x0213-1@2000 . #x514D)	; &G-JX1-514D; [49-45]
     (->subsumptive
      ((ideographic-strokes . 8)
       (total-strokes	   . 10)
@@ -656,7 +668,7 @@
       (=jis-x0208@1983	  . #x514D)	; &I-J83-514D; [49-45]
       (=jis-x0208@1990	  . #x514D)	; &I-J90-514D; [49-45]
       (=cns11643-1	  . #x5441)	; &I-C1-5441; [52-33]
-      (=jis-x0213-1	  . #x514D)	; &I-JX1-514D; [49-45]
+      (=jis-x0213-1@2000  . #x514D)	; &I-JX1-514D; [49-45]
       (=gt		  . 02089)	; &I-GT-02089;
       (=gt-k		  . 06575)	; &I-GT-K06575;
       (=gt-pj-1		  . #x514D)	; &I-GT-02089; [49-45]
diff --git a/lisp/utf-2000/Ideograph-R015-Ice.el b/lisp/utf-2000/Ideograph-R015-Ice.el
index e6b6e65..d2bc832 100644
--- a/lisp/utf-2000/Ideograph-R015-Ice.el
+++ b/lisp/utf-2000/Ideograph-R015-Ice.el
@@ -230,7 +230,8 @@
 (define-char
   '((ideographic-radical . 15)	; ⼎
     (=ucs		. #x51B4)	; 冴
-    (=jis-x0208@1997	. #x3A63)	; 冴 [26-67]
+    (=>jis-x0208	. #x3A63)	; 冴 [26-67]
+    (=>jis-x0213-1	. #x3A63)	; 冴 [26-67]
     (->subsumptive
      ((ideographic-strokes . 4)
       (total-strokes	   . 6)
@@ -1284,8 +1285,7 @@
 	)
        ((=ucs		    . #x51AB)	; 冫
 	)
-       ((=ucs@big5	    . #x677E)	; &M-14516;
-	(=jis-x0208@1978    . #x3E3E)	; &M-14516; [30-30]
+       ((=jis-x0208@1978    . #x3E3E)	; &M-14516; [30-30]
 	(=jis-x0208@1983    . #x3E3E)	; &I-J83-3E3E; [30-30]
 	(=ks-x1001	    . #x6166)	; &I-K0-6166; [65-70]
 	(=daikanwa	    . 14516)	; &I-M-14516;
diff --git a/lisp/utf-2000/Ideograph-R018-Knife.el b/lisp/utf-2000/Ideograph-R018-Knife.el
index 077427b..a58888c 100644
--- a/lisp/utf-2000/Ideograph-R018-Knife.el
+++ b/lisp/utf-2000/Ideograph-R018-Knife.el
@@ -4529,26 +4529,43 @@
     (=daikanwa		. 02048)	; &I-M-02048;
     ))
 (define-char
+  '((ideographic-radical . 18)	; ⼑
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (=>jis-x0208@1997	. #x476D)	; &J97-476D; [39-77]
+    (=>jis-x0213-1@2000 . #x476D)	; &J97-476D; [39-77]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x476D)	; &J97-476D; [39-77]
+     ((=>jis-x0208@1997	  . #x476D)	; &J97-476D; [39-77]
       ))
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
     (hanyu-dazidian	1 346 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5F54)	; 彔
+      )
+     ((name		  . "CJK RADICAL KNIFE TWO")
+      (=ucs		  . #x2E89)	; ⺉
+      ))
     (=ucs		. #x525D)	; 剝
+    (=>jis-x0213-1@2004 . #x2F7E)	; 剝 [15-94]
     (=big5		. #xADE9)	; &I-B-ADE9;
     (->subsumptive
-     ((=jis-x0208@1978	  . #x476D)	; &M-02049; [39-77]
-      (=daikanwa	  . 02049)	; &I-M-02049;
-      (=shinjigen	  .  0666)	; &M-02049;
+     ((=daikanwa	  . 02049)	; &M-02049;
       )
      ((=gt		  . 02661)	; &GT-02661;
       (=gt-k		  . 07286)	; &I-GT-K07286;
       (=gt-pj-2		  . #x417C)	; &GT-02661; [33-92]
       )
-     ((=ks-x1001	  . #x5A4E)	; &K0-5A4E; [58-46]
-      (=shinjigen	  .  0666)	; &M-02049;
+     ((=jis-x0208@1978	  . #x476D)	; &JX3-2F7E; [39-77]
+      (=ks-x1001	  . #x5A4E)	; &I-K0-5A4E; [58-46]
+      (=jis-x0213-1@2004  . #x2F7E)	; &I-JX3-2F7E; [15-94]
+      (=shinjigen	  .  0666)	; &JX3-2F7E;
       )
      ((=ucs@unicode	  . #x525D)	; &UU+525D;
       )
@@ -4568,12 +4585,6 @@
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
-    (=jis-x0208@1997	. #x476D)	; &J97-476D; [39-77]
-    ))
-(define-char
-  '((ideographic-radical . 18)	; ⼑
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
     (=ucs		. #x2073B)	; 𠜻
     (=cns11643-4	. #x2B6C)	; &I-C4-2B6C; [11-76]
     (=daikanwa		. 02050)	; &I-M-02050;
@@ -5049,12 +5060,22 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x476D)	; &J97-476D; [39-77]
+     ((=>jis-x0208@1997	  . #x476D)	; &J97-476D; [39-77]
       ))
     (ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5F55)	; 录
+      )
+     ((name		  . "CJK RADICAL KNIFE TWO")
+      (=ucs		  . #x2E89)	; ⺉
+      ))
     (=ucs		. #x5265)	; 剥
+    (=>jis-x0213-1@2004 . #x476D)	; 剥 [39-77]
     (->subsumptive
      ((=ucs@unicode	  . #x5265)	; &M-48939;
       (=gb2312		  . #x307E)	; &M-48939; [16-94]
@@ -5065,15 +5086,15 @@
       (=shinjigen	  .  0667)	; &M-48939;
       (=jef-china3	  . #x44D0)	; &I-JC3-44D0;
       (<-same
-       ((=jis-x0208@1978    . #x476D)	; &M-02049; [39-77]
-	(=daikanwa	    . 02049)	; &I-M-02049;
+       ((=daikanwa	    . 02049)	; &M-02049;
 	))
       (<-same*sources
        daikanwa)
       (<-vulgar
-       ((=jis-x0208@1978    . #x476D)	; &M-02049; [39-77]
-	(=daikanwa	    . 02049)	; &I-M-02049;
-	(=shinjigen	    .  0666)	; &M-02049;
+       ((=jis-x0208@1978    . #x476D)	; &JX3-2F7E; [39-77]
+	(=ks-x1001	    . #x5A4E)	; &I-K0-5A4E; [58-46]
+	(=jis-x0213-1@2004  . #x2F7E)	; &I-JX3-2F7E; [15-94]
+	(=shinjigen	    .  0666)	; &JX3-2F7E;
 	))
       (<-vulgar*sources
        shinjigen)
@@ -5097,6 +5118,15 @@
   '((ideographic-radical . 18)	; ⼑
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5944)	; 奄
+      )
+     ((name		  . "CJK RADICAL KNIFE TWO")
+      (=ucs		  . #x2E89)	; ⺉
+      ))
     (=ucs		. #x5266)	; 剦
     (->subsumptive
      ((morohashi-daikanwa	ho 50)
@@ -6248,8 +6278,9 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
     (=ucs		. #x5275)	; 創
+    (=>jis-x0208	. #x414F)	; 創 [33-47]
+    (=>jis-x0213-1	. #x414F)	; 創 [33-47]
     (=big5		. #xB3D0)	; &I-B-B3D0;
-    (=jis-x0208@1997	. #x414F)	; 創 [33-47]
     (->subsumptive
      ((hanyu-dazidian	  1 350 15)
       (ideographic-structure
diff --git a/lisp/utf-2000/Ideograph-R020-Wrap.el b/lisp/utf-2000/Ideograph-R020-Wrap.el
index a9e7c0b..f8c5fa5 100644
--- a/lisp/utf-2000/Ideograph-R020-Wrap.el
+++ b/lisp/utf-2000/Ideograph-R020-Wrap.el
@@ -20,8 +20,9 @@
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
     (=ucs		. #x52FA)	; 勺
+    (=>jis-x0208	. #x3C5B)	; 勺 [28-59]
+    (=>jis-x0213-1	. #x3C5B)	; 勺 [28-59]
     (=big5		. #xA463)	; &I-B-A463;
-    (=jis-x0208@1997	. #x3C5B)	; 勺 [28-59]
     ))
 (define-char
   '((<-denotational
@@ -80,6 +81,13 @@
     (=shinjigen		.  0762)	; ï©·
     ))
 (define-char
+  '((ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (=ucs@big5		. #x52FB)	; &B-A4C3;
+    (=big5		. #xA4C3)	; &B-A4C3;
+    ))
+(define-char
   '((<-denotational
      ((=ucs@big5	  . #x52FB)	; &B-A4C3;
       (=big5		  . #xA4C3)	; &B-A4C3;
@@ -109,13 +117,6 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
-    (ideographic-strokes . 2)
-    (total-strokes	 . 4)
-    (=ucs@big5		. #x52FB)	; &B-A4C3;
-    (=big5		. #xA4C3)	; &B-A4C3;
-    ))
-(define-char
   '((<-denotational
      ((=ucs@big5	  . #x52FB)	; &B-A4C3;
       (=big5		  . #xA4C3)	; &B-A4C3;
@@ -368,7 +369,8 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 5)
     (=ucs		. #x5305)	; 包
-    (=jis-x0208@1997	. #x4A71)	; 包 [42-81]
+    (=>jis-x0208	. #x4A71)	; 包 [42-81]
+    (=>jis-x0213-1	. #x4A71)	; 包 [42-81]
     ))
 (define-char
   '((<-denotational
@@ -478,8 +480,15 @@
     (=cns11643-5	. #x213D)	; &I-C5-213D; [01-29]
     ))
 (define-char
+  '((ideographic-radical . 20)	; ⼓
+    (ideographic-strokes . 3)
+    (total-strokes	 . 5)
+    (=>jis-x0208	. #x5232)	; &J97-5232; [50-18]
+    (=>jis-x0213-1	. #x5232)	; &J97-5232; [50-18]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5232)	; &J97-5232; [50-18]
+     ((=>jis-x0208	  . #x5232)	; &J97-5232; [50-18]
       ))
     (=>ucs*		. #x5306)	; 匆
     (ideographic-radical . 20)	; ⼓
@@ -507,14 +516,8 @@
      shinjigen@1ed)
     ))
 (define-char
-  '((ideographic-radical . 20)	; ⼓
-    (ideographic-strokes . 3)
-    (total-strokes	 . 5)
-    (=jis-x0208@1997	. #x5232)	; &J97-5232; [50-18]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5232)	; &J97-5232; [50-18]
+     ((=>jis-x0208	  . #x5232)	; &J97-5232; [50-18]
       ))
     (ideographic-radical . 20)	; ⼓
     (ideographic-strokes . 3)
diff --git a/lisp/utf-2000/Ideograph-R021-Spoon.el b/lisp/utf-2000/Ideograph-R021-Spoon.el
index 9f8613c..cb22f0a 100644
--- a/lisp/utf-2000/Ideograph-R021-Spoon.el
+++ b/lisp/utf-2000/Ideograph-R021-Spoon.el
@@ -1,7 +1,18 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (define-char
+  '((=>ucs@jis		. #x5315)	; 匕
+    (ideographic-radical . 21)	; ⼔
+    (ideographic-strokes . 0)
+    (total-strokes	 . 2)
+    (=ucs@big5		. #x5315)	; &J97-5238;
+    (=>jis-x0208	. #x5238)	; &J97-5238; [50-24]
+    (=>jis-x0213-1	. #x5238)	; &J97-5238; [50-24]
+    (=big5		. #xA450)	; &J97-5238;
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5238)	; &J97-5238; [50-24]
+     ((=ucs@big5	  . #x5315)	; &J97-5238;
+      (=>jis-x0208	  . #x5238)	; &J97-5238; [50-24]
       ))
     (ideographic-radical . 21)	; ⼔
     (ideographic-strokes . 0)
@@ -13,7 +24,6 @@
     (=jis-x0208@1990	. #x5238)	; &I-J90-5238; [50-24]
     (=cns11643-1	. #x4431)	; &I-C1-4431; [36-17]
     (=jis-x0213-1	. #x5238)	; &I-JX1-5238; [50-24]
-    (=big5		. #xA450)	; &I-B-A450;
     (=gt		. 03296)	; &I-GT-03296;
     (=gt-k		. 00092)	; &I-GT-K00092;
     (=gt-pj-1		. #x5238)	; &I-GT-03296; [50-24]
@@ -21,13 +31,6 @@
     (=shinjigen		.  0783)	; 匕
     ))
 (define-char
-  '((=>ucs@jis		. #x5315)	; 匕
-    (ideographic-radical . 21)	; ⼔
-    (ideographic-strokes . 0)
-    (total-strokes	 . 2)
-    (=jis-x0208@1997	. #x5238)	; &J97-5238; [50-24]
-    ))
-(define-char
   '((<-denotational
      ((=ucs		  . #x5315)	; 匕
       ))
@@ -41,7 +44,8 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5238)	; &J97-5238; [50-24]
+     ((=ucs@big5	  . #x5315)	; &J97-5238;
+      (=>jis-x0208	  . #x5238)	; &J97-5238; [50-24]
       ))
     (ideographic-radical . 21)	; ⼔
     (ideographic-strokes . 0)
diff --git a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
index 79178a7..a898c79 100644
--- a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
@@ -17,31 +17,38 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x5338)	; 匸
-    (ideographic-radical . 23)	; ⼖
+  '((ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 0)
     (total-strokes	 . 2)
-    (hanyu-dazidian	1 81 4)
-    (=ucs@jis		. #x5338)	; &GT-03427;
-    (=jis-x0208		. #x523E)	; &GT-03427; [50-30]
-    (=cns11643-3	. #x2129)	; &I-C3-2129; [01-09]
-    (=jis-x0213-1	. #x523E)	; &I-JX1-523E; [50-30]
-    (=big5-cdp		. #x8A70)	; &I-CDP-8A70;
-    (=gt		. 03427)	; &I-GT-03427;
-    (=gt-k		. 00096)	; &I-GT-K00096;
-    (=gt-pj-1		. #x523E)	; &I-GT-03427; [50-30]
-    (=daikanwa		. 02672)	; &I-M-02672;
-    (=shinjigen		.  0800)	; &GT-03427;
+    (=ucs		. #x5338)	; 匸
+    (->subsumptive
+     ((hanyu-dazidian	  1 81 4)
+      (=ucs@jis		  . #x5338)	; &GT-03427;
+      (=jis-x0208	  . #x523E)	; &GT-03427; [50-30]
+      (=cns11643-3	  . #x2129)	; &I-C3-2129; [01-09]
+      (=jis-x0213-1	  . #x523E)	; &I-JX1-523E; [50-30]
+      (=big5-cdp	  . #x8A70)	; &I-CDP-8A70;
+      (=gt		  . 03427)	; &I-GT-03427;
+      (=gt-k		  . 00096)	; &I-GT-K00096;
+      (=gt-pj-1		  . #x523E)	; &I-GT-03427; [50-30]
+      (=daikanwa	  . 02672)	; &I-M-02672;
+      (=shinjigen	  .  0800)	; &GT-03427;
+      )
+     ((=ucs@unicode	  . #x5338)	; &UU+5338;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	2672 0 1)
-    (ideographic-radical . 23)	; ⼖
-    (ideographic-strokes . 0)
-    (total-strokes	 . 2)
-    (=ucs		. #x5338)	; 匸
+  '((ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (=ucs		. #x5339)	; 匹
+    (=>jis-x0208	. #x4924)	; 匹 [41-04]
+    (=>jis-x0213-1	. #x4924)	; 匹 [41-04]
     ))
 (define-char
-  '((=>ucs		. #x5339)	; 匹
+  '((<-denotational
+     ((=ucs		  . #x5339)	; 匹
+      ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
@@ -54,22 +61,45 @@
       )
      ((=ucs		  . #x513F)	; 儿
       ))
-    (=ucs@big5		. #x5339)	; &M-02673;
-    (=big5		. #xA4C7)	; &M-02673;
-    (=daikanwa		. 02673)	; &I-M-02673;
-    (=shinjigen		.  0804)	; &M-02673;
-    ))
-(define-char
-  '((=>ucs		. #x5339)	; 匹
-    (morohashi-daikanwa	2673 0 0)
-    (ideographic-radical . 23)	; ⼖
-    (ideographic-strokes . 2)
-    (total-strokes	 . 4)
-    (=cns11643-1	. #x4528)	; &C1-4528; [37-08]
-    (mojikyo		. 002673)	; &MCS-60000A71;
+    (=ucs@big5		. #x5339)	; &G-GT-03429;
+    (=big5		. #xA4C7)	; &G-GT-03429;
+    (=>>gt		. 03429)	; &G-GT-03429;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((=ucs@jis	    . #x5338)	; &GT-03427;
+	(=jis-x0208	    . #x523E)	; &GT-03427; [50-30]
+	(=cns11643-3	    . #x2129)	; &I-C3-2129; [01-09]
+	(=jis-x0213-1	    . #x523E)	; &I-JX1-523E; [50-30]
+	(=daikanwa	    . 02672)	; &I-M-02672;
+	)
+       ((=ucs		    . #x513F)	; 儿
+	))
+      (=daikanwa	  . 02673)	; &M-02673;
+      (=shinjigen	  .  0804)	; &M-02673;
+      )
+     ((=cns11643-1	  . #x4528)	; &C1-4528; [37-08]
+      (mojikyo		  . 002673)	; &MCS-60000A71;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((=ucs@unicode	    . #x5338)	; &UU+5338;
+	)
+       ((=ucs		    . #x513F)	; 儿
+	))
+      (=gt		  . 03429)	; &GT-03429;
+      (=gt-k		  . 00478)	; &I-GT-K00478;
+      (=gt-pj-2		  . #x4777)	; &GT-03429; [39-87]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	2673 0 1)
+  '((<-denotational
+     ((=ucs		  . #x5339)	; 匹
+      ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
@@ -81,15 +111,15 @@
       )
      ((=ucs		  . #x513F)	; 儿
       ))
-    (=ucs		. #x5339)	; 匹
-    (=jis-x0208		. #x4924)	; &I-J90-4924; [41-04]
+    (=ucs@unicode	. #x5339)	; &GT-03328;
+    (=jis-x0208		. #x4924)	; &GT-03328; [41-04]
     (=gb2312		. #x4625)	; &I-G0-4625; [38-05]
     (=ks-x1001		. #x792F)	; &I-K0-792F; [89-15]
     (=jis-x0213-1	. #x4924)	; &I-JX1-4924; [41-04]
     (=gt		. 03328)	; &I-GT-03328;
     (=gt-k		. 00479)	; &I-GT-K00479;
     (=gt-pj-1		. #x4924)	; &I-GT-03328; [41-04]
-    (=shinjigen		.  0803)	; 匹
+    (=shinjigen		.  0803)	; &GT-03328;
     ))
 (define-char
   '((ideographic-radical . 23)	; ⼖
@@ -99,6 +129,23 @@
     (<-simplified@ucs
      ((=ucs		  . #x5340)	; 區
       ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x533A)	; 区
+      ))
+    (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x5338)	; 匸
+      )
+     ((=ucs		  . #x3405)	; 㐅
+      ))
+    (=>>gt		. 03428)	; &G-GT-03428;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
@@ -112,7 +159,9 @@
 	)
        ((=ucs		    . #x3405)	; 㐅
 	))
-      (=cns11643-3	  . #x2157)	; &M-02674; [01-55]
+      (=cns11643-3	  . #x2157)	; &GT-03428; [01-55]
+      (=gt		  . 03428)	; &I-GT-03428;
+      (=gt-pj-2		  . #x4778)	; &I-GT-03428; [39-88]
       (=daikanwa	  . 02674)	; &I-M-02674;
       (<-simplified
        ((=cns11643-1	    . #x5934)	; &M-02691; [57-20]
@@ -120,42 +169,49 @@
 	))
       (<-simplified*sources
        daikanwa)
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x533A)	; 区
+      ))
+    (script		JP Jouyou CN Simplified Ideograph)
+    (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 2)
+    (total-strokes	 . 4)
+    (hanyu-dazidian	1 81 5)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((script		JP Jouyou CN Simplified Ideograph)
-      (hanyu-dazidian	  1 81 5)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-	(=ucs		    . #x2FF7)	; â¿·
-	)
-       ((=ucs		    . #x531A)	; 匚
-	)
-       ((=ucs		    . #x3405)	; 㐅
-	))
-      (=ucs@unicode	  . #x533A)	; &GT-03327;
-      (=jis-x0208	  . #x3668)	; &GT-03327; [22-72]
-      (=gb2312		  . #x4778)	; &I-G0-4778; [39-88]
-      (=jis-x0213-1	  . #x3668)	; &I-JX1-3668; [22-72]
-      (=gt		  . 03327)	; &I-GT-03327;
-      (=gt-k		  . 00414)	; &I-GT-K00414;
-      (=gt-pj-1		  . #x3668)	; &I-GT-03327; [22-72]
-      (=shinjigen	  .  0801)	; &GT-03327;
-      (=hanziku-1	  . #xB4B6)	; &I-HZK01-B4B6;
-      (<-simplified
-       ((=cns11643-1	    . #x5934)	; &M-02691; [57-20]
-	(=daikanwa	    . 02691)	; &I-M-02691;
-	(=shinjigen	    .  0802)	; &M-02691;
-	))
-      (<-simplified*sources
-       shinjigen@1ed)
-      (<-simplified@CN
-       ((=gb12345	    . #x4778)	; &GT-03378; [39-88]
-	))
-      (<-simplified@JP/Jouyou
-       ((=ucs@unicode	    . #x5340)	; &GT-03378;
-	(=ks-x1001	    . #x4F21)	; &GT-03378; [47-01]
-	(=jis-x0208@1990    . #x523F)	; &I-J90-523F; [50-31]
-	(=jis-x0213-1	    . #x523F)	; &I-JX1-523F; [50-31]
-	))
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x3405)	; 㐅
+      ))
+    (=ucs@unicode	. #x533A)	; &GT-03327;
+    (=jis-x0208		. #x3668)	; &GT-03327; [22-72]
+    (=gb2312		. #x4778)	; &I-G0-4778; [39-88]
+    (=jis-x0213-1	. #x3668)	; &I-JX1-3668; [22-72]
+    (=gt		. 03327)	; &I-GT-03327;
+    (=gt-k		. 00414)	; &I-GT-K00414;
+    (=gt-pj-1		. #x3668)	; &I-GT-03327; [22-72]
+    (=shinjigen		.  0801)	; &GT-03327;
+    (=hanziku-1		. #xB4B6)	; &I-HZK01-B4B6;
+    (<-simplified
+     ((=cns11643-1	  . #x5934)	; &M-02691; [57-20]
+      (=daikanwa	  . 02691)	; &I-M-02691;
+      (=shinjigen	  .  0802)	; &M-02691;
+      ))
+    (<-simplified*sources
+     shinjigen@1ed)
+    (<-simplified@CN
+     ((=gb12345		  . #x4778)	; &GT-03378; [39-88]
+      ))
+    (<-simplified@JP/Jouyou
+     ((=ucs@unicode	  . #x5340)	; &GT-03378;
+      (=ks-x1001	  . #x4F21)	; &GT-03378; [47-01]
+      (=jis-x0208@1990	  . #x523F)	; &I-J90-523F; [50-31]
+      (=jis-x0213-1	  . #x523F)	; &I-JX1-523F; [50-31]
       ))
     ))
 (define-char
@@ -521,7 +577,15 @@
     (=cns11643-6	. #x2F35)	; &I-C6-2F35; [15-21]
     ))
 (define-char
-  '((=>ucs		. #x20976)	; 𠥶
+  '((ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (=ucs		. #x20976)	; 𠥶
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20976)	; 𠥶
+      ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
@@ -529,15 +593,53 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
-     ((=ucs		  . #x531A)	; 匚
+     ((=ucs		  . #x5338)	; 匸
       )
      ((=ucs		  . #x864E)	; 虎
       ))
-    (=daikanwa		. 02688)	; &M-02688;
-    (=cbeta		. 02506)	; &I-CB02506;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((=ucs@jis	    . #x5338)	; &GT-03427;
+	(=jis-x0208	    . #x523E)	; &GT-03427; [50-30]
+	(=cns11643-3	    . #x2129)	; &I-C3-2129; [01-09]
+	(=jis-x0213-1	    . #x523E)	; &I-JX1-523E; [50-30]
+	(=daikanwa	    . 02672)	; &I-M-02672;
+	)
+       ((=ucs@jis	    . #x864E)	; &GT-44178;
+	(=jis-x0208	    . #x3857)	; &GT-44178; [24-55]
+	(=ks-x1001	    . #x7B5B)	; &I-K0-7B5B; [91-59]
+	(=jis-x0213-1	    . #x3857)	; &I-JX1-3857; [24-55]
+	(=daikanwa	    . 32675)	; &I-M-32675;
+	))
+      (=daikanwa	  . 02688)	; &M-02688;
+      )
+     ((=gt		  . 03445)	; &GT-03445;
+      (=gt-pj-2		  . #x4828)	; &GT-03445; [40-08]
+      )
+     ((=ucs@iso		  . #x20976)	; &U-00020976;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((=ucs@jis	    . #x5338)	; &GT-03427;
+	(=jis-x0208	    . #x523E)	; &GT-03427; [50-30]
+	(=cns11643-3	    . #x2129)	; &I-C3-2129; [01-09]
+	(=jis-x0213-1	    . #x523E)	; &I-JX1-523E; [50-30]
+	(=daikanwa	    . 02672)	; &I-M-02672;
+	)
+       ((=cns11643-1	    . #x4F4D)	; &C1-4F4D; [47-45]
+	))
+      (=cns11643-6	  . #x3564)	; &C6-3564; [21-68]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	2688 0 0)
+  '((<-denotational
+     ((=ucs		  . #x20976)	; 𠥶
+      ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
@@ -545,41 +647,72 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
-     ((=ucs		  . #x5338)	; 匸
+     ((=ucs		  . #x531A)	; 匚
       )
      ((=ucs		  . #x864E)	; 虎
       ))
-    (=ucs		. #x20976)	; 𠥶
-    (=cns11643-6	. #x3564)	; &I-C6-3564; [21-68]
+    (=cbeta		. 02506)	; &CB02506;
     ))
 (define-char
-  '((=>ucs		. #x533E)	; 匾
-    (ideographic-radical . 23)	; ⼖
+  '((ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
     (hanyu-dazidian	1 88 3)
+    (=ucs		. #x533E)	; 匾
+    (=big5		. #xB0D0)	; &I-B-B0D0;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x533E)	; 匾
+      ))
+    (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
      ((=ucs		  . #x5338)	; 匸
       )
-     ((=ucs@big5	  . #x6241)	; &GT-14816;
+     ((=ucs@jis/2004	  . #x6241)	; &GT-14816;
       (=ks-x1001	  . #x7837)	; &GT-14816; [88-23]
       (=cns11643-1	  . #x5137)	; &I-C1-5137; [49-23]
+      (=jis-x0213-1@2004  . #x5928)	; &I-JX3-5928; [57-08]
       (=daikanwa	  . 11724)	; &I-M-11724;
       ))
-    (=ucs@jis		. #x533E)	; &M-02689;
-    (=ucs@big5		. #x533E)	; &M-02689;
-    (=jis-x0212		. #x3435)	; &M-02689; [20-21]
-    (=cns11643-1	. #x5935)	; &I-C1-5935; [57-21]
-    (=jis-x0213-2	. #x2350)	; &I-JX2-2350; [03-48]
-    (=big5		. #xB0D0)	; &I-B-B0D0;
-    (=daikanwa		. 02689)	; &I-M-02689;
+    (=>>gt		. 03448)	; &G-GT-03448;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+	(=ucs		    . #x2FF7)	; â¿·
+	)
+       ((=ucs@jis	    . #x5338)	; &GT-03427;
+	(=jis-x0208	    . #x523E)	; &GT-03427; [50-30]
+	(=cns11643-3	    . #x2129)	; &I-C3-2129; [01-09]
+	(=jis-x0213-1	    . #x523E)	; &I-JX1-523E; [50-30]
+	(=daikanwa	    . 02672)	; &I-M-02672;
+	)
+       ((=ucs@jis/2004	    . #x6241)	; &GT-14816;
+	(=ks-x1001	    . #x7837)	; &GT-14816; [88-23]
+	(=cns11643-1	    . #x5137)	; &I-C1-5137; [49-23]
+	(=jis-x0213-1@2004  . #x5928)	; &I-JX3-5928; [57-08]
+	(=daikanwa	    . 11724)	; &I-M-11724;
+	))
+      (=ucs@jis		  . #x533E)	; &M-02689;
+      (=jis-x0212	  . #x3435)	; &M-02689; [20-21]
+      (=cns11643-1	  . #x5935)	; &I-C1-5935; [57-21]
+      (=jis-x0213-2	  . #x2350)	; &I-JX2-2350; [03-48]
+      (=daikanwa	  . 02689)	; &I-M-02689;
+      )
+     ((=gt		  . 03448)	; &GT-03448;
+      (=gt-k		  . 08389)	; &I-GT-K08389;
+      (=gt-pj-2		  . #x4829)	; &GT-03448; [40-09]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x533E)	; 匾
-    (morohashi-daikanwa	2689 0 1)
+  '((<-denotational
+     ((=ucs		  . #x533E)	; 匾
+      ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
@@ -589,15 +722,18 @@
       )
      ((=ucs		  . #x531A)	; 匚
       )
-     ((=ucs@big5	  . #x6241)	; &GT-14816;
+     ((=ucs@jis/2004	  . #x6241)	; &GT-14816;
       (=ks-x1001	  . #x7837)	; &GT-14816; [88-23]
       (=cns11643-1	  . #x5137)	; &I-C1-5137; [49-23]
+      (=jis-x0213-1@2004  . #x5928)	; &I-JX3-5928; [57-08]
       (=daikanwa	  . 11724)	; &I-M-11724;
       ))
     (=jef-china3	. #x45BB)	; &JC3-45BB;
     ))
 (define-char
-  '((morohashi-daikanwa	2689 0 2)
+  '((<-denotational
+     ((=ucs		  . #x533E)	; 匾
+      ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
@@ -607,13 +743,24 @@
       )
      ((=ucs		  . #x531A)	; 匚
       )
-     ((=ucs		  . #x6241)	; 扁
+     ((=ucs@unicode	  . #x6241)	; &G0-3162;
+      (=gb2312		  . #x3162)	; &G0-3162; [17-66]
       ))
-    (=ucs		. #x533E)	; 匾
-    (=gb2312		. #x5852)	; &I-G0-5852; [56-50]
+    (=ucs@unicode	. #x533E)	; &G0-5852;
+    (=gb2312		. #x5852)	; &G0-5852; [56-50]
     ))
 (define-char
-  '((=>ucs		. #x533F)	; 匿
+  '((ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (hanyu-dazidian	1 86 12)
+    (=ucs		. #x533F)	; 匿
+    (=big5		. #xB0CE)	; &I-B-B0CE;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x533F)	; 匿
+      ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
@@ -630,35 +777,34 @@
      ((=cns11643-1	  . #x533C)	; &GT-40124; [51-28]
       (=daikanwa	  . 30796)	; &I-M-30796;
       ))
-    (=cns11643-1	. #x5933)	; &M-02690; [57-19]
+    (=cns11643-1	. #x5933)	; &GT-03447; [57-19]
+    (=gt		. 03447)	; &I-GT-03447;
+    (=gt-k		. 07990)	; &I-GT-K07990;
+    (=gt-pj-2		. #x482A)	; &I-GT-03447; [40-10]
     (=daikanwa		. 02690)	; &I-M-02690;
-    (=shinjigen		.  0807)	; &M-02690;
+    (=shinjigen		.  0807)	; &GT-03447;
     (mojikyo		. 002690)	; &MCS-60000A82;
     ))
 (define-char
-  '((=>ucs		. #x533F)	; 匿
-    (morohashi-daikanwa	2690 0 1)
+  '((<-denotational
+     ((=ucs		  . #x533F)	; 匿
+      ))
     (ideographic-radical . 23)	; ⼖
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
-    (hanyu-dazidian	1 86 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs		  . #x2FF7)	; â¿·
       )
-     ((=ucs@jis		  . #x5338)	; &GT-03427;
-      (=jis-x0208	  . #x523E)	; &GT-03427; [50-30]
-      (=cns11643-3	  . #x2129)	; &I-C3-2129; [01-09]
-      (=jis-x0213-1	  . #x523E)	; &I-JX1-523E; [50-30]
-      (=daikanwa	  . 02672)	; &I-M-02672;
+     ((=ucs		  . #x531A)	; 匚
       )
      ((=ucs		  . #x82E5)	; 若
       ))
-    (=ucs@big5		. #x533F)	; &B-B0CE;
-    (=big5		. #xB0CE)	; &B-B0CE;
+    (=>>jis-x0208	. #x463F)	; &G-JX1-463F; [38-31]
+    (=>>jis-x0213-1	. #x463F)	; &G-JX1-463F; [38-31]
     ))
 (define-char
-  '((morohashi-daikanwa	2690 0 2)
+  '((<-denotational
+     ((=>>jis-x0208	  . #x463F)	; &G-JX1-463F; [38-31]
+      ))
     (ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 8)
     (total-strokes	 . 10)
@@ -668,28 +814,45 @@
       )
      ((=ucs		  . #x531A)	; 匚
       )
-     ((=ucs		  . #x82E5)	; 若
+     ((=ucs		  . #x2F998)	; 若
       ))
-    (=ucs		. #x533F)	; 匿
-    (=jis-x0208		. #x463F)	; &I-J90-463F; [38-31]
+    (=ucs@unicode	. #x533F)	; &GT-03370;
+    (=jis-x0208		. #x463F)	; &GT-03370; [38-31]
     (=gb2312		. #x4464)	; &I-G0-4464; [36-68]
     (=ks-x1001		. #x527B)	; &I-K0-527B; [50-91]
     (=jis-x0213-1	. #x463F)	; &I-JX1-463F; [38-31]
     (=gt		. 03370)	; &I-GT-03370;
     (=gt-k		. 06521)	; &I-GT-K06521;
     (=gt-pj-1		. #x463F)	; &I-GT-03370; [38-31]
-    (=shinjigen		.  0806)	; 匿
+    (=shinjigen		.  0806)	; &GT-03370;
     ))
 (define-char
   '((ideographic-radical . 23)	; ⼖
     (ideographic-strokes . 9)
     (total-strokes	 . 11)
+    (hanyu-dazidian	1 87 10)
     (=ucs		. #x5340)	; 區
+    (=>jis-x0208	. #x523F)	; 區 [50-31]
+    (=>jis-x0213-1	. #x523F)	; 區 [50-31]
     (=big5		. #xB0CF)	; &I-B-B0CF;
-    (=jis-x0208@1997	. #x523F)	; 區 [50-31]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5340)	; 區
+      ))
+    (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
+      )
+     ((=ucs		  . #x5338)	; 匸
+      )
+     ((=ucs		  . #x54C1)	; 品
+      ))
     (->subsumptive
-     ((hanyu-dazidian	  1 87 10)
-      (ideographic-structure
+     ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
 	(=ucs		    . #x2FF7)	; â¿·
 	)
@@ -709,30 +872,37 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
 	(=ucs		    . #x2FF7)	; â¿·
 	)
-       ((=ucs		    . #x531A)	; 匚
+       ((=ucs@unicode	    . #x5338)	; &UU+5338;
 	)
        ((=ucs		    . #x54C1)	; 品
 	))
       (=jis-x0208@1978	  . #x523F)	; &J83-523F; [50-31]
       (=jis-x0208@1983	  . #x523F)	; &I-J83-523F; [50-31]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5340)	; 區
+      ))
+    (ideographic-radical . 23)	; ⼖
+    (ideographic-strokes . 9)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
+      (=ucs		  . #x2FF7)	; â¿·
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
-	(=ucs		    . #x2FF7)	; â¿·
-	)
-       ((=ucs		    . #x531A)	; 匚
-	)
-       ((=ucs		    . #x54C1)	; 品
-	))
-      (=ucs@unicode	  . #x5340)	; &GT-03378;
-      (=ks-x1001	  . #x4F21)	; &GT-03378; [47-01]
-      (=jis-x0208@1990	  . #x523F)	; &I-J90-523F; [50-31]
-      (=jis-x0213-1	  . #x523F)	; &I-JX1-523F; [50-31]
-      (=gb12345		  . #x4778)	; &GT-03378; [39-88]
-      (=gt		  . 03378)	; &I-GT-03378;
-      (=gt-k		  . 07911)	; &I-GT-K07911;
-      (=gt-pj-1		  . #x523F)	; &I-GT-03378; [50-31]
+     ((=ucs		  . #x531A)	; 匚
+      )
+     ((=ucs		  . #x54C1)	; 品
       ))
+    (=ucs@unicode	. #x5340)	; &GT-03378;
+    (=ks-x1001		. #x4F21)	; &GT-03378; [47-01]
+    (=jis-x0208@1990	. #x523F)	; &I-J90-523F; [50-31]
+    (=jis-x0213-1	. #x523F)	; &I-JX1-523F; [50-31]
+    (=gb12345		. #x4778)	; &GT-03378; [39-88]
+    (=gt		. 03378)	; &I-GT-03378;
+    (=gt-k		. 07911)	; &I-GT-K07911;
+    (=gt-pj-1		. #x523F)	; &I-GT-03378; [50-31]
     ))
 (define-char
   '((=>ucs		. #x3538)	; 㔸
diff --git a/lisp/utf-2000/Ideograph-R026-Seal.el b/lisp/utf-2000/Ideograph-R026-Seal.el
index 612890f..f39b70c 100644
--- a/lisp/utf-2000/Ideograph-R026-Seal.el
+++ b/lisp/utf-2000/Ideograph-R026-Seal.el
@@ -995,8 +995,9 @@
   '((ideographic-radical . 26)	; ⼙
     (hanyu-dazidian	1 318 3)
     (=ucs		. #x537F)	; 卿
+    (=>jis-x0208	. #x362A)	; 卿 [22-10]
+    (=>jis-x0213-1	. #x362A)	; 卿 [22-10]
     (=big5		. #xADEB)	; &I-B-ADEB;
-    (=jis-x0208@1997	. #x362A)	; 卿 [22-10]
     ))
 (define-char
   '((<-denotational
@@ -1041,22 +1042,26 @@
     (=jis-x0208@1983	. #x362A)	; &I-J83-362A; [22-10]
     (=jis-x0208@1990	. #x362A)	; &I-J90-362A; [22-10]
     (=cns11643-1	. #x544E)	; &I-C1-544E; [52-46]
-    (=jis-x0213-1	. #x362A)	; &I-JX1-362A; [22-10]
+    (=jis-x0213-1@2000	. #x362A)	; &I-JX1-362A; [22-10]
     (=gt		. 03656)	; &I-GT-03656;
     (=gt-pj-1		. #x362A)	; &I-GT-03656; [22-10]
     (=shinjigen		.  0870)	; &GT-03656;
     (=jef-china3	. #x45D5)	; &I-JC3-45D5;
     (mojikyo		. 054486)	; &MCS-6000D4D6;
     (<-simplified@JP/jis
-     ((=ucs@ks		  . #x537F)	; &M-02880;
+     ((=ucs@jis/2004	  . #x537F)	; &M-02880;
+      (=ucs@ks		  . #x537F)	; &M-02880;
       (=jis-x0208@1978	  . #x362A)	; &M-02880; [22-10]
       (=ks-x1001	  . #x4C4F)	; &I-K0-4C4F; [44-47]
+      (=jis-x0213-1@2004  . #x362A)	; &I-JX3-362A; [22-10]
       (=daikanwa	  . 02880)	; &I-M-02880;
       ))
     (<-vulgar
-     ((=ucs@ks		  . #x537F)	; &M-02880;
+     ((=ucs@jis/2004	  . #x537F)	; &M-02880;
+      (=ucs@ks		  . #x537F)	; &M-02880;
       (=jis-x0208@1978	  . #x362A)	; &M-02880; [22-10]
       (=ks-x1001	  . #x4C4F)	; &I-K0-4C4F; [44-47]
+      (=jis-x0213-1@2004  . #x362A)	; &I-JX3-362A; [22-10]
       (=daikanwa	  . 02880)	; &I-M-02880;
       (=shinjigen	  .  0868)	; &M-02880;
       ))
@@ -1094,9 +1099,11 @@
     (=daikanwa		. 02879)	; &I-M-02879;
     (=shinjigen		.  0869)	; 卿
     (<-same
-     ((=ucs@ks		  . #x537F)	; &M-02880;
+     ((=ucs@jis/2004	  . #x537F)	; &M-02880;
+      (=ucs@ks		  . #x537F)	; &M-02880;
       (=jis-x0208@1978	  . #x362A)	; &M-02880; [22-10]
       (=ks-x1001	  . #x4C4F)	; &I-K0-4C4F; [44-47]
+      (=jis-x0213-1@2004  . #x362A)	; &I-JX3-362A; [22-10]
       (=daikanwa	  . 02880)	; &I-M-02880;
       (=shinjigen	  .  0868)	; &M-02880;
       ))
@@ -1110,9 +1117,11 @@
     (ideographic-radical . 26)	; ⼙
     (ideographic-strokes . 10)
     (total-strokes	 . 12)
+    (=ucs@jis/2004	. #x537F)	; &M-02880;
     (=ucs@ks		. #x537F)	; &M-02880;
     (=jis-x0208@1978	. #x362A)	; &M-02880; [22-10]
     (=ks-x1001		. #x4C4F)	; &I-K0-4C4F; [44-47]
+    (=jis-x0213-1@2004	. #x362A)	; &I-JX3-362A; [22-10]
     (=daikanwa		. 02880)	; &I-M-02880;
     (=shinjigen		.  0868)	; &M-02880;
     (<-same
diff --git a/lisp/utf-2000/Ideograph-R027-Cliff.el b/lisp/utf-2000/Ideograph-R027-Cliff.el
index 0bdbafb..06785b1 100644
--- a/lisp/utf-2000/Ideograph-R027-Cliff.el
+++ b/lisp/utf-2000/Ideograph-R027-Cliff.el
@@ -2330,7 +2330,8 @@
 (define-char
   '((ideographic-radical . 27)	; ⼚
     (=ucs		. #x53A9)	; 厩
-    (=jis-x0208@1997	. #x3139)	; 厩 [17-25]
+    (=>jis-x0208	. #x3139)	; 厩 [17-25]
+    (=>jis-x0213-1	. #x3139)	; 厩 [17-25]
     ))
 (define-char
   '((<-denotational
@@ -2696,7 +2697,6 @@
      ((=ucs		  . #x5382)	; 厂
       )
      ((=ucs@jis		  . #x6562)	; &GT-16742;
-      (=ucs@big5	  . #x6562)	; &GT-16742;
       (=ks-x1001	  . #x4A72)	; &GT-16742; [42-82]
       (=jis-x0208@1990	  . #x343A)	; &I-J90-343A; [20-26]
       (=cns11643-1	  . #x5F56)	; &I-C1-5F56; [63-54]
diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el
index f8f14d6..e14fbe4 100644
--- a/lisp/utf-2000/Ideograph-R029-Again.el
+++ b/lisp/utf-2000/Ideograph-R029-Again.el
@@ -55,12 +55,15 @@
     (ideographic-strokes . 1)
     (total-strokes	 . 3)
     (=ucs		. #x53C9)	; 叉
+    (=>jis-x0208	. #x3A35)	; 叉 [26-21]
+    (=>jis-x0213-1	. #x3A35)	; 叉 [26-21]
     (=big5		. #xA465)	; &I-B-A465;
     (->subsumptive
-     ((=ucs@jis		  . #x53C9)	; &GT-03947;
+     ((=ucs@jis/1990	  . #x53C9)	; &GT-03947;
+      (=ucs@jis/2000	  . #x53C9)	; &GT-03947;
       (=jis-x0208	  . #x3A35)	; &GT-03947; [26-21]
       (=ks-x1001	  . #x7329)	; &I-K0-7329; [83-09]
-      (=jis-x0213-1	  . #x3A35)	; &I-JX1-3A35; [26-21]
+      (=jis-x0213-1@2000  . #x3A35)	; &I-JX1-3A35; [26-21]
       (=gt		  . 03947)	; &I-GT-03947;
       (=gt-k		  . 00256)	; &I-GT-K00256;
       (=gt-pj-1		  . #x3A35)	; &I-GT-03947; [26-21]
@@ -71,6 +74,7 @@
       (=ucs@unicode	  . #x53C9)	; &GT-03946;
       (=gb2312		  . #x3266)	; &GT-03946; [18-70]
       (=cns11643-1	  . #x4446)	; &I-C1-4446; [36-38]
+      (=jis-x0213-1@2004  . #x3A35)	; &I-JX3-3A35; [26-21]
       (=gt		  . 03946)	; &I-GT-03946;
       (=gt-k		  . 00254)	; &I-GT-K00254;
       (=gt-pj-2		  . #x4C37)	; &I-GT-03946; [44-23]
@@ -400,16 +404,32 @@
 	)
        ((=ucs		    . #x53C8)	; 又
 	))
-      (=ucs@jis		  . #x53CD)	; &GT-03956;
-      (=jis-x0208	  . #x483F)	; &GT-03956; [40-31]
-      (=ks-x1001	  . #x5A63)	; &I-K0-5A63; [58-67]
-      (=cns11643-1	  . #x4530)	; &I-C1-4530; [37-16]
-      (=jis-x0213-1	  . #x483F)	; &I-JX1-483F; [40-31]
-      (=gt		  . 03956)	; &I-GT-03956;
-      (=gt-k		  . 00475)	; &I-GT-K00475;
-      (=gt-pj-1		  . #x483F)	; &I-GT-03956; [40-31]
-      (=daikanwa	  . 03127)	; &I-M-03127;
-      (=shinjigen	  .  0904)	; &GT-03956;
+      (=>>jis-x0208	  . #x483F)	; &G-JX1-483F; [40-31]
+      (=>>jis-x0213-1	  . #x483F)	; &G-JX1-483F; [40-31]
+      (->subsumptive
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+	  (=ucs		      . #x2FF8)	; ⿸
+	  )
+	 ((=ucs		      . #x5382)	; 厂
+	  )
+	 ((=ucs@unicode	      . #x53C8)	; &GT-03944;
+	  (=jis-x0208	      . #x4B74)	; &GT-03944; [43-84]
+	  (=gb2312	      . #x5356)	; &I-G0-5356; [51-54]
+	  (=cns11643-1	      . #x4434)	; &I-C1-4434; [36-20]
+	  (=jis-x0213-1	      . #x4B74)	; &I-JX1-4B74; [43-84]
+	  ))
+	(=ucs@jis	    . #x53CD)	; &GT-03956;
+	(=jis-x0208	    . #x483F)	; &GT-03956; [40-31]
+	(=ks-x1001	    . #x5A63)	; &I-K0-5A63; [58-67]
+	(=cns11643-1	    . #x4530)	; &I-C1-4530; [37-16]
+	(=jis-x0213-1	    . #x483F)	; &I-JX1-483F; [40-31]
+	(=gt		    . 03956)	; &I-GT-03956;
+	(=gt-k		    . 00475)	; &I-GT-K00475;
+	(=gt-pj-1	    . #x483F)	; &I-GT-03956; [40-31]
+	(=daikanwa	    . 03127)	; &I-M-03127;
+	(=shinjigen	    .  0904)	; &GT-03956;
+	))
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
@@ -419,10 +439,24 @@
 	)
        ((=ucs		    . #x53C8)	; 又
 	))
-      (=ucs@unicode	  . #x53CD)	; &GT-K00476;
-      (=gb2312		  . #x3734)	; &GT-K00476; [23-20]
-      (=gt-k		  . 00476)	; &I-GT-K00476;
-      (=gt-pj-k1	  . #x422F)	; &GT-K00476; [34-15]
+      (->subsumptive
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+	  (=ucs		      . #x2FF8)	; ⿸
+	  )
+	 ((=ucs		      . #x20086)	; 𠂆
+	  )
+	 ((=ucs@unicode	      . #x53C8)	; &GT-03944;
+	  (=jis-x0208	      . #x4B74)	; &GT-03944; [43-84]
+	  (=gb2312	      . #x5356)	; &I-G0-5356; [51-54]
+	  (=cns11643-1	      . #x4434)	; &I-C1-4434; [36-20]
+	  (=jis-x0213-1	      . #x4B74)	; &I-JX1-4B74; [43-84]
+	  ))
+	(=ucs@unicode	    . #x53CD)	; &GT-K00476;
+	(=gb2312	    . #x3734)	; &GT-K00476; [23-20]
+	(=gt-k		    . 00476)	; &I-GT-K00476;
+	(=gt-pj-k1	    . #x422F)	; &GT-K00476; [34-15]
+	))
       ))
     ))
 (define-char
@@ -431,7 +465,8 @@
     (ideographic-strokes . 2)
     (total-strokes	 . 4)
     (=ucs		. #x53CE)	; 収
-    (=jis-x0208@1997	. #x3C7D)	; 収 [28-93]
+    (=>jis-x0208	. #x3C7D)	; 収 [28-93]
+    (=>jis-x0213-1	. #x3C7D)	; 収 [28-93]
     (<-simplified@JP/Jouyou
      ((=ucs		  . #x6536)	; 收
       (=jis-x0208	  . #x5A40)	; &I-J90-5A40; [58-32]
@@ -442,7 +477,9 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x4E29)	; 丩
+       ((=ucs@unicode	    . #x4E29)	; &GT-00102;
+	(=jis-x0213-2	    . #x2125)	; &GT-00102; [01-05]
+	(=daikanwa	    . 00068)	; &I-M-00068;
 	)
        ((=ucs@unicode	    . #x53C8)	; &GT-03944;
 	(=jis-x0208	    . #x4B74)	; &GT-03944; [43-84]
@@ -480,7 +517,11 @@
        ((=ucs@cns	    . #x4E29)	; &GT-K00068;
 	(=cns11643-4	    . #x2127)	; &GT-K00068; [01-07]
 	)
-       ((=ucs		    . #x53C8)	; 又
+       ((=ucs@unicode	    . #x53C8)	; &GT-03944;
+	(=jis-x0208	    . #x4B74)	; &GT-03944; [43-84]
+	(=gb2312	    . #x5356)	; &I-G0-5356; [51-54]
+	(=cns11643-1	    . #x4434)	; &I-C1-4434; [36-20]
+	(=jis-x0213-1	    . #x4B74)	; &I-JX1-4B74; [43-84]
 	))
       (=cns11643-3	  . #x2160)	; &C3-2160; [01-64]
       ))
@@ -719,7 +760,7 @@
        zhengzitong daikanwa)
       )
      ((hanyu-dazidian	  1 394 3)
-      (=shinjigen@1ed	  .  0945)	; &HZK01-F6F2;
+      (=shinjigen	  .  0945)	; &HZK01-F6F2;
       (=hanziku-1	  . #xF6F2)	; &HZK01-F6F2;
       (<-original
        ((=ucs@unicode	    . #x53F2)	; &GT-04122;
@@ -727,10 +768,10 @@
 	(=jis-x0208@1990    . #x3B4B)	; &I-J90-3B4B; [27-43]
 	(=cns11643-1	    . #x4638)	; &I-C1-4638; [38-24]
 	(=jis-x0213-1	    . #x3B4B)	; &I-JX1-3B4B; [27-43]
-	(=shinjigen@1ed	    .  0943)	; &GT-04122;
+	(=shinjigen	    .  0943)	; &GT-04122;
 	))
       (<-original*sources
-       shinjigen@1ed)
+       shinjigen)
       )
      ((=ucs@unicode	  . #x355C)	; &C3-2332;
       (=cns11643-3	  . #x2332)	; &C3-2332; [03-18]
@@ -951,7 +992,9 @@
     (->subsumptive
      ((=daikanwa	  . 03151)	; &M-03151;
       (<-vulgar
-       ((=ucs		    . #x53DF)	; 叟
+       ((=ucs@jis/2004	    . #x53DF)	; &GT-04022;
+	(=cns11643-1	    . #x5451)	; &GT-04022; [52-49]
+	(=jis-x0213-1@2004  . #x5257)	; &I-JX3-5257; [50-55]
 	(=daikanwa	    . 03176)	; &I-M-03176;
 	))
       (<-vulgar*sources
@@ -1325,15 +1368,42 @@
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x534A)	; 半
+      )
+     ((=ucs		  . #x53CD)	; 反
+      ))
     (=ucs		. #x53DB)	; 叛
+    (=>jis-x0208	. #x4840)	; 叛 [40-32]
+    (=>jis-x0213-1	. #x4840)	; 叛 [40-32]
     (=big5		. #xAB71)	; &I-B-AB71;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x53DB)	; 叛
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ks-x1001	  . #x5A62)	; &GT-03469; [58-66]
+      (=daikanwa	  . 02707)	; &I-M-02707;
+      )
+     ((=ucs		  . #x53CD)	; 反
+      ))
+    (=>>jis-x0213-1@2004 . #x4840)	; &G-JX3-4840; [40-32]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ks-x1001	    . #x5A62)	; &GT-03469; [58-66]
-	(=daikanwa	    . 02707)	; &I-M-02707;
+       ((=gt-k		    . 01097)	; &GT-K01097;
 	)
        ((=ucs@jis	    . #x53CD)	; &GT-03956;
 	(=jis-x0208	    . #x483F)	; &GT-03956; [40-31]
@@ -1342,20 +1412,42 @@
 	(=jis-x0213-1	    . #x483F)	; &I-JX1-483F; [40-31]
 	(=daikanwa	    . 03127)	; &I-M-03127;
 	))
+      (=ucs@jis/2004	  . #x53DB)	; &M-03166;
       (=ks-x1001	  . #x5A64)	; &M-03166; [58-68]
+      (=jis-x0213-1@2004  . #x4840)	; &I-JX3-4840; [40-32]
       (=daikanwa	  . 03166)	; &I-M-03166;
       )
      ((mojikyo		  . 003166)	; &MCS-60000C5E;
       )
      ((mojikyo		  . 067958)	; &MCS-60010976;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x53DB)	; 叛
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((mojikyo		  . 054307)	; &MCS-6000D423;
+     ((=ucs@unicode	  . #x534A)	; &GT-03470;
+      (=jis-x0208	  . #x483E)	; &GT-03470; [40-30]
+      (=gb2312		  . #x306B)	; &I-G0-306B; [16-75]
+      (=cns11643-1	  . #x4624)	; &I-C1-4624; [38-04]
+      (=jis-x0213-1	  . #x483E)	; &I-JX1-483E; [40-30]
       )
+     ((=ucs		  . #x53CD)	; 反
+      ))
+    (=>>jis-x0213-1@2000 . #x4840)	; &G-JX1-4840; [40-32]
+    (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x534A)	; 半
+       ((=gt-k		    . 00987)	; &GT-K00987;
 	)
        ((=ucs@jis	    . #x53CD)	; &GT-03956;
 	(=jis-x0208	    . #x483F)	; &GT-03956; [40-31]
@@ -1364,40 +1456,21 @@
 	(=jis-x0213-1	    . #x483F)	; &I-JX1-483F; [40-31]
 	(=daikanwa	    . 03127)	; &I-M-03127;
 	))
-      (=ucs@jis		  . #x53DB)	; &GT-04013;
+      (=ucs@jis/1990	  . #x53DB)	; &GT-04013;
+      (=ucs@jis/2000	  . #x53DB)	; &GT-04013;
       (=jis-x0208	  . #x4840)	; &GT-04013; [40-32]
-      (=jis-x0213-1	  . #x4840)	; &I-JX1-4840; [40-32]
+      (=jis-x0213-1@2000  . #x4840)	; &I-JX1-4840; [40-32]
       (=gt		  . 04013)	; &I-GT-04013;
       (=gt-pj-1		  . #x4840)	; &I-GT-04013; [40-32]
       (=jef-china3	  . #x45EC)	; &I-JC3-45EC;
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x534A)	; 半
-	)
-       ((=ucs@jis	    . #x53CD)	; &GT-03956;
-	(=jis-x0208	    . #x483F)	; &GT-03956; [40-31]
-	(=ks-x1001	    . #x5A63)	; &I-K0-5A63; [58-67]
-	(=cns11643-1	    . #x4530)	; &I-C1-4530; [37-16]
-	(=jis-x0213-1	    . #x483F)	; &I-JX1-483F; [40-31]
-	(=daikanwa	    . 03127)	; &I-M-03127;
-	))
-      (=cns11643-1	  . #x5035)	; &C1-5035; [48-21]
+     ((=cns11643-1	  . #x5035)	; &C1-5035; [48-21]
+      )
+     ((mojikyo		  . 054307)	; &MCS-6000D423;
       )
      ((mojikyo		  . 057947)	; &MCS-6000E25B;
       )
      ((hanyu-dazidian	  1 398 2)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x534A)	; 半
-	)
-       ((=ucs@unicode	    . #x53CD)	; &GT-K00476;
-	(=gb2312	    . #x3734)	; &GT-K00476; [23-20]
-	))
       (=ucs@unicode	  . #x53DB)	; &G0-4551;
       (=gb2312		  . #x4551)	; &G0-4551; [37-49]
       ))
@@ -1406,6 +1479,16 @@
   '((ideographic-radical . 29)	; ⼜
     (ideographic-strokes . 7)
     (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
+      (=ucs		  . #x2FF3)	; ⿳
+      )
+     ((=ucs		  . #x5B80)	; 宀
+      )
+     ((=ucs		  . #x706B)	; 火
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
     (=ucs		. #x53DC)	; 叜
     (->subsumptive
      ((ideographic-structure
@@ -1417,7 +1500,12 @@
 	(=jis-x0213-1	    . #x555F)	; &I-JX1-555F; [53-63]
 	(=daikanwa	    . 07054)	; &I-M-07054;
 	)
-       ((=ucs		    . #x706B)	; 火
+       ((=ucs@unicode	    . #x706B)	; &GT-24152;
+	(=jis-x0208	    . #x3250)	; &GT-24152; [18-48]
+	(=gb2312	    . #x3B70)	; &I-G0-3B70; [27-80]
+	(=ks-x1001	    . #x7B7D)	; &I-K0-7B7D; [91-93]
+	(=jis-x0213-1	    . #x3250)	; &I-JX1-3250; [18-48]
+	(=daikanwa	    . 18850)	; &I-M-18850;
 	)
        ((=ks-x1001	    . #x6951)	; &M-03115; [73-49]
 	(=daikanwa	    . 03115)	; &I-M-03115;
@@ -1434,25 +1522,25 @@
 	(=jis-x0213-1	    . #x555F)	; &I-JX1-555F; [53-63]
 	(=daikanwa	    . 07054)	; &I-M-07054;
 	)
-       ((=ucs		    . #x706B)	; 火
+       ((=ucs@unicode	    . #x706B)	; &GT-24152;
+	(=jis-x0208	    . #x3250)	; &GT-24152; [18-48]
+	(=gb2312	    . #x3B70)	; &I-G0-3B70; [27-80]
+	(=ks-x1001	    . #x7B7D)	; &I-K0-7B7D; [91-93]
+	(=jis-x0213-1	    . #x3250)	; &I-JX1-3250; [18-48]
+	(=daikanwa	    . 18850)	; &I-M-18850;
 	)
-       ((=ucs		    . #x53C8)	; 又
+       ((=ucs@unicode	    . #x53C8)	; &GT-03944;
+	(=jis-x0208	    . #x4B74)	; &GT-03944; [43-84]
+	(=gb2312	    . #x5356)	; &I-G0-5356; [51-54]
+	(=cns11643-1	    . #x4434)	; &I-C1-4434; [36-20]
+	(=jis-x0213-1	    . #x4B74)	; &I-JX1-4B74; [43-84]
 	))
-      (=big5-cdp	  . #x8AC4)	; &CDP-8AC4;
-      (=cbeta		  . 00008)	; &I-CB00008;
+      (=cbeta		  . 00008)	; &CB00008;
       (=jef-china3	  . #x8EC0)	; &I-JC3-8EC0;
       )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-	(=ucs		    . #x2FF3)	; ⿳
-	)
-       ((=ucs		    . #x5B80)	; 宀
-	)
-       ((=ucs		    . #x706B)	; 火
-	)
-       ((=ucs		    . #x53C8)	; 又
-	))
-      (=ucs@unicode	  . #x53DC)	; &UU+53DC;
+     ((=big5-cdp	  . #x8AC4)	; &CDP-8AC4;
+      )
+     ((=ucs@unicode	  . #x53DC)	; &UU+53DC;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
@@ -1463,7 +1551,12 @@
 	(=jis-x0213-1	    . #x555F)	; &I-JX1-555F; [53-63]
 	(=daikanwa	    . 07054)	; &I-M-07054;
 	)
-       ((=ucs		    . #x706B)	; 火
+       ((=ucs@unicode	    . #x706B)	; &GT-24152;
+	(=jis-x0208	    . #x3250)	; &GT-24152; [18-48]
+	(=gb2312	    . #x3B70)	; &I-G0-3B70; [27-80]
+	(=ks-x1001	    . #x7B7D)	; &I-K0-7B7D; [91-93]
+	(=jis-x0213-1	    . #x3250)	; &I-JX1-3250; [18-48]
+	(=daikanwa	    . 18850)	; &I-M-18850;
 	)
        ((mojikyo	    . 003115)	; &MCS-60000C2B;
 	))
@@ -1473,11 +1566,17 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
 	(=ucs		    . #x2FF3)	; ⿳
 	)
-       ((=ucs		    . #x5B80)	; 宀
+       ((=ucs@unicode	    . #x5B80)	; &C3-213B;
+	(=gb2312	    . #x6532)	; &C3-213B; [69-18]
+	(=cns11643-3	    . #x213B)	; &I-C3-213B; [01-27]
 	)
        ((=cns11643-1	    . #x4556)	; &C1-4556; [37-54]
 	)
-       ((=ucs		    . #x53C8)	; 又
+       ((=ucs@unicode	    . #x53C8)	; &GT-03944;
+	(=jis-x0208	    . #x4B74)	; &GT-03944; [43-84]
+	(=gb2312	    . #x5356)	; &I-G0-5356; [51-54]
+	(=cns11643-1	    . #x4434)	; &I-C1-4434; [36-20]
+	(=jis-x0213-1	    . #x4B74)	; &I-JX1-4B74; [43-84]
 	))
       (=ucs@cns		  . #x53DC)	; &C3-2B4E;
       (=cns11643-3	  . #x2B4E)	; &C3-2B4E; [11-46]
@@ -1634,27 +1733,78 @@
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
-    (ideographic-strokes . 8)
-    (total-strokes	 . 10)
     (hanyu-dazidian	1 399 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=big5-cdp	  . #x8CCD)	; &CDP-8CCD;
+     ((=ucs		  . #x26954)	; 𦥔
       )
      ((=ucs		  . #x53C8)	; 又
       ))
     (=ucs		. #x53DF)	; 叟
-    (=jis-x0208		. #x5257)	; &I-J90-5257; [50-55]
-    (=gb2312		. #x5B45)	; &I-G0-5B45; [59-37]
-    (=cns11643-1	. #x5451)	; &I-C1-5451; [52-49]
-    (=jis-x0213-1	. #x5257)	; &I-JX1-5257; [50-55]
+    (=>jis-x0208	. #x5257)	; 叟 [50-55]
+    (=>jis-x0213-1	. #x5257)	; 叟 [50-55]
     (=big5		. #xADEE)	; &I-B-ADEE;
-    (=gt		. 04009)	; &I-GT-04009;
-    (=gt-k		. 05219)	; &I-GT-K05219;
-    (=gt-pj-1		. #x5257)	; &I-GT-04009; [50-55]
-    (=daikanwa		. 03176)	; &I-M-03176;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x53DF)	; 叟
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 8)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=big5-cdp	  . #x8CCD)	; &CDP-8CCD;
+      )
+     ((=ucs		  . #x53C8)	; 又
+      ))
+    (=>>jis-x0213-1@2004 . #x5257)	; &G-JX3-5257; [50-55]
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=big5-cdp	    . #x8CCD)	; &CDP-8CCD;
+	)
+       ((=ucs@unicode	    . #x53C8)	; &GT-03944;
+	(=jis-x0208	    . #x4B74)	; &GT-03944; [43-84]
+	(=gb2312	    . #x5356)	; &I-G0-5356; [51-54]
+	(=cns11643-1	    . #x4434)	; &I-C1-4434; [36-20]
+	(=jis-x0213-1	    . #x4B74)	; &I-JX1-4B74; [43-84]
+	))
+      (=ucs@jis/2004	  . #x53DF)	; &GT-04022;
+      (=cns11643-1	  . #x5451)	; &GT-04022; [52-49]
+      (=jis-x0213-1@2004  . #x5257)	; &I-JX3-5257; [50-55]
+      (=gt		  . 04022)	; &I-GT-04022;
+      (=gt-k		  . 06578)	; &I-GT-K06578;
+      (=gt-pj-2		  . #x4C6D)	; &I-GT-04022; [44-77]
+      (=daikanwa	  . 03176)	; &I-M-03176;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x53DF)	; 叟
+      ))
+    (ideographic-radical . 29)	; ⼜
+    (ideographic-strokes . 7)
+    (total-strokes	 . 9)
+    (=>>jis-x0213-1@2000 . #x5257)	; &G-JX1-5257; [50-55]
+    (->subsumptive
+     ((=ucs@jis/1990	  . #x53DF)	; &GT-04009;
+      (=ucs@jis/2000	  . #x53DF)	; &GT-04009;
+      (=jis-x0208	  . #x5257)	; &GT-04009; [50-55]
+      (=jis-x0213-1@2000  . #x5257)	; &I-JX1-5257; [50-55]
+      (=gt		  . 04009)	; &I-GT-04009;
+      (=gt-k		  . 05219)	; &I-GT-K05219;
+      (=gt-pj-1		  . #x5257)	; &I-GT-04009; [50-55]
+      )
+     ((=ucs@unicode	  . #x53DF)	; &G0-5B45;
+      (=gb2312		  . #x5B45)	; &G0-5B45; [59-37]
+      ))
     ))
 (define-char
   '((ideographic-radical . 29)	; ⼜
diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el
index 291d9e1..42507f6 100644
--- a/lisp/utf-2000/Ideograph-R030-Mouth.el
+++ b/lisp/utf-2000/Ideograph-R030-Mouth.el
@@ -611,13 +611,14 @@
     (total-strokes	 . 5)
     (hanyu-dazidian	1 571 2)
     (=ucs		. #x53F2)	; 史
-    (=jis-x0208@1997	. #x3B4B)	; 史 [27-43]
+    (=>jis-x0208	. #x3B4B)	; 史 [27-43]
+    (=>jis-x0213-1	. #x3B4B)	; 史 [27-43]
     (->subsumptive
      ((=jis-x0208@1978	  . #x3B4B)	; &M-03249; [27-43]
       (=jis-x0208@1983	  . #x3B4B)	; &I-J83-3B4B; [27-43]
       (=ks-x1001	  . #x5E48)	; &I-K0-5E48; [62-40]
       (=daikanwa	  . 03249)	; &I-M-03249;
-      (=shinjigen@1ed	  .  0944)	; &M-03249;
+      (=shinjigen	  .  0944)	; &M-03249;
       (=jef-china3	  . #x47B5)	; &I-JC3-47B5;
       (->subsumptive
        ((mojikyo	    . 054796)	; &MCS-6000D60C;
@@ -635,8 +636,7 @@
       (=big5		  . #xA576)	; &I-B-A576;
       (=gt		  . 04122)	; &I-GT-04122;
       (=gt-pj-1		  . #x3B4B)	; &I-GT-04122; [27-43]
-      (=shinjigen@1ed	  .  0943)	; &GT-04122;
-      (=shinjigen@rev	  .  0944)	; &GT-04122;
+      (=shinjigen	  .  0943)	; &GT-04122;
       ))
     ))
 (define-char
@@ -1071,7 +1071,7 @@
       ))
     (=gt-k		. 01160)	; &GT-K01160;
     (=gt-pj-k1		. #x3850)	; &GT-K01160; [24-48]
-    (<-original
+    (<-original@component
      ((=ucs		  . #x5B50)	; 子
       ))
     ))
@@ -2028,7 +2028,7 @@
       ))
     (=gt-k		. 01881)	; &GT-K01881;
     (=gt-pj-k1		. #x3732)	; &GT-K01881; [23-18]
-    (<-original
+    (<-original@component/connect-above
      ((=ucs		  . #x5B50)	; 子
       ))
     ))
@@ -2295,9 +2295,18 @@
     (=hanziku-2		. #xCBF6)	; &I-HZK02-CBF6;
     ))
 (define-char
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (hanyu-dazidian	1 585 4)
+    (=ucs@big5		. #x541E)	; &J97-465D;
+    (=>jis-x0208@1997	. #x465D)	; &J97-465D; [38-61]
+    (=big5		. #xA75D)	; &J97-465D;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x541E)	; &B-A75D;
-      (=big5		  . #xA75D)	; &B-A75D;
+     ((=ucs@big5	  . #x541E)	; &J97-465D;
+      (=>jis-x0208@1997	  . #x465D)	; &J97-465D; [38-61]
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
@@ -2311,23 +2320,39 @@
      ((=ucs		  . #x53E3)	; 口
       ))
     (=ucs		. #x541E)	; 吞
-    (=gb2312		. #x4D4C)	; &I-G0-4D4C; [45-44]
-    (=cns11643-1	. #x493F)	; &I-C1-493F; [41-31]
-    (=daikanwa		. 03329)	; &I-M-03329;
-    ))
-(define-char
-  '((ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (hanyu-dazidian	1 585 4)
-    (=ucs@big5		. #x541E)	; &B-A75D;
-    (=big5		. #xA75D)	; &B-A75D;
+    (=>jis-x0213-1@2004 . #x4F7E)	; 吞 [47-94]
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs@unicode	    . #x5929)	; &GT-K00468;
+	(=gb2312	    . #x4C6C)	; &GT-K00468; [44-76]
+	(=cns11643-1	    . #x4532)	; &I-C1-4532; [37-18]
+	)
+       ((=ucs		    . #x53E3)	; 口
+	))
+      (=ucs@unicode	  . #x541E)	; &M-03329;
+      (=gb2312		  . #x4D4C)	; &M-03329; [45-44]
+      (=cns11643-1	  . #x493F)	; &I-C1-493F; [41-31]
+      (=jis-x0213-1@2004  . #x4F7E)	; &I-JX3-4F7E; [47-94]
+      (=daikanwa	  . 03329)	; &I-M-03329;
+      (=shinjigen	  .  1001)	; &M-03329;
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (hanyu-dazidian	1 591 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=ucs		  . #x4ECA)	; 今
+      ))
     (=ucs		. #x541F)	; 吟
     (=big5		. #xA775)	; &I-B-A775;
     (->subsumptive
@@ -2353,7 +2378,7 @@
       (=gt-k		  . 02528)	; &I-GT-K02528;
       (=gt-pj-1		  . #x3663)	; &I-GT-04222; [22-67]
       (=daikanwa	  . 03330)	; &I-M-03330;
-      (=shinjigen@rev	  .  0985)	; &GT-04222;
+      (=shinjigen	  .  0985)	; &GT-04222;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -3172,13 +3197,21 @@
     (=cbeta		. 00052)	; &I-CB00052;
     ))
 (define-char
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (=>jis-x0208	. #x3862)	; &J97-3862; [24-66]
+    (=>jis-x0213-1	. #x3862)	; &J97-3862; [24-66]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3862)	; &J97-3862; [24-66]
+     ((=>jis-x0208	  . #x3862)	; &J97-3862; [24-66]
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x5433)	; 吳
+    (=big5		. #xA764)	; &I-B-A764;
     (->subsumptive
      ((hanyu-dazidian	  1 595 8)
       (ideographic-structure
@@ -3191,23 +3224,16 @@
 	))
       (=ucs@unicode	  . #x5433)	; &M-03365;
       (=ks-x1001	  . #x676F)	; &M-03365; [71-79]
-      (=big5		  . #xA764)	; &I-B-A764;
       (=daikanwa	  . 03365)	; &I-M-03365;
-      (=shinjigen@1ed	  .  0988)	; &M-03365;
+      (=shinjigen	  .  0988)	; &M-03365;
       (=jef-china3	  . #x45F9)	; &I-JC3-45F9;
       )
      ((=cns11643-1	  . #x4946)	; &C1-4946; [41-38]
       ))
     ))
 (define-char
-  '((ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=jis-x0208@1997	. #x3862)	; &J97-3862; [24-66]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3862)	; &J97-3862; [24-66]
+     ((=>jis-x0208	  . #x3862)	; &J97-3862; [24-66]
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
@@ -3230,6 +3256,11 @@
     (=gt-pj-1		. #x3862)	; &I-GT-04233; [24-66]
     (=shinjigen		.  0987)	; &GT-04233;
     (mojikyo		. 050117)	; &MCS-6000C3C5;
+    (<-simplified@JP
+     ((=ucs@unicode	  . #x5433)	; &M-03365;
+      (=ks-x1001	  . #x676F)	; &M-03365; [71-79]
+      (=daikanwa	  . 03365)	; &I-M-03365;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -3259,16 +3290,16 @@
     (=jis-x0212		. #x346D)	; &I-JSP-346D; [20-77]
     (=cns11643-3	. #x247B)	; &I-C3-247B; [04-91]
     (=daikanwa		. 03366)	; &I-M-03366;
-    (=shinjigen@1ed	.  0989)	; 吴
+    (=shinjigen		.  0989)	; 吴
     (=hanziku-2		. #xCAD1)	; &I-HZK02-CAD1;
     (<-vulgar
      ((=ucs@unicode	  . #x5433)	; &M-03365;
       (=ks-x1001	  . #x676F)	; &M-03365; [71-79]
       (=daikanwa	  . 03365)	; &I-M-03365;
-      (=shinjigen@1ed	  .  0988)	; &M-03365;
+      (=shinjigen	  .  0988)	; &M-03365;
       ))
     (<-vulgar*sources
-     zhengzitong daikanwa shinjigen@1ed)
+     zhengzitong daikanwa shinjigen)
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -3749,10 +3780,18 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (=ucs@big5		. #x544A)	; &J97-3970;
+    (=>jis-x0208	. #x3970)	; &J97-3970; [25-80]
+    (=>jis-x0213-1	. #x3970)	; &J97-3970; [25-80]
+    (=big5		. #xA769)	; &J97-3970;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x544A)	; &B-A769;
-      (=big5		  . #xA769)	; &B-A769;
-      (=jis-x0208@1997	  . #x3970)	; &B-A769; [25-80]
+     ((=ucs@big5	  . #x544A)	; &J97-3970;
+      (=>jis-x0208	  . #x3970)	; &J97-3970; [25-80]
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
@@ -3768,22 +3807,13 @@
     (=ucs		. #x543F)	; 吿
     (=cns11643-3	. #x2521)	; &I-C3-2521; [05-01]
     (=daikanwa		. 03381)	; &I-M-03381;
-    (=shinjigen@1ed	.  0994)	; 吿
+    (=shinjigen		.  0994)	; 吿
     (=jef-china3	. #x45FC)	; &I-JC3-45FC;
     ))
 (define-char
-  '((ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=ucs@big5		. #x544A)	; &B-A769;
-    (=big5		. #xA769)	; &B-A769;
-    (=jis-x0208@1997	. #x3970)	; &B-A769; [25-80]
-    ))
-(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x544A)	; &B-A769;
-      (=big5		  . #xA769)	; &B-A769;
-      (=jis-x0208@1997	  . #x3970)	; &B-A769; [25-80]
+     ((=ucs@big5	  . #x544A)	; &J97-3970;
+      (=>jis-x0208	  . #x3970)	; &J97-3970; [25-80]
       ))
     (morohashi-daikanwa	3381 1)
     (ideographic-radical . 30)	; ⼝
@@ -3810,6 +3840,9 @@
     (=gt-pj-1		. #x3970)	; &I-GT-04244; [25-80]
     (=shinjigen		.  0993)	; 告
     (mojikyo		. 050119)	; &MCS-6000C3C7;
+    (<-simplified@JP
+     ((=ucs		  . #x543F)	; 吿
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -4569,8 +4602,8 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x541E)	; &B-A75D;
-      (=big5		  . #xA75D)	; &B-A75D;
+     ((=ucs@big5	  . #x541E)	; &J97-465D;
+      (=>jis-x0208@1997	  . #x465D)	; &J97-465D; [38-61]
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 4)
@@ -4592,14 +4625,34 @@
     (=gt-k		. 02624)	; &I-GT-K02624;
     (=gt-pj-1		. #x465D)	; &I-GT-04276; [38-61]
     (=daikanwa		. 48970)	; &I-M-48970;
-    (=shinjigen@rev	.  1002)	; 呑
+    (=shinjigen		.  1002)	; 呑
     (mojikyo		. 048970)	; &MCS-6000BF4A;
+    (<-simplified@JP/extra
+     ((=ucs@unicode	  . #x541E)	; &M-03329;
+      (=gb2312		  . #x4D4C)	; &M-03329; [45-44]
+      (=cns11643-1	  . #x493F)	; &I-C1-493F; [41-31]
+      (=jis-x0213-1@2004  . #x4F7E)	; &I-JX3-4F7E; [47-94]
+      (=daikanwa	  . 03329)	; &I-M-03329;
+      ))
     (<-vulgar
-     ((=ucs		  . #x541E)	; 吞
+     ((=ucs@unicode	  . #x541E)	; &M-03329;
+      (=gb2312		  . #x4D4C)	; &M-03329; [45-44]
+      (=cns11643-1	  . #x493F)	; &I-C1-493F; [41-31]
+      (=jis-x0213-1@2004  . #x4F7E)	; &I-JX3-4F7E; [47-94]
       (=daikanwa	  . 03329)	; &I-M-03329;
       ))
     (<-vulgar*sources
      daikanwa)
+    (<-wrong
+     ((=ucs@unicode	  . #x541E)	; &M-03329;
+      (=gb2312		  . #x4D4C)	; &M-03329; [45-44]
+      (=cns11643-1	  . #x493F)	; &I-C1-493F; [41-31]
+      (=jis-x0213-1@2004  . #x4F7E)	; &I-JX3-4F7E; [47-94]
+      (=daikanwa	  . 03329)	; &I-M-03329;
+      (=shinjigen	  .  1001)	; &M-03329;
+      ))
+    (<-wrong*sources
+     shinjigen)
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -7695,7 +7748,17 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (hanyu-dazidian	1 621 2)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=ucs		  . #x4EA4)	; 交
+      ))
     (=ucs		. #x54AC)	; 咬
+    (=>jis-x0208	. #x527B)	; 咬 [50-91]
+    (=>jis-x0213-1	. #x527B)	; 咬 [50-91]
     (=big5		. #xAB72)	; &I-B-AB72;
     (->subsumptive
      ((ideographic-structure
@@ -7704,19 +7767,20 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=jis-x0208@1978    . #x3872)	; &M-00291; [24-82]
+       ((=jis-x0208@1978    . #x3872)	; &GT-00389; [24-82]
 	(=jis-x0208@1983    . #x3872)	; &I-J83-3872; [24-82]
 	(=ks-x1001	    . #x4E5F)	; &I-K0-4E5F; [46-63]
 	(=daikanwa	    . 00291)	; &I-M-00291;
 	))
-      (=ucs@jis		  . #x54AC)	; &GT-04467;
+      (=ucs@jis/1990	  . #x54AC)	; &GT-04467;
+      (=ucs@jis/2000	  . #x54AC)	; &GT-04467;
       (=jis-x0208	  . #x527B)	; &GT-04467; [50-91]
       (=ks-x1001	  . #x4E61)	; &I-K0-4E61; [46-65]
-      (=jis-x0213-1	  . #x527B)	; &I-JX1-527B; [50-91]
+      (=jis-x0213-1@2000  . #x527B)	; &I-JX1-527B; [50-91]
       (=gt		  . 04467)	; &I-GT-04467;
       (=gt-pj-1		  . #x527B)	; &I-GT-04467; [50-91]
       (=daikanwa	  . 03543)	; &I-M-03543;
-      (=shinjigen@rev	  .  1062)	; &GT-04467;
+      (=shinjigen	  .  1062)	; &GT-04467;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -7724,13 +7788,37 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ucs@unicode	    . #x4EA4)	; &C1-4728;
-	(=gb2312	    . #x3D3B)	; &C1-4728; [29-27]
-	(=cns11643-1	    . #x4728)	; &I-C1-4728; [39-08]
+       ((=>>gt		    . 00390)	; &G-GT-00390;
+	))
+      (=>>jis-x0213-1@2004 . #x527B)	; &G-JX3-527B; [50-91]
+      (->subsumptive
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	  (=ucs		      . #x2FF0)	; â¿°
+	  )
+	 ((=ucs		      . #x53E3)	; 口
+	  )
+	 ((=ucs@jis	      . #x4EA4)	; &GT-00390;
+	  (=jis-x0208@1990    . #x3872)	; &GT-00390; [24-82]
+	  (=jis-x0213-1	      . #x3872)	; &I-JX1-3872; [24-82]
+	  ))
+	(=ucs@jis/2004	    . #x54AC)	; &JX3-527B;
+	(=jis-x0213-1@2004  . #x527B)	; &JX3-527B; [50-91]
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	  (=ucs		      . #x2FF0)	; â¿°
+	  )
+	 ((=ucs		      . #x53E3)	; 口
+	  )
+	 ((=ucs@unicode	      . #x4EA4)	; &C1-4728;
+	  (=gb2312	      . #x3D3B)	; &C1-4728; [29-27]
+	  (=cns11643-1	      . #x4728)	; &I-C1-4728; [39-08]
+	  ))
+	(=ucs@unicode	    . #x54AC)	; &C1-5036;
+	(=gb2312	    . #x5227)	; &C1-5036; [50-07]
+	(=cns11643-1	    . #x5036)	; &I-C1-5036; [48-22]
 	))
-      (=ucs@unicode	  . #x54AC)	; &C1-5036;
-      (=gb2312		  . #x5227)	; &C1-5036; [50-07]
-      (=cns11643-1	  . #x5036)	; &I-C1-5036; [48-22]
       ))
     ))
 (define-char
@@ -9506,6 +9594,25 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=ucs		  . #x4E9A)	; 亚
+      ))
+    (=ucs		. #x54D1)	; 哑
+    (=gb2312		. #x5146)	; &I-G0-5146; [49-38]
+    (<-simplified@CN
+     ((=ucs		  . #x555E)	; 啞
+      (=gb12345		  . #x5146)	; 啞 [49-38]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
     (hanyu-dazidian	1 613 15)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -10075,7 +10182,17 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=ucs		  . #x8096)	; 肖
+      ))
     (=ucs		. #x54E8)	; 哨
+    (=>jis-x0208	. #x3E25)	; 哨 [30-05]
+    (=>jis-x0213-1	. #x3E25)	; 哨 [30-05]
     ))
 (define-char
   '((<-denotational
@@ -10093,8 +10210,10 @@
      ((=ks-x1001	  . #x752B)	; &GT-37890; [85-11]
       (=daikanwa	  . 29263)	; &I-M-29263;
       ))
+    (=ucs@jis/2004	. #x54E8)	; &M-03646;
     (=jis-x0208@1978	. #x3E25)	; &M-03646; [30-05]
     (=ks-x1001		. #x747A)	; &I-K0-747A; [84-90]
+    (=jis-x0213-1@2004	. #x3E25)	; &I-JX3-3E25; [30-05]
     (=daikanwa		. 03646)	; &I-M-03646;
     ))
 (define-char
@@ -10104,6 +10223,7 @@
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (=>>gt		. 04609)	; &G-GT-04609;
     (->subsumptive
      ((hanyu-dazidian	  1 628 1)
       (ideographic-structure
@@ -10121,7 +10241,7 @@
       (=gb2312		  . #x495A)	; &GT-04609; [41-58]
       (=jis-x0208@1983	  . #x3E25)	; &I-J83-3E25; [30-05]
       (=jis-x0208@1990	  . #x3E25)	; &I-J90-3E25; [30-05]
-      (=jis-x0213-1	  . #x3E25)	; &I-JX1-3E25; [30-05]
+      (=jis-x0213-1@2000  . #x3E25)	; &I-JX1-3E25; [30-05]
       (=big5		  . #xADEF)	; &I-B-ADEF;
       (=gt		  . 04609)	; &I-GT-04609;
       (=gt-k		  . 06465)	; &I-GT-K06465;
@@ -12270,8 +12390,12 @@
     (=hanziku-2		. #xD450)	; &I-HZK02-D450;
     ))
 (define-char
+  '((ideographic-radical . 30)	; ⼝
+    (=>jis-x0208@1997	. #x3022)	; &J97-3022; [16-02]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3022)	; &J97-3022; [16-02]
+     ((=>jis-x0208@1997	  . #x3022)	; &J97-3022; [16-02]
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
@@ -12298,10 +12422,6 @@
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
-    (=jis-x0208@1997	. #x3022)	; &J97-3022; [16-02]
-    ))
-(define-char
-  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (hanyu-dazidian	1 627 8)
@@ -13183,7 +13303,8 @@
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (=ucs		. #x5533)	; 唳
-    (=jis-x0208@1997	. #x533A)	; 唳 [51-26]
+    (=>jis-x0208	. #x533A)	; 唳 [51-26]
+    (=>jis-x0213-1	. #x533A)	; 唳 [51-26]
     ))
 (define-char
   '((<-denotational
@@ -13199,6 +13320,23 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
+     ((=ucs		  . #x623E)	; 戾
+      ))
+    (=big5		. #xB0E6)	; &B-B0E6;
+    ))
+(define-char
+  '((<-denotational
+     ((=big5		  . #xB0E6)	; &B-B0E6;
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
      ((=ucs@jis		  . #x623E)	; &M-11712;
       (=ucs@big5	  . #x623E)	; &M-11712;
       (=ks-x1001	  . #x5568)	; &M-11712; [53-72]
@@ -13207,13 +13345,12 @@
       (=daikanwa	  . 11712)	; &I-M-11712;
       ))
     (=cns11643-1	. #x594B)	; &M-03767; [57-43]
-    (=big5		. #xB0E6)	; &I-B-B0E6;
     (=daikanwa		. 03767)	; &I-M-03767;
     (=jef-china3	. #x46DE)	; &I-JC3-46DE;
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x5533)	; 唳
+     ((=big5		  . #xB0E6)	; &B-B0E6;
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
@@ -13222,7 +13359,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x5533)	; 唳
+     ((=big5		  . #xB0E6)	; &B-B0E6;
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
@@ -13246,6 +13383,33 @@
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=ucs		  . #x623B)	; 戻
+      ))
+    (=>>jis-x0213-1	. #x533A)	; &G-JX1-533A; [51-26]
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1	  . #x533A)	; &G-JX1-533A; [51-26]
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=ucs@jis		  . #x623B)	; &GT-14766;
+      (=jis-x0208	  . #x4C61)	; &GT-14766; [44-65]
+      (=jis-x0213-1	  . #x4C61)	; &I-JX1-4C61; [44-65]
+      ))
     (=ucs@jis		. #x5533)	; &GT-04665;
     (=jis-x0208@1983	. #x533A)	; &GT-04665; [51-26]
     (=jis-x0208@1990	. #x533A)	; &I-J90-533A; [51-26]
@@ -13253,6 +13417,13 @@
     (=gt		. 04665)	; &I-GT-04665;
     (=gt-pj-1		. #x533A)	; &I-GT-04665; [51-26]
     (=jef-china3	. #x70BC)	; &I-JC3-70BC;
+    (<-simplified@JP
+     ((=cns11643-1	  . #x594B)	; &M-03767; [57-43]
+      (=daikanwa	  . 03767)	; &I-M-03767;
+      ))
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x533A)	; &J78-533A; [51-26]
+      ))
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
@@ -13476,8 +13647,9 @@
     (total-strokes	 . 11)
     (hanyu-dazidian	1 645 5)
     (=ucs		. #x5539)	; 唹
+    (=>jis-x0208	. #x5330)	; 唹 [51-16]
+    (=>jis-x0213-1	. #x5330)	; 唹 [51-16]
     (=big5		. #xD4A5)	; &I-B-D4A5;
-    (=jis-x0208@1997	. #x5330)	; 唹 [51-16]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -14103,7 +14275,8 @@
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (=ucs		. #x5544)	; 啄
-    (=jis-x0208@1997	. #x426F)	; 啄 [34-79]
+    (=>jis-x0208	. #x426F)	; 啄 [34-79]
+    (=>jis-x0213-1	. #x426F)	; 啄 [34-79]
     ))
 (define-char
   '((<-denotational
@@ -14113,6 +14286,14 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (hanyu-dazidian	1 639 1)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=ucs		  . #x8C56)	; 豖
+      ))
     (=big5		. #xB0D6)	; &B-B0D6;
     (->subsumptive
      ((ideographic-structure
@@ -14127,6 +14308,7 @@
       (=ks-x1001	  . #x7672)	; &I-K0-7672; [86-82]
       (=daikanwa	  . 03801)	; &I-M-03801;
       (=shinjigen@1ed	  .  1121)	; &M-03801;
+      (=shinjigen@rev	  .  1094)	; &M-03801;
       (mojikyo		  . 003801)	; &MCS-60000ED9;
       )
      ((ideographic-structure
@@ -14158,8 +14340,29 @@
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=ucs		  . #x8C55)	; 豕
+      ))
+    (=>>jis-x0213-1	. #x426F)	; &G-JX1-426F; [34-79]
     (->subsumptive
-     ((=ucs@jis		  . #x5544)	; &GT-04629;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=ucs@jis	    . #x8C55)	; &GT-48747;
+	(=ks-x1001	    . #x634E)	; &GT-48747; [67-46]
+	(=jis-x0208@1990    . #x6C35)	; &I-J90-6C35; [76-21]
+	(=jis-x0213-1	    . #x6C35)	; &I-JX1-6C35; [76-21]
+	(=daikanwa	    . 36334)	; &I-M-36334;
+	))
+      (=ucs@jis		  . #x5544)	; &GT-04629;
       (=jis-x0208@1983	  . #x426F)	; &GT-04629; [34-79]
       (=jis-x0208@1990	  . #x426F)	; &I-J90-426F; [34-79]
       (=jis-x0213-1	  . #x426F)	; &I-JX1-426F; [34-79]
@@ -14169,7 +14372,17 @@
       (=shinjigen@rev	  .  1093)	; &GT-04629;
       (mojikyo		  . 054217)	; &MCS-6000D3C9;
       )
-     ((=jef-china3	  . #x70B9)	; &JC3-70B9;
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=jis-x0208@1978    . #x6C35)	; &J83-6C35; [76-21]
+	(=jis-x0208@1983    . #x6C35)	; &I-J83-6C35; [76-21]
+	(=cns11643-1	    . #x4B49)	; &I-C1-4B49; [43-41]
+	))
+      (=jef-china3	  . #x70B9)	; &JC3-70B9;
       ))
     ))
 (define-char
@@ -15294,7 +15507,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3022)	; &J97-3022; [16-02]
+     ((=>jis-x0208@1997	  . #x3022)	; &J97-3022; [16-02]
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
@@ -15321,22 +15534,6 @@
     (=shinjigen@rev	.  1103)	; 啞
     ))
 (define-char
-  '((=>daikanwa		. 03835)	; 啞
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=ucs		  . #x4E9A)	; 亚
-      ))
-    (=ucs		. #x54D1)	; 哑
-    (=gb2312		. #x5146)	; &I-G0-5146; [49-38]
-    ))
-(define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
@@ -16337,6 +16534,27 @@
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (hanyu-dazidian	1 639 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=ucs		  . #x9F7F)	; 齿
+      ))
+    (=ucs		. #x556E)	; 啮
+    (=gb2312		. #x4476)	; &I-G0-4476; [36-86]
+    (=hanziku-2		. #xD5D8)	; &I-HZK02-D5D8;
+    (<-simplified@CN
+     ((=ucs		  . #x5699)	; 嚙
+      (=gb12345		  . #x4476)	; 嚙 [36-86]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 8)
     (kangxi-strokes	 . 11)
     (total-strokes	 . 11)
     (ideographic-structure
@@ -19063,40 +19281,77 @@
     (=ucs@unicode	. #x55A8)	; &UU+55A8;
     ))
 (define-char
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (=>jis-x0208	. #x5348)	; &J97-5348; [51-40]
+    (=>jis-x0213-1	. #x5348)	; &J97-5348; [51-40]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5348)	; &J97-5348; [51-40]
+     ((=>jis-x0208	  . #x5348)	; &J97-5348; [51-40]
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x55A9)	; 喩
-    (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x53E3)	; 口
-	)
-       ((=ucs@jis	    . #x516A)	; &GT-01873;
-	(=jis-x0208	    . #x5141)	; &GT-01873; [49-33]
-	(=ks-x1001	    . #x6A64)	; &I-K0-6A64; [74-68]
-	(=jis-x0213-1	    . #x5141)	; &I-JX1-5141; [49-33]
-	(=daikanwa	    . 01437)	; &I-M-01437;
-	))
-      (=ucs@jis		  . #x55A9)	; &GT-05017;
-      (=ks-x1001	  . #x6A67)	; &GT-05017; [74-71]
-      (=jis-x0208@1990	  . #x5348)	; &I-J90-5348; [51-40]
-      (=jis-x0213-1	  . #x5348)	; &I-JX1-5348; [51-40]
-      (=gt		  . 05017)	; &I-GT-05017;
-      (=gt-pj-1		  . #x5348)	; &I-GT-05017; [51-40]
-      (=daikanwa	  . 03979)	; &I-M-03979;
-      (=shinjigen	  .  1176)	; &GT-05017;
-      (mojikyo		  . 003979)	; &MCS-60000F8B;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x55A9)	; 喩
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=ucs@jis		  . #x516A)	; &GT-01873;
+      (=jis-x0208	  . #x5141)	; &GT-01873; [49-33]
+      (=ks-x1001	  . #x6A64)	; &I-K0-6A64; [74-68]
+      (=jis-x0213-1	  . #x5141)	; &I-JX1-5141; [49-33]
+      (=daikanwa	  . 01437)	; &I-M-01437;
+      ))
+    (=ucs@jis		. #x55A9)	; &GT-05017;
+    (=ks-x1001		. #x6A67)	; &GT-05017; [74-71]
+    (=jis-x0208@1990	. #x5348)	; &I-J90-5348; [51-40]
+    (=jis-x0213-1	. #x5348)	; &I-JX1-5348; [51-40]
+    (=gt		. 05017)	; &I-GT-05017;
+    (=gt-pj-1		. #x5348)	; &I-GT-05017; [51-40]
+    (=daikanwa		. 03979)	; &I-M-03979;
+    (=shinjigen		.  1176)	; &GT-05017;
+    (mojikyo		. 003979)	; &MCS-60000F8B;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x55A9)	; 喩
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=jis-x0208@1978	  . #x5348)	; &J83-5348; [51-40]
-      (=jis-x0208@1983	  . #x5348)	; &I-J83-5348; [51-40]
-      (mojikyo		  . 055162)	; &MCS-6000D77A;
+     ((=ucs		  . #x53E3)	; 口
       )
+     ((=gt-k		  . 05210)	; &GT-K05210;
+      ))
+    (=jis-x0208@1978	. #x5348)	; &J83-5348; [51-40]
+    (=jis-x0208@1983	. #x5348)	; &I-J83-5348; [51-40]
+    (mojikyo		. 055162)	; &MCS-6000D77A;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x55A9)	; 喩
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
@@ -19120,24 +19375,33 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 30)	; ⼝
+  '((<-denotational
+     ((=>jis-x0208	  . #x5348)	; &J97-5348; [51-40]
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (=ucs		. #x55BB)	; 喻
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x55BB)	; 喻
+      ))
+    (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=jis-x0208@1997	. #x5348)	; &J97-5348; [51-40]
+    (=jef-china3	. #x46EB)	; &JC3-46EB;
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5348)	; &J97-5348; [51-40]
+     ((=ucs		  . #x55BB)	; 喻
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (hanyu-dazidian	1 657 8)
-    (=ucs		. #x55BB)	; 喻
-    (=big5		. #xB3EB)	; &I-B-B3EB;
+    (=big5		. #xB3EB)	; &B-B3EB;
     (->subsumptive
-     ((=jef-china3	  . #x46EB)	; &JC3-46EB;
-      )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
@@ -19846,8 +20110,17 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=ucs		  . #x98DF)	; 食
+      ))
     (=ucs		. #x55B0)	; 喰
-    (=jis-x0208@1997	. #x3674)	; 喰 [22-84]
+    (=>jis-x0208	. #x3674)	; 喰 [22-84]
+    (=>jis-x0213-1	. #x3674)	; 喰 [22-84]
     ))
 (define-char
   '((<-denotational
@@ -19866,11 +20139,13 @@
       (=cns11643-1	  . #x537A)	; &I-C1-537A; [51-90]
       (=daikanwa	  . 44014)	; &I-M-44014;
       ))
+    (=ucs@jis/2004	. #x55B0)	; &GT-04938;
     (=jis-x0208@1978	. #x3674)	; &GT-04938; [22-84]
+    (=jis-x0213-1@2004	. #x3674)	; &I-JX3-3674; [22-84]
     (=gt		. 04938)	; &I-GT-04938;
     (=gt-pj-2		. #x5471)	; &I-GT-04938; [52-81]
     (=daikanwa		. 04015)	; &I-M-04015;
-    (=shinjigen@1ed	.  1180)	; &GT-04938;
+    (=shinjigen		.  1180)	; &GT-04938;
     (=cbeta		. 00068)	; &I-CB00068;
     ))
 (define-char
@@ -19891,13 +20166,13 @@
 	(=jis-x0208	    . #x3F29)	; &GT-59029; [31-09]
 	(=jis-x0213-1	    . #x3F29)	; &I-JX1-3F29; [31-09]
 	))
-      (=ucs@jis		  . #x55B0)	; &GT-04939;
+      (=ucs@jis/1990	  . #x55B0)	; &GT-04939;
+      (=ucs@jis/2000	  . #x55B0)	; &GT-04939;
       (=jis-x0208@1983	  . #x3674)	; &GT-04939; [22-84]
       (=jis-x0208@1990	  . #x3674)	; &I-J90-3674; [22-84]
-      (=jis-x0213-1	  . #x3674)	; &I-JX1-3674; [22-84]
+      (=jis-x0213-1@2000  . #x3674)	; &I-JX1-3674; [22-84]
       (=gt		  . 04939)	; &I-GT-04939;
       (=gt-pj-1		  . #x3674)	; &I-GT-04939; [22-84]
-      (=shinjigen@rev	  .  1180)	; &GT-04939;
       (=jef-china3	  . #x70B6)	; &I-JC3-70B6;
       )
      ((hanyu-dazidian	  1 658 4)
@@ -20973,7 +21248,6 @@
      ((=ucs		  . #x53E3)	; 口
       )
      ((=ucs@jis		  . #x5B6B)	; &GT-08784;
-      (=ucs@big5	  . #x5B6B)	; &GT-08784;
       (=jis-x0208	  . #x4239)	; &GT-08784; [34-25]
       (=ks-x1001	  . #x615D)	; &I-K0-615D; [65-61]
       (=jis-x0213-1	  . #x4239)	; &I-JX1-4239; [34-25]
@@ -22350,19 +22624,61 @@
      ((=ucs		  . #x8006)	; 耆
       ))
     (=ucs		. #x55DC)	; 嗜
-    (=jis-x0208		. #x534F)	; &I-J90-534F; [51-47]
-    (=gb2312		. #x4A48)	; &I-G0-4A48; [42-40]
-    (=ks-x1001		. #x506E)	; &I-K0-506E; [48-78]
-    (=cns11643-1	. #x6344)	; &I-C1-6344; [67-36]
-    (=jis-x0213-1	. #x534F)	; &I-JX1-534F; [51-47]
     (=big5		. #xB6DD)	; &I-B-B6DD;
-    (=gt		. 05100)	; &I-GT-05100;
-    (=gt-pj-1		. #x534F)	; &I-GT-05100; [51-47]
-    (=daikanwa		. 04089)	; &I-M-04089;
-    (=shinjigen@rev	.  1195)	; 嗜
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=ucs@unicode	    . #x8006)	; &GT-37316;
+	(=jis-x0208	    . #x664D)	; &GT-37316; [70-45]
+	(=gb2312	    . #x6A48)	; &I-G0-6A48; [74-40]
+	(=ks-x1001	    . #x513D)	; &I-K0-513D; [49-29]
+	(=jis-x0213-1	    . #x664D)	; &I-JX1-664D; [70-45]
+	(=daikanwa	    . 28849)	; &I-M-28849;
+	))
+      (=ucs@unicode	  . #x55DC)	; &GT-05100;
+      (=jis-x0208	  . #x534F)	; &GT-05100; [51-47]
+      (=gb2312		  . #x4A48)	; &I-G0-4A48; [42-40]
+      (=ks-x1001	  . #x506E)	; &I-K0-506E; [48-78]
+      (=jis-x0213-1	  . #x534F)	; &I-JX1-534F; [51-47]
+      (=gt		  . 05100)	; &I-GT-05100;
+      (=gt-pj-1		  . #x534F)	; &I-GT-05100; [51-47]
+      (=daikanwa	  . 04089)	; &I-M-04089;
+      (=shinjigen	  .  1195)	; &GT-05100;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=ucs@cns	    . #x8006)	; &C1-5752;
+	(=cns11643-1	    . #x5752)	; &C1-5752; [55-50]
+	))
+      (=cns11643-1	  . #x6344)	; &C1-6344; [67-36]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x20E55)	; 𠹕
+  '((ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=ucs		  . #x8C79)	; è±¹
+      ))
+    (=ucs		. #x20E55)	; 𠹕
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x20E55)	; 𠹕
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
@@ -22372,13 +22688,17 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ks-x1001	  . #x787B)	; &GT-48933; [88-91]
+     ((=ucs@jis/2004	  . #x8C79)	; &GT-48933;
+      (=ks-x1001	  . #x787B)	; &GT-48933; [88-91]
+      (=jis-x0213-1@2004  . #x493F)	; &I-JX3-493F; [41-31]
       (=daikanwa	  . 36499)	; &I-M-36499;
       ))
     (=daikanwa		. 04090)	; &M-04090;
     ))
 (define-char
-  '((morohashi-daikanwa	4090 0 2)
+  '((<-denotational
+     ((=ucs		  . #x20E55)	; 𠹕
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
@@ -22389,10 +22709,14 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs		  . #x8C79)	; è±¹
+     ((=ucs@unicode	  . #x8C79)	; &GT-48934;
+      (=jis-x0208	  . #x493F)	; &GT-48934; [41-31]
+      (=gb2312		  . #x312A)	; &I-G0-312A; [17-10]
+      (=cns11643-1	  . #x5841)	; &I-C1-5841; [56-33]
+      (=jis-x0213-1@2000  . #x493F)	; &I-JX1-493F; [41-31]
       ))
-    (=ucs		. #x20E55)	; 𠹕
-    (=cns11643-5	. #x3E33)	; &I-C5-3E33; [30-19]
+    (=ucs@iso		. #x20E55)	; &CB05355;
+    (=cns11643-5	. #x3E33)	; &CB05355; [30-19]
     (=hanziku-2		. #xDBEA)	; &I-HZK02-DBEA;
     (=cbeta		. 05355)	; &I-CB05355;
     ))
@@ -25975,7 +26299,7 @@
 	)
        ((=ucs		    . #x53E3)	; 口
 	)
-       ((=ks-x1001	    . #x582B)	; &M-47887; [56-11]
+       ((=ks-x1001	    . #x582B)	; &GT-65256; [56-11]
 	(=daikanwa	    . 47887)	; &I-M-47887;
 	))
       (=ucs@jis		  . #x561B)	; &GT-05313;
@@ -26882,8 +27206,17 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (hanyu-dazidian	1 681 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=ucs		  . #x671D)	; 朝
+      ))
     (=ucs		. #x5632)	; 嘲
-    (=jis-x0208@1997	. #x535E)	; 嘲 [51-62]
+    (=>jis-x0208	. #x535E)	; 嘲 [51-62]
+    (=>jis-x0213-1	. #x535E)	; 嘲 [51-62]
     ))
 (define-char
   '((<-denotational
@@ -26900,12 +27233,14 @@
       )
      ((=daikanwa	  . 14374)	; &M-14374;
       ))
+    (=ucs@jis/2004	. #x5632)	; &GT-05427;
     (=jis-x0208@1978	. #x535E)	; &GT-05427; [51-62]
     (=ks-x1001		. #x703F)	; &I-K0-703F; [80-31]
+    (=jis-x0213-1@2004	. #x535E)	; &I-JX3-535E; [51-62]
     (=gt		. 05427)	; &I-GT-05427;
     (=gt-pj-2		. #x5734)	; &I-GT-05427; [55-20]
     (=daikanwa		. 04254)	; &I-M-04254;
-    (=shinjigen@1ed	.  1245)	; &GT-05427;
+    (=shinjigen		.  1245)	; &GT-05427;
     (mojikyo		. 004254)	; &MCS-6000109E;
     ))
 (define-char
@@ -26921,14 +27256,19 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs		  . #x671D)	; 朝
+     ((=ucs@unicode	  . #x671D)	; &GT-18245;
+      (=jis-x0208	  . #x442B)	; &GT-18245; [36-11]
+      (=gb2312		  . #x332F)	; &I-G0-332F; [19-15]
+      (=ks-x1001	  . #x7048)	; &I-K0-7048; [80-40]
+      (=cns11643-1	  . #x5F67)	; &I-C1-5F67; [63-71]
+      (=jis-x0213-1	  . #x442B)	; &I-JX1-442B; [36-11]
       ))
     (=ucs@unicode	. #x5632)	; &GT-05428;
     (=gb2312		. #x3330)	; &GT-05428; [19-16]
     (=jis-x0208@1983	. #x535E)	; &I-J83-535E; [51-62]
     (=jis-x0208@1990	. #x535E)	; &I-J90-535E; [51-62]
     (=cns11643-1	. #x6C34)	; &I-C1-6C34; [76-20]
-    (=jis-x0213-1	. #x535E)	; &I-JX1-535E; [51-62]
+    (=jis-x0213-1@2000	. #x535E)	; &I-JX1-535E; [51-62]
     (=big5		. #xBC4A)	; &I-B-BC4A;
     (=gt		. 05428)	; &I-GT-05428;
     (=gt-pj-1		. #x535E)	; &I-GT-05428; [51-62]
@@ -27597,8 +27937,9 @@
     (total-strokes	 . 15)
     (hanyu-dazidian	1 686 5)
     (=ucs		. #x5642)	; 噂
+    (=>jis-x0208	. #x313D)	; 噂 [17-29]
+    (=>jis-x0213-1	. #x313D)	; 噂 [17-29]
     (=big5		. #xE4F7)	; &I-B-E4F7;
-    (=jis-x0208@1997	. #x313D)	; 噂 [17-29]
     ))
 (define-char
   '((<-denotational
@@ -28044,7 +28385,6 @@
      ((=ucs		  . #x53E3)	; 口
       )
      ((=ucs@jis		  . #x6562)	; &GT-16742;
-      (=ucs@big5	  . #x6562)	; &GT-16742;
       (=ks-x1001	  . #x4A72)	; &GT-16742; [42-82]
       (=jis-x0208@1990	  . #x343A)	; &I-J90-343A; [20-26]
       (=cns11643-1	  . #x5F56)	; &I-C1-5F56; [63-54]
@@ -28195,6 +28535,24 @@
 (define-char
   '((ideographic-radical . 30)	; ⼝
     (=ucs		. #x564C)	; 噌
+    (=>jis-x0208	. #x4139)	; 噌 [33-25]
+    (=>jis-x0213-1	. #x4139)	; 噌 [33-25]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x564C)	; 噌
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (hanyu-dazidian	1 686 8)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=ucs		  . #x66FE)	; 曾
+      ))
+    (=big5		. #xE4F8)	; &B-E4F8;
     ))
 (define-char
   '((<-denotational
@@ -28215,19 +28573,13 @@
       (=jis-x0213-1	  . #x413D)	; &I-JX1-413D; [33-29]
       (=daikanwa	  . 14299)	; &I-M-14299;
       ))
+    (=ucs@jis/2004	. #x564C)	; &M-04303;
     (=jis-x0208@1978	. #x4139)	; &M-04303; [33-25]
+    (=jis-x0213-1@2004	. #x4139)	; &I-JX3-4139; [33-25]
     (=daikanwa		. 04303)	; &I-M-04303;
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x564C)	; 噌
-      ))
-    (ideographic-radical . 30)	; ⼝
-    (hanyu-dazidian	1 686 8)
-    (=big5		. #xE4F8)	; &B-E4F8;
-    ))
-(define-char
-  '((<-denotational
      ((=big5		  . #xE4F8)	; &B-E4F8;
       ))
     (ideographic-radical . 30)	; ⼝
@@ -28254,10 +28606,19 @@
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=ucs@jis		. #x564C)	; &GT-05268;
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x53E3)	; 口
+      )
+     ((=ucs		  . #x66FD)	; 曽
+      ))
+    (=ucs@jis/1990	. #x564C)	; &GT-05268;
+    (=ucs@jis/2000	. #x564C)	; &GT-05268;
     (=jis-x0208@1983	. #x4139)	; &GT-05268; [33-25]
     (=jis-x0208@1990	. #x4139)	; &I-J90-4139; [33-25]
-    (=jis-x0213-1	. #x4139)	; &I-JX1-4139; [33-25]
+    (=jis-x0213-1@2000	. #x4139)	; &I-JX1-4139; [33-25]
     (=gt		. 05268)	; &I-GT-05268;
     (=gt-pj-1		. #x4139)	; &I-GT-05268; [33-25]
     (=jef-china3	. #x70B8)	; &I-JC3-70B8;
@@ -29447,8 +29808,12 @@
     (=hanziku-2		. #xDECE)	; &I-HZK02-DECE;
     ))
 (define-char
+  '((ideographic-radical . 30)	; ⼝
+    (=>jis-x0208@1997	. #x337A)	; &J97-337A; [19-90]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x337A)	; &J97-337A; [19-90]
+     ((=>jis-x0208@1997	  . #x337A)	; &J97-337A; [19-90]
       ))
     (morohashi-daikanwa	ho 71)
     (ideographic-radical . 30)	; ⼝
@@ -29473,10 +29838,6 @@
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
-    (=jis-x0208@1997	. #x337A)	; &J97-337A; [19-90]
-    ))
-(define-char
-  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (hanyu-dazidian	8 14 26)
@@ -31366,8 +31727,9 @@
     (total-strokes	 . 16)
     (hanyu-dazidian	1 689 10)
     (=ucs		. #x5678)	; 噸
+    (=>jis-x0208	. #x4655)	; 噸 [38-53]
+    (=>jis-x0213-1	. #x4655)	; 噸 [38-53]
     (=big5		. #xBEB7)	; &I-B-BEB7;
-    (=jis-x0208@1997	. #x4655)	; 噸 [38-53]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -33570,7 +33932,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x337A)	; &J97-337A; [19-90]
+     ((=>jis-x0208@1997	  . #x337A)	; &J97-337A; [19-90]
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 15)
@@ -33594,24 +33956,6 @@
     (=daikanwa		. 04516)	; &I-M-04516;
     ))
 (define-char
-  '((=>daikanwa		. 04516)	; 嚙
-    (ideographic-radical . 30)	; ⼝
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (hanyu-dazidian	1 639 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x53E3)	; 口
-      )
-     ((=ucs		  . #x9F7F)	; 齿
-      ))
-    (=ucs		. #x556E)	; 啮
-    (=gb2312		. #x4476)	; &I-G0-4476; [36-86]
-    (=hanziku-2		. #xD5D8)	; &I-HZK02-D5D8;
-    ))
-(define-char
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
@@ -34245,8 +34589,12 @@
     (=daikanwa		. 48984)	; &I-M-48984;
     ))
 (define-char
+  '((ideographic-radical . 30)	; ⼝
+    (=>jis-x0208@1997	. #x4739)	; &J97-4739; [39-25]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4739)	; &J97-4739; [39-25]
+     ((=>jis-x0208@1997	  . #x4739)	; &J97-4739; [39-25]
       ))
     (morohashi-daikanwa	ho 561)
     (ideographic-radical . 30)	; ⼝
@@ -34268,10 +34616,6 @@
     ))
 (define-char
   '((ideographic-radical . 30)	; ⼝
-    (=jis-x0208@1997	. #x4739)	; &J97-4739; [39-25]
-    ))
-(define-char
-  '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (ideographic-structure
@@ -34377,8 +34721,13 @@
     (mojikyo		. 063459)	; &MCS-6000F7E3;
     ))
 (define-char
+  '((ideographic-radical . 30)	; ⼝
+    (=>jis-x0208	. #x536B)	; &J97-536B; [51-75]
+    (=>jis-x0213-1	. #x536B)	; &J97-536B; [51-75]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x536B)	; &J97-536B; [51-75]
+     ((=>jis-x0208	  . #x536B)	; &J97-536B; [51-75]
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 16)
@@ -34390,33 +34739,49 @@
       )
      ((=ucs		  . #x53E3)	; 口
       )
-     ((=ucs@unicode	  . #x71D5)	; &GT-24843;
-      (=jis-x0208	  . #x316D)	; &GT-24843; [17-77]
-      (=gb2312		  . #x5160)	; &I-G0-5160; [49-64]
-      (=ks-x1001	  . #x6658)	; &I-K0-6658; [70-56]
-      (=jis-x0213-1	  . #x316D)	; &I-JX1-316D; [17-77]
-      (=daikanwa	  . 19429)	; &I-M-19429;
+     ((=ucs		  . #x71D5)	; 燕
       ))
     (=ucs		. #x56A5)	; 嚥
-    (=jis-x0208@1983	. #x536B)	; &I-J83-536B; [51-75]
-    (=ks-x1001		. #x663F)	; &I-K0-663F; [70-31]
-    (=jis-x0208@1990	. #x536B)	; &I-J90-536B; [51-75]
-    (=cns11643-1	. #x782C)	; &I-C1-782C; [88-12]
-    (=jis-x0213-1	. #x536B)	; &I-JX1-536B; [51-75]
     (=big5		. #xC360)	; &I-B-C360;
-    (=gt		. 05718)	; &I-GT-05718;
-    (=gt-pj-1		. #x536B)	; &I-GT-05718; [51-75]
-    (=daikanwa		. 04545)	; &I-M-04545;
-    (=shinjigen@rev	.  1280)	; 嚥
-    (mojikyo		. 004545)	; &MCS-600011C1;
-    ))
-(define-char
-  '((ideographic-radical . 30)	; ⼝
-    (=jis-x0208@1997	. #x536B)	; &J97-536B; [51-75]
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=ucs@unicode	    . #x71D5)	; &GT-24843;
+	(=jis-x0208	    . #x316D)	; &GT-24843; [17-77]
+	(=gb2312	    . #x5160)	; &I-G0-5160; [49-64]
+	(=ks-x1001	    . #x6658)	; &I-K0-6658; [70-56]
+	(=jis-x0213-1	    . #x316D)	; &I-JX1-316D; [17-77]
+	(=daikanwa	    . 19429)	; &I-M-19429;
+	))
+      (=ucs@unicode	  . #x56A5)	; &GT-05718;
+      (=jis-x0208@1983	  . #x536B)	; &GT-05718; [51-75]
+      (=ks-x1001	  . #x663F)	; &I-K0-663F; [70-31]
+      (=jis-x0208@1990	  . #x536B)	; &I-J90-536B; [51-75]
+      (=jis-x0213-1	  . #x536B)	; &I-JX1-536B; [51-75]
+      (=gt		  . 05718)	; &I-GT-05718;
+      (=gt-pj-1		  . #x536B)	; &I-GT-05718; [51-75]
+      (=daikanwa	  . 04545)	; &I-M-04545;
+      (=shinjigen	  .  1280)	; &GT-05718;
+      (mojikyo		  . 004545)	; &MCS-600011C1;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs		    . #x53E3)	; 口
+	)
+       ((=cns11643-1	    . #x713A)	; &C1-713A; [81-26]
+	))
+      (=cns11643-1	  . #x782C)	; &C1-782C; [88-12]
+      ))
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x536B)	; &J97-536B; [51-75]
+     ((=>jis-x0208	  . #x536B)	; &J97-536B; [51-75]
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 15)
@@ -35459,7 +35824,6 @@
 	  ))
 	)
        ((=ucs@jis	    . #x6562)	; &GT-16742;
-	(=ucs@big5	    . #x6562)	; &GT-16742;
 	(=ks-x1001	    . #x4A72)	; &GT-16742; [42-82]
 	(=jis-x0208@1990    . #x343A)	; &I-J90-343A; [20-26]
 	(=cns11643-1	    . #x5F56)	; &I-C1-5F56; [63-54]
@@ -36255,6 +36619,17 @@
   '((ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 18)
     (total-strokes	 . 21)
+    (=ucs		. #x56C0)	; 囀
+    (=>jis-x0208	. #x5373)	; 囀 [51-83]
+    (=>jis-x0213-1	. #x5373)	; 囀 [51-83]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x56C0)	; 囀
+      ))
+    (ideographic-radical . 30)	; ⼝
+    (ideographic-strokes . 18)
+    (total-strokes	 . 21)
     (hanyu-dazidian	1 705 18)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -36264,21 +36639,24 @@
       )
      ((=ucs		  . #x8F49)	; 轉
       ))
-    (=ucs		. #x56C0)	; 囀
-    (=cns11643-1	. #x7A65)	; &I-C1-7A65; [90-69]
-    (=gb12345		. #x5F79)	; 囀 [63-89]
+    (=ucs@unicode	. #x56C0)	; &M-04614;
+    (=cns11643-1	. #x7A65)	; &M-04614; [90-69]
+    (=jis-x0213-1@2004	. #x5373)	; &I-JX3-5373; [51-83]
+    (=gb12345		. #x5F79)	; &M-04614; [63-89]
     (=big5		. #xC4DA)	; &I-B-C4DA;
     (=daikanwa		. 04614)	; &I-M-04614;
     ))
 (define-char
-  '((=>ucs		. #x56C0)	; 囀
-    (morohashi-daikanwa	4614 0 3)
+  '((<-denotational
+     ((=ucs		  . #x56C0)	; 囀
+      ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 18)
     (total-strokes	 . 21)
-    (=ucs@jis		. #x56C0)	; &GT-05820;
+    (=ucs@jis/1990	. #x56C0)	; &GT-05820;
+    (=ucs@jis/2000	. #x56C0)	; &GT-05820;
     (=jis-x0208		. #x5373)	; &GT-05820; [51-83]
-    (=jis-x0213-1	. #x5373)	; &I-JX1-5373; [51-83]
+    (=jis-x0213-1@2000	. #x5373)	; &I-JX1-5373; [51-83]
     (=gt		. 05820)	; &I-GT-05820;
     (=gt-pj-1		. #x5373)	; &I-GT-05820; [51-83]
     ))
@@ -36288,8 +36666,9 @@
     (total-strokes	 . 21)
     (hanyu-dazidian	1 705 12)
     (=ucs		. #x56C1)	; 囁
+    (=>jis-x0208	. #x5371)	; 囁 [51-81]
+    (=>jis-x0213-1	. #x5371)	; 囁 [51-81]
     (=big5		. #xC4D9)	; &I-B-C4D9;
-    (=jis-x0208@1997	. #x5371)	; 囁 [51-81]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -36963,34 +37342,12 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4739)	; &J97-4739; [39-25]
+     ((=>jis-x0208@1997	  . #x4739)	; &J97-4739; [39-25]
       ))
     (ideographic-radical . 30)	; ⼝
     (ideographic-strokes . 19)
     (total-strokes	 . 22)
     (hanyu-dazidian	1 707 13)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=big5-cdp	    . #x8DDD)	; &CDP-8DDD;
-	)
-       ((=ucs		    . #x5196)	; 冖
-	))
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=big5-cdp	    . #x8CA3)	; &CDP-8CA3;
-	)
-       ((=big5-cdp	    . #x8B67)	; &CDP-8B67;
-	))
-      ))
     (=ucs		. #x56CA)	; 囊
     (=jis-x0208@1978	. #x4739)	; &I-J78-4739; [39-25]
     (=gb2312		. #x4452)	; &I-G0-4452; [36-50]
@@ -37000,6 +37357,7 @@
     (=jis-x0213-1	. #x2F40)	; &I-JX1-2F40; [15-32]
     (=big5		. #xC56E)	; &I-B-C56E;
     (=daikanwa		. 04633)	; &I-M-04633;
+    (=jef-china3	. #x70BA)	; &I-JC3-70BA;
     (mojikyo		. 004633)	; &MCS-60001219;
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R031-Enclosure.el b/lisp/utf-2000/Ideograph-R031-Enclosure.el
index 36292aa..c529424 100644
--- a/lisp/utf-2000/Ideograph-R031-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R031-Enclosure.el
@@ -2177,11 +2177,39 @@
      ((=ucs		  . #x8C55)	; 豕
       ))
     (=ucs		. #x5702)	; 圂
-    (=jis-x0212		. #x3724)	; &I-JSP-3724; [23-04]
-    (=cns11643-2	. #x2E4B)	; &I-C2-2E4B; [14-43]
     (=big5		. #xD149)	; &I-B-D149;
-    (=daikanwa		. 04773)	; &I-M-04773;
-    (=jef-china3	. #x47C3)	; &I-JC3-47C3;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	(=ucs		    . #x2FF4)	; â¿´
+	)
+       ((=ucs		    . #x56D7)	; 囗
+	)
+       ((=ucs@jis	    . #x8C55)	; &GT-48747;
+	(=ks-x1001	    . #x634E)	; &GT-48747; [67-46]
+	(=jis-x0208@1990    . #x6C35)	; &I-J90-6C35; [76-21]
+	(=jis-x0213-1	    . #x6C35)	; &I-JX1-6C35; [76-21]
+	(=daikanwa	    . 36334)	; &I-M-36334;
+	))
+      (=ucs@jis		  . #x5702)	; &M-04773;
+      (=jis-x0212	  . #x3724)	; &M-04773; [23-04]
+      (=daikanwa	  . 04773)	; &I-M-04773;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
+	(=ucs		    . #x2FF4)	; â¿´
+	)
+       ((=ucs		    . #x56D7)	; 囗
+	)
+       ((=jis-x0208@1978    . #x6C35)	; &J83-6C35; [76-21]
+	(=jis-x0208@1983    . #x6C35)	; &I-J83-6C35; [76-21]
+	(=cns11643-1	    . #x4B49)	; &I-C1-4B49; [43-41]
+	))
+      (=cns11643-2	  . #x2E4B)	; &C2-2E4B; [14-43]
+      (=jef-china3	  . #x47C3)	; &I-JC3-47C3;
+      )
+     ((=ucs@unicode	  . #x5702)	; &UU+5702;
+      ))
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
@@ -2206,15 +2234,13 @@
     (=gt		. 06011)	; &I-GT-06011;
     (=gt-pj-1		. #x4A60)	; &I-GT-06011; [42-64]
     (=daikanwa		. 04774)	; &I-M-04774;
-    (=shinjigen@rev	.  1326)	; 圃
+    (=shinjigen		.  1326)	; 圃
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (hanyu-dazidian-vol	 . 1)
-    (hanyu-dazidian-page . 719)
-    (hanyu-dazidian-char . 1)
+    (hanyu-dazidian	1 719 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND")
       (=ucs		  . #x2FF4)	; â¿´
@@ -2234,7 +2260,7 @@
     (=gt-k		. 06582)	; &I-GT-K06582;
     (=gt-pj-1		. #x537D)	; &I-GT-05998; [51-93]
     (=daikanwa		. 04775)	; &I-M-04775;
-    (=shinjigen@rev	.  1324)	; 圄
+    (=shinjigen		.  1324)	; 圄
     ))
 (define-char
   '((ideographic-radical . 31)	; ⼞
diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el
index e042dc6..b9b1d8c 100644
--- a/lisp/utf-2000/Ideograph-R032-Earth.el
+++ b/lisp/utf-2000/Ideograph-R032-Earth.el
@@ -2701,20 +2701,18 @@
     (=big5		. #xABB2)	; &I-B-ABB2;
     (->subsumptive
      ((=ucs@jis		  . #x5793)	; &GT-06323;
-      (=ucs@big5	  . #x5793)	; &GT-06323;
       (=jis-x0208	  . #x5436)	; &GT-06323; [52-22]
       (=ks-x1001	  . #x7A27)	; &I-K0-7A27; [90-07]
       (=jis-x0213-1	  . #x5436)	; &I-JX1-5436; [52-22]
       (=gt		  . 06323)	; &I-GT-06323;
       (=gt-pj-1		  . #x5436)	; &I-GT-06323; [52-22]
       (=daikanwa	  . 05040)	; &I-M-05040;
-      (=shinjigen@rev	  .  1384)	; &GT-06323;
       )
      ((=ucs@unicode	  . #x5793)	; &C1-5054;
       (=gb2312		  . #x5B72)	; &C1-5054; [59-82]
       (=cns11643-1	  . #x5054)	; &I-C1-5054; [48-52]
       )
-     ((=shinjigen@1ed	  .  1384)	; &SJG1-1384;
+     ((=shinjigen	  .  1384)	; &SJG2-1384;
       ))
     ))
 (define-char
@@ -4837,27 +4835,27 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x57E9)	; &B-D4C9;
-      (=big5		  . #xD4C9)	; &B-D4C9;
+     ((=ucs		  . #x57E9)	; 埩
       ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (hanyu-dazidian	1 455 1)
-    (=ucs@jis		. #x57E9)	; &M-05174;
-    (=jis-x0212		. #x3771)	; &M-05174; [23-81]
-    (=daikanwa		. 05174)	; &I-M-05174;
-    (=jef-china3	. #x48A1)	; &I-JC3-48A1;
+    (=ucs@big5		. #x57E9)	; &B-D4C9;
+    (=big5		. #xD4C9)	; &B-D4C9;
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x57E9)	; 埩
+     ((=ucs@big5	  . #x57E9)	; &B-D4C9;
+      (=big5		  . #xD4C9)	; &B-D4C9;
       ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs@big5		. #x57E9)	; &B-D4C9;
-    (=big5		. #xD4C9)	; &B-D4C9;
+    (hanyu-dazidian	1 455 1)
+    (=ucs@jis		. #x57E9)	; &M-05174;
+    (=jis-x0212		. #x3771)	; &M-05174; [23-81]
+    (=daikanwa		. 05174)	; &I-M-05174;
+    (=jef-china3	. #x48A1)	; &I-JC3-48A1;
     ))
 (define-char
   '((<-denotational
@@ -5634,25 +5632,41 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x580B)	; 堋
-    (=jis-x0208@1997	. #x5444)	; 堋 [52-36]
-    (->subsumptive
-     ((=jis-x0208@1978	  . #x5444)	; &M-05217; [52-36]
-      (=daikanwa	  . 05217)	; &I-M-05217;
-      (mojikyo		  . 005217)	; &MCS-60001461;
-      )
-     ((hanyu-dazidian	  1 455 9)
-      (=ucs@unicode	  . #x580B)	; &GT-06579;
-      (=gb2312		  . #x5C21)	; &GT-06579; [60-01]
-      (=jis-x0208@1983	  . #x5444)	; &I-J83-5444; [52-36]
-      (=jis-x0208@1990	  . #x5444)	; &I-J90-5444; [52-36]
-      (=cns11643-2	  . #x343B)	; &I-C2-343B; [20-27]
-      (=jis-x0213-1	  . #x5444)	; &I-JX1-5444; [52-36]
-      (=big5		  . #xD4B8)	; &I-B-D4B8;
-      (=gt		  . 06579)	; &I-GT-06579;
-      (=gt-pj-1		  . #x5444)	; &I-GT-06579; [52-36]
-      (=jef-china3	  . #x48C8)	; &I-JC3-48C8;
-      (mojikyo		  . 055183)	; &MCS-6000D78F;
+    (=>jis-x0208	. #x5444)	; 堋 [52-36]
+    (=>jis-x0213-1	. #x5444)	; 堋 [52-36]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x580B)	; 堋
+      ))
+    (ideographic-radical . 32)	; ⼟
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (=jis-x0208@1978	. #x5444)	; &GT-06578; [52-36]
+    (=gt		. 06578)	; &I-GT-06578;
+    (=gt-pj-2		. #x6055)	; &I-GT-06578; [64-53]
+    (=daikanwa		. 05217)	; &I-M-05217;
+    (mojikyo		. 005217)	; &MCS-60001461;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x580B)	; 堋
       ))
+    (ideographic-radical . 32)	; ⼟
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (hanyu-dazidian	1 455 9)
+    (=ucs@unicode	. #x580B)	; &GT-06579;
+    (=gb2312		. #x5C21)	; &GT-06579; [60-01]
+    (=jis-x0208@1983	. #x5444)	; &I-J83-5444; [52-36]
+    (=jis-x0208@1990	. #x5444)	; &I-J90-5444; [52-36]
+    (=cns11643-2	. #x343B)	; &I-C2-343B; [20-27]
+    (=jis-x0213-1	. #x5444)	; &I-JX1-5444; [52-36]
+    (=big5		. #xD4B8)	; &I-B-D4B8;
+    (=gt		. 06579)	; &I-GT-06579;
+    (=gt-pj-1		. #x5444)	; &I-GT-06579; [52-36]
+    (=jef-china3	. #x48C8)	; &I-JC3-48C8;
+    (mojikyo		. 055183)	; &MCS-6000D78F;
     ))
 (define-char
   '((ideographic-radical . 32)	; ⼟
@@ -6826,8 +6840,9 @@
 (define-char
   '((ideographic-radical . 32)	; ⼟
     (=ucs		. #x5835)	; å µ
+    (=>jis-x0208	. #x4548)	; å µ [37-40]
+    (=>jis-x0213-1	. #x4548)	; å µ [37-40]
     (=big5		. #xB0F4)	; &I-B-B0F4;
-    (=jis-x0208@1997	. #x4548)	; å µ [37-40]
     ))
 (define-char
   '((<-denotational
@@ -6836,8 +6851,10 @@
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (=ucs@jis/2004	. #x5835)	; &M-05279;
     (=jis-x0208@1978	. #x4548)	; &M-05279; [37-40]
     (=ks-x1001		. #x5372)	; &I-K0-5372; [51-82]
+    (=jis-x0213-1@2004	. #x4548)	; &I-JX3-4548; [37-40]
     (=daikanwa		. 05279)	; &I-M-05279;
     ))
 (define-char
@@ -6853,13 +6870,15 @@
     (=jis-x0208@1983	. #x4548)	; &I-J83-4548; [37-40]
     (=jis-x0208@1990	. #x4548)	; &I-J90-4548; [37-40]
     (=cns11643-1	. #x5959)	; &I-C1-5959; [57-57]
-    (=jis-x0213-1	. #x4548)	; &I-JX1-4548; [37-40]
+    (=jis-x0213-1@2000	. #x4548)	; &I-JX1-4548; [37-40]
     (=gt		. 06554)	; &I-GT-06554;
     (=gt-pj-1		. #x4548)	; &I-GT-06554; [37-40]
     (=jef-china3	. #x47CB)	; &I-JC3-47CB;
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4548)	; &M-05279; [37-40]
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x5835)	; &M-05279;
+      (=jis-x0208@1978	  . #x4548)	; &M-05279; [37-40]
       (=ks-x1001	  . #x5372)	; &I-K0-5372; [51-82]
+      (=jis-x0213-1@2004  . #x4548)	; &I-JX3-4548; [37-40]
       (=daikanwa	  . 05279)	; &I-M-05279;
       ))
     ))
@@ -6868,11 +6887,11 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5836)	; å ¶
+    (=big5		. #xD8AD)	; &I-B-D8AD;
     (->subsumptive
      ((hanyu-dazidian	  1 461 9)
       (=ucs@unicode	  . #x5836)	; &M-05280;
-      (=big5		  . #xD8AD)	; &M-05280;
-      (=daikanwa	  . 05280)	; &I-M-05280;
+      (=daikanwa	  . 05280)	; &M-05280;
       )
      ((=ucs@cns		  . #x5836)	; &C2-3A6F;
       (=cns11643-2	  . #x3A6F)	; &C2-3A6F; [26-79]
@@ -8112,7 +8131,8 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x5858)	; 塘
-    (=jis-x0208@1997	. #x4564)	; 塘 [37-68]
+    (=>jis-x0208	. #x4564)	; 塘 [37-68]
+    (=>jis-x0213-1	. #x4564)	; 塘 [37-68]
     ))
 (define-char
   '((<-denotational
@@ -8167,7 +8187,6 @@
     (=big5		. #xDCEC)	; &I-B-DCEC;
     (->subsumptive
      ((=ucs@jis		  . #x5859)	; &GT-06721;
-      (=ucs@big5	  . #x5859)	; &GT-06721;
       (=jis-x0208	  . #x4839)	; &GT-06721; [40-25]
       (=jis-x0213-1	  . #x4839)	; &I-JX1-4839; [40-25]
       (=gt		  . 06721)	; &I-GT-06721;
@@ -8230,7 +8249,7 @@
 (define-char
   '((ideographic-radical . 32)	; ⼟
     (=ucs		. #x585A)	; 塚
-    (=jis-x0208@1997	. #x444D)	; 塚 [36-45]
+    (=>jis-x0208@1997	. #x444D)	; 塚 [36-45]
     ))
 (define-char
   '((<-denotational
@@ -8246,6 +8265,7 @@
     (hanyu-dazidian	1 476 7)
     (=ucs		. #xFA10)	; 塚
     (=ucs@big5		. #x585A)	; 塚
+    (=>jis-x0213-1	. #x2F57)	; 塚 [15-55]
     (=big5		. #xB6EF)	; &I-B-B6EF;
     (->subsumptive
      ((=ucs@unicode	  . #xFA10)	; &GT-06756;
@@ -8257,6 +8277,7 @@
       (=gt-pj-2		  . #x6166)	; &I-GT-06756; [65-70]
       (=daikanwa	  . 05345)	; &I-M-05345;
       (=shinjigen@1ed	  .  1463)	; &GT-06756;
+      (=shinjigen@rev	  .  1441)	; &GT-06756;
       )
      ((=ucs@unicode	  . #x585A)	; &EGB-2E32;
       (=iso-ir165	  . #x2E32)	; &EGB-2E32; [14-18]
@@ -8274,6 +8295,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #xFA7C)	; 塚
+    (=>jis-x0213-1	. #x444D)	; 塚 [36-45]
     (->subsumptive
      ((=ucs@jis		  . #x585A)	; &GT-06661;
       (=jis-x0208@1983	  . #x444D)	; &GT-06661; [36-45]
@@ -8306,24 +8328,20 @@
     (=daikanwa		. 05346)	; &I-M-05346;
     ))
 (define-char
-  '((=>ucs		. #x585D)	; 塝
-    (ideographic-radical . 32)	; ⼟
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=ucs@big5		. #x585D)	; &M-05347;
-    (=big5		. #xDCEB)	; &M-05347;
-    (=daikanwa		. 05347)	; &I-M-05347;
-    (=jef-china3	. #x91BC)	; &I-JC3-91BC;
-    ))
-(define-char
-  '((morohashi-daikanwa	5347 0 0)
-    (ideographic-radical . 32)	; ⼟
+  '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (hanyu-dazidian	1 474 2)
     (=ucs		. #x585D)	; 塝
-    (=iso-ir165		. #x2E31)	; &I-EGB-2E31; [14-17]
-    (=cns11643-2	. #x4232)	; &I-C2-4232; [34-18]
+    (=big5		. #xDCEB)	; &I-B-DCEB;
+    (->subsumptive
+     ((=daikanwa	  . 05347)	; &M-05347;
+      (=jef-china3	  . #x91BC)	; &I-JC3-91BC;
+      )
+     ((=ucs@unicode	  . #x585D)	; &C2-4232;
+      (=iso-ir165	  . #x2E31)	; &C2-4232; [14-17]
+      (=cns11643-2	  . #x4232)	; &I-C2-4232; [34-18]
+      ))
     ))
 (define-char
   '((ideographic-radical . 32)	; ⼟
@@ -8356,6 +8374,7 @@
       (=gt-k		  . 10208)	; &I-GT-K10208;
       (=gt-pj-1		  . #x3A49)	; &I-GT-06725; [26-41]
       (=daikanwa	  . 05349)	; &I-M-05349;
+      (=shinjigen@1ed	  .  1462)	; &GT-06725;
       (=shinjigen@rev	  .  1464)	; &GT-06725;
       )
      ((=ucs@unicode	  . #x585E)	; &C1-6352;
@@ -8431,6 +8450,14 @@
     ))
 (define-char
   '((ideographic-radical . 32)	; ⼟
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x571F)	; 土
+      )
+     ((=ucs		  . #x8FFD)	; 追
+      ))
     (=ucs		. #x5860)	; å¡ 
     ))
 (define-char
@@ -8444,7 +8471,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x571F)	; 土
+     ((=gt-k		  . 00199)	; &GT-K00199;
       )
      ((=ks-x1001	  . #x755A)	; &M-38836; [85-58]
       (=daikanwa	  . 38836)	; &I-M-38836;
@@ -8466,7 +8493,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x571F)	; 土
+     ((=gt-k		  . 00199)	; &GT-K00199;
       )
      ((=cns11643-1	  . #x5851)	; &C1-5851; [56-49]
       ))
@@ -8484,7 +8511,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x571F)	; 土
+     ((=gt-k		  . 00199)	; &GT-K00199;
       )
      ((=ucs@unicode	  . #x8FFD)	; &GT-51912;
       (=jis-x0208	  . #x4449)	; &GT-51912; [36-41]
@@ -8497,15 +8524,23 @@
     (=hanziku-2		. #xAFC7)	; &I-HZK02-AFC7;
     ))
 (define-char
+  '((ideographic-radical . 32)	; ⼟
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs@big5		. #x586B)	; &J97-4536;
+    (=>jis-x0208@1997	. #x4536)	; &J97-4536; [37-22]
+    (=big5		. #xB6F1)	; &J97-4536;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x586B)	; &B-B6F1;
-      (=big5		  . #xB6F1)	; &B-B6F1;
-      (=jis-x0208@1997	  . #x4536)	; &B-B6F1; [37-22]
+     ((=ucs@big5	  . #x586B)	; &J97-4536;
+      (=>jis-x0208@1997	  . #x4536)	; &J97-4536; [37-22]
       ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x5861)	; å¡¡
+    (=>jis-x0213-1	. #x2F58)	; å¡¡ [15-56]
     (->subsumptive
      ((=ucs@jis		  . #x5861)	; &M-05355;
       (=jis-x0208@1978	  . #x4536)	; &M-05355; [37-22]
@@ -8523,14 +8558,6 @@
   '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=ucs@big5		. #x586B)	; &B-B6F1;
-    (=big5		. #xB6F1)	; &B-B6F1;
-    (=jis-x0208@1997	. #x4536)	; &B-B6F1; [37-22]
-    ))
-(define-char
-  '((ideographic-radical . 32)	; ⼟
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
     (=ucs		. #x213B7)	; 𡎷
     (->subsumptive
      ((=daikanwa	  . 05356)	; &M-05356;
@@ -9021,14 +9048,14 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x586B)	; &B-B6F1;
-      (=big5		  . #xB6F1)	; &B-B6F1;
-      (=jis-x0208@1997	  . #x4536)	; &B-B6F1; [37-22]
+     ((=ucs@big5	  . #x586B)	; &J97-4536;
+      (=>jis-x0208@1997	  . #x4536)	; &J97-4536; [37-22]
       ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x586B)	; å¡«
+    (=>jis-x0213-1	. #x4536)	; å¡« [37-22]
     ))
 (define-char
   '((<-denotational
@@ -9046,6 +9073,14 @@
     (=gt-pj-1		. #x4536)	; &I-GT-06762; [37-22]
     (=jef-china3	. #x47CA)	; &I-JC3-47CA;
     (mojikyo		. 054248)	; &MCS-6000D3E8;
+    (<-simplified@JP/jis
+     ((=ucs@jis		  . #x5861)	; &M-05355;
+      (=jis-x0208@1978	  . #x4536)	; &M-05355; [37-22]
+      (=ks-x1001	  . #x6E73)	; &I-K0-6E73; [78-83]
+      (=jis-x0212	  . #x3834)	; &I-JSP-3834; [24-20]
+      (=jis-x0213-1	  . #x2F58)	; &I-JX1-2F58; [15-56]
+      (=daikanwa	  . 05355)	; &I-M-05355;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -9862,14 +9897,29 @@
     (=cbeta		. 01838)	; &CB01838;
     ))
 (define-char
+  '((ideographic-radical . 32)	; ⼟
+    (=ucs@big5		. #x5848)	; &A-JX2-252B;
+    (=>jis-x0213-2	. #x252B)	; &A-JX2-252B; [05-11]
+    (=big5		. #xD8A7)	; &A-JX2-252B;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x5848)	; &B-D8A7;
-      (=big5		  . #xD8A7)	; &B-D8A7;
+     ((=ucs@big5	  . #x5848)	; &A-JX2-252B;
+      (=>jis-x0213-2	  . #x252B)	; &A-JX2-252B; [05-11]
       ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x588D)	; 墍
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x588D)	; 墍
+      ))
+    (ideographic-radical . 32)	; ⼟
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=>>jis-x0213-2	. #x252B)	; &G-JX2-252B; [05-11]
     (->subsumptive
      ((=ucs@jis		  . #x588D)	; &M-05423;
       (=jis-x0212	  . #x3842)	; &M-05423; [24-34]
@@ -9882,14 +9932,18 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 32)	; ⼟
-    (=ucs@big5		. #x5848)	; &B-D8A7;
-    (=big5		. #xD8A7)	; &B-D8A7;
+  '((<-denotational
+     ((=ucs		  . #x588D)	; 墍
+      ))
+    (ideographic-radical . 32)	; ⼟
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=jef-china3	. #x47D8)	; &JC3-47D8;
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x5848)	; &B-D8A7;
-      (=big5		  . #xD8A7)	; &B-D8A7;
+     ((=ucs@big5	  . #x5848)	; &A-JX2-252B;
+      (=>jis-x0213-2	  . #x252B)	; &A-JX2-252B; [05-11]
       ))
     (ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 9)
@@ -9909,18 +9963,6 @@
       ))
     ))
 (define-char
-  '((<-denotational
-     ((=ucs@big5	  . #x5848)	; &B-D8A7;
-      (=big5		  . #xD8A7)	; &B-D8A7;
-      ))
-    (=>ucs		. #x588D)	; 墍
-    (=>daikanwa		. 05423)	; &M-05423;
-    (ideographic-radical . 32)	; ⼟
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=jef-china3	. #x47D8)	; &JC3-47D8;
-    ))
-(define-char
   '((ideographic-radical . 32)	; ⼟
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
@@ -10832,8 +10874,9 @@
     (total-strokes	 . 15)
     (hanyu-dazidian	1 488 14)
     (=ucs		. #x58AB)	; 墫
+    (=>jis-x0208	. #x5453)	; 墫 [52-51]
+    (=>jis-x0213-1	. #x5453)	; 墫 [52-51]
     (=big5		. #xE54A)	; &I-B-E54A;
-    (=jis-x0208@1997	. #x5453)	; 墫 [52-51]
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R035-Go-Slowly.el b/lisp/utf-2000/Ideograph-R035-Go-Slowly.el
index eb94dfe..630eb51 100644
--- a/lisp/utf-2000/Ideograph-R035-Go-Slowly.el
+++ b/lisp/utf-2000/Ideograph-R035-Go-Slowly.el
@@ -572,41 +572,56 @@
     (=ucs@iso		. #x20B76)	; &U-00020B76;
     ))
 (define-char
+  '((ideographic-radical@cns . 66)	; ⽁
+    (ideographic-radical@cns*sources
+     cns11643-2 ucs=0x657B)
+    (ideographic-radical@jis . 35)	; â¼¢
+    (ideographic-radical@jis*sources
+     daikanwa jis-x0208 cns11643-3 ucs=0x5910)
+    (=ucs@big5		. #x657B)	; &J97-546B;
+    (=>jis-x0208	. #x546B)	; &J97-546B; [52-75]
+    (=>jis-x0213-1	. #x546B)	; &J97-546B; [52-75]
+    (=big5		. #xE5C0)	; &J97-546B;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x657B)	; &B-E5C0;
-      (=big5		  . #xE5C0)	; &B-E5C0;
-      (=jis-x0208@1997	  . #x546B)	; &B-E5C0; [52-75]
+     ((=ucs@big5	  . #x657B)	; &J97-546B;
+      (=>jis-x0208	  . #x546B)	; &J97-546B; [52-75]
       ))
     (ideographic-radical . 35)	; â¼¢
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (hanyu-dazidian	2 871 14)
     (=ucs		. #x5910)	; 夐
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5910)	; 夐
+      ))
+    (ideographic-radical . 35)	; â¼¢
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
     (->subsumptive
      ((=daikanwa	  . 05731)	; &M-05731;
+      (=shinjigen	  .  1540)	; &M-05731;
       )
      ((=cns11643-3	  . #x4646)	; &C3-4646; [38-38]
-      )
-     ((=ucs@unicode	  . #x5910)	; &GT-07223;
-      (=jis-x0208	  . #x546B)	; &GT-07223; [52-75]
-      (=iso-ir165	  . #x7A3A)	; &I-EGB-7A3A; [90-26]
-      (=jis-x0213-1	  . #x546B)	; &I-JX1-546B; [52-75]
-      (=gt		  . 07223)	; &I-GT-07223;
-      (=gt-k		  . 11198)	; &I-GT-K11198;
-      (=gt-pj-1		  . #x546B)	; &I-GT-07223; [52-75]
-      (=shinjigen@rev	  .  1540)	; &GT-07223;
       ))
     ))
 (define-char
-  '((ideographic-radical@cns . 66)	; ⽁
-    (ideographic-radical@cns*sources
-     cns11643-2 ucs=0x657B)
-    (ideographic-radical@jis . 35)	; â¼¢
-    (ideographic-radical@jis*sources
-     daikanwa jis-x0208 cns11643-3 ucs=0x5910)
-    (=ucs@big5		. #x657B)	; &B-E5C0;
-    (=big5		. #xE5C0)	; &B-E5C0;
-    (=jis-x0208@1997	. #x546B)	; &B-E5C0; [52-75]
+  '((<-denotational
+     ((=ucs		  . #x5910)	; 夐
+      ))
+    (ideographic-radical . 35)	; â¼¢
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x5910)	; &GT-07223;
+    (=jis-x0208		. #x546B)	; &GT-07223; [52-75]
+    (=iso-ir165		. #x7A3A)	; &I-EGB-7A3A; [90-26]
+    (=jis-x0213-1	. #x546B)	; &I-JX1-546B; [52-75]
+    (=gt		. 07223)	; &I-GT-07223;
+    (=gt-k		. 11198)	; &I-GT-K11198;
+    (=gt-pj-1		. #x546B)	; &I-GT-07223; [52-75]
     ))
 (define-char
   '((=>ucs		. #x21572)	; 𡕲
diff --git a/lisp/utf-2000/Ideograph-R036-Evening.el b/lisp/utf-2000/Ideograph-R036-Evening.el
index 19abfbf..f8e0b62 100644
--- a/lisp/utf-2000/Ideograph-R036-Evening.el
+++ b/lisp/utf-2000/Ideograph-R036-Evening.el
@@ -216,15 +216,23 @@
      jiyun daikanwa)
     ))
 (define-char
+  '((ideographic-radical . 36)	; â¼£
+    (ideographic-strokes . 3)
+    (total-strokes	 . 6)
+    (=ucs		. #x591B)	; 夛
+    (=>jis-x0208	. #x546C)	; 夛 [52-76]
+    (=>jis-x0213-1	. #x546C)	; 夛 [52-76]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x546C)	; &J97-546C; [52-76]
+     ((=ucs		  . #x591B)	; 夛
       ))
     (ideographic-radical . 36)	; â¼£
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
     (hanyu-dazidian	2 863 1)
-    (=ucs		. #x591B)	; 夛
-    (=jis-x0208		. #x546C)	; &I-J90-546C; [52-76]
+    (=ucs@unicode	. #x591B)	; &GT-07281;
+    (=jis-x0208		. #x546C)	; &GT-07281; [52-76]
     (=cns11643-4	. #x2252)	; &I-C4-2252; [02-50]
     (=jis-x0213-1	. #x546C)	; &I-JX1-546C; [52-76]
     (=gt		. 07281)	; &I-GT-07281;
@@ -239,20 +247,20 @@
      zhengzitong daikanwa)
     ))
 (define-char
-  '((=>ucs		. #x591B)	; 夛
-    (ideographic-radical . 36)	; â¼£
-    (ideographic-strokes . 3)
-    (total-strokes	 . 6)
-    (=jis-x0208@1997	. #x546C)	; &J97-546C; [52-76]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x546C)	; &J97-546C; [52-76]
+     ((=ucs		  . #x591B)	; 夛
       ))
     (ideographic-radical . 36)	; â¼£
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (=shinjigen@1ed	.  1547)	; &SJG1-1547;
+    (=shinjigen		.  1547)	; &SJG2-1547;
+    (<-vulgar
+     ((=ucs		  . #x591A)	; 多
+      (=jis-x0208	  . #x423F)	; &I-J90-423F; [34-31]
+      (=shinjigen	  .  1546)	; 多
+      ))
+    (<-vulgar*sources
+     shinjigen)
     ))
 (define-char
   '((ideographic-radical . 36)	; â¼£
@@ -711,10 +719,10 @@
     (<-vulgar
      ((=cns11643-1	  . #x6842)	; &M-05802; [72-34]
       (=daikanwa	  . 05802)	; &I-M-05802;
-      (=shinjigen@1ed	  .  1550)	; &M-05802;
+      (=shinjigen	  .  1550)	; &M-05802;
       ))
     (<-vulgar*sources
-     songyuan-yilai-suzipu zihui daikanwa shinjigen@1ed)
+     songyuan-yilai-suzipu zihui daikanwa shinjigen)
     (->subsumptive
      ((ideographic-radical . 36)	; â¼£
       (ideographic-strokes . 8)
@@ -907,8 +915,9 @@
   '((ideographic-radical . 36)	; â¼£
     (hanyu-dazidian	2 864 19)
     (=ucs		. #x5922)	; 夢
+    (=>jis-x0208	. #x4C34)	; 夢 [44-20]
+    (=>jis-x0213-1	. #x4C34)	; 夢 [44-20]
     (=big5		. #xB9DA)	; &I-B-B9DA;
-    (=jis-x0208@1997	. #x4C34)	; 夢 [44-20]
     ))
 (define-char
   '((<-denotational
@@ -930,15 +939,15 @@
     (=gt		. 07332)	; &I-GT-07332;
     (=gt-k		. 10272)	; &I-GT-K10272;
     (=gt-pj-1		. #x4C34)	; &I-GT-07332; [44-20]
-    (=shinjigen@1ed	.  1549)	; 夢
+    (=shinjigen		.  1549)	; 夢
     (mojikyo		. 050144)	; &MCS-6000C3E0;
     (<-simplified
      ((=cns11643-1	  . #x6842)	; &M-05802; [72-34]
       (=daikanwa	  . 05802)	; &I-M-05802;
-      (=shinjigen@1ed	  .  1550)	; &M-05802;
+      (=shinjigen	  .  1550)	; &M-05802;
       ))
     (<-simplified*sources
-     shinjigen@1ed)
+     daikanwa shinjigen)
     ))
 (define-char
   '((<-denotational
@@ -949,7 +958,7 @@
     (total-strokes	 . 14)
     (=cns11643-1	. #x6842)	; &M-05802; [72-34]
     (=daikanwa		. 05802)	; &I-M-05802;
-    (=shinjigen@1ed	.  1550)	; &M-05802;
+    (=shinjigen		.  1550)	; &M-05802;
     ))
 (define-char
   '((ideographic-radical . 36)	; â¼£
@@ -961,14 +970,14 @@
       (=ucs@jis		  . #x5923)	; &M-05803;
       (=jis-x0212	  . #x3869)	; &M-05803; [24-73]
       (=daikanwa	  . 05803)	; &I-M-05803;
-      (=shinjigen@1ed	  .  1553)	; &M-05803;
+      (=shinjigen	  .  1553)	; &M-05803;
       (<-vulgar
        ((=cns11643-1	    . #x6842)	; &M-05802; [72-34]
 	(=daikanwa	    . 05802)	; &I-M-05802;
-	(=shinjigen@1ed	    .  1550)	; &M-05802;
+	(=shinjigen	    .  1550)	; &M-05802;
 	))
       (<-vulgar*sources
-       shinjigen@1ed)
+       shinjigen)
       )
      ((ideographic-strokes . 11)
       (total-strokes	   . 14)
diff --git a/lisp/utf-2000/Ideograph-R037-Big.el b/lisp/utf-2000/Ideograph-R037-Big.el
index ee59a3e..455a8e3 100644
--- a/lisp/utf-2000/Ideograph-R037-Big.el
+++ b/lisp/utf-2000/Ideograph-R037-Big.el
@@ -1467,8 +1467,14 @@
     (=jef-china3	. #x48E3)	; &I-JC3-48E3;
     ))
 (define-char
+  '((ideographic-radical . 37)	; ⼤
+    (=ucs		. #x5954)	; 奔
+    (=>jis-x0208	. #x4B5B)	; 奔 [43-59]
+    (=>jis-x0213-1	. #x4B5B)	; 奔 [43-59]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4B5B)	; &J97-4B5B; [43-59]
+     ((=ucs		  . #x5954)	; 奔
       ))
     (=>ucs*		. #x5954)	; 奔
     (ideographic-radical . 37)	; ⼤
@@ -1478,18 +1484,14 @@
     (=daikanwa		. 05921)	; &I-M-05921;
     ))
 (define-char
-  '((ideographic-radical . 37)	; ⼤
-    (=jis-x0208@1997	. #x4B5B)	; &J97-4B5B; [43-59]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4B5B)	; &J97-4B5B; [43-59]
+     ((=ucs		  . #x5954)	; 奔
       ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=ucs		. #x5954)	; 奔
-    (=jis-x0208		. #x4B5B)	; &I-J90-4B5B; [43-59]
+    (=ucs@unicode	. #x5954)	; &GT-07449;
+    (=jis-x0208		. #x4B5B)	; &GT-07449; [43-59]
     (=gb2312		. #x313C)	; &I-G0-313C; [17-28]
     (=ks-x1001		. #x5D46)	; &I-K0-5D46; [61-38]
     (=cns11643-1	. #x4C64)	; &I-C1-4C64; [44-68]
@@ -2182,6 +2184,15 @@
   '((ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (=ucs		. #x21645)	; 𡙅
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21645)	; 𡙅
+      ))
+    (ideographic-radical . 37)	; ⼤
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -2191,10 +2202,12 @@
       )
      ((=ucs		  . #x4E18)	; 丘
       ))
-    (=ucs		. #x21645)	; 𡙅
+    (=ucs@iso		. #x21645)	; &U-00021645;
     ))
 (define-char
-  '((=>ucs		. #x21645)	; 𡙅
+  '((<-denotational
+     ((=ucs		  . #x21645)	; 𡙅
+      ))
     (ideographic-radical . 37)	; ⼤
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
@@ -2203,8 +2216,9 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs@jis		  . #x20509)	; &GT-01905;
-      (=jis-x0213-2	  . #x2327)	; &GT-01905; [03-07]
+     ((=ucs@iso		  . #x20509)	; &M-48931;
+      (=cns11643-6	  . #x2357)	; &M-48931; [03-55]
+      (=daikanwa	  . 48931)	; &I-M-48931;
       )
      ((=ucs		  . #x4E18)	; 丘
       ))
@@ -2215,8 +2229,9 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5960)	; 奠
+    (=>jis-x0208	. #x547B)	; 奠 [52-91]
+    (=>jis-x0213-1	. #x547B)	; 奠 [52-91]
     (=big5		. #xB3FE)	; &I-B-B3FE;
-    (=jis-x0208@1997	. #x547B)	; 奠 [52-91]
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R038-Woman.el b/lisp/utf-2000/Ideograph-R038-Woman.el
index 420ac59..d37ad67 100644
--- a/lisp/utf-2000/Ideograph-R038-Woman.el
+++ b/lisp/utf-2000/Ideograph-R038-Woman.el
@@ -4,18 +4,18 @@
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
     (=ucs		. #x5973)	; 女
+    (=big5		. #xA46B)	; &I-B-A46B;
     (->subsumptive
      ((=ucs@unicode	  . #x5973)	; &GT-07623;
       (=jis-x0208	  . #x3D77)	; &GT-07623; [29-87]
       (=gb2312		  . #x452E)	; &I-G0-452E; [37-14]
       (=ks-x1001	  . #x5233)	; &I-K0-5233; [50-19]
       (=jis-x0213-1	  . #x3D77)	; &I-JX1-3D77; [29-87]
-      (=big5		  . #xA46B)	; &I-B-A46B;
       (=gt		  . 07623)	; &I-GT-07623;
       (=gt-k		  . 00185)	; &I-GT-K00185;
       (=gt-pj-1		  . #x3D77)	; &I-GT-07623; [29-87]
       (=daikanwa	  . 06036)	; &I-M-06036;
-      (=shinjigen@rev	  .  1599)	; &GT-07623;
+      (=shinjigen	  .  1599)	; &GT-07623;
       )
      ((=cns11643-1	  . #x444C)	; &C1-444C; [36-44]
       ))
@@ -689,6 +689,14 @@
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5973)	; 女
+      )
+     ((=ucs		  . #x5198)	; 冘
+      ))
     (=ucs		. #x5989)	; 妉
     (->subsumptive
      ((ideographic-structure
@@ -724,17 +732,17 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x598A)	; 妊
+    (=big5		. #xA7B3)	; &I-B-A7B3;
     (->subsumptive
      ((=ucs@unicode	  . #x598A)	; &GT-07696;
       (=jis-x0208	  . #x4725)	; &GT-07696; [39-05]
       (=gb2312		  . #x4851)	; &I-G0-4851; [40-49]
       (=ks-x1001	  . #x6C74)	; &I-K0-6C74; [76-84]
       (=jis-x0213-1	  . #x4725)	; &I-JX1-4725; [39-05]
-      (=big5		  . #xA7B3)	; &I-B-A7B3;
       (=gt		  . 07696)	; &I-GT-07696;
       (=gt-pj-1		  . #x4725)	; &I-GT-07696; [39-05]
       (=daikanwa	  . 06072)	; &I-M-06072;
-      (=shinjigen@rev	  .  1611)	; &GT-07696;
+      (=shinjigen	  .  1611)	; &GT-07696;
       )
      ((=cns11643-1	  . #x4973)	; &C1-4973; [41-83]
       ))
@@ -769,46 +777,60 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 38)	; â¼¥
+    (=>jis-x0208@1997	. #x552B)	; &J97-552B; [53-11]
+    (=>jis-x0213-1@2000 . #x552B)	; &J97-552B; [53-11]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x552B)	; &J97-552B; [53-11]
+     ((=>jis-x0208@1997	  . #x552B)	; &J97-552B; [53-11]
       ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x598D)	; 妍
+    (=>jis-x0213-1@2004 . #x552B)	; 妍 [53-11]
+    (=big5		. #xA7B0)	; &I-B-A7B0;
     (->subsumptive
      ((=ucs@unicode	  . #x598D)	; &GT-07670;
       (=jis-x0208	  . #x552B)	; &GT-07670; [53-11]
       (=gb2312		  . #x657B)	; &I-G0-657B; [69-91]
       (=jis-x0213-1	  . #x552B)	; &I-JX1-552B; [53-11]
-      (=big5		  . #xA7B0)	; &I-B-A7B0;
       (=gt		  . 07670)	; &I-GT-07670;
       (=gt-pj-1		  . #x552B)	; &I-GT-07670; [53-11]
       (=daikanwa	  . 06075)	; &I-M-06075;
       (=shinjigen	  .  1650)	; &GT-07670;
+      (<-same
+       ((=ks-x1001	    . #x6641)	; &M-06247; [70-33]
+	(=jis-x0213-1@2004  . #x7E7A)	; &I-JX3-7E7A; [94-90]
+	(=daikanwa	    . 06247)	; &I-M-06247;
+	))
+      (<-same*sources
+       zihui daikanwa)
+      (<-simplified@JP/jis
+       ((=ks-x1001	    . #x6641)	; &M-06247; [70-33]
+	(=jis-x0213-1@2004  . #x7E7A)	; &I-JX3-7E7A; [94-90]
+	(=daikanwa	    . 06247)	; &I-M-06247;
+	))
       (<-vulgar
        ((=ucs@unicode	    . #x59F8)	; &UU+59F8;
-	(=shinjigen@1ed	    .  1649)	; &UU+59F8;
+	(=shinjigen	    .  1649)	; &UU+59F8;
 	))
       (<-vulgar*sources
-       shinjigen@1ed)
+       shinjigen)
       )
      ((=cns11643-1	  . #x4970)	; &C1-4970; [41-80]
       ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
-    (=jis-x0208@1997	. #x552B)	; &J97-552B; [53-11]
-    ))
-(define-char
-  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x598E)	; 妎
+    (=big5		. #xCAB6)	; &I-B-CAB6;
     (->subsumptive
      ((=ucs@unicode	  . #x598E)	; &M-06076;
       (=jis-x0212	  . #x392A)	; &M-06076; [25-10]
-      (=big5		  . #xCAB6)	; &I-B-CAB6;
       (=daikanwa	  . 06076)	; &I-M-06076;
       (=jef-china3	  . #x48FD)	; &I-JC3-48FD;
       )
@@ -2484,6 +2506,7 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x59C8)	; 姈
+    (=big5		. #xCC52)	; &I-B-CC52;
     (->subsumptive
      ((=ucs@jis		  . #x59C8)	; &M-06163;
       (=jis-x0212	  . #x393C)	; &M-06163; [25-28]
@@ -2497,8 +2520,7 @@
       (=cns11643-2	  . #x2633)	; &C2-2633; [06-19]
       (mojikyo		  . 059379)	; &MCS-6000E7F3;
       )
-     ((=ucs@unicode	  . #x59C8)	; &B-CC52;
-      (=big5		  . #xCC52)	; &B-CC52;
+     ((=ucs@unicode	  . #x59C8)	; &UU+59C8;
       )
      ((mojikyo		  . 059378)	; &MCS-6000E7F2;
       ))
@@ -2508,13 +2530,23 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x59CA)	; 姊
+    (=big5		. #xA96E)	; &I-B-A96E;
     (->subsumptive
      ((=ucs@unicode	  . #x59CA)	; &M-06164;
       (=gb2312		  . #x6622)	; &M-06164; [70-02]
       (=jis-x0212	  . #x393D)	; &I-JSP-393D; [25-29]
-      (=big5		  . #xA96E)	; &I-B-A96E;
       (=daikanwa	  . 06164)	; &I-M-06164;
+      (=shinjigen	  .  1629)	; &M-06164;
       (=jef-china3	  . #x49AB)	; &I-JC3-49AB;
+      (<-original
+       ((=ucs@unicode	    . #x59C9)	; &M-06165;
+	(=jis-x0208@1978    . #x3B50)	; &M-06165; [27-48]
+	(=jis-x0208@1983    . #x3B50)	; &I-J83-3B50; [27-48]
+	(=daikanwa	    . 06165)	; &I-M-06165;
+	(=shinjigen	    .  1628)	; &M-06165;
+	))
+      (<-original*sources
+       shinjigen)
       )
      ((=cns11643-1	  . #x4C70)	; &C1-4C70; [44-80]
       ))
@@ -2524,7 +2556,8 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x59C9)	; 姉
-    (=jis-x0208@1997	. #x3B50)	; 姉 [27-48]
+    (=>jis-x0208	. #x3B50)	; 姉 [27-48]
+    (=>jis-x0213-1	. #x3B50)	; 姉 [27-48]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -2547,7 +2580,7 @@
       (=jis-x0208@1978	  . #x3B50)	; &M-06165; [27-48]
       (=jis-x0208@1983	  . #x3B50)	; &I-J83-3B50; [27-48]
       (=daikanwa	  . 06165)	; &I-M-06165;
-      (=shinjigen@rev	  .  1628)	; &M-06165;
+      (=shinjigen	  .  1628)	; &M-06165;
       (=cbeta		  . 00106)	; &I-CB00106;
       (<-vulgar
        ((=ucs@unicode	    . #x59CA)	; &M-06164;
@@ -3173,6 +3206,11 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 38)	; â¼¥
+    (=ucs@big5		. #x59D8)	; &B-ABB9;
+    (=big5		. #xABB9)	; &B-ABB9;
+    ))
+(define-char
   '((<-denotational
      ((=ucs@big5	  . #x59D8)	; &B-ABB9;
       (=big5		  . #xABB9)	; &B-ABB9;
@@ -3180,22 +3218,33 @@
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (sound@ja/on/s=fuck "hAu" "hei")
+    (sound@ja/on/s=wife "hiN")
     (=ucs		. #x59D8)	; 姘
     (->subsumptive
      ((=ucs@unicode	  . #x59D8)	; &M-06199;
       (=gb2312		  . #x6630)	; &M-06199; [70-16]
       (=daikanwa	  . 06199)	; &I-M-06199;
+      (<-ancient@s=wife
+       ((=ucs@jis	    . #x5B2A)	; &GT-08605;
+	(=jis-x0208	    . #x554D)	; &GT-08605; [53-45]
+	(=ks-x1001	    . #x5E2E)	; &I-K0-5E2E; [62-14]
+	(=jis-x0213-1	    . #x554D)	; &I-JX1-554D; [53-45]
+	(=daikanwa	    . 06819)	; &I-M-06819;
+	))
+      (<-ancient@s=wife*sources
+       jiyun daikanwa)
+      (<-vulgar@s=fuck
+       ((=daikanwa	    . 06366)	; &M-06366;
+	))
+      (<-vulgar@s=fuck*sources
+       zihui daikanwa)
       )
      ((=cns11643-1	  . #x505B)	; &C1-505B; [48-59]
       ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
-    (=ucs@big5		. #x59D8)	; &B-ABB9;
-    (=big5		. #xABB9)	; &B-ABB9;
-    ))
-(define-char
-  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (ideographic-structure
@@ -3206,67 +3255,113 @@
       )
      ((=ucs		  . #x4EFB)	; ä»»
       ))
+    (sound@ja/on	"niN")
     (=ucs		. #x59D9)	; 姙
-    (=jis-x0208		. #x552C)	; &I-J90-552C; [53-12]
-    (=ks-x1001		. #x6C75)	; &I-K0-6C75; [76-85]
-    (=jis-x0213-1	. #x552C)	; &I-JX1-552C; [53-12]
-    (=gt		. 07874)	; &I-GT-07874;
-    (=gt-pj-1		. #x552C)	; &I-GT-07874; [53-12]
-    (=daikanwa		. 06200)	; &I-M-06200;
-    (=shinjigen@rev	.  1612)	; 姙
-    (=cbeta		. 00775)	; &I-CB00775;
-    ))
-(define-char
-  '((=>ucs		. #x59D9)	; 姙
-    (morohashi-daikanwa	6200 0 0)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=cns11643-1	  . #x444C)	; &C1-444C; [36-44]
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs@unicode	    . #x5973)	; &GT-07623;
+	(=jis-x0208	    . #x3D77)	; &GT-07623; [29-87]
+	(=gb2312	    . #x452E)	; &I-G0-452E; [37-14]
+	(=ks-x1001	    . #x5233)	; &I-K0-5233; [50-19]
+	(=jis-x0213-1	    . #x3D77)	; &I-JX1-3D77; [29-87]
+	(=daikanwa	    . 06036)	; &I-M-06036;
+	)
+       ((=ucs@unicode	    . #x4EFB)	; &GT-00582;
+	(=jis-x0208	    . #x4724)	; &GT-00582; [39-04]
+	(=gb2312	    . #x484E)	; &I-G0-484E; [40-46]
+	(=ks-x1001	    . #x6C72)	; &I-K0-6C72; [76-82]
+	(=jis-x0213-1	    . #x4724)	; &I-JX1-4724; [39-04]
+	(=daikanwa	    . 00416)	; &I-M-00416;
+	))
+      (=ucs@unicode	  . #x59D9)	; &GT-07874;
+      (=jis-x0208	  . #x552C)	; &GT-07874; [53-12]
+      (=ks-x1001	  . #x6C75)	; &I-K0-6C75; [76-85]
+      (=jis-x0213-1	  . #x552C)	; &I-JX1-552C; [53-12]
+      (=gt		  . 07874)	; &I-GT-07874;
+      (=gt-pj-1		  . #x552C)	; &I-GT-07874; [53-12]
+      (=daikanwa	  . 06200)	; &I-M-06200;
+      (=shinjigen	  .  1612)	; &GT-07874;
+      (=cbeta		  . 00775)	; &I-CB00775;
+      (<-formed
+       ((=ucs@unicode	    . #x598A)	; &GT-07696;
+	(=jis-x0208	    . #x4725)	; &GT-07696; [39-05]
+	(=gb2312	    . #x4851)	; &I-G0-4851; [40-49]
+	(=ks-x1001	    . #x6C74)	; &I-K0-6C74; [76-84]
+	(=jis-x0213-1	    . #x4725)	; &I-JX1-4725; [39-05]
+	(=daikanwa	    . 06072)	; &I-M-06072;
+	(=shinjigen	    .  1611)	; &GT-07696;
+	))
+      (<-formed*sources
+       shinjigen)
+      (<-same
+       ((=ucs@unicode	    . #x598A)	; &GT-07696;
+	(=jis-x0208	    . #x4725)	; &GT-07696; [39-05]
+	(=gb2312	    . #x4851)	; &I-G0-4851; [40-49]
+	(=ks-x1001	    . #x6C74)	; &I-K0-6C74; [76-84]
+	(=jis-x0213-1	    . #x4725)	; &I-JX1-4725; [39-05]
+	(=daikanwa	    . 06072)	; &I-M-06072;
+	))
+      (<-same*sources
+       zihui daikanwa)
       )
-     ((=cns11643-1	  . #x4736)	; &C1-4736; [39-22]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=cns11643-1	    . #x444C)	; &C1-444C; [36-44]
+	)
+       ((=cns11643-1	    . #x4736)	; &C1-4736; [39-22]
+	))
+      (=cns11643-3	  . #x2C2D)	; &C3-2C2D; [12-13]
       ))
-    (=cns11643-3	. #x2C2D)	; &C3-2C2D; [12-13]
-    ))
-(define-char
-  '((=>ucs		. #x2171F)	; 𡜟
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=daikanwa		. 06201)	; &M-06201;
     ))
 (define-char
-  '((morohashi-daikanwa	6201 0 2)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (sound@ja/on	"niN")
     (=ucs		. #x2171F)	; 𡜟
-    (=cns11643-6	. #x2F75)	; &I-C6-2F75; [15-85]
+    (->subsumptive
+     ((=daikanwa	  . 06201)	; &M-06201;
+      (<-same
+       ((=ucs@unicode	    . #x598A)	; &GT-07696;
+	(=jis-x0208	    . #x4725)	; &GT-07696; [39-05]
+	(=gb2312	    . #x4851)	; &I-G0-4851; [40-49]
+	(=ks-x1001	    . #x6C74)	; &I-K0-6C74; [76-84]
+	(=jis-x0213-1	    . #x4725)	; &I-JX1-4725; [39-05]
+	(=daikanwa	    . 06072)	; &I-M-06072;
+	))
+      (<-same*sources
+       jiyun daikanwa)
+      )
+     ((=ucs@iso		  . #x2171F)	; &C6-2F75;
+      (=cns11643-6	  . #x2F75)	; &C6-2F75; [15-85]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x59DA)	; 姚
-    (=jis-x0208@1997	. #x552D)	; 姚 [53-13]
+    (=>jis-x0208	. #x552D)	; 姚 [53-13]
+    (=>jis-x0213-1	. #x552D)	; 姚 [53-13]
+    (=big5		. #xABC0)	; &I-B-ABC0;
     (->subsumptive
-     ((=jis-x0208@1978	  . #x552D)	; &M-06202; [53-13]
+     ((=jis-x0208@1978	  . #x552D)	; &GT-07887; [53-13]
       (=jis-x0208@1983	  . #x552D)	; &I-J83-552D; [53-13]
       (=ks-x1001	  . #x686E)	; &I-K0-686E; [72-78]
+      (=gt		  . 07887)	; &I-GT-07887;
+      (=gt-pj-1		  . #x552D)	; &I-GT-07887; [53-13]
       (=daikanwa	  . 06202)	; &I-M-06202;
-      (=shinjigen@rev	  .  1662)	; &M-06202;
       )
-     ((=ucs@unicode	  . #x59DA)	; &GT-07887;
-      (=gb2312		  . #x5226)	; &GT-07887; [50-06]
+     ((=ucs@unicode	  . #x59DA)	; &J90-552D;
+      (=gb2312		  . #x5226)	; &J90-552D; [50-06]
       (=jis-x0208@1990	  . #x552D)	; &I-J90-552D; [53-13]
       (=jis-x0213-1	  . #x552D)	; &I-JX1-552D; [53-13]
-      (=big5		  . #xABC0)	; &I-B-ABC0;
-      (=gt		  . 07887)	; &I-GT-07887;
-      (=gt-pj-1		  . #x552D)	; &I-GT-07887; [53-13]
+      (=shinjigen	  .  1662)	; &J90-552D;
       )
      ((=cns11643-1	  . #x5062)	; &C1-5062; [48-66]
       ))
@@ -3276,47 +3371,44 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x59DB)	; 姛
+    (=big5		. #xCE6F)	; &I-B-CE6F;
     (->subsumptive
      ((=ucs@unicode	  . #x59DB)	; &M-06203;
-      (=big5		  . #xCE6F)	; &M-06203;
-      (=daikanwa	  . 06203)	; &I-M-06203;
+      (=daikanwa	  . 06203)	; &M-06203;
       )
      ((=ucs@cns		  . #x59DB)	; &C2-2970;
       (=cns11643-2	  . #x2970)	; &C2-2970; [09-80]
       ))
     ))
 (define-char
-  '((=>ucs		. #x2171D)	; 𡜝
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=daikanwa		. 06204)	; &M-06204;
-    ))
-(define-char
-  '((morohashi-daikanwa	6204 0 0)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x2171D)	; 𡜝
-    (=cns11643-4	. #x286C)	; &I-C4-286C; [08-76]
+    (->subsumptive
+     ((=daikanwa	  . 06204)	; &M-06204;
+      )
+     ((=ucs@iso		  . #x2171D)	; &C4-286C;
+      (=cns11643-4	  . #x286C)	; &C4-286C; [08-76]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x59DC)	; 姜
+    (=big5		. #xABB8)	; &I-B-ABB8;
     (->subsumptive
      ((=ucs@unicode	  . #x59DC)	; &GT-07827;
       (=jis-x0208	  . #x552A)	; &GT-07827; [53-10]
       (=gb2312		  . #x3D2A)	; &I-G0-3D2A; [29-10]
       (=ks-x1001	  . #x4B29)	; &I-K0-4B29; [43-09]
       (=jis-x0213-1	  . #x552A)	; &I-JX1-552A; [53-10]
-      (=big5		  . #xABB8)	; &I-B-ABB8;
       (=gt		  . 07827)	; &I-GT-07827;
       (=gt-k		  . 05233)	; &I-GT-K05233;
       (=gt-pj-1		  . #x552A)	; &I-GT-07827; [53-10]
       (=daikanwa	  . 06205)	; &I-M-06205;
-      (=shinjigen@rev	  .  1648)	; &GT-07827;
+      (=shinjigen	  .  1648)	; &GT-07827;
       )
      ((=cns11643-1	  . #x505A)	; &C1-505A; [48-58]
       ))
@@ -3326,13 +3418,13 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x59DD)	; 姝
+    (=big5		. #xCE67)	; &I-B-CE67;
     (->subsumptive
      ((=ucs@unicode	  . #x59DD)	; &M-06206;
       (=gb2312		  . #x662D)	; &M-06206; [70-13]
       (=ks-x1001	  . #x712F)	; &I-K0-712F; [81-15]
       (=jis-x0212	  . #x3940)	; &I-JSP-3940; [25-32]
       (=jis-x0213-1	  . #x2F70)	; &I-JX1-2F70; [15-80]
-      (=big5		  . #xCE67)	; &I-B-CE67;
       (=daikanwa	  . 06206)	; &I-M-06206;
       (=jef-china3	  . #x49AE)	; &I-JC3-49AE;
       )
@@ -4061,19 +4153,21 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x552B)	; &J97-552B; [53-11]
+     ((=>jis-x0208@1997	  . #x552B)	; &J97-552B; [53-11]
       ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x59F8)	; 姸
+    (=>jis-x0213-1@2004 . #x7E7A)	; 姸 [94-90]
     (->subsumptive
      ((=ks-x1001	  . #x6641)	; &M-06247; [70-33]
+      (=jis-x0213-1@2004  . #x7E7A)	; &I-JX3-7E7A; [94-90]
       (=daikanwa	  . 06247)	; &I-M-06247;
       (=jef-china3	  . #x49B5)	; &I-JC3-49B5;
       )
      ((=ucs@unicode	  . #x59F8)	; &UU+59F8;
-      (=shinjigen@1ed	  .  1649)	; &UU+59F8;
+      (=shinjigen	  .  1649)	; &UU+59F8;
       )
      ((=cns11643-3	  . #x2C2B)	; &C3-2C2B; [12-11]
       ))
@@ -4082,6 +4176,14 @@
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5973)	; 女
+      )
+     ((=ucs		  . #x5B85)	; 宅
+      ))
     (=ucs		. #x59F9)	; 姹
     (->subsumptive
      ((ideographic-structure
@@ -5122,17 +5224,24 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 38)	; â¼¥
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=>jis-x0208	. #x3864)	; &J97-3864; [24-68]
+    (=>jis-x0213-1	. #x3864)	; &J97-3864; [24-68]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3864)	; &J97-3864; [24-68]
+     ((=>jis-x0208	  . #x3864)	; &J97-3864; [24-68]
       ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5A1B)	; 娛
+    (=big5		. #xAE54)	; &I-B-AE54;
     (->subsumptive
      ((=ucs@unicode	  . #x5A1B)	; &M-06307;
       (=ks-x1001	  . #x6774)	; &M-06307; [71-84]
-      (=big5		  . #xAE54)	; &I-B-AE54;
       (=daikanwa	  . 06307)	; &I-M-06307;
       (=jef-china3	  . #x49BA)	; &I-JC3-49BA;
       )
@@ -5140,14 +5249,8 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=jis-x0208@1997	. #x3864)	; &J97-3864; [24-68]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3864)	; &J97-3864; [24-68]
+     ((=>jis-x0208	  . #x3864)	; &J97-3864; [24-68]
       ))
     (=>ucs*		. #x5A1B)	; 娛
     (ideographic-radical . 38)	; â¼¥
@@ -5158,7 +5261,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3864)	; &J97-3864; [24-68]
+     ((=>jis-x0208	  . #x3864)	; &J97-3864; [24-68]
       ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 7)
@@ -5587,45 +5690,56 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x21735)	; 𡜵
-    (=daikanwa		. 06336)	; &I-M-06336;
-    ))
-(define-char
-  '((=>ucs		. #x21735)	; 𡜵
-    (morohashi-daikanwa	6336 0 0)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=cns11643-5	. #x2C6E)	; &C5-2C6E; [12-78]
+    (->subsumptive
+     ((=ucs@iso		  . #x21735)	; &M-06336;
+      (=daikanwa	  . 06336)	; &M-06336;
+      )
+     ((=cns11643-5	  . #x2C6E)	; &C5-2C6E; [12-78]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (=ucs		. #x5A29)	; 娩
-    (=jis-x0208@1997	. #x4A5A)	; 娩 [42-58]
+    (=>jis-x0208	. #x4A5A)	; 娩 [42-58]
+    (=>jis-x0213-1	. #x4A5A)	; 娩 [42-58]
     (->subsumptive
      ((ideographic-strokes . 7)
       (total-strokes	   . 10)
-      (=ucs@unicode	  . #x5A29)	; &M-06337;
-      (=jis-x0208@1978	  . #x4A5A)	; &M-06337; [42-58]
-      (=gb2312		  . #x4364)	; &I-G0-4364; [35-68]
-      (=ks-x1001	  . #x5834)	; &I-K0-5834; [56-20]
-      (=big5		  . #xAE59)	; &I-B-AE59;
-      (=daikanwa	  . 06337)	; &I-M-06337;
-      (=jef-china3	  . #x49EE)	; &I-JC3-49EE;
-      )
-     ((ideographic-strokes . 7)
-      (total-strokes	   . 10)
-      (=cns11643-1	  . #x547B)	; &C1-547B; [52-91]
-      (mojikyo		  . 006337)	; &MCS-600018C1;
+      (=big5		  . #xAE59)	; &B-AE59;
+      (->subsumptive
+       ((=ucs@jis/2004	    . #x5A29)	; &M-06337;
+	(=jis-x0208@1978    . #x4A5A)	; &M-06337; [42-58]
+	(=ks-x1001	    . #x5834)	; &I-K0-5834; [56-20]
+	(=jis-x0213-1@2004  . #x4A5A)	; &I-JX3-4A5A; [42-58]
+	(=daikanwa	    . 06337)	; &I-M-06337;
+	(=jef-china3	    . #x49EE)	; &I-JC3-49EE;
+	)
+       ((=ucs@unicode	    . #x5A29)	; &GT-07980;
+	(=gb2312	    . #x4364)	; &GT-07980; [35-68]
+	(=gt		    . 07980)	; &I-GT-07980;
+	(=gt-pj-2	    . #x6B2C)	; &I-GT-07980; [75-12]
+	)
+       ((=cns11643-1	    . #x547B)	; &C1-547B; [52-91]
+	(mojikyo	    . 006337)	; &MCS-600018C1;
+	))
       )
      ((ideographic-strokes . 8)
       (total-strokes	   . 11)
-      (=ucs@jis		  . #x5A29)	; &GT-08093;
+      (=ucs@jis/1990	  . #x5A29)	; &GT-08093;
+      (=ucs@jis/2000	  . #x5A29)	; &GT-08093;
       (=jis-x0208@1983	  . #x4A5A)	; &GT-08093; [42-58]
       (=jis-x0208@1990	  . #x4A5A)	; &I-J90-4A5A; [42-58]
-      (=jis-x0213-1	  . #x4A5A)	; &I-JX1-4A5A; [42-58]
+      (=jis-x0213-1@2000  . #x4A5A)	; &I-JX1-4A5A; [42-58]
       (=gt		  . 08093)	; &I-GT-08093;
       (=gt-pj-1		  . #x4A5A)	; &I-GT-08093; [42-58]
       (mojikyo		  . 054353)	; &MCS-6000D451;
+      (<-simplified@JP/extra/design
+       ((=ucs@jis/2004	    . #x5A29)	; &M-06337;
+	(=jis-x0208@1978    . #x4A5A)	; &M-06337; [42-58]
+	(=ks-x1001	    . #x5834)	; &I-K0-5834; [56-20]
+	(=jis-x0213-1@2004  . #x4A5A)	; &I-JX3-4A5A; [42-58]
+	(=daikanwa	    . 06337)	; &I-M-06337;
+	))
       ))
     ))
 (define-char
@@ -5642,45 +5756,44 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x5A2B)	; 娫
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 7)
-    (total-strokes	 . 9)
-    (=daikanwa		. 06339)	; &M-06339;
-    ))
-(define-char
-  '((morohashi-daikanwa	6339 0 1)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
+  '((ideographic-radical . 38)	; â¼¥
     (=ucs		. #x5A2B)	; 娫
-    (=cns11643-3	. #x3522)	; &I-C3-3522; [21-02]
+    (->subsumptive
+     ((ideographic-strokes . 7)
+      (total-strokes	   . 9)
+      (->subsumptive
+       ((=daikanwa	    . 06339)	; &M-06339;
+	)
+       ((=ucs@unicode	    . #x5A2B)	; &UU+5A2B;
+	))
+      )
+     ((ideographic-strokes . 8)
+      (total-strokes	   . 11)
+      (=cns11643-3	  . #x3522)	; &C3-3522; [21-02]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x21736)	; 𡜶
-    (=daikanwa		. 06340)	; &I-M-06340;
-    ))
-(define-char
-  '((=>ucs		. #x21736)	; 𡜶
-    (morohashi-daikanwa	6340 0 0)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=cns11643-6	. #x3656)	; &C6-3656; [22-54]
+    (->subsumptive
+     ((=ucs@iso		  . #x21736)	; &M-06340;
+      (=daikanwa	  . 06340)	; &M-06340;
+      )
+     ((=cns11643-6	  . #x3656)	; &C6-3656; [22-54]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5A2D)	; 娭
+    (=big5		. #xD15D)	; &I-B-D15D;
     (->subsumptive
      ((=ucs@unicode	  . #x5A2D)	; &M-06341;
       (=jis-x0212	  . #x3959)	; &M-06341; [25-57]
       (=jis-x0213-2	  . #x255C)	; &I-JX2-255C; [05-60]
-      (=big5		  . #xD15D)	; &I-B-D15D;
       (=daikanwa	  . 06341)	; &I-M-06341;
       )
      ((=ucs@cns		  . #x5A2D)	; &C2-2E5F;
@@ -7062,17 +7175,17 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A5A)	; 婚
+    (=big5		. #xB142)	; &I-B-B142;
     (->subsumptive
      ((=ucs@unicode	  . #x5A5A)	; &GT-08034;
       (=jis-x0208	  . #x3A27)	; &GT-08034; [26-07]
       (=gb2312		  . #x3B69)	; &I-G0-3B69; [27-73]
       (=ks-x1001	  . #x7B66)	; &I-K0-7B66; [91-70]
       (=jis-x0213-1	  . #x3A27)	; &I-JX1-3A27; [26-07]
-      (=big5		  . #xB142)	; &I-B-B142;
       (=gt		  . 08034)	; &I-GT-08034;
       (=gt-pj-1		  . #x3A27)	; &I-GT-08034; [26-07]
       (=daikanwa	  . 06418)	; &I-M-06418;
-      (=shinjigen@rev	  .  1684)	; &GT-08034;
+      (=shinjigen	  .  1684)	; &GT-08034;
       )
      ((=cns11643-1	  . #x5966)	; &C1-5966; [57-70]
       ))
@@ -7082,127 +7195,165 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x2176A)	; 𡝪
-    (=daikanwa		. 06419)	; &I-M-06419;
-    ))
-(define-char
-  '((=>ucs		. #x2176A)	; 𡝪
-    (morohashi-daikanwa	6419 0 0)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=cns11643-6	. #x3E4E)	; &C6-3E4E; [30-46]
+    (->subsumptive
+     ((=ucs@iso		  . #x2176A)	; &M-06419;
+      (=daikanwa	  . 06419)	; &M-06419;
+      )
+     ((=cns11643-6	  . #x3E4E)	; &C6-3E4E; [30-46]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A5B)	; 婛
-    (=cns11643-2	. #x3464)	; &I-C2-3464; [20-68]
     (=big5		. #xD4E1)	; &I-B-D4E1;
-    (=daikanwa		. 06420)	; &I-M-06420;
+    (->subsumptive
+     ((=daikanwa	  . 06420)	; &M-06420;
+      )
+     ((=ucs@unicode	  . #x5A5B)	; &UU+5A5B;
+      )
+     ((=cns11643-2	  . #x3464)	; &C2-3464; [20-68]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A5C)	; 婜
-    (=cns11643-2	. #x3471)	; &I-C2-3471; [20-81]
     (=big5		. #xD4EE)	; &I-B-D4EE;
-    (=daikanwa		. 06421)	; &I-M-06421;
+    (->subsumptive
+     ((=ucs@unicode	  . #x5A5C)	; &M-06421;
+      (=daikanwa	  . 06421)	; &M-06421;
+      )
+     ((=cns11643-2	  . #x3471)	; &C2-3471; [20-81]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A5D)	; 婝
-    (=cns11643-2	. #x3461)	; &I-C2-3461; [20-65]
     (=big5		. #xD4DE)	; &I-B-D4DE;
-    (=daikanwa		. 06422)	; &I-M-06422;
+    (->subsumptive
+     ((=daikanwa	  . 06422)	; &M-06422;
+      )
+     ((=ucs@unicode	  . #x5A5D)	; &UU+5A5D;
+      )
+     ((=cns11643-2	  . #x3461)	; &C2-3461; [20-65]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A5E)	; 婞
-    (=jis-x0212		. #x3962)	; &I-JSP-3962; [25-66]
-    (=iso-ir165		. #x2C41)	; &I-EGB-2C41; [12-33]
-    (=cns11643-2	. #x3455)	; &I-C2-3455; [20-53]
     (=big5		. #xD4D2)	; &I-B-D4D2;
-    (=daikanwa		. 06423)	; &I-M-06423;
-    (=jef-china3	. #x49C3)	; &I-JC3-49C3;
+    (->subsumptive
+     ((=ucs@jis		  . #x5A5E)	; &M-06423;
+      (=jis-x0212	  . #x3962)	; &M-06423; [25-66]
+      (=daikanwa	  . 06423)	; &I-M-06423;
+      (=jef-china3	  . #x49C3)	; &I-JC3-49C3;
+      )
+     ((=ucs@unicode	  . #x5A5E)	; &EGB-2C41;
+      (=iso-ir165	  . #x2C41)	; &EGB-2C41; [12-33]
+      )
+     ((=cns11643-2	  . #x3455)	; &C2-3455; [20-53]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (sound@ja/on/go	"go")
+    (sound@ja/on/kan	"ko")
     (=ucs		. #x5A5F)	; 婟
-    (=cns11643-2	. #x345A)	; &I-C2-345A; [20-58]
     (=big5		. #xD4D7)	; &I-B-D4D7;
-    (=daikanwa		. 06424)	; &I-M-06424;
+    (->subsumptive
+     ((=ucs@unicode	  . #x5A5F)	; &M-06424;
+      (=daikanwa	  . 06424)	; &M-06424;
+      )
+     ((=cns11643-2	  . #x345A)	; &C2-345A; [20-58]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A60)	; å© 
-    (=cns11643-2	. #x3451)	; &I-C2-3451; [20-49]
     (=big5		. #xD4CE)	; &I-B-D4CE;
-    (=daikanwa		. 06425)	; &I-M-06425;
-    ))
-(define-char
-  '((=>ucs		. #x2176B)	; 𡝫
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=daikanwa		. 06426)	; &M-06426;
+    (->subsumptive
+     ((=daikanwa	  . 06425)	; &M-06425;
+      )
+     ((=ucs@unicode	  . #x5A60)	; &UU+5A60;
+      )
+     ((=cns11643-2	  . #x3451)	; &C2-3451; [20-49]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	6426 0 0)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x2176B)	; 𡝫
-    (=cns11643-5	. #x316B)	; &I-C5-316B; [17-75]
+    (->subsumptive
+     ((=daikanwa	  . 06426)	; &M-06426;
+      )
+     ((=ucs@iso		  . #x2176B)	; &C5-316B;
+      (=cns11643-5	  . #x316B)	; &C5-316B; [17-75]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A61)	; å©¡
-    (=cns11643-3	. #x3527)	; &I-C3-3527; [21-07]
-    (=daikanwa		. 06427)	; &I-M-06427;
+    (->subsumptive
+     ((=ucs@unicode	  . #x5A61)	; &M-06427;
+      (=daikanwa	  . 06427)	; &M-06427;
+      )
+     ((=cns11643-3	  . #x3527)	; &C3-3527; [21-07]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A62)	; å©¢
-    (=jis-x0208		. #x5539)	; &I-J90-5539; [53-25]
-    (=gb2312		. #x663E)	; &I-G0-663E; [70-30]
-    (=ks-x1001		. #x5D66)	; &I-K0-5D66; [61-70]
-    (=cns11643-1	. #x5965)	; &I-C1-5965; [57-69]
-    (=jis-x0213-1	. #x5539)	; &I-JX1-5539; [53-25]
     (=big5		. #xB141)	; &I-B-B141;
-    (=gt		. 08083)	; &I-GT-08083;
-    (=gt-pj-1		. #x5539)	; &I-GT-08083; [53-25]
-    (=daikanwa		. 06428)	; &I-M-06428;
-    (=shinjigen@rev	.  1693)	; å©¢
+    (->subsumptive
+     ((=ucs@unicode	  . #x5A62)	; &GT-08083;
+      (=jis-x0208	  . #x5539)	; &GT-08083; [53-25]
+      (=gb2312		  . #x663E)	; &I-G0-663E; [70-30]
+      (=ks-x1001	  . #x5D66)	; &I-K0-5D66; [61-70]
+      (=jis-x0213-1	  . #x5539)	; &I-JX1-5539; [53-25]
+      (=gt		  . 08083)	; &I-GT-08083;
+      (=gt-pj-1		  . #x5539)	; &I-GT-08083; [53-25]
+      (=daikanwa	  . 06428)	; &I-M-06428;
+      (=shinjigen	  .  1693)	; &GT-08083;
+      )
+     ((=cns11643-1	  . #x5965)	; &C1-5965; [57-69]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A63)	; å©£
-    (=jis-x0212		. #x3963)	; &I-JSP-3963; [25-67]
-    (=cns11643-3	. #x353C)	; &I-C3-353C; [21-28]
-    (=daikanwa		. 06429)	; &I-M-06429;
-    (=jef-china3	. #x49C4)	; &I-JC3-49C4;
+    (->subsumptive
+     ((=ucs@unicode	  . #x5A63)	; &M-06429;
+      (=jis-x0212	  . #x3963)	; &M-06429; [25-67]
+      (=daikanwa	  . 06429)	; &I-M-06429;
+      (=jef-china3	  . #x49C4)	; &I-JC3-49C4;
+      )
+     ((=cns11643-3	  . #x353C)	; &C3-353C; [21-28]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A64)	; 婤
+    (=big5		. #xD4DB)	; &I-B-D4DB;
     ))
 (define-char
   '((<-denotational
@@ -7211,8 +7362,7 @@
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=big5		. #xD4DB)	; &M-06430;
-    (=daikanwa		. 06430)	; &I-M-06430;
+    (=daikanwa		. 06430)	; &M-06430;
     ))
 (define-char
   '((<-denotational
@@ -7233,12 +7383,12 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A65)	; å©¥
+    (=big5		. #xD4D8)	; &I-B-D4D8;
     (->subsumptive
      ((=ucs@unicode	  . #x5A65)	; &M-06431;
       (=jis-x0212	  . #x3964)	; &M-06431; [25-68]
       (=iso-ir165	  . #x2E3F)	; &I-EGB-2E3F; [14-31]
       (=jis-x0213-2	  . #x255E)	; &I-JX2-255E; [05-62]
-      (=big5		  . #xD4D8)	; &I-B-D4D8;
       (=daikanwa	  . 06431)	; &I-M-06431;
       (=jef-china3	  . #x49C5)	; &I-JC3-49C5;
       )
@@ -7251,8 +7401,9 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5A66)	; 婦
+    (=>jis-x0208	. #x4958)	; 婦 [41-56]
+    (=>jis-x0213-1	. #x4958)	; 婦 [41-56]
     (=big5		. #xB0FC)	; &I-B-B0FC;
-    (=jis-x0208@1997	. #x4958)	; 婦 [41-56]
     ))
 (define-char
   '((<-denotational
@@ -7900,6 +8051,7 @@
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (=ucs		. #x5A7C)	; 婼
+    (=big5		. #xD8BD)	; &I-B-D8BD;
     ))
 (define-char
   '((<-denotational
@@ -7924,48 +8076,65 @@
     (total-strokes	 . 11)
     (=ucs@unicode	. #x5A7C)	; &EGB-7B37;
     (=iso-ir165		. #x7B37)	; &EGB-7B37; [91-23]
-    (=big5		. #xD8BD)	; &I-B-D8BD;
     (=jef-china3	. #x97E2)	; &I-JC3-97E2;
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (sound@ja/on/pianhai "beN")
+    (sound@ja/on/zihui	"teN")
     (=ucs		. #x36EF)	; 㛯
-    (=daikanwa		. 06465)	; &I-M-06465;
-    ))
-(define-char
-  '((=>ucs		. #x36EF)	; 㛯
-    (morohashi-daikanwa	6465 0 0)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=cns11643-3	. #x3A67)	; &C3-3A67; [26-71]
+    (->subsumptive
+     ((=daikanwa	  . 06465)	; &M-06465;
+      (<-same@pianhai
+       ((=ucs@jis/2004	    . #x5A29)	; &M-06337;
+	(=jis-x0208@1978    . #x4A5A)	; &M-06337; [42-58]
+	(=ks-x1001	    . #x5834)	; &I-K0-5834; [56-20]
+	(=jis-x0213-1@2004  . #x4A5A)	; &I-JX3-4A5A; [42-58]
+	(=daikanwa	    . 06337)	; &I-M-06337;
+	))
+      (<-same@pianhai*sources
+       pianhai daikanwa)
+      )
+     ((=ucs@unicode	  . #x36EF)	; &UU+36EF;
+      )
+     ((=cns11643-3	  . #x3A67)	; &C3-3A67; [26-71]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x36F0)	; 㛰
-    (=daikanwa		. 06466)	; &I-M-06466;
-    ))
-(define-char
-  '((=>ucs		. #x36F0)	; 㛰
-    (morohashi-daikanwa	6466 0 0)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=cns11643-3	. #x3A74)	; &C3-3A74; [26-84]
+    (->subsumptive
+     ((=ucs@unicode	  . #x36F0)	; &M-06466;
+      (=daikanwa	  . 06466)	; &M-06466;
+      (=shinjigen	  .  1685)	; &M-06466;
+      (<-vulgar
+       ((=ucs@unicode	    . #x5A5A)	; &GT-08034;
+	(=jis-x0208	    . #x3A27)	; &GT-08034; [26-07]
+	(=gb2312	    . #x3B69)	; &I-G0-3B69; [27-73]
+	(=ks-x1001	    . #x7B66)	; &I-K0-7B66; [91-70]
+	(=jis-x0213-1	    . #x3A27)	; &I-JX1-3A27; [26-07]
+	(=daikanwa	    . 06418)	; &I-M-06418;
+	(=shinjigen	    .  1684)	; &GT-08034;
+	))
+      (<-vulgar*sources
+       shinjigen)
+      )
+     ((=cns11643-3	  . #x3A74)	; &C3-3A74; [26-84]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5A7D)	; 婽
+    (=big5		. #xD8CA)	; &I-B-D8CA;
     (->subsumptive
      ((=ucs@unicode	  . #x5A7D)	; &M-06467;
-      (=big5		  . #xD8CA)	; &M-06467;
-      (=daikanwa	  . 06467)	; &I-M-06467;
+      (=daikanwa	  . 06467)	; &M-06467;
       )
      ((=ucs@cns		  . #x5A7D)	; &C2-3B2E;
       (=cns11643-2	  . #x3B2E)	; &C2-3B2E; [27-14]
@@ -8286,6 +8455,14 @@
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5973)	; 女
+      )
+     ((=ucs		  . #x8ECD)	; 軍
+      ))
     (=ucs		. #x5A88)	; 媈
     (->subsumptive
      ((ideographic-structure
@@ -8333,11 +8510,11 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5A8A)	; 媊
+    (=big5		. #xD8C4)	; &I-B-D8C4;
     (->subsumptive
      ((=daikanwa	  . 06486)	; &M-06486;
       )
-     ((=ucs@unicode	  . #x5A8A)	; &B-D8C4;
-      (=big5		  . #xD8C4)	; &B-D8C4;
+     ((=ucs@unicode	  . #x5A8A)	; &UU+5A8A;
       )
      ((=ucs@cns		  . #x5A8A)	; &C2-3B28;
       (=cns11643-2	  . #x3B28)	; &C2-3B28; [27-08]
@@ -8348,11 +8525,11 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5A8B)	; 媋
+    (=big5		. #xD8C7)	; &I-B-D8C7;
     (->subsumptive
      ((=ucs@unicode	  . #x5A8B)	; &M-06487;
       (=jis-x0212	  . #x396B)	; &M-06487; [25-75]
       (=jis-x0213-2	  . #x2560)	; &I-JX2-2560; [05-64]
-      (=big5		  . #xD8C7)	; &I-B-D8C7;
       (=daikanwa	  . 06487)	; &I-M-06487;
       (=jef-china3	  . #x49CC)	; &I-JC3-49CC;
       )
@@ -8363,6 +8540,7 @@
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (=ucs		. #x5A8C)	; 媌
+    (=big5		. #xD8CB)	; &I-B-D8CB;
     ))
 (define-char
   '((<-denotational
@@ -8385,12 +8563,10 @@
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs@unicode	. #x5A8C)	; &B-D8CB;
-    (=big5		. #xD8CB)	; &B-D8CB;
+    (=ucs@unicode	. #x5A8C)	; &UU+5A8C;
     ))
 (define-char
-  '((=>ucs		. #x2179E)	; 𡞞
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (ideographic-structure
@@ -8399,120 +8575,154 @@
       )
      ((=ucs		  . #x5973)	; 女
       )
-     ((=ucs@jis		  . #x7701)	; &GT-29688;
-      (=jis-x0208	  . #x3E4A)	; &GT-29688; [30-42]
-      (=ks-x1001	  . #x607D)	; &I-K0-607D; [64-93]
-      (=jis-x0213-1	  . #x3E4A)	; &I-JX1-3E4A; [30-42]
-      (=daikanwa	  . 23179)	; &I-M-23179;
+     ((=ucs		  . #x7701)	; 省
       ))
-    (=daikanwa		. 06489)	; &M-06489;
-    (=cbeta		. 05741)	; &I-CB05741;
-    ))
-(define-char
-  '((morohashi-daikanwa	6489 0 0)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x2179E)	; 𡞞
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs@unicode	    . #x5973)	; &GT-07623;
+	(=jis-x0208	    . #x3D77)	; &GT-07623; [29-87]
+	(=gb2312	    . #x452E)	; &I-G0-452E; [37-14]
+	(=ks-x1001	    . #x5233)	; &I-K0-5233; [50-19]
+	(=jis-x0213-1	    . #x3D77)	; &I-JX1-3D77; [29-87]
+	(=daikanwa	    . 06036)	; &I-M-06036;
+	)
+       ((=ucs@jis	    . #x7701)	; &GT-29688;
+	(=jis-x0208	    . #x3E4A)	; &GT-29688; [30-42]
+	(=ks-x1001	    . #x607D)	; &I-K0-607D; [64-93]
+	(=jis-x0213-1	    . #x3E4A)	; &I-JX1-3E4A; [30-42]
+	(=daikanwa	    . 23179)	; &I-M-23179;
+	))
+      (=daikanwa	  . 06489)	; &M-06489;
+      (=cbeta		  . 05741)	; &I-CB05741;
       )
-     ((=ucs		  . #x5973)	; 女
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=ucs@unicode	    . #x5973)	; &GT-07623;
+	(=jis-x0208	    . #x3D77)	; &GT-07623; [29-87]
+	(=gb2312	    . #x452E)	; &I-G0-452E; [37-14]
+	(=ks-x1001	    . #x5233)	; &I-K0-5233; [50-19]
+	(=jis-x0213-1	    . #x3D77)	; &I-JX1-3D77; [29-87]
+	(=daikanwa	    . 06036)	; &I-M-06036;
+	)
+       ((=ucs@unicode	    . #x7701)	; &C1-525C;
+	(=gb2312	    . #x4A21)	; &C1-525C; [42-01]
+	(=cns11643-1	    . #x525C)	; &I-C1-525C; [50-60]
+	))
+      (=ucs@iso		  . #x2179E)	; &U-0002179E;
       )
-     ((=ucs		  . #x7701)	; 省
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=cns11643-1	    . #x444C)	; &C1-444C; [36-44]
+	)
+       ((=ucs@unicode	    . #x7701)	; &C1-525C;
+	(=gb2312	    . #x4A21)	; &C1-525C; [42-01]
+	(=cns11643-1	    . #x525C)	; &I-C1-525C; [50-60]
+	))
+      (=cns11643-4	  . #x367C)	; &C4-367C; [22-92]
       ))
-    (=ucs		. #x2179E)	; 𡞞
     ))
 (define-char
-  '((=>ucs		. #x2179E)	; 𡞞
-    (morohashi-daikanwa	6489 0 1)
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x5973)	; 女
+    (=ucs		. #x5A8D)	; 媍
+    (->subsumptive
+     ((=ucs@unicode	  . #x5A8D)	; &M-06490;
+      (=daikanwa	  . 06490)	; &M-06490;
       )
-     ((=ucs		  . #x7701)	; 省
+     ((=cns11643-3	  . #x3A7B)	; &C3-3A7B; [26-91]
       ))
-    (=cns11643-4	. #x367C)	; &C4-367C; [22-92]
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=ucs		. #x5A8D)	; 媍
-    (=cns11643-3	. #x3A7B)	; &I-C3-3A7B; [26-91]
-    (=daikanwa		. 06490)	; &I-M-06490;
+    (=ucs		. #x5A8E)	; 媎
     ))
 (define-char
-  '((=>ucs		. #x5A8E)	; 媎
+  '((<-denotational
+     ((=ucs		  . #x5A8E)	; 媎
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=daikanwa		. 06491)	; &M-06491;
     ))
 (define-char
-  '((morohashi-daikanwa	6491 0 1)
+  '((<-denotational
+     ((=ucs		  . #x5A8E)	; 媎
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x5A8E)	; 媎
-    (=cns11643-2	. #x3466)	; &I-C2-3466; [20-70]
-    (=big5		. #xD4E3)	; &I-B-D4E3;
+    (=big5		. #xD4E3)	; &B-D4E3;
+    (->subsumptive
+     ((=ucs@unicode	  . #x5A8E)	; &UU+5A8E;
+      )
+     ((=cns11643-2	  . #x3466)	; &C2-3466; [20-70]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (sound@ja/on	"taN")
     (=ucs		. #x5A8F)	; 媏
-    (=cns11643-2	. #x3B31)	; &I-C2-3B31; [27-17]
     (=big5		. #xD8CD)	; &I-B-D8CD;
-    (=daikanwa		. 06492)	; &I-M-06492;
+    (->subsumptive
+     ((=ucs@unicode	  . #x5A8F)	; &M-06492;
+      (=daikanwa	  . 06492)	; &M-06492;
+      )
+     ((=cns11643-2	  . #x3B31)	; &C2-3B31; [27-17]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (sound@ja/on	"taN")
     (=ucs		. #x36F6)	; 㛶
-    (=cns11643-5	. #x374E)	; &I-C5-374E; [23-46]
-    (=daikanwa		. 06493)	; &I-M-06493;
+    (->subsumptive
+     ((=daikanwa	  . 06493)	; &M-06493;
+      )
+     ((=ucs@unicode	  . #x36F6)	; &UU+36F6;
+      )
+     ((=cns11643-5	  . #x374E)	; &C5-374E; [23-46]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x2179F)	; 𡞟
-    (ideographic-radical . 38)	; â¼¥
+  '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ks-x1001	  . #x5A64)	; &M-03166; [58-68]
-      (=daikanwa	  . 03166)	; &I-M-03166;
+     ((=ucs		  . #x53DB)	; 叛
       )
      ((=ucs		  . #x5973)	; 女
       ))
-    (=daikanwa		. 06494)	; &M-06494;
+    (=ucs		. #x2179F)	; 𡞟
     ))
 (define-char
-  '((morohashi-daikanwa	6494 0 2)
+  '((<-denotational
+     ((=ucs		  . #x2179F)	; 𡞟
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=cns11643-1	  . #x5035)	; &C1-5035; [48-21]
-      )
-     ((=ucs		  . #x5973)	; 女
-      ))
-    (=cbeta		. 03600)	; &CB03600;
+    (=daikanwa		. 06494)	; &M-06494;
     ))
 (define-char
-  '((morohashi-daikanwa	6494 0 3)
+  '((<-denotational
+     ((=ucs		  . #x2179F)	; 𡞟
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -8522,13 +8732,44 @@
       )
      ((=cns11643-1	  . #x5035)	; &C1-5035; [48-21]
       )
-     ((=cns11643-1	  . #x444C)	; &C1-444C; [36-44]
+     ((=ucs		  . #x5973)	; 女
+      ))
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=cns11643-1	    . #x5035)	; &C1-5035; [48-21]
+	)
+       ((=ucs@unicode	    . #x5973)	; &GT-07623;
+	(=jis-x0208	    . #x3D77)	; &GT-07623; [29-87]
+	(=gb2312	    . #x452E)	; &I-G0-452E; [37-14]
+	(=ks-x1001	    . #x5233)	; &I-K0-5233; [50-19]
+	(=jis-x0213-1	    . #x3D77)	; &I-JX1-3D77; [29-87]
+	(=daikanwa	    . 06036)	; &I-M-06036;
+	))
+      (=cbeta		  . 03600)	; &CB03600;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=cns11643-1	    . #x5035)	; &C1-5035; [48-21]
+	)
+       ((=cns11643-1	    . #x444C)	; &C1-444C; [36-44]
+	))
+      (=ucs@iso		  . #x2179F)	; &C5-375A;
+      (=cns11643-5	  . #x375A)	; &C5-375A; [23-58]
       ))
-    (=ucs		. #x2179F)	; 𡞟
-    (=cns11643-5	. #x375A)	; &I-C5-375A; [23-58]
     ))
 (define-char
-  '((=>ucs		. #x5A90)	; 媐
+  '((ideographic-radical . 38)	; â¼¥
+    (=ucs		. #x5A90)	; 媐
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5A90)	; 媐
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -8537,13 +8778,18 @@
     (=daikanwa		. 06495)	; &I-M-06495;
     ))
 (define-char
-  '((morohashi-daikanwa	6495 0 2)
+  '((<-denotational
+     ((=ucs		  . #x5A90)	; 媐
+      ))
     (ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=ucs		. #x5A90)	; 媐
-    (=cns11643-2	. #x424D)	; &I-C2-424D; [34-45]
-    (=big5		. #xDD47)	; &I-B-DD47;
+    (=big5		. #xDD47)	; &B-DD47;
+    (->subsumptive
+     ((=ucs@unicode	  . #x5A90)	; &UU+5A90;
+      )
+     ((=cns11643-2	  . #x424D)	; &C2-424D; [34-45]
+      ))
     ))
 (define-char
   '((=>ucs		. #x217A0)	; 𡞠
@@ -10619,9 +10865,24 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x370E)	; 㜎
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x370E)	; 㜎
+      ))
+    (ideographic-radical . 38)	; â¼¥
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=daikanwa		. 06617)	; &M-06617;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x370E)	; 㜎
+      ))
+    (ideographic-radical . 38)	; â¼¥
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
     (->subsumptive
-     ((=daikanwa	  . 06617)	; &M-06617;
-      )
      ((=ucs@unicode	  . #x370E)	; &UU+370E;
       )
      ((=cns11643-4	  . #x3C63)	; &C4-3C63; [28-67]
@@ -10632,8 +10893,9 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x5ACC)	; 嫌
+    (=>jis-x0208	. #x3779)	; 嫌 [23-89]
+    (=>jis-x0213-1	. #x3779)	; 嫌 [23-89]
     (=big5		. #xB6FB)	; &I-B-B6FB;
-    (=jis-x0208@1997	. #x3779)	; 嫌 [23-89]
     ))
 (define-char
   '((<-denotational
@@ -10664,6 +10926,11 @@
       (=gt		  . 08275)	; &I-GT-08275;
       (=gt-pj-1		  . #x3779)	; &I-GT-08275; [23-89]
       (=jef-china3	  . #x49EC)	; &I-JC3-49EC;
+      (<-simplified@JP/jis
+       ((=jis-x0208@1978    . #x3779)	; &GT-08274; [23-89]
+	(=ks-x1001	    . #x7A6E)	; &I-K0-7A6E; [90-78]
+	(=daikanwa	    . 06618)	; &I-M-06618;
+	))
       )
      ((=cns11643-1	  . #x6362)	; &C1-6362; [67-66]
       ))
@@ -12416,10 +12683,10 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x5AFD)	; 嫽
+    (=big5		. #xE556)	; &I-B-E556;
     (->subsumptive
      ((=ucs@unicode	  . #x5AFD)	; &M-06717;
       (=jis-x0212	  . #x3A2D)	; &M-06717; [26-13]
-      (=big5		  . #xE556)	; &I-B-E556;
       (=daikanwa	  . 06717)	; &I-M-06717;
       (=jef-china3	  . #x49E1)	; &I-JC3-49E1;
       )
@@ -12432,25 +12699,23 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x5AFE)	; 嫾
-    (=daikanwa		. 06718)	; &I-M-06718;
-    ))
-(define-char
-  '((=>ucs		. #x5AFE)	; 嫾
-    (morohashi-daikanwa	6718 0 0)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=cns11643-3	. #x4B54)	; &C3-4B54; [43-52]
+    (->subsumptive
+     ((=daikanwa	  . 06718)	; &M-06718;
+      )
+     ((=ucs@unicode	  . #x5AFE)	; &UU+5AFE;
+      )
+     ((=cns11643-3	  . #x4B54)	; &C3-4B54; [43-52]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x5AFF)	; å«¿
+    (=big5		. #xE554)	; &I-B-E554;
     (->subsumptive
      ((=ucs@unicode	  . #x5AFF)	; &M-06719;
-      (=big5		  . #xE554)	; &M-06719;
-      (=daikanwa	  . 06719)	; &I-M-06719;
+      (=daikanwa	  . 06719)	; &M-06719;
       (=jef-china3	  . #x91C7)	; &I-JC3-91C7;
       )
      ((=ucs@cns		  . #x5AFF)	; &C2-4F7B;
@@ -12459,6 +12724,11 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 38)	; â¼¥
+    (=ucs@big5		. #x5AAF)	; &B-D8B5;
+    (=big5		. #xD8B5)	; &B-D8B5;
+    ))
+(define-char
   '((<-denotational
      ((=ucs@big5	  . #x5AAF)	; &B-D8B5;
       (=big5		  . #xD8B5)	; &B-D8B5;
@@ -12482,9 +12752,18 @@
     (=jef-china3	. #x49E2)	; &I-JC3-49E2;
     ))
 (define-char
-  '((ideographic-radical . 38)	; â¼¥
-    (=ucs@big5		. #x5AAF)	; &B-D8B5;
-    (=big5		. #xD8B5)	; &B-D8B5;
+  '((<-denotational
+     ((=ucs		  . #x5B00)	; 嬀
+      ))
+    (ideographic-radical . 38)	; â¼¥
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (->subsumptive
+     ((=ucs@unicode	  . #x5B00)	; &UU+5B00;
+      (=gb12345		  . #x6623)	; &UU+5B00; [70-03]
+      )
+     ((=cns11643-3	  . #x4B5E)	; &C3-4B5E; [43-62]
+      ))
     ))
 (define-char
   '((<-denotational
@@ -12497,6 +12776,12 @@
     (=ucs		. #x5AAF)	; 媯
     (->subsumptive
      ((=ucs@unicode	  . #x5AAF)	; &UU+5AAF;
+      (<-simplified
+       ((=ucs@jis	    . #x5B00)	; &M-06720;
+	(=jis-x0212	    . #x3A2E)	; &M-06720; [26-14]
+	(=jis-x0213-2	    . #x2571)	; &I-JX2-2571; [05-81]
+	(=daikanwa	    . 06720)	; &I-M-06720;
+	))
       )
      ((=ucs@cns		  . #x5AAF)	; &C2-3A77;
       (=cns11643-2	  . #x3A77)	; &C2-3A77; [26-87]
@@ -12504,28 +12789,14 @@
       ))
     ))
 (define-char
-  '((<-denotational
-     ((=ucs		  . #x5B00)	; 嬀
-      ))
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (->subsumptive
-     ((=ucs@unicode	  . #x5B00)	; &UU+5B00;
-      (=gb12345		  . #x6623)	; &UU+5B00; [70-03]
-      )
-     ((=cns11643-3	  . #x4B5E)	; &C3-4B5E; [43-62]
-      ))
-    ))
-(define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x5B01)	; 嬁
+    (=big5		. #xE55D)	; &I-B-E55D;
     (->subsumptive
      ((=ucs@unicode	  . #x5B01)	; &M-06721;
       (=jis-x0212	  . #x3A2F)	; &M-06721; [26-15]
-      (=big5		  . #xE55D)	; &I-B-E55D;
       (=daikanwa	  . 06721)	; &I-M-06721;
       (=jef-china3	  . #x49E3)	; &I-JC3-49E3;
       )
@@ -12553,10 +12824,10 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x5B03)	; 嬃
+    (=big5		. #xE559)	; &I-B-E559;
     (->subsumptive
      ((=ucs@unicode	  . #x5B03)	; &M-06723;
-      (=big5		  . #xE559)	; &M-06723;
-      (=daikanwa	  . 06723)	; &I-M-06723;
+      (=daikanwa	  . 06723)	; &M-06723;
       (=jef-china3	  . #x91C8)	; &I-JC3-91C8;
       (mojikyo		  . 006723)	; &MCS-60001A43;
       )
@@ -14284,53 +14555,49 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x5B2A)	; 嬪
-    (=jis-x0208		. #x554D)	; &I-J90-554D; [53-45]
-    (=ks-x1001		. #x5E2E)	; &I-K0-5E2E; [62-14]
-    (=jis-x0213-1	. #x554D)	; &I-JX1-554D; [53-45]
-    (=gb12345		. #x6649)	; 嬪 [70-41]
     (=big5		. #xC0A7)	; &I-B-C0A7;
-    (=gt		. 08605)	; &I-GT-08605;
-    (=gt-pj-1		. #x554D)	; &I-GT-08605; [53-45]
-    (=daikanwa		. 06819)	; &I-M-06819;
-    (=shinjigen@rev	.  1763)	; 嬪
-    ))
-(define-char
-  '((=>ucs		. #x5B2A)	; 嬪
-    (morohashi-daikanwa	6819 0 1)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=cns11643-1	. #x7350)	; &C1-7350; [83-48]
+    (->subsumptive
+     ((=ucs@jis		  . #x5B2A)	; &GT-08605;
+      (=jis-x0208	  . #x554D)	; &GT-08605; [53-45]
+      (=ks-x1001	  . #x5E2E)	; &I-K0-5E2E; [62-14]
+      (=jis-x0213-1	  . #x554D)	; &I-JX1-554D; [53-45]
+      (=gt		  . 08605)	; &I-GT-08605;
+      (=gt-pj-1		  . #x554D)	; &I-GT-08605; [53-45]
+      (=daikanwa	  . 06819)	; &I-M-06819;
+      (=shinjigen	  .  1763)	; &GT-08605;
+      )
+     ((=ucs@unicode	  . #x5B2A)	; &UU+5B2A;
+      (=gb12345		  . #x6649)	; &UU+5B2A; [70-41]
+      )
+     ((=cns11643-1	  . #x7350)	; &C1-7350; [83-48]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x5B2B)	; 嬫
-    (=daikanwa		. 06820)	; &I-M-06820;
-    ))
-(define-char
-  '((=>ucs		. #x5B2B)	; 嬫
-    (morohashi-daikanwa	6820 0 1)
-    (ideographic-radical . 38)	; â¼¥
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=cns11643-3	. #x544E)	; &C3-544E; [52-46]
+    (->subsumptive
+     ((=ucs@unicode	  . #x5B2B)	; &M-06820;
+      (=daikanwa	  . 06820)	; &M-06820;
+      )
+     ((=cns11643-3	  . #x544E)	; &C3-544E; [52-46]
+      ))
     ))
 (define-char
   '((ideographic-radical . 38)	; â¼¥
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x5B2C)	; 嬬
+    (=big5		. #xECD2)	; &I-B-ECD2;
     (->subsumptive
      ((=ucs@unicode	  . #x5B2C)	; &GT-08582;
       (=jis-x0208	  . #x445C)	; &GT-08582; [36-60]
       (=jis-x0213-1	  . #x445C)	; &I-JX1-445C; [36-60]
-      (=big5		  . #xECD2)	; &I-B-ECD2;
       (=gt		  . 08582)	; &I-GT-08582;
       (=gt-pj-1		  . #x445C)	; &I-GT-08582; [36-60]
       (=daikanwa	  . 06821)	; &I-M-06821;
-      (=shinjigen@rev	  .  1760)	; &GT-08582;
+      (=shinjigen	  .  1760)	; &GT-08582;
       )
      ((=ucs@cns		  . #x5B2C)	; &C2-5C5E;
       (=cns11643-2	  . #x5C5E)	; &C2-5C5E; [60-62]
diff --git a/lisp/utf-2000/Ideograph-R039-Child.el b/lisp/utf-2000/Ideograph-R039-Child.el
index 937a9b3..ca3b984 100644
--- a/lisp/utf-2000/Ideograph-R039-Child.el
+++ b/lisp/utf-2000/Ideograph-R039-Child.el
@@ -873,21 +873,22 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5B6B)	; å­«
+    (=big5		. #xAE5D)	; &I-B-AE5D;
     (->subsumptive
      ((=ucs@jis		  . #x5B6B)	; &GT-08784;
-      (=ucs@big5	  . #x5B6B)	; &GT-08784;
       (=jis-x0208	  . #x4239)	; &GT-08784; [34-25]
       (=ks-x1001	  . #x615D)	; &I-K0-615D; [65-61]
       (=jis-x0213-1	  . #x4239)	; &I-JX1-4239; [34-25]
-      (=big5		  . #xAE5D)	; &I-B-AE5D;
       (=gt		  . 08784)	; &I-GT-08784;
       (=gt-k		  . 06495)	; &I-GT-K06495;
       (=gt-pj-1		  . #x4239)	; &I-GT-08784; [34-25]
       (=daikanwa	  . 06987)	; &I-M-06987;
       (=shinjigen	  .  1792)	; &GT-08784;
       (<-formed
-       ((=jis-x0208@1978    . #x423D)	; &M-39038; [34-29]
+       ((=ucs@jis/2004	    . #x905C)	; &M-39038;
+	(=jis-x0208@1978    . #x423D)	; &M-39038; [34-29]
 	(=ks-x1001	    . #x6161)	; &I-K0-6161; [65-65]
+	(=jis-x0213-1@2004  . #x423D)	; &I-JX3-423D; [34-29]
 	(=daikanwa	    . 39038)	; &I-M-39038;
 	))
       )
@@ -899,24 +900,35 @@
     ))
 (define-char
   '((ideographic-radical . 39)	; ⼦
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5B50)	; 子
+      )
+     ((=ucs		  . #x514D)	; 免
+      ))
     (=ucs		. #x3743)	; 㝃
     (->subsumptive
      ((ideographic-strokes . 7)
       (total-strokes	   . 10)
-      (ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
+      (->subsumptive
+       ((=daikanwa	    . 06988)	; &M-06988;
 	)
-       ((=ucs		    . #x5B50)	; 子
-	)
-       ((=ucs@unicode	    . #x514D)	; &C1-492D;
-	(=gb2312	    . #x4362)	; &C1-492D; [35-66]
-	(=ks-x1001	    . #x5873)	; &I-K0-5873; [56-83]
-	(=cns11643-1	    . #x492D)	; &I-C1-492D; [41-13]
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	  (=ucs		      . #x2FF0)	; â¿°
+	  )
+	 ((=ucs		      . #x5B50)	; 子
+	  )
+	 ((=ucs@unicode	      . #x514D)	; &C1-492D;
+	  (=gb2312	      . #x4362)	; &C1-492D; [35-66]
+	  (=ks-x1001	      . #x5873)	; &I-K0-5873; [56-83]
+	  (=cns11643-1	      . #x492D)	; &I-C1-492D; [41-13]
+	  ))
+	(=ucs@unicode	    . #x3743)	; &C3-3054;
+	(=cns11643-3	    . #x3054)	; &C3-3054; [16-52]
 	))
-      (=ucs@unicode	  . #x3743)	; &M-06988;
-      (=cns11643-3	  . #x3054)	; &M-06988; [16-52]
-      (=daikanwa	  . 06988)	; &I-M-06988;
       )
      ((ideographic-strokes . 8)
       (total-strokes	   . 11)
@@ -938,10 +950,10 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5B6C)	; å­¬
+    (=big5		. #xD165)	; &I-B-D165;
     (->subsumptive
      ((=ucs@unicode	  . #x5B6C)	; &M-06989;
       (=gb2312		  . #x582B)	; &M-06989; [56-11]
-      (=big5		  . #xD165)	; &I-B-D165;
       (=daikanwa	  . 06989)	; &I-M-06989;
       )
      ((=ucs@cns		  . #x5B6C)	; &C2-2E67;
@@ -1177,35 +1189,58 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x21983)	; 𡦃
-    (=cns11643-4	. #x3C66)	; &I-C4-3C66; [28-70]
-    (=daikanwa		. 07008)	; &I-M-07008;
+    (->subsumptive
+     ((=ucs@iso		  . #x21983)	; &M-07008;
+      (=daikanwa	  . 07008)	; &M-07008;
+      )
+     ((=cns11643-4	  . #x3C66)	; &C4-3C66; [28-70]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 39)	; ⼦
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs		. #x21984)	; 𡦄
     ))
 (define-char
-  '((=>ucs		. #x21984)	; 𡦄
+  '((<-denotational
+     ((=ucs		  . #x21984)	; 𡦄
+      ))
     (ideographic-radical . 39)	; ⼦
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=daikanwa		. 07009)	; &M-07009;
     ))
 (define-char
-  '((morohashi-daikanwa	7009 0 2)
+  '((<-denotational
+     ((=ucs		  . #x21984)	; 𡦄
+      ))
     (ideographic-radical . 39)	; ⼦
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=ucs		. #x21984)	; 𡦄
-    (=cns11643-4	. #x3C68)	; &I-C4-3C68; [28-72]
+    (=ucs@iso		. #x21984)	; &C4-3C68;
+    (=cns11643-4	. #x3C68)	; &C4-3C68; [28-72]
     ))
 (define-char
   '((ideographic-radical . 39)	; ⼦
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x21985)	; 𡦅
-    (=cns11643-6	. #x516D)	; &I-C6-516D; [49-77]
-    (=daikanwa		. 07010)	; &I-M-07010;
+    (->subsumptive
+     ((=cns11643-6	  . #x516D)	; &M-07010; [49-77]
+      (=daikanwa	  . 07010)	; &I-M-07010;
+      )
+     ((=ucs@iso		  . #x21985)	; &U-00021985;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 39)	; ⼦
+    (=>jis-x0208	. #x555A)	; &J97-555A; [53-58]
+    (=>jis-x0213-1	. #x555A)	; &J97-555A; [53-58]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x555A)	; &J97-555A; [53-58]
+     ((=>jis-x0208	  . #x555A)	; &J97-555A; [53-58]
       ))
     (ideographic-radical . 39)	; ⼦
     (ideographic-strokes . 10)
@@ -1224,12 +1259,17 @@
     (=jef-china3	. #x49F6)	; &I-JC3-49F6;
     ))
 (define-char
-  '((ideographic-radical . 39)	; ⼦
-    (=jis-x0208@1997	. #x555A)	; &J97-555A; [53-58]
+  '((<-denotational
+     ((=ucs		  . #x5B76)	; å­¶
+      ))
+    (ideographic-radical . 39)	; ⼦
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (=ucs@unicode	. #x5B76)	; &UU+5B76;
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x555A)	; &J97-555A; [53-58]
+     ((=>jis-x0208	  . #x555A)	; &J97-555A; [53-58]
       ))
     (ideographic-radical . 39)	; ⼦
     (ideographic-strokes . 9)
@@ -1245,15 +1285,6 @@
     (mojikyo		. 054543)	; &MCS-6000D50F;
     ))
 (define-char
-  '((<-denotational
-     ((=ucs		  . #x5B76)	; å­¶
-      ))
-    (ideographic-radical . 39)	; ⼦
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=ucs@unicode	. #x5B76)	; &UU+5B76;
-    ))
-(define-char
   '((ideographic-radical . 39)	; ⼦
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
diff --git a/lisp/utf-2000/Ideograph-R040-Roof.el b/lisp/utf-2000/Ideograph-R040-Roof.el
index 0ea02b7..290fc74 100644
--- a/lisp/utf-2000/Ideograph-R040-Roof.el
+++ b/lisp/utf-2000/Ideograph-R040-Roof.el
@@ -2556,61 +2556,61 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x5BC1)	; 寁
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=ucs@jis		. #x5BC1)	; &M-07199;
-    (=ucs@big5		. #x5BC1)	; &M-07199;
-    (=jis-x0212		. #x3A5C)	; &M-07199; [26-60]
-    (=big5		. #xD4F1)	; &I-B-D4F1;
-    (=daikanwa		. 07199)	; &I-M-07199;
-    (=jef-china3	. #x4AB7)	; &I-JC3-4AB7;
-    ))
-(define-char
-  '((morohashi-daikanwa	7199 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5BC1)	; 寁
-    (=cns11643-2	. #x3474)	; &I-C2-3474; [20-84]
+    (=big5		. #xD4F1)	; &I-B-D4F1;
+    (->subsumptive
+     ((=ucs@jis		  . #x5BC1)	; &M-07199;
+      (=jis-x0212	  . #x3A5C)	; &M-07199; [26-60]
+      (=daikanwa	  . 07199)	; &I-M-07199;
+      (=jef-china3	  . #x4AB7)	; &I-JC3-4AB7;
+      )
+     ((=ucs@unicode	  . #x5BC1)	; &C2-3474;
+      (=cns11643-2	  . #x3474)	; &C2-3474; [20-84]
+      ))
     ))
 (define-char
   '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5BC2)	; 寂
-    (=jis-x0208		. #x3C64)	; &I-J90-3C64; [28-68]
-    (=gb2312		. #x3C45)	; &I-G0-3C45; [28-37]
-    (=ks-x1001		. #x6E56)	; &I-K0-6E56; [78-54]
-    (=cns11643-1	. #x596D)	; &I-C1-596D; [57-77]
-    (=jis-x0213-1	. #x3C64)	; &I-JX1-3C64; [28-68]
     (=big5		. #xB149)	; &I-B-B149;
-    (=gt		. 09054)	; &I-GT-09054;
-    (=gt-k		. 07780)	; &I-GT-K07780;
-    (=gt-pj-1		. #x3C64)	; &I-GT-09054; [28-68]
-    (=daikanwa		. 07200)	; &I-M-07200;
-    (=shinjigen@rev	.  1845)	; 寂
-    ))
-(define-char
-  '((=>ucs		. #x21A24)	; 𡨤
-    (ideographic-radical . 40)	; ⼧
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=daikanwa		. 07201)	; &M-07201;
+    (->subsumptive
+     ((=ucs@jis		  . #x5BC2)	; &GT-09054;
+      (=jis-x0208	  . #x3C64)	; &GT-09054; [28-68]
+      (=ks-x1001	  . #x6E56)	; &I-K0-6E56; [78-54]
+      (=jis-x0213-1	  . #x3C64)	; &I-JX1-3C64; [28-68]
+      (=gt		  . 09054)	; &I-GT-09054;
+      (=gt-k		  . 07780)	; &I-GT-K07780;
+      (=gt-pj-1		  . #x3C64)	; &I-GT-09054; [28-68]
+      (=daikanwa	  . 07200)	; &I-M-07200;
+      (=shinjigen	  .  1845)	; &GT-09054;
+      )
+     ((=ucs@unicode	  . #x5BC2)	; &C1-596D;
+      (=gb2312		  . #x3C45)	; &C1-596D; [28-37]
+      (=cns11643-1	  . #x596D)	; &I-C1-596D; [57-77]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	7201 0 0)
-    (ideographic-radical . 40)	; ⼧
+  '((ideographic-radical . 40)	; ⼧
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x21A24)	; 𡨤
-    (=cns11643-6	. #x3E57)	; &I-C6-3E57; [30-55]
+    (->subsumptive
+     ((=daikanwa	  . 07201)	; &M-07201;
+      )
+     ((=ucs@iso		  . #x21A24)	; &U-00021A24;
+      )
+     ((=cns11643-6	  . #x3E57)	; &C6-3E57; [30-55]
+      ))
     ))
 (define-char
   '((ideographic-radical . 40)	; ⼧
     (=ucs		. #x5BC3)	; 寃
-    (=jis-x0208@1997	. #x5563)	; 寃 [53-67]
+    (=>jis-x0208	. #x5563)	; 寃 [53-67]
+    (=>jis-x0213-1	. #x5563)	; 寃 [53-67]
     ))
 (define-char
   '((<-denotational
@@ -3229,7 +3229,8 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5BD0)	; 寐
-    (=jis-x0208@1997	. #x5567)	; 寐 [53-71]
+    (=>jis-x0208	. #x5567)	; 寐 [53-71]
+    (=>jis-x0213-1	. #x5567)	; 寐 [53-71]
     ))
 (define-char
   '((<-denotational
@@ -3333,26 +3334,33 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5BD2)	; 寒
+    (=>jis-x0208	. #x3428)	; 寒 [20-08]
+    (=>jis-x0213-1	. #x3428)	; 寒 [20-08]
     (=big5		. #xB448)	; &I-B-B448;
-    (=jis-x0208@1997	. #x3428)	; 寒 [20-08]
     (->subsumptive
-     ((=ks-x1001	  . #x794E)	; &M-07239; [89-46]
+     ((=ks-x1001	  . #x794E)	; &GT-09091; [89-46]
+      (=gt		  . 09091)	; &I-GT-09091;
+      (=gt-k		  . 09013)	; &I-GT-K09013;
+      (=gt-pj-2		  . #x7367)	; &I-GT-09091; [83-71]
       (=daikanwa	  . 07239)	; &I-M-07239;
-      (=shinjigen@1ed	  .  0557)	; &M-07239;
+      (=shinjigen	  .  0557)	; &GT-09091;
       (=jef-china3	  . #x4ABC)	; &I-JC3-4ABC;
       )
-     ((=ucs@jis		  . #x5BD2)	; &GT-09092;
-      (=jis-x0208	  . #x3428)	; &GT-09092; [20-08]
-      (=jis-x0213-1	  . #x3428)	; &I-JX1-3428; [20-08]
-      (=gt		  . 09092)	; &I-GT-09092;
-      (=gt-k		  . 09014)	; &I-GT-K09014;
-      (=gt-pj-1		  . #x3428)	; &I-GT-09092; [20-08]
-      (=shinjigen@1ed	  .  0556)	; &GT-09092;
-      )
-     ((=ucs@unicode	  . #x5BD2)	; &G0-3A2E;
-      (=gb2312		  . #x3A2E)	; &G0-3A2E; [26-14]
-      )
-     ((=cns11643-1	  . #x5E6D)	; &C1-5E6D; [62-77]
+     ((=>>gt		  . 09092)	; &G-GT-09092;
+      (->subsumptive
+       ((=ucs@jis	    . #x5BD2)	; &GT-09092;
+	(=jis-x0208	    . #x3428)	; &GT-09092; [20-08]
+	(=jis-x0213-1	    . #x3428)	; &I-JX1-3428; [20-08]
+	(=gt		    . 09092)	; &I-GT-09092;
+	(=gt-k		    . 09014)	; &I-GT-K09014;
+	(=gt-pj-1	    . #x3428)	; &I-GT-09092; [20-08]
+	(=shinjigen	    .  0556)	; &GT-09092;
+	)
+       ((=ucs@unicode	    . #x5BD2)	; &G0-3A2E;
+	(=gb2312	    . #x3A2E)	; &G0-3A2E; [26-14]
+	)
+       ((=cns11643-1	    . #x5E6D)	; &C1-5E6D; [62-77]
+	))
       ))
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R042-Small.el b/lisp/utf-2000/Ideograph-R042-Small.el
index 380f6cd..c9519dd 100644
--- a/lisp/utf-2000/Ideograph-R042-Small.el
+++ b/lisp/utf-2000/Ideograph-R042-Small.el
@@ -82,25 +82,52 @@
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
     (=ucs		. #x5C12)	; 尒
-    (->subsumptive
-     ((=gt		  . 09427)	; &GT-09427;
-      (=gt-k		  . 01236)	; &I-GT-K01236;
-      (=gt-pj-3		  . #x317B)	; &GT-09427; [17-91]
-      (=daikanwa	  . 07477)	; &I-M-07477;
-      (=shinjigen@1ed	  .  4716)	; &GT-09427;
-      )
-     ((=ucs@unicode	  . #x5C12)	; &GT-09430;
-      (=cns11643-2	  . #x2155)	; &GT-09430; [01-53]
-      (=jis-x0213-1	  . #x4F5B)	; &I-JX1-4F5B; [47-59]
-      (=big5		  . #xC974)	; &I-B-C974;
-      (=gt		  . 09430)	; &I-GT-09430;
-      (=gt-pj-9		  . #x5060)	; &I-GT-09430; [48-64]
-      (=jef-china3	  . #x41E1)	; &I-JC3-41E1;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5C12)	; 尒
+      ))
+    (ideographic-radical . 42)	; ⼩
+    (ideographic-strokes . 2)
+    (total-strokes	 . 5)
+    (=gt		. 09427)	; &GT-09427;
+    (=gt-k		. 01236)	; &I-GT-K01236;
+    (=gt-pj-3		. #x317B)	; &GT-09427; [17-91]
+    (=daikanwa		. 07477)	; &I-M-07477;
+    (=shinjigen		.  4716)	; &GT-09427;
+    (<-vulgar
+     ((=ucs		  . #x723E)	; 爾
+      (=jis-x0208	  . #x3C24)	; &I-J90-3C24; [28-04]
+      (=shinjigen	  .  4714)	; 爾
       ))
+    (<-vulgar*sources
+     shinjigen)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5C12)	; 尒
+      ))
+    (ideographic-radical . 42)	; ⼩
+    (ideographic-strokes . 2)
+    (total-strokes	 . 5)
+    (=ucs@unicode	. #x5C12)	; &GT-09430;
+    (=cns11643-2	. #x2155)	; &GT-09430; [01-53]
+    (=jis-x0213-1	. #x4F5B)	; &I-JX1-4F5B; [47-59]
+    (=big5		. #xC974)	; &I-B-C974;
+    (=gt		. 09430)	; &I-GT-09430;
+    (=gt-pj-9		. #x5060)	; &I-GT-09430; [48-64]
+    (=jef-china3	. #x41E1)	; &I-JC3-41E1;
+    ))
+(define-char
+  '((ideographic-radical . 42)	; ⼩
+    (ideographic-strokes . 2)
+    (total-strokes	 . 5)
+    (=>jis-x0208	. #x5575)	; &J97-5575; [53-85]
+    (=>jis-x0213-1	. #x5575)	; &J97-5575; [53-85]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5575)	; &J97-5575; [53-85]
+     ((=>jis-x0208	  . #x5575)	; &J97-5575; [53-85]
       ))
     (ideographic-radical . 42)	; ⼩
     (ideographic-strokes . 2)
@@ -112,23 +139,30 @@
       (=gt-k		  . 01044)	; &I-GT-K01044;
       (=gt-pj-1		  . #x5575)	; &I-GT-09428; [53-85]
       (=daikanwa	  . 07478)	; &I-M-07478;
-      )
-     ((=shinjigen	  .  4715)	; &SJG2-4715;
+      (<-same
+       ((=gt		    . 09427)	; &GT-09427;
+	(=daikanwa	    . 07477)	; &I-M-07477;
+	))
+      (<-same*sources
+       zihui daikanwa)
       )
      ((=ucs@unicode	  . #x5C13)	; &J90-5575;
       (=jis-x0208	  . #x5575)	; &J90-5575; [53-85]
       (=jis-x0213-1	  . #x5575)	; &I-JX1-5575; [53-85]
+      )
+     ((=shinjigen	  .  4715)	; &SJG2-4715;
+      (<-vulgar
+       ((=ucs		    . #x723E)	; 爾
+	(=jis-x0208	    . #x3C24)	; &I-J90-3C24; [28-04]
+	(=shinjigen	    .  4714)	; 爾
+	))
+      (<-vulgar*sources
+       shinjigen)
       ))
     ))
 (define-char
-  '((ideographic-radical . 42)	; ⼩
-    (ideographic-strokes . 2)
-    (total-strokes	 . 5)
-    (=jis-x0208@1997	. #x5575)	; &J97-5575; [53-85]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5575)	; &J97-5575; [53-85]
+     ((=>jis-x0208	  . #x5575)	; &J97-5575; [53-85]
       ))
     (ideographic-radical . 42)	; ⼩
     (ideographic-strokes . 2)
@@ -344,10 +378,18 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 42)	; ⼩
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (=ucs@big5		. #x5C1A)	; &J97-3E30;
+    (=>jis-x0208	. #x3E30)	; &J97-3E30; [30-16]
+    (=>jis-x0213-1	. #x3E30)	; &J97-3E30; [30-16]
+    (=big5		. #xA97C)	; &J97-3E30;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x5C1A)	; &B-A97C;
-      (=big5		  . #xA97C)	; &B-A97C;
-      (=jis-x0208@1997	  . #x3E30)	; &B-A97C; [30-16]
+     ((=ucs@big5	  . #x5C1A)	; &J97-3E30;
+      (=>jis-x0208	  . #x3E30)	; &J97-3E30; [30-16]
       ))
     (ideographic-radical . 42)	; ⼩
     (ideographic-strokes . 5)
@@ -364,18 +406,9 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 42)	; ⼩
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=ucs@big5		. #x5C1A)	; &B-A97C;
-    (=big5		. #xA97C)	; &B-A97C;
-    (=jis-x0208@1997	. #x3E30)	; &B-A97C; [30-16]
-    ))
-(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x5C1A)	; &B-A97C;
-      (=big5		  . #xA97C)	; &B-A97C;
-      (=jis-x0208@1997	  . #x3E30)	; &B-A97C; [30-16]
+     ((=ucs@big5	  . #x5C1A)	; &J97-3E30;
+      (=>jis-x0208	  . #x3E30)	; &J97-3E30; [30-16]
       ))
     (morohashi-daikanwa	7493 1)
     (ideographic-radical . 42)	; ⼩
@@ -390,6 +423,18 @@
     (=gt-k		. 03743)	; &I-GT-K03743;
     (=gt-pj-1		. #x3E30)	; &I-GT-09446; [30-16]
     (mojikyo		. 050154)	; &MCS-6000C3EA;
+    (<-same
+     ((=ucs@unicode	  . #x5C19)	; &M-07493;
+      (=ks-x1001	  . #x5F46)	; &M-07493; [63-38]
+      (=daikanwa	  . 07493)	; &I-M-07493;
+      ))
+    (<-same*sources
+     daikanwa)
+    (<-simplified@JP
+     ((=ucs@unicode	  . #x5C19)	; &M-07493;
+      (=ks-x1001	  . #x5F46)	; &M-07493; [63-38]
+      (=daikanwa	  . 07493)	; &I-M-07493;
+      ))
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R043-Lame.el b/lisp/utf-2000/Ideograph-R043-Lame.el
index 25db87e..c8bd1e5 100644
--- a/lisp/utf-2000/Ideograph-R043-Lame.el
+++ b/lisp/utf-2000/Ideograph-R043-Lame.el
@@ -4,7 +4,8 @@
     (ideographic-strokes . 0)
     (total-strokes	 . 3)
     (=ucs		. #x5C22)	; å°¢
-    (=jis-x0208@1997	. #x5577)	; å°¢ [53-87]
+    (=>jis-x0208	. #x5577)	; å°¢ [53-87]
+    (=>jis-x0213-1	. #x5577)	; å°¢ [53-87]
     ))
 (define-char
   '((<-denotational
@@ -79,19 +80,6 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x5C23)	; å°£
-      ))
-    (name		. "CJK RADICAL LAME TWO")
-    (general-category	symbol other) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (=ucs		. #x2E8F)	; ⺏
-    (<-identical@component
-     ((=ucs		  . #x5C23)	; å°£
-      ))
-    ))
-(define-char
-  '((<-denotational
      ((=ucs@unicode	  . #x5C23)	; &M-07540;
       (=jis-x0212	  . #x3A6D)	; &M-07540; [26-77]
       (=jis-x0213-1	  . #x4F5D)	; &I-JX1-4F5D; [47-61]
@@ -114,6 +102,19 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x5C23)	; å°£
+      ))
+    (name		. "CJK RADICAL LAME TWO")
+    (general-category	symbol other) ; Informative Category
+    (bidi-category	. "ON")
+    (mirrored		. nil)
+    (=ucs		. #x2E8F)	; ⺏
+    (<-identical@component
+     ((=ucs		  . #x5C23)	; å°£
+      ))
+    ))
+(define-char
   '((ideographic-radical . 43)	; ⼪
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
@@ -1146,6 +1147,26 @@
     (=ucs@unicode	. #x5C33)	; &UU+5C33;
     ))
 (define-char
+  '((ideographic-radical@ucs . 43)	; ⼪
+    (ideographic-strokes@ucs . 10)
+    (ideographic-radical@cns . 113)	; â½°
+    (ideographic-strokes@cns . 9)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (ideographic-strokes@cns*sources
+     daikanwa)
+    (total-strokes	 . 14)
+    (=ucs		. #x21C07)	; 𡰇
+    (->subsumptive
+     ((=ucs@iso		  . #x21C07)	; &M-24785;
+      (=daikanwa	  . 24785)	; &M-24785;
+      )
+     ((ideographic-radical . 113)	; â½°
+      (ideographic-strokes . 9)
+      (=cns11643-5	  . #x4826)	; &C5-4826; [40-06]
+      ))
+    ))
+(define-char
   '((=>ucs		. #x21C0A)	; 𡰊
     (ideographic-radical . 43)	; ⼪
     (ideographic-strokes . 10)
diff --git a/lisp/utf-2000/Ideograph-R044-Corpse.el b/lisp/utf-2000/Ideograph-R044-Corpse.el
index 79c9530..0e02b9e 100644
--- a/lisp/utf-2000/Ideograph-R044-Corpse.el
+++ b/lisp/utf-2000/Ideograph-R044-Corpse.el
@@ -832,8 +832,13 @@
     (=daikanwa		. 07691)	; &I-M-07691;
     ))
 (define-char
+  '((ideographic-radical . 44)	; ⼫
+    (=>jis-x0208@1997	. #x5622)	; &J97-5622; [54-02]
+    (=>jis-x0213-1@2000 . #x5622)	; &J97-5622; [54-02]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5622)	; &J97-5622; [54-02]
+     ((=>jis-x0208@1997	  . #x5622)	; &J97-5622; [54-02]
       ))
     (ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 6)
@@ -849,24 +854,23 @@
     (=gt-k		. 05236)	; &I-GT-K05236;
     (=gt-pj-1		. #x5622)	; &I-GT-09700; [54-02]
     (=daikanwa		. 07692)	; &I-M-07692;
-    (=shinjigen@rev	.  1939)	; 屏
+    (=shinjigen		.  1939)	; 屏
     (=jef-china3	. #x4AE7)	; &I-JC3-4AE7;
-    (<-simplified@JP
+    (<-simplified@JP/extra
      ((=jis-x0208@1978	  . #x5622)	; &M-07734; [54-02]
       (=ks-x1001	  . #x5C33)	; &I-K0-5C33; [60-19]
+      (=jis-x0213-1@2004  . #x7E7B)	; &I-JX3-7E7B; [94-91]
       (=daikanwa	  . 07734)	; &I-M-07734;
       ))
     (<-vulgar
      ((=jis-x0208@1978	  . #x5622)	; &M-07734; [54-02]
       (=ks-x1001	  . #x5C33)	; &I-K0-5C33; [60-19]
+      (=jis-x0213-1@2004  . #x7E7B)	; &I-JX3-7E7B; [94-91]
       (=daikanwa	  . 07734)	; &I-M-07734;
+      (=shinjigen	  .  1938)	; &M-07734;
       ))
     (<-vulgar*sources
-     zhengzitong daikanwa)
-    ))
-(define-char
-  '((ideographic-radical . 44)	; ⼫
-    (=jis-x0208@1997	. #x5622)	; &J97-5622; [54-02]
+     zhengzitong daikanwa shinjigen)
     ))
 (define-char
   '((ideographic-radical . 44)	; ⼫
@@ -1057,15 +1061,16 @@
     (=gt-k		. 06586)	; &I-GT-K06586;
     (=gt-pj-1		. #x5621)	; &I-GT-09707; [54-01]
     (=daikanwa		. 07708)	; &I-M-07708;
-    (=shinjigen@rev	.  1935)	; 屐
+    (=shinjigen		.  1935)	; 屐
     ))
 (define-char
   '((ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5C51)	; 屑
+    (=>jis-x0208	. #x367D)	; 屑 [22-93]
+    (=>jis-x0213-1	. #x367D)	; 屑 [22-93]
     (=big5		. #xAE68)	; &I-B-AE68;
-    (=jis-x0208@1997	. #x367D)	; 屑 [22-93]
     ))
 (define-char
   '((<-denotational
@@ -1074,8 +1079,10 @@
     (ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (=ucs@jis/2004	. #x5C51)	; &M-07709;
     (=jis-x0208@1978	. #x367D)	; &M-07709; [22-93]
     (=ks-x1001		. #x605A)	; &I-K0-605A; [64-58]
+    (=jis-x0213-1@2004	. #x367D)	; &I-JX3-367D; [22-93]
     (=daikanwa		. 07709)	; &I-M-07709;
     ))
 (define-char
@@ -1090,14 +1097,16 @@
       (=gb2312		  . #x503C)	; &GT-09717; [48-28]
       (=jis-x0208@1983	  . #x367D)	; &I-J83-367D; [22-93]
       (=jis-x0208@1990	  . #x367D)	; &I-J90-367D; [22-93]
-      (=jis-x0213-1	  . #x367D)	; &I-JX1-367D; [22-93]
+      (=jis-x0213-1@2000  . #x367D)	; &I-JX1-367D; [22-93]
       (=gt		  . 09717)	; &I-GT-09717;
       (=gt-k		  . 06408)	; &I-GT-K06408;
       (=gt-pj-1		  . #x367D)	; &I-GT-09717; [22-93]
       (=jef-china3	  . #x4AE4)	; &I-JC3-4AE4;
-      (<-simplified@JP
-       ((=jis-x0208@1978    . #x367D)	; &M-07709; [22-93]
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x5C51)	; &M-07709;
+	(=jis-x0208@1978    . #x367D)	; &M-07709; [22-93]
 	(=ks-x1001	    . #x605A)	; &I-K0-605A; [64-58]
+	(=jis-x0213-1@2004  . #x367D)	; &I-JX3-367D; [22-93]
 	(=daikanwa	    . 07709)	; &I-M-07709;
 	))
       )
@@ -1419,16 +1428,19 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5622)	; &J97-5622; [54-02]
+     ((=>jis-x0208@1997	  . #x5622)	; &J97-5622; [54-02]
       ))
     (ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5C5B)	; 屛
+    (=>jis-x0213-1@2004 . #x7E7B)	; 屛 [94-91]
     (->subsumptive
      ((=jis-x0208@1978	  . #x5622)	; &M-07734; [54-02]
       (=ks-x1001	  . #x5C33)	; &I-K0-5C33; [60-19]
+      (=jis-x0213-1@2004  . #x7E7B)	; &I-JX3-7E7B; [94-91]
       (=daikanwa	  . 07734)	; &I-M-07734;
+      (=shinjigen	  .  1938)	; &M-07734;
       )
      ((=ucs@unicode	  . #x5C5B)	; &C3-3543;
       (=cns11643-3	  . #x3543)	; &C3-3543; [21-35]
@@ -1697,8 +1709,9 @@
 (define-char
   '((ideographic-radical . 44)	; ⼫
     (=ucs		. #x5C60)	; å± 
+    (=>jis-x0208	. #x454B)	; å±  [37-43]
+    (=>jis-x0213-1	. #x454B)	; å±  [37-43]
     (=big5		. #xB14F)	; &I-B-B14F;
-    (=jis-x0208@1997	. #x454B)	; å±  [37-43]
     ))
 (define-char
   '((<-denotational
@@ -1710,9 +1723,11 @@
     (total-strokes	 . 12)
     (=ucs		. #x2F877)	; 屠
     (->subsumptive
-     ((=ucs@ks		  . #x5C60)	; &M-07761;
+     ((=ucs@jis/2004	  . #x5C60)	; &M-07761;
+      (=ucs@ks		  . #x5C60)	; &M-07761;
       (=jis-x0208@1978	  . #x454B)	; &M-07761; [37-43]
       (=ks-x1001	  . #x5375)	; &I-K0-5375; [51-85]
+      (=jis-x0213-1@2004  . #x454B)	; &I-JX3-454B; [37-43]
       (=daikanwa	  . 07761)	; &I-M-07761;
       )
      ((=ucs@iso		  . #x2F877)	; &C6-477B;
@@ -1731,16 +1746,18 @@
     (=jis-x0208@1983	. #x454B)	; &I-J83-454B; [37-43]
     (=jis-x0208@1990	. #x454B)	; &I-J90-454B; [37-43]
     (=cns11643-1	. #x5973)	; &I-C1-5973; [57-83]
-    (=jis-x0213-1	. #x454B)	; &I-JX1-454B; [37-43]
+    (=jis-x0213-1@2000	. #x454B)	; &I-JX1-454B; [37-43]
     (=gt		. 09744)	; &I-GT-09744;
     (=gt-k		. 07842)	; &I-GT-K07842;
     (=gt-pj-1		. #x454B)	; &I-GT-09744; [37-43]
     (=jef-china3	. #x4AE6)	; &I-JC3-4AE6;
     (mojikyo		. 054252)	; &MCS-6000D3EC;
-    (<-simplified@JP
-     ((=ucs@ks		  . #x5C60)	; &M-07761;
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x5C60)	; &M-07761;
+      (=ucs@ks		  . #x5C60)	; &M-07761;
       (=jis-x0208@1978	  . #x454B)	; &M-07761; [37-43]
       (=ks-x1001	  . #x5375)	; &I-K0-5375; [51-85]
+      (=jis-x0213-1@2004  . #x454B)	; &I-JX3-454B; [37-43]
       (=daikanwa	  . 07761)	; &I-M-07761;
       ))
     ))
@@ -1817,17 +1834,26 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x21CA3)	; 𡲣
-    (=cns11643-6	. #x477C)	; &I-C6-477C; [39-92]
-    (=daikanwa		. 07769)	; &I-M-07769;
+    (->subsumptive
+     ((=ucs@iso		  . #x21CA3)	; &M-07769;
+      (=daikanwa	  . 07769)	; &M-07769;
+      )
+     ((=cns11643-6	  . #x477C)	; &C6-477C; [39-92]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 44)	; ⼫
+    (=>jis-x0208@1997	. #x3C48)	; &J97-3C48; [28-40]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3C48)	; &J97-3C48; [28-40]
+     ((=>jis-x0208@1997	  . #x3C48)	; &J97-3C48; [28-40]
       ))
     (ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5C61)	; 屡
+    (=>jis-x0213-1	. #x3C48)	; 屡 [28-40]
     (<-simplified@ucs
      ((=ucs		  . #x5C62)	; å±¢
       ))
@@ -1847,16 +1873,14 @@
 	(=jis-x0208@1978    . #x3C48)	; &M-07787; [28-40]
 	(=ks-x1001	    . #x5726)	; &I-K0-5726; [55-06]
 	(=jis-x0212	    . #x3A7A)	; &I-JSP-3A7A; [26-90]
-	(=jis-x0213-1	    . #x4F60)	; &I-JX1-4F60; [47-64]
 	(=gb12345	    . #x4245)	; &M-07787; [34-37]
 	(=daikanwa	    . 07787)	; &I-M-07787;
 	))
-      (<-simplified@JP
+      (<-simplified@JP/jis
        ((=ucs@unicode	    . #x5C62)	; &M-07787;
 	(=jis-x0208@1978    . #x3C48)	; &M-07787; [28-40]
 	(=ks-x1001	    . #x5726)	; &I-K0-5726; [55-06]
 	(=jis-x0212	    . #x3A7A)	; &I-JSP-3A7A; [26-90]
-	(=jis-x0213-1	    . #x4F60)	; &I-JX1-4F60; [47-64]
 	(=daikanwa	    . 07787)	; &I-M-07787;
 	))
       (<-vulgar
@@ -1864,12 +1888,11 @@
 	(=jis-x0208@1978    . #x3C48)	; &M-07787; [28-40]
 	(=ks-x1001	    . #x5726)	; &I-K0-5726; [55-06]
 	(=jis-x0212	    . #x3A7A)	; &I-JSP-3A7A; [26-90]
-	(=jis-x0213-1	    . #x4F60)	; &I-JX1-4F60; [47-64]
 	(=daikanwa	    . 07787)	; &I-M-07787;
-	(=shinjigen@1ed	    .  1948)	; &M-07787;
+	(=shinjigen	    .  1948)	; &M-07787;
 	))
       (<-vulgar*sources
-       songyuan-yilai-suzipu daikanwa shinjigen@1ed)
+       songyuan-yilai-suzipu daikanwa shinjigen)
       )
      ((total-strokes@cns       . 11)
       (=cns11643-3	  . #x3544)	; &C3-3544; [21-36]
@@ -1877,10 +1900,6 @@
     ))
 (define-char
   '((ideographic-radical . 44)	; ⼫
-    (=jis-x0208@1997	. #x3C48)	; &J97-3C48; [28-40]
-    ))
-(define-char
-  '((ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x21CAA)	; 𡲪
@@ -2046,22 +2065,29 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3C48)	; &J97-3C48; [28-40]
+     ((=>jis-x0208@1997	  . #x3C48)	; &J97-3C48; [28-40]
       ))
     (ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x5C62)	; å±¢
+    (=>jis-x0213-1	. #x4F60)	; å±¢ [47-64]
+    (=big5		. #xB9F0)	; &I-B-B9F0;
     (->subsumptive
      ((=ucs@unicode	  . #x5C62)	; &M-07787;
       (=jis-x0208@1978	  . #x3C48)	; &M-07787; [28-40]
       (=ks-x1001	  . #x5726)	; &I-K0-5726; [55-06]
       (=jis-x0212	  . #x3A7A)	; &I-JSP-3A7A; [26-90]
-      (=jis-x0213-1	  . #x4F60)	; &I-JX1-4F60; [47-64]
       (=gb12345		  . #x4245)	; &M-07787; [34-37]
-      (=big5		  . #xB9F0)	; &I-B-B9F0;
       (=daikanwa	  . 07787)	; &I-M-07787;
-      (=shinjigen@1ed	  .  1948)	; &M-07787;
+      (=shinjigen	  .  1948)	; &M-07787;
+      (->subsumptive
+       ((=ucs@jis/2000	    . #x5C62)	; &JX1-4F60;
+	(=jis-x0213-1@2000  . #x4F60)	; &JX1-4F60; [47-64]
+	)
+       ((=ucs@jis/2004	    . #x5C62)	; &JX3-4F60;
+	(=jis-x0213-1@2004  . #x4F60)	; &JX3-4F60; [47-64]
+	))
       )
      ((=cns11643-1	  . #x6858)	; &C1-6858; [72-56]
       ))
@@ -2192,7 +2218,7 @@
 (define-char
   '((ideographic-radical . 44)	; ⼫
     (=ucs		. #x5C64)	; 層
-    (=jis-x0208@1997	. #x4158)	; 層 [33-56]
+    (=>jis-x0208@1997	. #x4158)	; 層 [33-56]
     ))
 (define-char
   '((<-denotational
@@ -2201,21 +2227,37 @@
     (ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=big5		. #xBC68)	; &B-BC68;
-    (->subsumptive
-     ((=>ucs*		  . #x5C64)	; 層
-      (=ucs		  . #xFA3B)	; 層
-      (=ucs@ks		  . #x5C64)	; 層
-      (=ucs@big5	  . #x5C64)	; 層
-      (=ks-x1001	  . #x7635)	; &I-K0-7635; [86-21]
-      (=jis-x0213-1	  . #x4F61)	; &I-JX1-4F61; [47-65]
-      (=daikanwa	  . 07798)	; &I-M-07798;
-      (=jef-china3	  . #x4AE0)	; &I-JC3-4AE0;
-      )
-     ((=ucs@unicode	  . #x5C64)	; &C1-6C52;
-      (=cns11643-1	  . #x6C52)	; &C1-6C52; [76-50]
-      (=gb12345		  . #x3263)	; &C1-6C52; [18-67]
+    (=ucs@big5		. #x5C64)	; &A-JX1-4F61;
+    (=>jis-x0213-1	. #x4F61)	; &A-JX1-4F61; [47-65]
+    (=big5		. #xBC68)	; &A-JX1-4F61;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs@big5	  . #x5C64)	; &A-JX1-4F61;
+      (=>jis-x0213-1	  . #x4F61)	; &A-JX1-4F61; [47-65]
+      ))
+    (=>ucs*		. #x5C64)	; 層
+    (ideographic-radical . 44)	; ⼫
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #xFA3B)	; 層
+    (=ucs@ks		. #x5C64)	; 層
+    (=ks-x1001		. #x7635)	; &I-K0-7635; [86-21]
+    (=jis-x0213-1	. #x4F61)	; &I-JX1-4F61; [47-65]
+    (=daikanwa		. 07798)	; &I-M-07798;
+    (=jef-china3	. #x4AE0)	; &I-JC3-4AE0;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs@big5	  . #x5C64)	; &A-JX1-4F61;
+      (=>jis-x0213-1	  . #x4F61)	; &A-JX1-4F61; [47-65]
       ))
+    (ideographic-radical . 44)	; ⼫
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs@unicode	. #x5C64)	; &C1-6C52;
+    (=cns11643-1	. #x6C52)	; &C1-6C52; [76-50]
+    (=gb12345		. #x3263)	; &C1-6C52; [18-67]
     ))
 (define-char
   '((<-denotational
@@ -2238,30 +2280,66 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x5C65)	; å±¥
+    (=big5		. #xBC69)	; &I-B-BC69;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5C65)	; å±¥
+      ))
+    (ideographic-radical . 44)	; ⼫
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
     (->subsumptive
      ((=daikanwa	  . 07799)	; &M-07799;
       )
      ((=cns11643-1	  . #x6C53)	; &C1-6C53; [76-51]
-      )
-     ((=ucs@unicode	  . #x5C65)	; &GT-09823;
-      (=jis-x0208	  . #x4D7A)	; &GT-09823; [45-90]
-      (=gb2312		  . #x4244)	; &I-G0-4244; [34-36]
-      (=ks-x1001	  . #x575B)	; &I-K0-575B; [55-59]
-      (=jis-x0213-1	  . #x4D7A)	; &I-JX1-4D7A; [45-90]
-      (=big5		  . #xBC69)	; &I-B-BC69;
-      (=gt		  . 09823)	; &I-GT-09823;
-      (=gt-pj-1		  . #x4D7A)	; &I-GT-09823; [45-90]
-      (=shinjigen@rev	  .  1950)	; &GT-09823;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x5C65)	; å±¥
+      ))
+    (ideographic-radical . 44)	; ⼫
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs@unicode	. #x5C65)	; &GT-09823;
+    (=jis-x0208		. #x4D7A)	; &GT-09823; [45-90]
+    (=gb2312		. #x4244)	; &I-G0-4244; [34-36]
+    (=ks-x1001		. #x575B)	; &I-K0-575B; [55-59]
+    (=jis-x0213-1	. #x4D7A)	; &I-JX1-4D7A; [45-90]
+    (=gt		. 09823)	; &I-GT-09823;
+    (=gt-pj-1		. #x4D7A)	; &I-GT-09823; [45-90]
+    (=shinjigen		.  1950)	; &GT-09823;
+    ))
+(define-char
   '((ideographic-radical . 44)	; ⼫
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x21CD0)	; 𡳐
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21CD0)	; 𡳐
+      ))
+    (ideographic-radical . 44)	; ⼫
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=daikanwa		. 07800)	; &M-07800;
+    (<-original
+     ((=daikanwa	  . 07799)	; &M-07799;
+      ))
+    (<-original*sources
+     zhengzitong daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x21CD0)	; 𡳐
+      ))
+    (ideographic-radical . 44)	; ⼫
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=>>gt		. 09824)	; &G-GT-09824;
     (->subsumptive
-     ((=daikanwa	  . 07800)	; &M-07800;
-      )
      ((=gt		  . 09824)	; &GT-09824;
       (=gt-pj-3		  . #x3535)	; &GT-09824; [21-21]
       )
@@ -2274,9 +2352,25 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x379F)	; 㞟
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x379F)	; 㞟
+      ))
+    (ideographic-radical . 44)	; ⼫
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=daikanwa		. 07801)	; &M-07801;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x379F)	; 㞟
+      ))
+    (ideographic-radical . 44)	; ⼫
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=>>gt		. 09822)	; &G-GT-09822;
     (->subsumptive
-     ((=daikanwa	  . 07801)	; &M-07801;
-      )
      ((=cns11643-4	  . #x494A)	; &C4-494A; [41-42]
       )
      ((=gt		  . 09822)	; &GT-09822;
diff --git a/lisp/utf-2000/Ideograph-R046-Mountain.el b/lisp/utf-2000/Ideograph-R046-Mountain.el
index 6f56575..2dc2af0 100644
--- a/lisp/utf-2000/Ideograph-R046-Mountain.el
+++ b/lisp/utf-2000/Ideograph-R046-Mountain.el
@@ -3112,8 +3112,9 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5CFB)	; å³»
+    (=>jis-x0208	. #x3D54)	; å³» [29-52]
+    (=>jis-x0213-1	. #x3D54)	; å³» [29-52]
     (=big5		. #xAE6D)	; &I-B-AE6D;
-    (=jis-x0208@1997	. #x3D54)	; å³» [29-52]
     ))
 (define-char
   '((<-denotational
@@ -3151,7 +3152,7 @@
     (=jis-x0213-1	. #x3D54)	; &I-JX1-3D54; [29-52]
     (=gt		. 10203)	; &I-GT-10203;
     (=gt-pj-1		. #x3D54)	; &I-GT-10203; [29-52]
-    (=shinjigen@rev	.  1983)	; &GT-10203;
+    (=shinjigen		.  1983)	; &GT-10203;
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
@@ -5272,52 +5273,66 @@
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x79BE)	; 禾
-	)
-       ((=ucs		    . #x5C24)	; å°¤
-	))
+    (=ucs		. #x5D46)	; 嵆
+    (->subsumptive
+     ((=ucs@unicode	  . #x5D46)	; &M-08272;
+      (=daikanwa	  . 08272)	; &M-08272;
+      (=cbeta		  . 03704)	; &I-CB03704;
       )
-     ((=ucs		  . #x5C71)	; å±±
+     ((=ucs@jis		  . #x5D46)	; &JX1-4F73;
+      (=jis-x0212	  . #x3B52)	; &JX1-4F73; [27-50]
+      (=cns11643-3	  . #x3B37)	; &I-C3-3B37; [27-23]
+      (=jis-x0213-1	  . #x4F73)	; &I-JX1-4F73; [47-83]
+      (=jef-china3	  . #x4BB4)	; &I-JC3-4BB4;
       ))
-    (=ucs		. #x5D46)	; 嵆
-    (=jis-x0212		. #x3B52)	; &I-JSP-3B52; [27-50]
-    (=cns11643-3	. #x3B37)	; &I-C3-3B37; [27-23]
-    (=jis-x0213-1	. #x4F73)	; &I-JX1-4F73; [47-83]
-    (=daikanwa		. 08272)	; &I-M-08272;
-    (=cbeta		. 03704)	; &I-CB03704;
-    (=jef-china3	. #x4BB4)	; &I-JC3-4BB4;
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5D47)	; 嵇
-    (=gb2312		. #x6F7A)	; &I-G0-6F7A; [79-90]
-    (=cns11643-1	. #x5E77)	; &I-C1-5E77; [62-87]
-    (=jis-x0213-1	. #x4F74)	; &I-JX1-4F74; [47-84]
     (=big5		. #xB452)	; &I-B-B452;
-    (=daikanwa		. 08273)	; &I-M-08273;
-    (=jef-china3	. #x5DAE)	; &I-JC3-5DAE;
+    (->subsumptive
+     ((=cns11643-1	  . #x5E77)	; &M-08273; [62-87]
+      (=daikanwa	  . 08273)	; &I-M-08273;
+      (=jef-china3	  . #x5DAE)	; &I-JC3-5DAE;
+      (<-same
+       ((=ucs@unicode	    . #x5D46)	; &M-08272;
+	(=daikanwa	    . 08272)	; &M-08272;
+	))
+      (<-same*sources
+       zhengzitong daikanwa)
+      )
+     ((=ucs@unicode	  . #x5D47)	; &JX1-4F74;
+      (=gb2312		  . #x6F7A)	; &JX1-4F74; [79-90]
+      (=jis-x0213-1	  . #x4F74)	; &I-JX1-4F74; [47-84]
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x37E8)	; 㟨
-    (=cns11643-3	. #x3B29)	; &I-C3-3B29; [27-09]
-    (=jis-x0213-2	. #x2856)	; &I-JX2-2856; [08-54]
-    (=daikanwa		. 08274)	; &I-M-08274;
+    (->subsumptive
+     ((=ucs@jis		  . #x37E8)	; &M-08274;
+      (=jis-x0213-2	  . #x2856)	; &M-08274; [08-54]
+      (=daikanwa	  . 08274)	; &I-M-08274;
+      )
+     ((=cns11643-3	  . #x3B29)	; &C3-3B29; [27-09]
+      )
+     ((=ucs@unicode	  . #x37E8)	; &UU+37E8;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5D48)	; 嵈
+  '((ideographic-radical . 46)	; â¼­
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (=ucs		. #x5D48)	; 嵈
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5D48)	; 嵈
+      ))
     (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -5327,67 +5342,87 @@
     (=jef-china3	. #x4BCF)	; &I-JC3-4BCF;
     ))
 (define-char
-  '((morohashi-daikanwa	8275 0 2)
+  '((<-denotational
+     ((=ucs		  . #x5D48)	; 嵈
+      ))
     (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs		. #x5D48)	; 嵈
-    (=cns11643-3	. #x3B2A)	; &I-C3-3B2A; [27-10]
+    (->subsumptive
+     ((=cns11643-3	  . #x3B2A)	; &C3-3B2A; [27-10]
+      )
+     ((=ucs@unicode	  . #x5D48)	; &UU+5D48;
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5D49)	; 嵉
-    (=cns11643-2	. #x3B4F)	; &I-C2-3B4F; [27-47]
     (=big5		. #xD8EB)	; &I-B-D8EB;
-    (=daikanwa		. 08276)	; &I-M-08276;
+    (->subsumptive
+     ((=daikanwa	  . 08276)	; &M-08276;
+      )
+     ((=cns11643-2	  . #x3B4F)	; &C2-3B4F; [27-47]
+      )
+     ((=ucs@unicode	  . #x5D49)	; &UU+5D49;
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x21E73)	; 𡹳
-    (=daikanwa		. 08277)	; &I-M-08277;
-    ))
-(define-char
-  '((=>ucs		. #x21E73)	; 𡹳
-    (morohashi-daikanwa	8277 0 0)
-    (ideographic-radical . 46)	; â¼­
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=cns11643-4	. #x3730)	; &C4-3730; [23-16]
+    (->subsumptive
+     ((=daikanwa	  . 08277)	; &M-08277;
+      )
+     ((=ucs@iso		  . #x21E73)	; &U-00021E73;
+      )
+     ((=cns11643-4	  . #x3730)	; &C4-3730; [23-16]
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5D4B)	; 嵋
-    (=jis-x0208		. #x564B)	; &I-J90-564B; [54-43]
-    (=gb2312		. #x6152)	; &I-G0-6152; [65-50]
-    (=ks-x1001		. #x5A2E)	; &I-K0-5A2E; [58-14]
-    (=cns11643-2	. #x3B41)	; &I-C2-3B41; [27-33]
-    (=jis-x0213-1	. #x564B)	; &I-JX1-564B; [54-43]
     (=big5		. #xD8DD)	; &I-B-D8DD;
-    (=gt		. 10458)	; &I-GT-10458;
-    (=gt-pj-1		. #x564B)	; &I-GT-10458; [54-43]
-    (=daikanwa		. 08278)	; &I-M-08278;
+    (->subsumptive
+     ((=ucs@jis		  . #x5D4B)	; &M-08278;
+      (=jis-x0208	  . #x564B)	; &M-08278; [54-43]
+      (=ks-x1001	  . #x5A2E)	; &I-K0-5A2E; [58-14]
+      (=jis-x0213-1	  . #x564B)	; &I-JX1-564B; [54-43]
+      (=daikanwa	  . 08278)	; &I-M-08278;
+      )
+     ((=cns11643-2	  . #x3B41)	; &C2-3B41; [27-33]
+      )
+     ((=gt		  . 10458)	; &GT-10458;
+      (=gt-pj-1		  . #x564B)	; &GT-10458; [54-43]
+      )
+     ((=ucs@unicode	  . #x5D4B)	; &G0-6152;
+      (=gb2312		  . #x6152)	; &G0-6152; [65-50]
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5D4C)	; 嵌
-    (=jis-x0208		. #x5648)	; &I-J90-5648; [54-40]
-    (=gb2312		. #x4736)	; &I-G0-4736; [39-22]
-    (=ks-x1001		. #x4A6E)	; &I-K0-4A6E; [42-78]
-    (=cns11643-1	. #x5E74)	; &I-C1-5E74; [62-84]
-    (=jis-x0213-1	. #x5648)	; &I-JX1-5648; [54-40]
     (=big5		. #xB44F)	; &I-B-B44F;
-    (=gt		. 10387)	; &I-GT-10387;
-    (=gt-pj-1		. #x5648)	; &I-GT-10387; [54-40]
-    (=daikanwa		. 08279)	; &I-M-08279;
-    (=shinjigen@rev	.  2012)	; 嵌
+    (->subsumptive
+     ((=ucs@jis		  . #x5D4C)	; &GT-10387;
+      (=jis-x0208	  . #x5648)	; &GT-10387; [54-40]
+      (=ks-x1001	  . #x4A6E)	; &I-K0-4A6E; [42-78]
+      (=cns11643-1	  . #x5E74)	; &I-C1-5E74; [62-84]
+      (=jis-x0213-1	  . #x5648)	; &I-JX1-5648; [54-40]
+      (=gt		  . 10387)	; &I-GT-10387;
+      (=gt-pj-1		  . #x5648)	; &I-GT-10387; [54-40]
+      (=daikanwa	  . 08279)	; &I-M-08279;
+      (=shinjigen	  .  2012)	; &GT-10387;
+      )
+     ((=ucs@unicode	  . #x5D4C)	; &G0-4736;
+      (=gb2312		  . #x4736)	; &G0-4736; [39-22]
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
@@ -5403,8 +5438,9 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5D4E)	; 嵎
+    (=>jis-x0208	. #x564A)	; 嵎 [54-42]
+    (=>jis-x0213-1	. #x564A)	; 嵎 [54-42]
     (=big5		. #xD8E1)	; &I-B-D8E1;
-    (=jis-x0208@1997	. #x564A)	; 嵎 [54-42]
     (->subsumptive
      ((=ucs@cns		  . #x5D4E)	; &M-08281;
       (=jis-x0208@1978	  . #x564A)	; &M-08281; [54-42]
@@ -6443,6 +6479,14 @@
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5C71)	; å±±
+      )
+     ((=ucs		  . #x8006)	; 耆
+      ))
     (=ucs		. #x21EB8)	; 𡺸
     (->subsumptive
      ((ideographic-structure
@@ -7699,24 +7743,43 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x5D87)	; 嶇
-    (=jis-x0208@1997	. #x564F)	; 嶇 [54-47]
+    (=>jis-x0208	. #x564F)	; 嶇 [54-47]
+    (=>jis-x0213-1	. #x564F)	; 嶇 [54-47]
+    (=big5		. #xB9F2)	; &I-B-B9F2;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5D87)	; 嶇
+      ))
+    (ideographic-radical . 46)	; â¼­
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
     (->subsumptive
-     ((=ucs@unicode	  . #x5D87)	; &M-08426;
-      (=jis-x0208@1978	  . #x564F)	; &M-08426; [54-47]
+     ((=jis-x0208@1978	  . #x564F)	; &M-08426; [54-47]
       (=jis-x0208@1983	  . #x564F)	; &I-J83-564F; [54-47]
       (=ks-x1001	  . #x4F29)	; &I-K0-4F29; [47-09]
-      (=gb12345		  . #x612B)	; &M-08426; [65-11]
-      (=big5		  . #xB9F2)	; &I-B-B9F2;
       (=daikanwa	  . 08426)	; &I-M-08426;
-      (=shinjigen@rev	  .  2026)	; &M-08426;
       )
+     ((=cns11643-1	  . #x685A)	; &C1-685A; [72-58]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x5D87)	; 嶇
+      ))
+    (ideographic-radical . 46)	; â¼­
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (->subsumptive
      ((=ucs@jis		  . #x5D87)	; &GT-10569;
       (=jis-x0208@1990	  . #x564F)	; &GT-10569; [54-47]
       (=jis-x0213-1	  . #x564F)	; &I-JX1-564F; [54-47]
       (=gt		  . 10569)	; &I-GT-10569;
       (=gt-pj-1		  . #x564F)	; &I-GT-10569; [54-47]
+      (=shinjigen	  .  2026)	; &GT-10569;
       )
-     ((=cns11643-1	  . #x685A)	; &C1-685A; [72-58]
+     ((=ucs@unicode	  . #x5D87)	; &UU+5D87;
+      (=gb12345		  . #x612B)	; &UU+5D87; [65-11]
       ))
     ))
 (define-char
@@ -10524,21 +10587,24 @@
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
     (=ucs		. #x5DC9)	; 巉
-    (=jis-x0208@1997	. #x565A)	; 巉 [54-58]
+    (=>jis-x0208	. #x565A)	; 巉 [54-58]
+    (=>jis-x0213-1	. #x565A)	; 巉 [54-58]
+    (=big5		. #xC460)	; &I-B-C460;
     (->subsumptive
-     ((=ucs@unicode	  . #x5DC9)	; &M-08618;
-      (=jis-x0208@1978	  . #x565A)	; &M-08618; [54-58]
+     ((=jis-x0208@1978	  . #x565A)	; &M-08618; [54-58]
       (=jis-x0208@1983	  . #x565A)	; &I-J83-565A; [54-58]
-      (=iso-ir165	  . #x7B23)	; &I-EGB-7B23; [91-03]
-      (=big5		  . #xC460)	; &I-B-C460;
       (=daikanwa	  . 08618)	; &I-M-08618;
-      (=shinjigen@rev	  .  2050)	; &M-08618;
       )
-     ((=ucs@jis		  . #x5DC9)	; &GT-10871;
-      (=jis-x0208@1990	  . #x565A)	; &GT-10871; [54-58]
+     ((=ucs@jis		  . #x5DC9)	; &J90-565A;
+      (=jis-x0208@1990	  . #x565A)	; &J90-565A; [54-58]
       (=jis-x0213-1	  . #x565A)	; &I-JX1-565A; [54-58]
-      (=gt		  . 10871)	; &I-GT-10871;
-      (=gt-pj-1		  . #x565A)	; &I-GT-10871; [54-58]
+      (=shinjigen	  .  2050)	; &J90-565A;
+      )
+     ((=gt		  . 10871)	; &GT-10871;
+      (=gt-pj-1		  . #x565A)	; &GT-10871; [54-58]
+      )
+     ((=ucs@unicode	  . #x5DC9)	; &EGB-7B23;
+      (=iso-ir165	  . #x7B23)	; &EGB-7B23; [91-03]
       )
      ((=cns11643-1	  . #x796B)	; &C1-796B; [89-75]
       ))
@@ -10547,6 +10613,14 @@
   '((ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5C71)	; å±±
+      )
+     ((=ucs		  . #x8E47)	; 蹇
+      ))
     (=ucs		. #x21FB0)	; 𡾰
     (->subsumptive
      ((ideographic-structure
@@ -10592,15 +10666,13 @@
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
     (=ucs		. #x5DCA)	; 巊
-    (=daikanwa		. 08621)	; &I-M-08621;
-    ))
-(define-char
-  '((=>ucs		. #x5DCA)	; 巊
-    (morohashi-daikanwa	8621 0 1)
-    (ideographic-radical . 46)	; â¼­
-    (ideographic-strokes . 17)
-    (total-strokes	 . 20)
-    (=cns11643-3	. #x5C3C)	; &C3-5C3C; [60-28]
+    (->subsumptive
+     ((=daikanwa	  . 08621)	; &M-08621;
+      )
+     ((=ucs@unicode	  . #x5DCA)	; &UU+5DCA;
+      )
+     ((=cns11643-3	  . #x5C3C)	; &C3-5C3C; [60-28]
+      ))
     ))
 (define-char
   '((ideographic-radical . 46)	; â¼­
@@ -10669,7 +10741,8 @@
     (ideographic-radical . 46)	; â¼­
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
-    (=jis-x0208@1997	. #x3460)	; &J97-3460; [20-64]
+    (=>jis-x0208	. #x3460)	; &J97-3460; [20-64]
+    (=>jis-x0213-1	. #x3460)	; &J97-3460; [20-64]
     (->subsumptive
      ((morohashi-daikanwa	8624 1)
       (=ucs@jis		  . #x5DCC)	; &GT-10864;
@@ -10708,6 +10781,7 @@
 (define-char
   '((ideographic-radical . 46)	; â¼­
     (=ucs		. #x5DCD)	; 巍
+    (=big5		. #xC4DE)	; &I-B-C4DE;
     (->subsumptive
      ((ideographic-strokes . 18)
       (total-strokes	   . 21)
@@ -10715,11 +10789,10 @@
       (=jis-x0208	  . #x565B)	; &GT-10878; [54-59]
       (=ks-x1001	  . #x6864)	; &I-K0-6864; [72-68]
       (=jis-x0213-1	  . #x565B)	; &I-JX1-565B; [54-59]
-      (=big5		  . #xC4DE)	; &I-B-C4DE;
       (=gt		  . 10878)	; &I-GT-10878;
       (=gt-pj-1		  . #x565B)	; &I-GT-10878; [54-59]
       (=daikanwa	  . 08626)	; &I-M-08626;
-      (=shinjigen@rev	  .  2051)	; &GT-10878;
+      (=shinjigen	  .  2051)	; &GT-10878;
       )
      ((ideographic-strokes . 18)
       (total-strokes	   . 21)
@@ -10978,7 +11051,8 @@
     (ideographic-strokes . 19)
     (total-strokes	 . 22)
     (=ucs		. #x5DD3)	; 巓
-    (=jis-x0208@1997	. #x565C)	; 巓 [54-60]
+    (=>jis-x0208	. #x565C)	; 巓 [54-60]
+    (=>jis-x0213-1	. #x565C)	; 巓 [54-60]
     (->subsumptive
      ((=ucs@jis		  . #x5DD3)	; &GT-10896;
       (=jis-x0208@1990	  . #x565C)	; &GT-10896; [54-60]
@@ -10986,13 +11060,13 @@
       (=gt		  . 10896)	; &I-GT-10896;
       (=gt-pj-1		  . #x565C)	; &I-GT-10896; [54-60]
       (=daikanwa	  . 08644)	; &I-M-08644;
-      (=shinjigen@rev	  .  2053)	; &GT-10896;
-      )
-     ((=ucs@unicode	  . #x5DD3)	; &C3-5F43;
-      (=cns11643-3	  . #x5F43)	; &C3-5F43; [63-35]
+      (=shinjigen	  .  2053)	; &GT-10896;
       )
      ((=jis-x0208@1978	  . #x565C)	; &J83-565C; [54-60]
       (=jis-x0208@1983	  . #x565C)	; &I-J83-565C; [54-60]
+      )
+     ((=ucs@unicode	  . #x5DD3)	; &C3-5F43;
+      (=cns11643-3	  . #x5F43)	; &C3-5F43; [63-35]
       ))
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R049-Oneself.el b/lisp/utf-2000/Ideograph-R049-Oneself.el
index 7968ad0..56e7924 100644
--- a/lisp/utf-2000/Ideograph-R049-Oneself.el
+++ b/lisp/utf-2000/Ideograph-R049-Oneself.el
@@ -188,7 +188,8 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x5DF7)	; å··
-    (=jis-x0208@1997	. #x392B)	; å·· [25-11]
+    (=>jis-x0208	. #x392B)	; å·· [25-11]
+    (=>jis-x0213-1	. #x392B)	; å·· [25-11]
     ))
 (define-char
   '((<-denotational
@@ -202,6 +203,7 @@
     (=gb2312		. #x4F6F)	; &I-G0-4F6F; [47-79]
     (=ks-x1001		. #x7975)	; &I-K0-7975; [89-85]
     (=cns11643-1	. #x5073)	; &I-C1-5073; [48-83]
+    (=jis-x0213-1@2004	. #x392B)	; &I-JX3-392B; [25-11]
     (=big5		. #xABD1)	; &I-B-ABD1;
     (=gt		. 11040)	; &I-GT-11040;
     (=gt-pj-3		. #x3E61)	; &I-GT-11040; [30-65]
@@ -214,14 +216,24 @@
     (ideographic-radical . 49)	; â¼°
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=ucs@jis		. #x5DF7)	; &GT-11041;
+    (=ucs@jis/1990	. #x5DF7)	; &GT-11041;
+    (=ucs@jis/2000	. #x5DF7)	; &GT-11041;
     (=jis-x0208@1983	. #x392B)	; &GT-11041; [25-11]
     (=jis-x0208@1990	. #x392B)	; &I-J90-392B; [25-11]
-    (=jis-x0213-1	. #x392B)	; &I-JX1-392B; [25-11]
+    (=jis-x0213-1@2000	. #x392B)	; &I-JX1-392B; [25-11]
     (=gt		. 11041)	; &I-GT-11041;
     (=gt-k		. 05074)	; &I-GT-K05074;
     (=gt-pj-1		. #x392B)	; &I-GT-11041; [25-11]
     (=jef-china3	. #x4BF4)	; &I-JC3-4BF4;
+    (<-simplified@JP/jis
+     ((=ucs@unicode	  . #x5DF7)	; &GT-11040;
+      (=jis-x0208@1978	  . #x392B)	; &GT-11040; [25-11]
+      (=gb2312		  . #x4F6F)	; &I-G0-4F6F; [47-79]
+      (=ks-x1001	  . #x7975)	; &I-K0-7975; [89-85]
+      (=cns11643-1	  . #x5073)	; &I-C1-5073; [48-83]
+      (=jis-x0213-1@2004  . #x392B)	; &I-JX3-392B; [25-11]
+      (=daikanwa	  . 08756)	; &I-M-08756;
+      ))
     ))
 (define-char
   '((=>ucs		. #x5DF8)	; å·¸
@@ -376,7 +388,8 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x5DFD)	; å·½
-    (=jis-x0208@1997	. #x4327)	; å·½ [35-07]
+    (=>jis-x0208	. #x4327)	; å·½ [35-07]
+    (=>jis-x0213-1	. #x4327)	; å·½ [35-07]
     ))
 (define-char
   '((<-denotational
@@ -385,6 +398,7 @@
     (ideographic-radical . 49)	; â¼°
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (=big5		. #xB453)	; &B-B453;
     (->subsumptive
      ((=>ucs*		  . #x5DFD)	; å·½
       (=ucs		  . #x2F884)	; 巽
@@ -394,12 +408,12 @@
       (=gb2312		  . #x5963)	; &I-G0-5963; [57-67]
       (=ks-x1001	  . #x615E)	; &I-K0-615E; [65-62]
       (=cns11643-6	  . #x4837)	; &I-C6-4837; [40-23]
-      (=big5		  . #xB453)	; &I-B-B453;
       (=gt		  . 11052)	; &I-GT-11052;
       (=gt-pj-3		  . #x3E6B)	; &I-GT-11052; [30-75]
       (=daikanwa	  . 08765)	; &I-M-08765;
       )
-     ((=cns11643-1	  . #x5E78)	; &C1-5E78; [62-88]
+     ((=ucs@cns		  . #x5DFD)	; &C1-5E78;
+      (=cns11643-1	  . #x5E78)	; &C1-5E78; [62-88]
       ))
     ))
 (define-char
@@ -417,7 +431,7 @@
     (=gt-k		. 09097)	; &I-GT-K09097;
     (=gt-pj-1		. #x4327)	; &I-GT-11054; [35-07]
     (=jef-china3	. #x4BF5)	; &I-JC3-4BF5;
-    (<-simplified@JP
+    (<-simplified@JP/jis
      ((=ucs		  . #x2F884)	; 巽
       (=jis-x0208@1978	  . #x4327)	; &I-J78-4327; [35-07]
       ))
diff --git a/lisp/utf-2000/Ideograph-R050-Turban.el b/lisp/utf-2000/Ideograph-R050-Turban.el
index b45c3fb..9f7eabd 100644
--- a/lisp/utf-2000/Ideograph-R050-Turban.el
+++ b/lisp/utf-2000/Ideograph-R050-Turban.el
@@ -2243,7 +2243,8 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5E30)	; 帰
-    (=jis-x0208@1997	. #x3522)	; 帰 [21-02]
+    (=>jis-x0208	. #x3522)	; 帰 [21-02]
+    (=>jis-x0213-1	. #x3522)	; 帰 [21-02]
     ))
 (define-char
   '((<-denotational
@@ -5645,6 +5646,14 @@
     ))
 (define-char
   '((ideographic-radical . 50)	; â¼±
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5DFE)	; å·¾
+      )
+     ((=ucs		  . #x8511)	; 蔑
+      ))
     (=ucs		. #x5E6D)	; å¹­
     (=big5		. #xEFC5)	; &I-B-EFC5;
     ))
@@ -5694,7 +5703,7 @@
       (=jis-x0208	  . #x4A4E)	; &GT-42131; [42-46]
       (=gb2312		  . #x436F)	; &I-G0-436F; [35-79]
       (=ks-x1001	  . #x5921)	; &I-K0-5921; [57-01]
-      (=jis-x0213-1	  . #x4A4E)	; &I-JX1-4A4E; [42-46]
+      (=jis-x0213-1@2000  . #x4A4E)	; &I-JX1-4A4E; [42-46]
       ))
     (=ucs@unicode	. #x5E6D)	; &JX2-287E;
     (=jis-x0212		. #x3C3F)	; &JX2-287E; [28-31]
diff --git a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
index 4c123ec..d0f8e93 100644
--- a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
+++ b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
@@ -748,6 +748,8 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x5E96)	; 庖
+    (=>jis-x0208	. #x4A79)	; 庖 [42-89]
+    (=>jis-x0213-1	. #x4A79)	; 庖 [42-89]
     (=big5		. #xA9B4)	; &I-B-A9B4;
     ))
 (define-char
@@ -757,8 +759,11 @@
     (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
+    (=>>jis-x0213-1@2004 . #x4A79)	; &G-JX3-4A79; [42-89]
     (->subsumptive
-     ((=jis-x0208@1978	  . #x4A79)	; &M-09266; [42-89]
+     ((=ucs@jis/2004	  . #x5E96)	; &M-09266;
+      (=jis-x0208@1978	  . #x4A79)	; &M-09266; [42-89]
+      (=jis-x0213-1@2004  . #x4A79)	; &I-JX3-4A79; [42-89]
       (=daikanwa	  . 09266)	; &I-M-09266;
       )
      ((=ucs@unicode	  . #x5E96)	; &C1-4D36;
@@ -773,16 +778,19 @@
     (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=ucs@jis		. #x5E96)	; &GT-11697;
+    (=ucs@jis/1990	. #x5E96)	; &GT-11697;
+    (=ucs@jis/2000	. #x5E96)	; &GT-11697;
     (=jis-x0208@1983	. #x4A79)	; &GT-11697; [42-89]
     (=jis-x0208@1990	. #x4A79)	; &I-J90-4A79; [42-89]
-    (=jis-x0213-1	. #x4A79)	; &I-JX1-4A79; [42-89]
+    (=jis-x0213-1@2000	. #x4A79)	; &I-JX1-4A79; [42-89]
     (=gt		. 11697)	; &I-GT-11697;
     (=gt-k		. 03820)	; &I-GT-K03820;
     (=gt-pj-1		. #x4A79)	; &I-GT-11697; [42-89]
     (=jef-china3	. #x4CD3)	; &I-JC3-4CD3;
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4A79)	; &M-09266; [42-89]
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x5E96)	; &M-09266;
+      (=jis-x0208@1978	  . #x4A79)	; &M-09266; [42-89]
+      (=jis-x0213-1@2004  . #x4A79)	; &I-JX3-4A79; [42-89]
       (=daikanwa	  . 09266)	; &I-M-09266;
       ))
     ))
@@ -1862,24 +1870,32 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x5EAD)	; 庭
+    (=>jis-x0208	. #x446D)	; 庭 [36-77]
+    (=>jis-x0213-1	. #x446D)	; 庭 [36-77]
     (=big5		. #xAE78)	; &I-B-AE78;
-    (=jis-x0208@1997	. #x446D)	; 庭 [36-77]
     (->subsumptive
-     ((=jis-x0208@1978	  . #x446D)	; &M-09337; [36-77]
+     ((=jis-x0208@1978	  . #x446D)	; &GT-11748; [36-77]
       (=jis-x0208@1983	  . #x446D)	; &I-J83-446D; [36-77]
       (=ks-x1001	  . #x6F54)	; &I-K0-6F54; [79-52]
+      (=gt		  . 11748)	; &I-GT-11748;
+      (=gt-k		  . 06510)	; &I-GT-K06510;
+      (=gt-pj-3		  . #x4443)	; &I-GT-11748; [36-35]
       (=daikanwa	  . 09337)	; &I-M-09337;
-      (=shinjigen@rev	  .  2186)	; &M-09337;
+      (=shinjigen	  .  2187)	; &GT-11748;
       )
-     ((=ucs@jis		  . #x5EAD)	; &GT-11749;
-      (=jis-x0208@1990	  . #x446D)	; &GT-11749; [36-77]
-      (=jis-x0213-1	  . #x446D)	; &I-JX1-446D; [36-77]
-      (=gt		  . 11749)	; &I-GT-11749;
-      (=gt-pj-1		  . #x446D)	; &I-GT-11749; [36-77]
-      )
-     ((=ucs@unicode	  . #x5EAD)	; &C1-553C;
-      (=gb2312		  . #x4D25)	; &C1-553C; [45-05]
-      (=cns11643-1	  . #x553C)	; &I-C1-553C; [53-28]
+     ((=>>gt		  . 11749)	; &G-GT-11749;
+      (->subsumptive
+       ((=ucs@jis	    . #x5EAD)	; &GT-11749;
+	(=jis-x0208@1990    . #x446D)	; &GT-11749; [36-77]
+	(=jis-x0213-1	    . #x446D)	; &I-JX1-446D; [36-77]
+	(=gt		    . 11749)	; &I-GT-11749;
+	(=gt-pj-1	    . #x446D)	; &I-GT-11749; [36-77]
+	(=shinjigen	    .  2186)	; &GT-11749;
+	)
+       ((=ucs@unicode	    . #x5EAD)	; &C1-553C;
+	(=gb2312	    . #x4D25)	; &C1-553C; [45-05]
+	(=cns11643-1	    . #x553C)	; &I-C1-553C; [53-28]
+	))
       ))
     ))
 (define-char
@@ -4449,52 +4465,49 @@
     (=cns11643-4	. #x4959)	; &I-C4-4959; [41-57]
     ))
 (define-char
-  '((=>ucs		. #x5EDD)	; 廝
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs@jis		. #x5EDD)	; &GT-11939;
-    (=jis-x0208		. #x5723)	; &GT-11939; [55-03]
-    (=jis-x0213-1	. #x5723)	; &I-JX1-5723; [55-03]
-    (=gt		. 11939)	; &I-GT-11939;
-    (=gt-pj-1		. #x5723)	; &I-GT-11939; [55-03]
-    (=daikanwa		. 09487)	; &I-M-09487;
-    (=shinjigen		.  2212)	; &GT-11939;
-    ))
-(define-char
-  '((morohashi-daikanwa	9487 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x5EDD)	; 廝
-    (=cns11643-1	. #x6C5C)	; &I-C1-6C5C; [76-60]
     (=big5		. #xBC72)	; &I-B-BC72;
+    (->subsumptive
+     ((=ucs@jis		  . #x5EDD)	; &GT-11939;
+      (=jis-x0208	  . #x5723)	; &GT-11939; [55-03]
+      (=jis-x0213-1	  . #x5723)	; &I-JX1-5723; [55-03]
+      (=gt		  . 11939)	; &I-GT-11939;
+      (=gt-pj-1		  . #x5723)	; &I-GT-11939; [55-03]
+      (=daikanwa	  . 09487)	; &I-M-09487;
+      (=shinjigen	  .  2212)	; &GT-11939;
+      )
+     ((=ucs@unicode	  . #x5EDD)	; &C1-6C5C;
+      (=cns11643-1	  . #x6C5C)	; &C1-6C5C; [76-60]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x5EDE)	; 廞
-    (ideographic-radical . 53)	; â¼´
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs@jis		. #x5EDE)	; &M-09488;
-    (=ucs@big5		. #x5EDE)	; &M-09488;
-    (=jis-x0212		. #x3C59)	; &M-09488; [28-57]
-    (=big5		. #xE574)	; &I-B-E574;
-    (=daikanwa		. 09488)	; &I-M-09488;
-    (=jef-china3	. #x4CCC)	; &I-JC3-4CCC;
-    ))
-(define-char
-  '((morohashi-daikanwa	9488 0 0)
-    (ideographic-radical . 53)	; â¼´
+  '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x5EDE)	; 廞
-    (=cns11643-2	. #x503D)	; &I-C2-503D; [48-29]
+    (=big5		. #xE574)	; &I-B-E574;
+    (->subsumptive
+     ((=daikanwa	  . 09488)	; &M-09488;
+      )
+     ((=ucs@unicode	  . #x5EDE)	; &UU+5EDE;
+      )
+     ((=ucs@jis		  . #x5EDE)	; &JSP-3C59;
+      (=jis-x0212	  . #x3C59)	; &JSP-3C59; [28-57]
+      (=jef-china3	  . #x4CCC)	; &I-JC3-4CCC;
+      )
+     ((=cns11643-2	  . #x503D)	; &C2-503D; [48-29]
+      ))
     ))
 (define-char
   '((ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x5EDF)	; 廟
+    (=>jis-x0208	. #x4940)	; 廟 [41-32]
+    (=>jis-x0213-1	. #x4940)	; 廟 [41-32]
     ))
 (define-char
   '((<-denotational
@@ -4503,8 +4516,10 @@
     (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (=ucs@jis/2004	. #x5EDF)	; &GT-11955;
     (=jis-x0208@1978	. #x4940)	; &GT-11955; [41-32]
     (=ks-x1001		. #x5959)	; &I-K0-5959; [57-57]
+    (=jis-x0213-1@2004	. #x4940)	; &I-JX3-4940; [41-32]
     (=gt		. 11955)	; &I-GT-11955;
     (=gt-pj-3		. #x456F)	; &I-GT-11955; [37-79]
     (=daikanwa		. 09489)	; &I-M-09489;
@@ -4516,18 +4531,22 @@
     (ideographic-radical . 53)	; â¼´
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=big5		. #xBC71)	; &B-BC71;
+    (=>>jis-x0213-1@2000 . #x4940)	; &G-JX1-4940; [41-32]
+    (=big5		. #xBC71)	; &G-JX1-4940;
     (->subsumptive
-     ((=ucs@jis		  . #x5EDF)	; &GT-11956;
+     ((=ucs@jis/1990	  . #x5EDF)	; &GT-11956;
+      (=ucs@jis/2000	  . #x5EDF)	; &GT-11956;
       (=jis-x0208@1983	  . #x4940)	; &GT-11956; [41-32]
       (=jis-x0208@1990	  . #x4940)	; &I-J90-4940; [41-32]
-      (=jis-x0213-1	  . #x4940)	; &I-JX1-4940; [41-32]
+      (=jis-x0213-1@2000  . #x4940)	; &I-JX1-4940; [41-32]
       (=gt		  . 11956)	; &I-GT-11956;
       (=gt-pj-1		  . #x4940)	; &I-GT-11956; [41-32]
       (=jef-china3	  . #x4CD2)	; &I-JC3-4CD2;
-      (<-simplified@JP
-       ((=jis-x0208@1978    . #x4940)	; &GT-11955; [41-32]
+      (<-simplified@JP/extra/design
+       ((=ucs@jis/2004	    . #x5EDF)	; &GT-11955;
+	(=jis-x0208@1978    . #x4940)	; &GT-11955; [41-32]
 	(=ks-x1001	    . #x5959)	; &I-K0-5959; [57-57]
+	(=jis-x0213-1@2004  . #x4940)	; &I-JX3-4940; [41-32]
 	(=daikanwa	    . 09489)	; &I-M-09489;
 	))
       )
diff --git a/lisp/utf-2000/Ideograph-R054-Long-Stride.el b/lisp/utf-2000/Ideograph-R054-Long-Stride.el
index 105b406..7726ef2 100644
--- a/lisp/utf-2000/Ideograph-R054-Long-Stride.el
+++ b/lisp/utf-2000/Ideograph-R054-Long-Stride.el
@@ -152,8 +152,20 @@
       (=gt		  . 12059)	; &I-GT-12059;
       (=gt-pj-3		  . #x465C)	; &I-GT-12059; [38-60]
       (=daikanwa	  . 09573)	; &I-M-09573;
+      (=shinjigen	  .  2240)	; &GT-12059;
       (=jef-china3	  . #x4CD7)	; &I-JC3-4CD7;
       (=adobe-japan1-5	  . 17605)	; &GT-12059;
+      (<-formed
+       ((=ucs@jis/1990	    . #x5EFB)	; &GT-12063;
+	(=ucs@jis/2000	    . #x5EFB)	; &GT-12063;
+	(=jis-x0208	    . #x3276)	; &GT-12063; [18-86]
+	(=ks-x1001	    . #x7C5F)	; &I-K0-7C5F; [92-63]
+	(=jis-x0213-1@2000  . #x3276)	; &I-JX1-3276; [18-86]
+	(=daikanwa	    . 09575)	; &I-M-09575;
+	(=shinjigen	    .  2239)	; &GT-12063;
+	))
+      (<-formed*sources
+       shinjigen)
       )
      ((=ucs@iso		  . #x2231E)	; &C6-2B2E;
       (=cns11643-6	  . #x2B2E)	; &C6-2B2E; [11-14]
@@ -226,6 +238,8 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x5EFB)	; å»»
+    (=>jis-x0208	. #x3276)	; å»» [18-86]
+    (=>jis-x0213-1	. #x3276)	; å»» [18-86]
     (->subsumptive
      ((=ucs@jis/1990	  . #x5EFB)	; &GT-12063;
       (=ucs@jis/2000	  . #x5EFB)	; &GT-12063;
@@ -235,7 +249,7 @@
       (=gt		  . 12063)	; &I-GT-12063;
       (=gt-pj-1		  . #x3276)	; &I-GT-12063; [18-86]
       (=daikanwa	  . 09575)	; &I-M-09575;
-      (=shinjigen@rev	  .  2239)	; &GT-12063;
+      (=shinjigen	  .  2239)	; &GT-12063;
       (=cbeta		  . 00327)	; &I-CB00327;
       )
      ((=ucs@unicode	  . #x5EFB)	; &JX3-3276;
@@ -271,6 +285,18 @@
      ((=ucs@jis		  . #x5EFD)	; &M-09577;
       (=jis-x0213-2	  . #x2C2C)	; &M-09577; [12-12]
       (=daikanwa	  . 09577)	; &I-M-09577;
+      (=shinjigen	  .  2241)	; &M-09577;
+      (<-vulgar
+       ((=ucs@jis/1990	    . #x5EFB)	; &GT-12063;
+	(=ucs@jis/2000	    . #x5EFB)	; &GT-12063;
+	(=jis-x0208	    . #x3276)	; &GT-12063; [18-86]
+	(=ks-x1001	    . #x7C5F)	; &I-K0-7C5F; [92-63]
+	(=jis-x0213-1@2000  . #x3276)	; &I-JX1-3276; [18-86]
+	(=daikanwa	    . 09575)	; &I-M-09575;
+	(=shinjigen	    .  2239)	; &GT-12063;
+	))
+      (<-vulgar*sources
+       shinjigen)
       )
      ((=ucs@unicode	  . #x5EFD)	; &C3-306E;
       (=cns11643-3	  . #x306E)	; &C3-306E; [16-78]
diff --git a/lisp/utf-2000/Ideograph-R055-Two-Hands.el b/lisp/utf-2000/Ideograph-R055-Two-Hands.el
index 56a3a8c..4a04f10 100644
--- a/lisp/utf-2000/Ideograph-R055-Two-Hands.el
+++ b/lisp/utf-2000/Ideograph-R055-Two-Hands.el
@@ -661,8 +661,18 @@
     (ideographic-radical@ucs/compat . 55)	; ⼶
     (ideographic-radical@ucs/compat*sources
      cns11643-6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x81FC)	; 臼
+      )
+     ((=ucs		  . #x5EFE)	; 廾
+      ))
     (=ucs		. #x8201)	; 舁
-    (=jis-x0208@1997	. #x674D)	; 舁 [71-45]
+    (=>jis-x0208	. #x674D)	; 舁 [71-45]
+    (=>jis-x0213-1	. #x674D)	; 舁 [71-45]
+    (=big5		. #xD370)	; &I-B-D370;
     ))
 (define-char
   '((<-denotational
@@ -698,7 +708,6 @@
     (=gb2312		. #x7428)	; &I-G0-7428; [84-08]
     (=cns11643-6	. #x3074)	; &I-C6-3074; [16-84]
     (=jis-x0213-1	. #x674D)	; &I-JX1-674D; [71-45]
-    (=big5		. #xD370)	; &I-B-D370;
     (=gt		. 39043)	; &I-GT-39043;
     (=gt-pj-1		. #x674D)	; &I-GT-39043; [71-45]
     ))
@@ -707,20 +716,38 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x2234D)	; 𢍍
-    (=cns11643-6	. #x373F)	; &I-C6-373F; [23-31]
-    (=daikanwa		. 09618)	; &I-M-09618;
+    (->subsumptive
+     ((=daikanwa	  . 09618)	; &M-09618;
+      )
+     ((=cns11643-6	  . #x373F)	; &C6-373F; [23-31]
+      )
+     ((=ucs@iso		  . #x2234D)	; &U-0002234D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 55)	; ⼶
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x2234E)	; 𢍎
-    (->subsumptive
-     ((=daikanwa	  . 09619)	; &M-09619;
-      )
-     ((=ucs@iso		  . #x2234E)	; &C6-373E;
-      (=cns11643-6	  . #x373E)	; &C6-373E; [23-30]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2234E)	; 𢍎
+      ))
+    (ideographic-radical . 55)	; ⼶
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=daikanwa		. 09619)	; &M-09619;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2234E)	; 𢍎
       ))
+    (ideographic-radical . 55)	; ⼶
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=ucs@iso		. #x2234E)	; &C6-373E;
+    (=cns11643-6	. #x373E)	; &C6-373E; [23-30]
     ))
 (define-char
   '((ideographic-radical . 55)	; ⼶
diff --git a/lisp/utf-2000/Ideograph-R056-Shoot.el b/lisp/utf-2000/Ideograph-R056-Shoot.el
index 9450ed1..e79912f 100644
--- a/lisp/utf-2000/Ideograph-R056-Shoot.el
+++ b/lisp/utf-2000/Ideograph-R056-Shoot.el
@@ -288,8 +288,13 @@
     (=daikanwa		. 09679)	; &I-M-09679;
     ))
 (define-char
+  '((ideographic-radical . 56)	; â¼·
+    (=>jis-x0208	. #x5736)	; &J97-5736; [55-22]
+    (=>jis-x0213-1	. #x5736)	; &J97-5736; [55-22]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5736)	; &J97-5736; [55-22]
+     ((=>jis-x0208	  . #x5736)	; &J97-5736; [55-22]
       ))
     (ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 9)
@@ -315,10 +320,6 @@
     (=cbeta		. 06128)	; &I-CB06128;
     ))
 (define-char
-  '((ideographic-radical . 56)	; â¼·
-    (=jis-x0208@1997	. #x5736)	; &J97-5736; [55-22]
-    ))
-(define-char
   '((<-denotational
      ((=ucs		  . #x5F11)	; 弑
       ))
@@ -389,7 +390,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5736)	; &J97-5736; [55-22]
+     ((=>jis-x0208	  . #x5736)	; &J97-5736; [55-22]
       ))
     (ideographic-radical . 56)	; â¼·
     (ideographic-strokes . 10)
diff --git a/lisp/utf-2000/Ideograph-R059-Bristle.el b/lisp/utf-2000/Ideograph-R059-Bristle.el
index 79646db..7976842 100644
--- a/lisp/utf-2000/Ideograph-R059-Bristle.el
+++ b/lisp/utf-2000/Ideograph-R059-Bristle.el
@@ -202,21 +202,41 @@
   '((ideographic-radical . 59)	; ⼺
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (=daikanwa		. 09978)	; &M-09978;
+    (hanyu-dazidian	2 854 6)
+    (sound@ja/on	"hi")
+    (=ucs		. #x2248D)	; 𢒍
+    (=daikanwa		. 09978)	; &I-M-09978;
+    (=hanziku-3		. #xABE2)	; &I-HZK03-ABE2;
     ))
 (define-char
   '((ideographic-radical . 59)	; ⼺
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
-    (hanyu-dazidian	2 854 2)
     (=ucs		. #x2248A)	; 𢒊
-    (=cns11643-6	. #x2B3B)	; &I-C6-2B3B; [11-27]
-    (=daikanwa		. 09979)	; &I-M-09979;
-    (=hanziku-3		. #xABDE)	; &I-HZK03-ABDE;
+    (->subsumptive
+     ((hanyu-dazidian	  2 854 2)
+      (=ucs@iso		  . #x2248A)	; &M-09979;
+      (=daikanwa	  . 09979)	; &M-09979;
+      (=hanziku-3	  . #xABDE)	; &I-HZK03-ABDE;
+      (<-vulgar
+       ((=daikanwa	    . 09980)	; &M-09980;
+	))
+      (<-vulgar*sources
+       zhengzitong daikanwa)
+      )
+     ((=cns11643-6	  . #x2B3B)	; &C6-2B3B; [11-27]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 59)	; ⼺
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (=>jis-x0208	. #x4927)	; &J97-4927; [41-07]
+    (=>jis-x0213-1	. #x4927)	; &J97-4927; [41-07]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4927)	; &J97-4927; [41-07]
+     ((=>jis-x0208	  . #x4927)	; &J97-4927; [41-07]
       ))
     (ideographic-radical . 59)	; ⼺
     (ideographic-strokes . 6)
@@ -225,6 +245,7 @@
     (=big5		. #xABDB)	; &I-B-ABDB;
     (->subsumptive
      ((=daikanwa	  . 09980)	; &M-09980;
+      (=shinjigen	  .  2313)	; &M-09980;
       (=jef-china3	  . #x4DA1)	; &I-JC3-4DA1;
       )
      ((=ucs@unicode	  . #x5F65)	; &UU+5F65;
@@ -233,14 +254,8 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 59)	; ⼺
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=jis-x0208@1997	. #x4927)	; &J97-4927; [41-07]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4927)	; &J97-4927; [41-07]
+     ((=>jis-x0208	  . #x4927)	; &J97-4927; [41-07]
       ))
     (ideographic-radical . 59)	; ⼺
     (ideographic-strokes . 6)
@@ -255,7 +270,15 @@
       (=gt-k		  . 05167)	; &I-GT-K05167;
       (=gt-pj-1		  . #x4927)	; &I-GT-12591; [41-07]
       (=daikanwa	  . 09981)	; &I-M-09981;
-      (=shinjigen@rev	  .  2312)	; &GT-12591;
+      (=shinjigen	  .  2312)	; &GT-12591;
+      (<-simplified@JP
+       ((=daikanwa	    . 09980)	; &M-09980;
+	))
+      (<-vulgar
+       ((=daikanwa	    . 09980)	; &M-09980;
+	))
+      (<-vulgar*sources
+       zhengzitong daikanwa)
       )
      ((=ucs@unicode	  . #x5F66)	; &C3-2C50;
       (=gb2312		  . #x5165)	; &C3-2C50; [49-69]
@@ -516,10 +539,19 @@
       ))
     ))
 (define-char
+  '((=>ucs*		. #x5F6B)	; 彫
+    (ideographic-radical . 59)	; ⼺
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (=ucs@big5		. #x5F6B)	; &J97-4426;
+    (=>jis-x0208	. #x4426)	; &J97-4426; [36-06]
+    (=>jis-x0213-1	. #x4426)	; &J97-4426; [36-06]
+    (=big5		. #xB16E)	; &J97-4426;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x5F6B)	; &B-B16E;
-      (=big5		  . #xB16E)	; &B-B16E;
-      (=jis-x0208@1997	  . #x4426)	; &B-B16E; [36-06]
+     ((=ucs@big5	  . #x5F6B)	; &J97-4426;
+      (=>jis-x0208	  . #x4426)	; &J97-4426; [36-06]
       ))
     (=>ucs*		. #x5F6B)	; 彫
     (ideographic-radical . 59)	; ⼺
@@ -539,19 +571,9 @@
       ))
     ))
 (define-char
-  '((=>ucs*		. #x5F6B)	; 彫
-    (ideographic-radical . 59)	; ⼺
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=ucs@big5		. #x5F6B)	; &B-B16E;
-    (=big5		. #xB16E)	; &B-B16E;
-    (=jis-x0208@1997	. #x4426)	; &B-B16E; [36-06]
-    ))
-(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x5F6B)	; &B-B16E;
-      (=big5		  . #xB16E)	; &B-B16E;
-      (=jis-x0208@1997	  . #x4426)	; &B-B16E; [36-06]
+     ((=ucs@big5	  . #x5F6B)	; &J97-4426;
+      (=>jis-x0208	  . #x4426)	; &J97-4426; [36-06]
       ))
     (morohashi-daikanwa	9995 1)
     (ideographic-radical . 59)	; ⼺
@@ -1174,12 +1196,6 @@
     ))
 (define-char
   '((ideographic-radical . 59)	; ⼺
-    (hanyu-dazidian	2 854 6)
-    (=ucs		. #x2248D)	; 𢒍
-    (=hanziku-3		. #xABE2)	; &I-HZK03-ABE2;
-    ))
-(define-char
-  '((ideographic-radical . 59)	; ⼺
     (hanyu-dazidian	2 854 14)
     (=ucs		. #x22493)	; 𢒓
     (=hanziku-3		. #xABEA)	; &I-HZK03-ABEA;
diff --git a/lisp/utf-2000/Ideograph-R060-Step.el b/lisp/utf-2000/Ideograph-R060-Step.el
index 3f7ccbe..a11be86 100644
--- a/lisp/utf-2000/Ideograph-R060-Step.el
+++ b/lisp/utf-2000/Ideograph-R060-Step.el
@@ -1421,20 +1421,25 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x5F98)	; 徘
+    (=>jis-x0208	. #x5751)	; 徘 [55-49]
+    (=>jis-x0213-1	. #x5751)	; 徘 [55-49]
     (->subsumptive
      ((=ucs@big5	  . #x5F98)	; &B-B172;
       (=big5		  . #xB172)	; &B-B172;
       (->subsumptive
-       ((=jis-x0208@1978    . #x5751)	; &M-10141; [55-49]
+       ((=ucs@jis/2004	    . #x5F98)	; &M-10141;
+	(=jis-x0208@1978    . #x5751)	; &M-10141; [55-49]
 	(=jis-x0208@1983    . #x5751)	; &I-J83-5751; [55-49]
+	(=jis-x0213-1@2004  . #x5751)	; &I-JX3-5751; [55-49]
 	(=daikanwa	    . 10141)	; &I-M-10141;
-	(=shinjigen@rev	    .  2365)	; &M-10141;
+	(=shinjigen	    .  2365)	; &M-10141;
 	)
-       ((=ucs@jis	    . #x5F98)	; &GT-12807;
+       ((=ucs@jis/1990	    . #x5F98)	; &GT-12807;
+	(=ucs@jis/2000	    . #x5F98)	; &GT-12807;
 	(=ks-x1001	    . #x5B47)	; &GT-12807; [59-39]
 	(=jis-x0208@1990    . #x5751)	; &I-J90-5751; [55-49]
 	(=cns11643-1	    . #x5A38)	; &I-C1-5A38; [58-24]
-	(=jis-x0213-1	    . #x5751)	; &I-JX1-5751; [55-49]
+	(=jis-x0213-1@2000  . #x5751)	; &I-JX1-5751; [55-49]
 	(=gt		    . 12807)	; &I-GT-12807;
 	(=gt-pj-1	    . #x5751)	; &I-GT-12807; [55-49]
 	))
@@ -1882,6 +1887,14 @@
   '((ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5F73)	; å½³
+      )
+     ((=ucs		  . #x6241)	; 扁
+      ))
     (=ucs		. #x5FA7)	; 徧
     ))
 (define-char
@@ -1897,9 +1910,10 @@
       )
      ((=ucs		  . #x5F73)	; å½³
       )
-     ((=ucs@big5	  . #x6241)	; &GT-14816;
+     ((=ucs@jis/2004	  . #x6241)	; &GT-14816;
       (=ks-x1001	  . #x7837)	; &GT-14816; [88-23]
       (=cns11643-1	  . #x5137)	; &I-C1-5137; [49-23]
+      (=jis-x0213-1@2004  . #x5928)	; &I-JX3-5928; [57-08]
       (=daikanwa	  . 11724)	; &I-M-11724;
       ))
     (=ucs@jis		. #x5FA7)	; &M-10174;
@@ -1940,9 +1954,10 @@
       )
      ((=ucs		  . #x5F73)	; å½³
       )
-     ((=ucs@jis		  . #x6241)	; &GT-14817;
+     ((=ucs@jis/1990	  . #x6241)	; &GT-14817;
+      (=ucs@jis/2000	  . #x6241)	; &GT-14817;
       (=jis-x0208	  . #x5928)	; &GT-14817; [57-08]
-      (=jis-x0213-1	  . #x5928)	; &I-JX1-5928; [57-08]
+      (=jis-x0213-1@2000  . #x5928)	; &I-JX1-5928; [57-08]
       ))
     (=cbeta		. 00642)	; &CB00642;
     ))
@@ -2907,13 +2922,18 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 60)	; â¼»
+    (=>jis-x0208@1997	. #x4427)	; &J97-4427; [36-07]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4427)	; &J97-4427; [36-07]
+     ((=>jis-x0208@1997	  . #x4427)	; &J97-4427; [36-07]
       ))
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x5FB4)	; å¾´
+    (=>jis-x0213-1	. #x4427)	; å¾´ [36-07]
     (->subsumptive
      ((morohashi-daikanwa	10238 1)
       (=ucs@jis		  . #x5FB4)	; &GT-12893;
@@ -2935,17 +2955,14 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 60)	; â¼»
-    (=jis-x0208@1997	. #x4427)	; &J97-4427; [36-07]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4427)	; &J97-4427; [36-07]
+     ((=>jis-x0208@1997	  . #x4427)	; &J97-4427; [36-07]
       ))
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x5FB5)	; å¾µ
+    (=>jis-x0213-1	. #x7444)	; å¾µ [84-36]
     (=big5		. #xBC78)	; &I-B-BC78;
     ))
 (define-char
@@ -3368,8 +3385,10 @@
     ))
 (define-char
   '((ideographic-radical . 60)	; â¼»
+    (sound@ja/on	"ki")
     (=ucs		. #x5FBD)	; å¾½
-    (=jis-x0208@1997	. #x352B)	; å¾½ [21-11]
+    (=>jis-x0208	. #x352B)	; å¾½ [21-11]
+    (=>jis-x0213-1	. #x352B)	; å¾½ [21-11]
     ))
 (define-char
   '((<-denotational
@@ -3378,13 +3397,14 @@
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
+    (=big5		. #xC0B2)	; &B-C0B2;
     (->subsumptive
-     ((=jis-x0208@1978	  . #x352B)	; &M-10267; [21-11]
+     ((=ucs@jis/2004	  . #x5FBD)	; &M-10267;
+      (=jis-x0208@1978	  . #x352B)	; &M-10267; [21-11]
       (=ks-x1001	  . #x7D45)	; &I-K0-7D45; [93-37]
       (=cns11643-1	  . #x735B)	; &I-C1-735B; [83-59]
-      (=big5		  . #xC0B2)	; &I-B-C0B2;
+      (=jis-x0213-1@2004  . #x352B)	; &I-JX3-352B; [21-11]
       (=daikanwa	  . 10267)	; &I-M-10267;
-      (=jef-china3	  . #x4DC1)	; &I-JC3-4DC1;
       )
      ((=ucs@unicode	  . #x5FBD)	; &G0-3B55;
       (=gb2312		  . #x3B55)	; &G0-3B55; [27-53]
@@ -3397,16 +3417,20 @@
     (ideographic-radical . 60)	; â¼»
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=ucs@jis		. #x5FBD)	; &GT-35717;
+    (=ucs@jis/1990	. #x5FBD)	; &GT-35717;
+    (=ucs@jis/2000	. #x5FBD)	; &GT-35717;
     (=jis-x0208@1983	. #x352B)	; &GT-35717; [21-11]
     (=jis-x0208@1990	. #x352B)	; &I-J90-352B; [21-11]
-    (=jis-x0213-1	. #x352B)	; &I-JX1-352B; [21-11]
+    (=jis-x0213-1@2000	. #x352B)	; &I-JX1-352B; [21-11]
     (=gt		. 35717)	; &I-GT-35717;
     (=gt-pj-1		. #x352B)	; &I-GT-35717; [21-11]
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x352B)	; &M-10267; [21-11]
+    (=jef-china3	. #x4DC1)	; &I-JC3-4DC1;
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x5FBD)	; &M-10267;
+      (=jis-x0208@1978	  . #x352B)	; &M-10267; [21-11]
       (=ks-x1001	  . #x7D45)	; &I-K0-7D45; [93-37]
       (=cns11643-1	  . #x735B)	; &I-C1-735B; [83-59]
+      (=jis-x0213-1@2004  . #x352B)	; &I-JX3-352B; [21-11]
       (=daikanwa	  . 10267)	; &I-M-10267;
       ))
     ))
diff --git a/lisp/utf-2000/Ideograph-R061-Heart.el b/lisp/utf-2000/Ideograph-R061-Heart.el
index 7e971d6..6e34f37 100644
--- a/lisp/utf-2000/Ideograph-R061-Heart.el
+++ b/lisp/utf-2000/Ideograph-R061-Heart.el
@@ -3841,7 +3841,8 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x6062)	; 恢
-    (=jis-x0208@1997	. #x327A)	; 恢 [18-90]
+    (=>jis-x0208	. #x327A)	; 恢 [18-90]
+    (=>jis-x0213-1	. #x327A)	; 恢 [18-90]
     ))
 (define-char
   '((<-denotational
@@ -5682,50 +5683,73 @@
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=daikanwa		. 10709)	; &M-10709;
+    (=ucs		. #x226BB)	; 𢚻
+    (=cns11643-5	. #x2D59)	; &I-C5-2D59; [13-57]
+    (=daikanwa		. 10709)	; &I-M-10709;
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=daikanwa		. 10710)	; &M-10710;
+    (=ucs		. #x226AE)	; 𢚮
+    (=daikanwa		. 10710)	; &I-M-10710;
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=daikanwa		. 10711)	; &M-10711;
+    (=ucs		. #x226A8)	; 𢚨
+    (=daikanwa		. 10711)	; &I-M-10711;
+    (=hanziku-6		. #xDBDB)	; &I-HZK06-DBDB;
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x60A8)	; 您
-    (=gb2312		. #x447A)	; &I-G0-447A; [36-90]
-    (=jis-x0212		. #x3D7B)	; &I-JSP-3D7B; [29-91]
-    (=cns11643-1	. #x5A40)	; &I-C1-5A40; [58-32]
-    (=jis-x0213-2	. #x2C4F)	; &I-JX2-2C4F; [12-47]
-    (=big5		. #xB17A)	; &I-B-B17A;
-    (=daikanwa		. 10712)	; &I-M-10712;
-    (=jef-china3	. #x4DD3)	; &I-JC3-4DD3;
+    (->subsumptive
+     ((=ucs@jis		  . #x60A8)	; &GT-13458;
+      (=jis-x0212	  . #x3D7B)	; &GT-13458; [29-91]
+      (=cns11643-1	  . #x5A40)	; &I-C1-5A40; [58-32]
+      (=jis-x0213-2	  . #x2C4F)	; &I-JX2-2C4F; [12-47]
+      (=big5		  . #xB17A)	; &I-B-B17A;
+      (=gt		  . 13458)	; &I-GT-13458;
+      (=gt-pj-3		  . #x5169)	; &I-GT-13458; [49-73]
+      (=daikanwa	  . 10712)	; &I-M-10712;
+      (=jef-china3	  . #x4DD3)	; &I-JC3-4DD3;
+      )
+     ((=ucs@unicode	  . #x60A8)	; &G0-447A;
+      (=gb2312		  . #x447A)	; &G0-447A; [36-90]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=daikanwa		. 10713)	; &M-10713;
+    (=ucs		. #x226AD)	; 𢚭
+    (->subsumptive
+     ((=daikanwa	  . 10713)	; &M-10713;
+      )
+     ((=ucs@iso		  . #x226AD)	; &U-000226AD;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=daikanwa		. 10714)	; &M-10714;
+    (=ucs		. #x226AA)	; 𢚪
+    (->subsumptive
+     ((=daikanwa	  . 10714)	; &M-10714;
+      )
+     ((=ucs@iso		  . #x226AA)	; &U-000226AA;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=daikanwa		. 10715)	; &M-10715;
+    (=ucs		. #x226AB)	; 𢚫
+    (=daikanwa		. 10715)	; &I-M-10715;
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -5823,20 +5847,6 @@
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=ucs		. #x226BB)	; 𢚻
-    (=cns11643-5	. #x2D59)	; &I-C5-2D59; [13-57]
-    ))
-(define-char
-  '((ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=ucs		. #x226DA)	; 𢛚
-    (=cns11643-6	. #x3F6E)	; &I-C6-3F6E; [31-78]
-    ))
-(define-char
-  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x60B0)	; 悰
@@ -6940,11 +6950,17 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x60D4)	; 惔
-    (=jis-x0212		. #x3E2B)	; &I-JSP-3E2B; [30-11]
-    (=cns11643-2	. #x353C)	; &I-C2-353C; [21-28]
-    (=jis-x0213-1	. #x7454)	; &I-JX1-7454; [84-52]
     (=big5		. #xD558)	; &I-B-D558;
-    (=daikanwa		. 10800)	; &I-M-10800;
+    (->subsumptive
+     ((=ucs@jis		  . #x60D4)	; &M-10800;
+      (=jis-x0212	  . #x3E2B)	; &M-10800; [30-11]
+      (=jis-x0213-1	  . #x7454)	; &I-JX1-7454; [84-52]
+      (=daikanwa	  . 10800)	; &I-M-10800;
+      )
+     ((=ucs@unicode	  . #x60D4)	; &UU+60D4;
+      )
+     ((=cns11643-2	  . #x353C)	; &C2-353C; [21-28]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -6956,9 +6972,16 @@
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 8)
+    (ideographic-strokes@daikanwa . 8)
+    (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=daikanwa		. 10802)	; &M-10802;
+    (=ucs		. #x226DA)	; 𢛚
+    (->subsumptive
+     ((=ucs@iso		  . #x226DA)	; &M-10802;
+      (=daikanwa	  . 10802)	; &M-10802;
+      )
+     ((=cns11643-6	  . #x3F6E)	; &C6-3F6E; [31-78]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -6976,31 +6999,48 @@
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=ucs		. #x60D6)	; 惖
+    (=cns11643-3	. #x3B55)	; &I-C3-3B55; [27-53]
+    (=daikanwa		. 10804)	; &I-M-10804;
+    (=hanziku-6		. #xDDF6)	; &I-HZK06-DDF6;
+    ))
+(define-char
+  '((ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=daikanwa		. 10804)	; &M-10804;
+    (=ucs		. #x3952)	; 㥒
     ))
 (define-char
-  '((=>ucs		. #x3952)	; 㥒
+  '((<-denotational
+     ((=ucs		  . #x3952)	; 㥒
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=daikanwa		. 10805)	; &M-10805;
     ))
 (define-char
-  '((morohashi-daikanwa	10805 0 3)
+  '((<-denotational
+     ((=ucs		  . #x3952)	; 㥒
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x3952)	; 㥒
-    (=cns11643-4	. #x3166)	; &I-C4-3166; [17-70]
+    (=ucs@unicode	. #x3952)	; &C4-3166;
+    (=cns11643-4	. #x3166)	; &C4-3166; [17-70]
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x60D7)	; 惗
-    (=cns11643-3	. #x356E)	; &I-C3-356E; [21-78]
-    (=daikanwa		. 10806)	; &I-M-10806;
+    (->subsumptive
+     ((=cns11643-3	  . #x356E)	; &M-10806; [21-78]
+      (=daikanwa	  . 10806)	; &I-M-10806;
+      )
+     ((=ucs@unicode	  . #x60D7)	; &UU+60D7;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -7733,13 +7773,6 @@
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=ucs		. #x60D6)	; 惖
-    (=cns11643-3	. #x3B55)	; &I-C3-3B55; [27-53]
-    ))
-(define-char
-  '((ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -8525,17 +8558,36 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x6108)	; 愈
-    (=big5		. #xB755)	; &I-B-B755;
+    (=>jis-x0208	. #x4C7C)	; 愈 [44-92]
+    (=>jis-x0213-1	. #x4C7C)	; 愈 [44-92]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6108)	; 愈
+      ))
+    (ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=ucs@jis/2004	. #x6108)	; &M-10904;
+    (=jis-x0208@1978	. #x4C7C)	; &M-10904; [44-92]
+    (=ks-x1001		. #x6A6F)	; &I-K0-6A6F; [74-79]
+    (=jis-x0213-1@2004	. #x4C7C)	; &I-JX3-4C7C; [44-92]
+    (=daikanwa		. 10904)	; &I-M-10904;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6108)	; 愈
+      ))
+    (ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=big5		. #xB755)	; &B-B755;
     (->subsumptive
-     ((=jis-x0208@1978	  . #x4C7C)	; &M-10904; [44-92]
-      (=ks-x1001	  . #x6A6F)	; &I-K0-6A6F; [74-79]
-      (=daikanwa	  . 10904)	; &I-M-10904;
-      )
      ((=ucs@unicode	  . #x6108)	; &GT-13912;
       (=gb2312		  . #x537A)	; &GT-13912; [51-90]
       (=jis-x0208@1983	  . #x4C7C)	; &I-J83-4C7C; [44-92]
       (=jis-x0208@1990	  . #x4C7C)	; &I-J90-4C7C; [44-92]
-      (=jis-x0213-1	  . #x4C7C)	; &I-JX1-4C7C; [44-92]
+      (=jis-x0213-1@2000  . #x4C7C)	; &I-JX1-4C7C; [44-92]
       (=gt		  . 13912)	; &I-GT-13912;
       (=gt-k		  . 10276)	; &I-GT-K10276;
       (=gt-pj-1		  . #x4C7C)	; &I-GT-13912; [44-92]
@@ -8545,36 +8597,42 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x6109)	; 愉
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ks-x1001		. #x6A70)	; &M-10905; [74-80]
-    (=daikanwa		. 10905)	; &I-M-10905;
-    (=jef-china3	. #x4EC5)	; &I-JC3-4EC5;
+    (=ucs		. #x6109)	; 愉
     ))
 (define-char
-  '((morohashi-daikanwa	10905 1)
+  '((<-denotational
+     ((=ucs		  . #x6109)	; 愉
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs		. #x6109)	; 愉
-    (=jis-x0208		. #x4C7B)	; &I-J90-4C7B; [44-91]
-    (=gb2312		. #x5364)	; &I-G0-5364; [51-68]
-    (=jis-x0213-1	. #x4C7B)	; &I-JX1-4C7B; [44-91]
-    (=big5		. #xB472)	; &I-B-B472;
-    (=gt		. 13761)	; &I-GT-13761;
-    (=gt-pj-1		. #x4C7B)	; &I-GT-13761; [44-91]
-    (mojikyo		. 050179)	; &MCS-6000C403;
+    (=ks-x1001		. #x6A70)	; &M-10905; [74-80]
+    (=daikanwa		. 10905)	; &I-M-10905;
+    (=jef-china3	. #x4EC5)	; &I-JC3-4EC5;
     ))
 (define-char
-  '((=>ucs		. #x6109)	; 愉
-    (morohashi-daikanwa	10905 1 0)
+  '((<-denotational
+     ((=ucs		  . #x6109)	; 愉
+      ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (->mojikyo		. 050179)	; 愉
-    (=cns11643-1	. #x5F39)	; &C1-5F39; [63-25]
+    (=big5		. #xB472)	; &B-B472;
+    (->subsumptive
+     ((morohashi-daikanwa	10905 1)
+      (=ucs@unicode	  . #x6109)	; &GT-13761;
+      (=jis-x0208	  . #x4C7B)	; &GT-13761; [44-91]
+      (=gb2312		  . #x5364)	; &I-G0-5364; [51-68]
+      (=jis-x0213-1	  . #x4C7B)	; &I-JX1-4C7B; [44-91]
+      (=gt		  . 13761)	; &I-GT-13761;
+      (=gt-pj-1		  . #x4C7B)	; &I-GT-13761; [44-91]
+      (mojikyo		  . 050179)	; &MCS-6000C403;
+      )
+     ((=cns11643-1	  . #x5F39)	; &C1-5F39; [63-25]
+      ))
     ))
 (define-char
   '((=>ucs		. #x2273A)	; 𢜺
@@ -12980,8 +13038,30 @@
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=daikanwa		. 11180)	; &M-11180;
-    (=cbeta		. 03648)	; &I-CB03648;
+    (=ucs		. #x2282B)	; 𢠫
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2282B)	; 𢠫
+      ))
+    (ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (->subsumptive
+     ((=daikanwa	  . 11180)	; &M-11180;
+      )
+     ((=ucs@iso		  . #x2282B)	; &HZK06-E56E;
+      (=hanziku-6	  . #xE56E)	; &HZK06-E56E;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2282B)	; 𢠫
+      ))
+    (ideographic-radical . 61)	; â¼¼
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=cbeta		. 03648)	; &CB03648;
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
@@ -12995,56 +13075,72 @@
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
-    (=daikanwa		. 11182)	; &M-11182;
+    (=ucs		. #x2282D)	; 𢠭
+    (->subsumptive
+     ((=daikanwa	  . 11182)	; &M-11182;
+      )
+     ((=ucs@iso		  . #x2282D)	; &HZK06-E5AC;
+      (=hanziku-6	  . #xE5AC)	; &HZK06-E5AC;
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x2282E)	; 𢠮
-    (=cns11643-5	. #x4575)	; &I-C5-4575; [37-85]
-    (=daikanwa		. 11183)	; &I-M-11183;
+    (->subsumptive
+     ((=daikanwa	  . 11183)	; &M-11183;
+      )
+     ((=ucs@iso		  . #x2282E)	; &U-0002282E;
+      )
+     ((=cns11643-5	  . #x4575)	; &C5-4575; [37-85]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 11184)	; &M-11184;
+    (=ucs		. #x2281B)	; 𢠛
+    (=daikanwa		. 11184)	; &I-M-11184;
+    (=hanziku-6		. #xE3EF)	; &I-HZK06-E3EF;
     ))
 (define-char
-  '((=>ucs		. #x22821)	; 𢠡
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (=daikanwa		. 11185)	; &M-11185;
-    ))
-(define-char
-  '((morohashi-daikanwa	11185 0 0)
-    (ideographic-radical . 61)	; â¼¼
+  '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x22821)	; 𢠡
-    (=cns11643-6	. #x5C7A)	; &I-C6-5C7A; [60-90]
+    (->subsumptive
+     ((=daikanwa	  . 11185)	; &M-11185;
+      )
+     ((=ucs@iso		  . #x22821)	; &U-00022821;
+      )
+     ((=cns11643-6	  . #x5C7A)	; &C6-5C7A; [60-90]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x2281E)	; 𢠞
-    (=daikanwa		. 11186)	; &I-M-11186;
-    ))
-(define-char
-  '((=>ucs		. #x2281E)	; 𢠞
-    (morohashi-daikanwa	11186 0 0)
-    (ideographic-radical . 61)	; â¼¼
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-7	. #x2278)	; &C7-2278; [02-88]
+    (->subsumptive
+     ((=ucs@iso		  . #x2281E)	; &M-11186;
+      (=daikanwa	  . 11186)	; &M-11186;
+      )
+     ((=cns11643-7	  . #x2278)	; &C7-2278; [02-88]
+      ))
     ))
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x751C)	; 甜
+      )
+     ((=ucs		  . #x5FC3)	; 心
+      ))
     (=ucs		. #x6187)	; 憇
     (->subsumptive
      ((ideographic-structure
@@ -13089,7 +13185,7 @@
 (define-char
   '((ideographic-radical . 61)	; â¼¼
     (=ucs		. #x618E)	; 憎
-    (=jis-x0208@1997	. #x417E)	; 憎 [33-94]
+    (=>jis-x0208@1997	. #x417E)	; 憎 [33-94]
     ))
 (define-char
   '((<-denotational
@@ -13468,11 +13564,12 @@
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=big5		. #xBCA8)	; &B-BCA8;
+    (=>jis-x0213-1	. #x745E)	; &A-JX1-745E; [84-62]
+    (=big5		. #xBCA8)	; &A-JX1-745E;
     ))
 (define-char
   '((<-denotational
-     ((=big5		  . #xBCA8)	; &B-BCA8;
+     ((=>jis-x0213-1	  . #x745E)	; &A-JX1-745E; [84-62]
       ))
     (=>ucs*		. #x618E)	; 憎
     (ideographic-radical . 61)	; â¼¼
@@ -13487,7 +13584,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=big5		  . #xBCA8)	; &B-BCA8;
+     ((=>jis-x0213-1	  . #x745E)	; &A-JX1-745E; [84-62]
       ))
     (ideographic-radical . 61)	; â¼¼
     (ideographic-strokes . 12)
diff --git a/lisp/utf-2000/Ideograph-R063-Door.el b/lisp/utf-2000/Ideograph-R063-Door.el
index f0d27c6..a14a1da 100644
--- a/lisp/utf-2000/Ideograph-R063-Door.el
+++ b/lisp/utf-2000/Ideograph-R063-Door.el
@@ -459,23 +459,49 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x39C1)	; 㧁
-    (->subsumptive
-     ((=cns11643-4	  . #x294D)	; &M-11721; [09-45]
-      (=daikanwa	  . 11721)	; &I-M-11721;
-      )
-     ((=ucs@unicode	  . #x39C1)	; &UU+39C1;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x39C1)	; 㧁
+      ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=cns11643-4	. #x294D)	; &M-11721; [09-45]
+    (=daikanwa		. 11721)	; &I-M-11721;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x39C1)	; 㧁
       ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=ucs@unicode	. #x39C1)	; &UU+39C1;
     ))
 (define-char
   '((ideographic-radical . 63)	; â¼¾
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x22A36)	; 𢨶
-    (->subsumptive
-     ((=daikanwa	  . 11722)	; &M-11722;
-      )
-     ((=ucs@iso		  . #x22A36)	; &U-00022A36;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22A36)	; 𢨶
+      ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=daikanwa		. 11722)	; &M-11722;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22A36)	; 𢨶
       ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=ucs@iso		. #x22A36)	; &U-00022A36;
     ))
 (define-char
   '((ideographic-radical . 63)	; â¼¾
@@ -490,25 +516,56 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x6241)	; 扁
-    (->subsumptive
-     ((=ucs@big5	  . #x6241)	; &GT-14816;
+    (=>jis-x0208	. #x5928)	; 扁 [57-08]
+    (=>jis-x0213-1	. #x5928)	; 扁 [57-08]
+    (=big5		. #xABF3)	; &I-B-ABF3;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6241)	; 扁
+      ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=ucs@jis/2004	. #x6241)	; &GT-14816;
+    (=ks-x1001		. #x7837)	; &GT-14816; [88-23]
+    (=cns11643-1	. #x5137)	; &I-C1-5137; [49-23]
+    (=jis-x0213-1@2004	. #x5928)	; &I-JX3-5928; [57-08]
+    (=gt		. 14816)	; &I-GT-14816;
+    (=gt-k		. 05246)	; &I-GT-K05246;
+    (=gt-pj-3		. #x5B46)	; &I-GT-14816; [59-38]
+    (=daikanwa		. 11724)	; &I-M-11724;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6241)	; 扁
+      ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=ucs@unicode	. #x6241)	; &G0-3162;
+    (=gb2312		. #x3162)	; &G0-3162; [17-66]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6241)	; 扁
+      ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=ucs@jis/1990	. #x6241)	; &GT-14817;
+    (=ucs@jis/2000	. #x6241)	; &GT-14817;
+    (=jis-x0208		. #x5928)	; &GT-14817; [57-08]
+    (=jis-x0213-1@2000	. #x5928)	; &I-JX1-5928; [57-08]
+    (=gt		. 14817)	; &I-GT-14817;
+    (=gt-k		. 05247)	; &I-GT-K05247;
+    (=gt-pj-1		. #x5928)	; &I-GT-14817; [57-08]
+    (<-simplified@JP/extra/design
+     ((=ucs@jis/2004	  . #x6241)	; &GT-14816;
       (=ks-x1001	  . #x7837)	; &GT-14816; [88-23]
       (=cns11643-1	  . #x5137)	; &I-C1-5137; [49-23]
-      (=big5		  . #xABF3)	; &I-B-ABF3;
-      (=gt		  . 14816)	; &I-GT-14816;
-      (=gt-k		  . 05246)	; &I-GT-K05246;
-      (=gt-pj-3		  . #x5B46)	; &I-GT-14816; [59-38]
+      (=jis-x0213-1@2004  . #x5928)	; &I-JX3-5928; [57-08]
       (=daikanwa	  . 11724)	; &I-M-11724;
-      )
-     ((=ucs@jis		  . #x6241)	; &GT-14817;
-      (=jis-x0208	  . #x5928)	; &GT-14817; [57-08]
-      (=jis-x0213-1	  . #x5928)	; &I-JX1-5928; [57-08]
-      (=gt		  . 14817)	; &I-GT-14817;
-      (=gt-k		  . 05247)	; &I-GT-K05247;
-      (=gt-pj-1		  . #x5928)	; &I-GT-14817; [57-08]
-      )
-     ((=ucs@unicode	  . #x6241)	; &G0-3162;
-      (=gb2312		  . #x3162)	; &G0-3162; [17-66]
       ))
     ))
 (define-char
@@ -883,18 +940,43 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x6249)	; 扉
-    (=jis-x0208@1997	. #x4862)	; 扉 [40-66]
+    (=>jis-x0208	. #x4862)	; 扉 [40-66]
+    (=>jis-x0213-1	. #x4862)	; 扉 [40-66]
+    (=big5		. #xB476)	; &I-B-B476;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6249)	; 扉
+      ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
     (->subsumptive
-     ((=ucs@big5	  . #x6249)	; &B-B476;
-      (=big5		  . #xB476)	; &B-B476;
-      (->subsumptive
-       ((=jis-x0208@1978    . #x4862)	; &M-11750; [40-66]
-	(=daikanwa	    . 11750)	; &I-M-11750;
-	)
-       ((=ks-x1001	    . #x5D6A)	; &C1-5F3D; [61-74]
-	(=cns11643-1	    . #x5F3D)	; &I-C1-5F3D; [63-29]
-	))
+     ((=jis-x0208@1978	  . #x4862)	; &M-11750; [40-66]
+      (=daikanwa	  . 11750)	; &I-M-11750;
       )
+     ((=ks-x1001	  . #x5D6A)	; &C1-5F3D; [61-74]
+      (=cns11643-1	  . #x5F3D)	; &I-C1-5F3D; [63-29]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6249)	; 扉
+      ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=ucs@unicode	. #x6249)	; &G0-6C69;
+    (=gb2312		. #x6C69)	; &G0-6C69; [76-73]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6249)	; 扉
+      ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (->subsumptive
      ((=jis-x0208@1983	  . #x4862)	; &J83-4862; [40-66]
       (=jef-china3	  . #x4EF9)	; &I-JC3-4EF9;
       )
@@ -903,9 +985,6 @@
       (=jis-x0213-1	  . #x4862)	; &I-JX1-4862; [40-66]
       (=gt		  . 14856)	; &I-GT-14856;
       (=gt-pj-1		  . #x4862)	; &I-GT-14856; [40-66]
-      )
-     ((=ucs@unicode	  . #x6249)	; &G0-6C69;
-      (=gb2312		  . #x6C69)	; &G0-6C69; [76-73]
       ))
     ))
 (define-char
@@ -913,19 +992,33 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x624A)	; 扊
+    (=big5		. #xD951)	; &I-B-D951;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x624A)	; 扊
+      ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
     (->subsumptive
-     ((=ucs@big5	  . #x624A)	; &M-11751;
-      (=big5		  . #xD951)	; &M-11751;
-      (=daikanwa	  . 11751)	; &I-M-11751;
+     ((=daikanwa	  . 11751)	; &M-11751;
       )
      ((=ucs@cns		  . #x624A)	; &C2-3B74;
       (=cns11643-2	  . #x3B74)	; &C2-3B74; [27-84]
-      )
-     ((=ucs@unicode	  . #x624A)	; &EGB-2C48;
-      (=iso-ir165	  . #x2C48)	; &EGB-2C48; [12-40]
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x624A)	; 扊
+      ))
+    (ideographic-radical . 63)	; â¼¾
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=ucs@unicode	. #x624A)	; &EGB-2C48;
+    (=iso-ir165		. #x2C48)	; &EGB-2C48; [12-40]
+    ))
+(define-char
   '((ideographic-radical . 63)	; â¼¾
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
diff --git a/lisp/utf-2000/Ideograph-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el
index efd8396..98c1592 100644
--- a/lisp/utf-2000/Ideograph-R064-Hand.el
+++ b/lisp/utf-2000/Ideograph-R064-Hand.el
@@ -2756,41 +2756,33 @@
     (=gt		. 15084)	; &I-GT-15084;
     (=gt-pj-1		. #x476F)	; &I-GT-15084; [39-79]
     (=daikanwa		. 11952)	; &I-M-11952;
+    (=shinjigen@1ed	.  2885)	; 拍
     (=shinjigen@rev	.  2883)	; 拍
     ))
 (define-char
-  '((=>ucs		. #x62CE)	; 拎
-    (ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=ucs@jis		. #x62CE)	; &M-11953;
-    (=ucs@big5		. #x62CE)	; &M-11953;
-    (=jis-x0212		. #x3F52)	; &M-11953; [31-50]
-    (=big5		. #xA9F0)	; &I-B-A9F0;
-    (=daikanwa		. 11953)	; &I-M-11953;
-    (=jef-china3	. #x4FB9)	; &I-JC3-4FB9;
-    ))
-(define-char
-  '((=>ucs		. #x62CE)	; 拎
-    (morohashi-daikanwa	11953 0 1)
-    (ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 5)
-    (total-strokes	 . 8)
-    (=cns11643-1	. #x4D72)	; &C1-4D72; [45-82]
-    ))
-(define-char
-  '((morohashi-daikanwa	11953 0 2)
-    (ideographic-radical . 64)	; ⼿
+  '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x62CE)	; 拎
-    (=gb2312		. #x4160)	; &I-G0-4160; [33-64]
+    (=big5		. #xA9F0)	; &I-B-A9F0;
+    (->subsumptive
+     ((=ucs@jis		  . #x62CE)	; &M-11953;
+      (=jis-x0212	  . #x3F52)	; &M-11953; [31-50]
+      (=daikanwa	  . 11953)	; &I-M-11953;
+      (=jef-china3	  . #x4FB9)	; &I-JC3-4FB9;
+      )
+     ((=cns11643-1	  . #x4D72)	; &C1-4D72; [45-82]
+      )
+     ((=ucs@unicode	  . #x62CE)	; &G0-4160;
+      (=gb2312		  . #x4160)	; &G0-4160; [33-64]
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x62CF)	; 拏
+    (=big5		. #xCED4)	; &I-B-CED4;
     (->subsumptive
      ((=jis-x0208@1978	  . #x593C)	; &M-11954; [57-28]
       (=jis-x0208@1983	  . #x593C)	; &I-J83-593C; [57-28]
@@ -2804,7 +2796,6 @@
       (=ks-x1001	  . #x5159)	; &GT-15200; [49-57]
       (=jis-x0208@1990	  . #x593C)	; &I-J90-593C; [57-28]
       (=jis-x0213-1	  . #x593C)	; &I-JX1-593C; [57-28]
-      (=big5		  . #xCED4)	; &I-B-CED4;
       (=gt		  . 15200)	; &I-GT-15200;
       (=gt-k		  . 05248)	; &I-GT-K05248;
       (=gt-pj-1		  . #x593C)	; &I-GT-15200; [57-28]
@@ -2815,31 +2806,87 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 8)
     (=ucs		. #x62D0)	; 拐
-    (=jis-x0208@1997	. #x327D)	; 拐 [18-93]
-    (->subsumptive
+    (=>jis-x0208	. #x327D)	; 拐 [18-93]
+    (=>jis-x0213-1	. #x327D)	; 拐 [18-93]
+    (=big5		. #xA9E4)	; &I-B-A9E4;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x62D0)	; 拐
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (=ucs@jis		. #x62D0)	; &GT-15032;
+    (=jis-x0208@1983	. #x327D)	; &GT-15032; [18-93]
+    (=jis-x0208@1990	. #x327D)	; &I-J90-327D; [18-93]
+    (=cns11643-1	. #x4D66)	; &I-C1-4D66; [45-70]
+    (=jis-x0213-1	. #x327D)	; &I-JX1-327D; [18-93]
+    (=gt		. 15032)	; &I-GT-15032;
+    (=gt-k		. 03656)	; &I-GT-K03656;
+    (=gt-pj-1		. #x327D)	; &I-GT-15032; [18-93]
+    (=daikanwa		. 11955)	; &I-M-11955;
+    (=shinjigen@1ed	.  2852)	; &GT-15032;
+    (=shinjigen@rev	.  2851)	; &GT-15032;
+    (=jef-china3	. #x4FBB)	; &I-JC3-4FBB;
+    (<-vulgar
+     ((=shinjigen@1ed	  .  2851)	; &JC3-4FBA;
+      (=jef-china3	  . #x4FBA)	; &JC3-4FBA;
+      ))
+    (<-vulgar*sources
+     shinjigen@1ed)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x62D0)	; 拐
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (=shinjigen@1ed	.  2851)	; &JC3-4FBA;
+    (=shinjigen@rev	.  2852)	; &JC3-4FBA;
+    (=jef-china3	. #x4FBA)	; &JC3-4FBA;
+    (<-original
      ((=ucs@jis		  . #x62D0)	; &GT-15032;
-      (=ucs@big5	  . #x62D0)	; &GT-15032;
       (=jis-x0208@1983	  . #x327D)	; &GT-15032; [18-93]
       (=jis-x0208@1990	  . #x327D)	; &I-J90-327D; [18-93]
       (=cns11643-1	  . #x4D66)	; &I-C1-4D66; [45-70]
       (=jis-x0213-1	  . #x327D)	; &I-JX1-327D; [18-93]
-      (=big5		  . #xA9E4)	; &I-B-A9E4;
-      (=gt		  . 15032)	; &I-GT-15032;
-      (=gt-k		  . 03656)	; &I-GT-K03656;
-      (=gt-pj-1		  . #x327D)	; &I-GT-15032; [18-93]
       (=daikanwa	  . 11955)	; &I-M-11955;
-      (=shinjigen@1ed	  .  2852)	; &GT-15032;
       (=shinjigen@rev	  .  2851)	; &GT-15032;
-      (=jef-china3	  . #x4FBB)	; &I-JC3-4FBB;
-      )
+      ))
+    (<-original*sources
+     shinjigen@rev)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x62D0)	; 拐
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 5)
+    (total-strokes	 . 8)
+    (=ucs@unicode	. #x62D0)	; &J78-327D;
+    (=jis-x0208@1978	. #x327D)	; &J78-327D; [18-93]
+    (=gb2312		. #x3955)	; &I-G0-3955; [25-53]
+    (=ks-x1001		. #x4E58)	; &I-K0-4E58; [46-56]
+    (=shinjigen		.  2853)	; &J78-327D;
+    (<-vulgar@shinjigen/1ed
      ((=shinjigen@1ed	  .  2851)	; &JC3-4FBA;
       (=jef-china3	  . #x4FBA)	; &JC3-4FBA;
-      )
-     ((=ucs@unicode	  . #x62D0)	; &J78-327D;
-      (=jis-x0208@1978	  . #x327D)	; &J78-327D; [18-93]
-      (=gb2312		  . #x3955)	; &I-G0-3955; [25-53]
-      (=ks-x1001	  . #x4E58)	; &I-K0-4E58; [46-56]
       ))
+    (<-vulgar@shinjigen/1ed*sources
+     shinjigen@1ed)
+    (<-vulgar@shinjigen/rev
+     ((=ucs@jis		  . #x62D0)	; &GT-15032;
+      (=jis-x0208@1983	  . #x327D)	; &GT-15032; [18-93]
+      (=jis-x0208@1990	  . #x327D)	; &I-J90-327D; [18-93]
+      (=cns11643-1	  . #x4D66)	; &I-C1-4D66; [45-70]
+      (=jis-x0213-1	  . #x327D)	; &I-JX1-327D; [18-93]
+      (=daikanwa	  . 11955)	; &I-M-11955;
+      (=shinjigen@rev	  .  2851)	; &GT-15032;
+      ))
+    (<-vulgar@shinjigen/rev*sources
+     shinjigen@rev)
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -2854,7 +2901,7 @@
     (=gt-k		. 03879)	; &I-GT-K03879;
     (=gt-pj-1		. #x593A)	; &I-GT-15037; [57-26]
     (=daikanwa		. 11956)	; &I-M-11956;
-    (=shinjigen@rev	.  2857)	; 拑
+    (=shinjigen		.  2857)	; 拑
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -3611,35 +3658,51 @@
     (=ucs		. #x22AE6)	; 𢫦
     (=cns11643-4	. #x2958)	; &I-C4-2958; [09-56]
     (=daikanwa		. 11999)	; &I-M-11999;
+    (=shinjigen@1ed	.  2886)	; 𢫦
+    (=shinjigen@rev	.  2884)	; 𢫦
     (=hanziku-5		. #xD6C3)	; &I-HZK05-D6C3;
+    (=cbeta		. 07882)	; &I-CB07882;
+    (<-original
+     ((=ucs		  . #x62CD)	; 拍
+      (=jis-x0208	  . #x476F)	; &I-J90-476F; [39-79]
+      (=shinjigen@1ed	  .  2885)	; 拍
+      (=shinjigen@rev	  .  2883)	; 拍
+      ))
+    (<-original*sources
+     shinjigen@1ed shinjigen@rev)
     ))
 (define-char
-  '((=>ucs		. #x62F4)	; 拴
-    (ideographic-radical . 64)	; ⼿
+  '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=ucs@jis		. #x62F4)	; &M-12000;
-    (=ucs@big5		. #x62F4)	; &M-12000;
-    (=jis-x0212		. #x3F58)	; &M-12000; [31-56]
+    (=ucs		. #x62F4)	; 拴
     (=big5		. #xAC43)	; &I-B-AC43;
-    (=daikanwa		. 12000)	; &I-M-12000;
-    (=jef-china3	. #x4FBF)	; &I-JC3-4FBF;
     ))
 (define-char
-  '((=>ucs		. #x62F4)	; 拴
-    (morohashi-daikanwa	12000 0 0)
+  '((<-denotational
+     ((=ucs		  . #x62F4)	; 拴
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=cns11643-1	. #x5146)	; &C1-5146; [49-38]
+    (->subsumptive
+     ((=ucs@jis		  . #x62F4)	; &M-12000;
+      (=jis-x0212	  . #x3F58)	; &M-12000; [31-56]
+      (=daikanwa	  . 12000)	; &I-M-12000;
+      (=jef-china3	  . #x4FBF)	; &I-JC3-4FBF;
+      )
+     ((=cns11643-1	  . #x5146)	; &C1-5146; [49-38]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	12000 0 1)
+  '((<-denotational
+     ((=ucs		  . #x62F4)	; 拴
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=ucs		. #x62F4)	; 拴
-    (=gb2312		. #x4B29)	; &I-G0-4B29; [43-09]
+    (=ucs@unicode	. #x62F4)	; &G0-4B29;
+    (=gb2312		. #x4B29)	; &G0-4B29; [43-09]
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -3653,6 +3716,7 @@
     (=gt		. 15196)	; &I-GT-15196;
     (=gt-pj-1		. #x594F)	; &I-GT-15196; [57-47]
     (=daikanwa		. 12001)	; &I-M-12001;
+    (=shinjigen@1ed	.  2919)	; 拵
     (=shinjigen@rev	.  2921)	; 拵
     ))
 (define-char
@@ -3823,6 +3887,15 @@
     (=daikanwa		. 12012)	; &I-M-12012;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x62FC)	; 拼
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (=jef-china3	. #x4FC0)	; &JC3-4FC0;
+    ))
+(define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
@@ -3833,7 +3906,15 @@
     (=jis-x0213-2	. #x2D25)	; &I-JX2-2D25; [13-05]
     (=big5		. #xABFB)	; &I-B-ABFB;
     (=daikanwa		. 12013)	; &I-M-12013;
+    (=shinjigen		.  3407)	; 拽
     (=jef-china3	. #x4FC1)	; &I-JC3-4FC1;
+    (<-formed
+     ((=ucs		  . #x66F3)	; 曳
+      (=jis-x0208	  . #x3148)	; &I-J90-3148; [17-40]
+      (=shinjigen	  .  3406)	; 曳
+      ))
+    (<-formed*sources
+     shinjigen)
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -5232,28 +5313,32 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x633A)	; 挺
+    (=>jis-x0208	. #x4472)	; 挺 [36-82]
+    (=>jis-x0213-1	. #x4472)	; 挺 [36-82]
     (=big5		. #xAEBC)	; &I-B-AEBC;
     (->subsumptive
-     ((=ucs@jis		  . #x633A)	; &GT-15324;
+     ((=ucs@jis/1990	  . #x633A)	; &GT-15324;
+      (=ucs@jis/2000	  . #x633A)	; &GT-15324;
       (=jis-x0208	  . #x4472)	; &GT-15324; [36-82]
       (=ks-x1001	  . #x6F58)	; &I-K0-6F58; [79-56]
-      (=jis-x0213-1	  . #x4472)	; &I-JX1-4472; [36-82]
+      (=jis-x0213-1@2000  . #x4472)	; &I-JX1-4472; [36-82]
       (=gt		  . 15324)	; &I-GT-15324;
       (=gt-pj-1		  . #x4472)	; &I-GT-15324; [36-82]
       (=daikanwa	  . 12106)	; &I-M-12106;
       )
-     ((=ucs@unicode	  . #x633A)	; &C1-555E;
-      (=gb2312		  . #x4D26)	; &C1-555E; [45-06]
+     ((=ucs@unicode	  . #x633A)	; &JX3-4472;
+      (=gb2312		  . #x4D26)	; &JX3-4472; [45-06]
       (=cns11643-1	  . #x555E)	; &I-C1-555E; [53-62]
+      (=jis-x0213-1@2004  . #x4472)	; &I-JX3-4472; [36-82]
       ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
     (=ucs		. #x633B)	; 挻
+    (=big5		. #xD57D)	; &I-B-D57D;
     (->subsumptive
      ((ideographic-strokes . 7)
       (total-strokes	   . 10)
-      (=big5		  . #xD57D)	; &B-D57D;
       (->subsumptive
        ((=ucs@jis	    . #x633B)	; &M-12107;
 	(=ks-x1001	    . #x6649)	; &M-12107; [70-41]
@@ -5327,23 +5412,45 @@
     (->subsumptive
      ((ideographic-strokes . 7)
       (total-strokes	   . 10)
-      (=ucs@unicode	  . #x633D)	; &M-12111;
-      (=jis-x0208@1978	  . #x4854)	; &M-12111; [40-52]
-      (=gb2312		  . #x4D6C)	; &I-G0-4D6C; [45-76]
-      (=ks-x1001	  . #x5838)	; &I-K0-5838; [56-24]
-      (=cns11643-1	  . #x5560)	; &I-C1-5560; [53-64]
-      (=big5		  . #xAEBE)	; &I-B-AEBE;
-      (=daikanwa	  . 12111)	; &I-M-12111;
-      (=jef-china3	  . #x70BF)	; &I-JC3-70BF;
+      (=big5		  . #xAEBE)	; &B-AEBE;
+      (->subsumptive
+       ((=ucs@jis/2004	    . #x633D)	; &M-12111;
+	(=jis-x0208@1978    . #x4854)	; &M-12111; [40-52]
+	(=jis-x0213-1@2004  . #x4854)	; &I-JX3-4854; [40-52]
+	(=daikanwa	    . 12111)	; &I-M-12111;
+	(<-same
+	 ((=ucs@unicode	      . #x8F13)	; &GT-51187;
+	  (=jis-x0208@1983    . #x6D4E)	; &GT-51187; [77-46]
+	  (=ks-x1001	      . #x5842)	; &I-K0-5842; [56-34]
+	  (=cns11643-1	      . #x6B3D)	; &I-C1-6B3D; [75-29]
+	  (=jis-x0213-1	      . #x6D4E)	; &I-JX1-6D4E; [77-46]
+	  (=daikanwa	      . 38337)	; &I-M-38337;
+	  ))
+	(<-same*sources
+	 jiyun daikanwa)
+	)
+       ((=ucs@unicode	    . #x633D)	; &C1-5560;
+	(=gb2312	    . #x4D6C)	; &C1-5560; [45-76]
+	(=ks-x1001	    . #x5838)	; &I-K0-5838; [56-24]
+	(=cns11643-1	    . #x5560)	; &I-C1-5560; [53-64]
+	))
       )
      ((ideographic-strokes . 8)
       (total-strokes	   . 11)
-      (=ucs@jis		  . #x633D)	; &GT-15498;
+      (=ucs@jis/1990	  . #x633D)	; &GT-15498;
+      (=ucs@jis/2000	  . #x633D)	; &GT-15498;
       (=jis-x0208@1983	  . #x4854)	; &GT-15498; [40-52]
       (=jis-x0208@1990	  . #x4854)	; &I-J90-4854; [40-52]
-      (=jis-x0213-1	  . #x4854)	; &I-JX1-4854; [40-52]
+      (=jis-x0213-1@2000  . #x4854)	; &I-JX1-4854; [40-52]
       (=gt		  . 15498)	; &I-GT-15498;
       (=gt-pj-1		  . #x4854)	; &I-GT-15498; [40-52]
+      (=jef-china3	  . #x70BF)	; &I-JC3-70BF;
+      (<-simplified@JP/extra/design
+       ((=ucs@jis/2004	    . #x633D)	; &M-12111;
+	(=jis-x0208@1978    . #x4854)	; &M-12111; [40-52]
+	(=jis-x0213-1@2004  . #x4854)	; &I-JX3-4854; [40-52]
+	(=daikanwa	    . 12111)	; &I-M-12111;
+	))
       ))
     ))
 (define-char
@@ -5766,43 +5873,62 @@
     (=hanziku-5		. #xDA66)	; &I-HZK05-DA66;
     ))
 (define-char
-  '((=>ucs		. #x634A)	; 捊
+  '((ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=ucs		. #x634A)	; 捊
+    (=big5		. #xD1BC)	; &I-B-D1BC;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x634A)	; 捊
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs@jis		. #x634A)	; &M-12139;
-    (=ucs@big5		. #x634A)	; &M-12139;
     (=jis-x0212		. #x3F70)	; &M-12139; [31-80]
-    (=big5		. #xD1BC)	; &I-B-D1BC;
     (=daikanwa		. 12139)	; &I-M-12139;
     ))
 (define-char
-  '((morohashi-daikanwa	12139 0 2)
+  '((<-denotational
+     ((=ucs		  . #x634A)	; 捊
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=ucs		. #x634A)	; 捊
-    (=cns11643-2	. #x2F3E)	; &I-C2-2F3E; [15-30]
+    (=ucs@unicode	. #x634A)	; &C2-2F3E;
+    (=cns11643-2	. #x2F3E)	; &C2-2F3E; [15-30]
+    ))
+(define-char
+  '((ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=ucs		. #x634B)	; 捋
+    (=big5		. #xD1BB)	; &I-B-D1BB;
     ))
 (define-char
-  '((=>ucs		. #x634B)	; 捋
+  '((<-denotational
+     ((=ucs		  . #x634B)	; 捋
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs@jis		. #x634B)	; &M-12140;
-    (=ucs@big5		. #x634B)	; &M-12140;
     (=jis-x0212		. #x3F71)	; &M-12140; [31-81]
-    (=big5		. #xD1BB)	; &I-B-D1BB;
     (=daikanwa		. 12140)	; &I-M-12140;
     (=shinjigen@1ed	.  2950)	; &M-12140;
+    (=shinjigen@rev	.  2953)	; &M-12140;
     ))
 (define-char
-  '((morohashi-daikanwa	12140 0 2)
+  '((<-denotational
+     ((=ucs		  . #x634B)	; 捋
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (=ucs		. #x634B)	; 捋
-    (=gb2312		. #x5E5B)	; &I-G0-5E5B; [62-59]
+    (=ucs@unicode	. #x634B)	; &C2-2F3D;
+    (=gb2312		. #x5E5B)	; &C2-2F3D; [62-59]
     (=cns11643-2	. #x2F3D)	; &I-C2-2F3D; [15-29]
     ))
 (define-char
@@ -5810,29 +5936,44 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x634C)	; 捌
-    (=jis-x0208@1997	. #x3B2B)	; 捌 [27-11]
+    (=>jis-x0208	. #x3B2B)	; 捌 [27-11]
+    (=>jis-x0213-1	. #x3B2B)	; 捌 [27-11]
+    (=big5		. #xAEC3)	; &I-B-AEC3;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x634C)	; 捌
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
     (->subsumptive
      ((=jis-x0208@1978	  . #x3B2B)	; &M-12141; [27-11]
       (=daikanwa	  . 12141)	; &I-M-12141;
       )
      ((=ucs@jis		  . #x634C)	; &GT-15341;
-      (=ucs@big5	  . #x634C)	; &GT-15341;
       (=jis-x0208@1983	  . #x3B2B)	; &GT-15341; [27-11]
       (=ks-x1001	  . #x7824)	; &I-K0-7824; [88-04]
       (=jis-x0208@1990	  . #x3B2B)	; &I-J90-3B2B; [27-11]
       (=cns11643-1	  . #x5565)	; &I-C1-5565; [53-69]
       (=jis-x0213-1	  . #x3B2B)	; &I-JX1-3B2B; [27-11]
-      (=big5		  . #xAEC3)	; &I-B-AEC3;
       (=gt		  . 15341)	; &I-GT-15341;
       (=gt-pj-1		  . #x3B2B)	; &I-GT-15341; [27-11]
       (=shinjigen@1ed	  .  2945)	; &GT-15341;
       (=shinjigen@rev	  .  2948)	; &GT-15341;
-      )
-     ((=ucs@unicode	  . #x634C)	; &G0-3046;
-      (=gb2312		  . #x3046)	; &G0-3046; [16-38]
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x634C)	; 捌
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=ucs@unicode	. #x634C)	; &G0-3046;
+    (=gb2312		. #x3046)	; &G0-3046; [16-38]
+    ))
+(define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
@@ -6109,7 +6250,8 @@
 (define-char
   '((ideographic-radical . 64)	; ⼿
     (=ucs		. #x6357)	; 捗
-    (=jis-x0208@1997	. #x443D)	; 捗 [36-29]
+    (=>jis-x0208	. #x443D)	; 捗 [36-29]
+    (=>jis-x0213-1	. #x443D)	; 捗 [36-29]
     ))
 (define-char
   '((<-denotational
@@ -6118,10 +6260,12 @@
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (=ucs@big5		. #x6357)	; &B-D1CA;
+    (=big5		. #xD1CA)	; &B-D1CA;
     (->subsumptive
-     ((=ucs@big5	  . #x6357)	; &M-12160;
+     ((=ucs@jis/2004	  . #x6357)	; &M-12160;
       (=jis-x0208@1978	  . #x443D)	; &M-12160; [36-29]
-      (=big5		  . #xD1CA)	; &I-B-D1CA;
+      (=jis-x0213-1@2004  . #x443D)	; &I-JX3-443D; [36-29]
       (=daikanwa	  . 12160)	; &I-M-12160;
       )
      ((=ucs@unicode	  . #x6357)	; &C2-2F4C;
@@ -6135,16 +6279,18 @@
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs@jis		. #x6357)	; &GT-15474;
+    (=ucs@jis/1990	. #x6357)	; &GT-15474;
+    (=ucs@jis/2000	. #x6357)	; &GT-15474;
     (=jis-x0208@1983	. #x443D)	; &GT-15474; [36-29]
     (=jis-x0208@1990	. #x443D)	; &I-J90-443D; [36-29]
-    (=jis-x0213-1	. #x443D)	; &I-JX1-443D; [36-29]
+    (=jis-x0213-1@2000	. #x443D)	; &I-JX1-443D; [36-29]
     (=gt		. 15474)	; &I-GT-15474;
     (=gt-pj-1		. #x443D)	; &I-GT-15474; [36-29]
     (=jef-china3	. #x50BC)	; &I-JC3-50BC;
-    (<-simplified@JP
-     ((=ucs@big5	  . #x6357)	; &M-12160;
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x6357)	; &M-12160;
       (=jis-x0208@1978	  . #x443D)	; &M-12160; [36-29]
+      (=jis-x0213-1@2004  . #x443D)	; &I-JX3-443D; [36-29]
       (=daikanwa	  . 12160)	; &I-M-12160;
       ))
     ))
@@ -6462,13 +6608,6 @@
     (mojikyo		. 060413)	; &MCS-6000EBFD;
     ))
 (define-char
-  '((=>ucs		. #x22B87)	; 𢮇
-    (ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=cns11643-5	. #x2D6E)	; &C5-2D6E; [13-78]
-    ))
-(define-char
   '((=>ucs*		. #x633D)	; 挽
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 7)
@@ -6678,28 +6817,30 @@
 (define-char
   '((ideographic-radical . 64)	; ⼿
     (=ucs		. #x6369)	; 捩
+    (=>jis-x0208	. #x5960)	; 捩 [57-64]
+    (=>jis-x0213-1	. #x5960)	; 捩 [57-64]
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x6369)	; &B-B1CA;
-      (=big5		  . #xB1CA)	; &B-B1CA;
+     ((=ucs		  . #x6369)	; 捩
       ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=jis-x0208@1978	. #x5960)	; &M-12192; [57-64]
-    (=cns11643-1	. #x5A6E)	; &I-C1-5A6E; [58-78]
-    (=daikanwa		. 12192)	; &I-M-12192;
+    (=ucs@big5		. #x6369)	; &B-B1CA;
+    (=big5		. #xB1CA)	; &B-B1CA;
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x6369)	; 捩
+     ((=ucs@big5	  . #x6369)	; &B-B1CA;
+      (=big5		  . #xB1CA)	; &B-B1CA;
       ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs@big5		. #x6369)	; &B-B1CA;
-    (=big5		. #xB1CA)	; &B-B1CA;
+    (=jis-x0208@1978	. #x5960)	; &M-12192; [57-64]
+    (=cns11643-1	. #x5A6E)	; &I-C1-5A6E; [58-78]
+    (=daikanwa		. 12192)	; &I-M-12192;
     ))
 (define-char
   '((<-denotational
@@ -6726,6 +6867,11 @@
     (=gt		. 15364)	; &I-GT-15364;
     (=gt-pj-1		. #x5960)	; &I-GT-15364; [57-64]
     (=jef-china3	. #x70C0)	; &I-JC3-70C0;
+    (<-simplified@JP/jis
+     ((=jis-x0208@1978	  . #x5960)	; &M-12192; [57-64]
+      (=cns11643-1	  . #x5A6E)	; &I-C1-5A6E; [58-78]
+      (=daikanwa	  . 12192)	; &I-M-12192;
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -6861,9 +7007,28 @@
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
+    (=ucs		. #x22B87)	; 𢮇
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22B87)	; 𢮇
+      ))
+    (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
+    (hanyu-dazidian	3 1891 2)
+    (=ucs@iso		. #x22B87)	; &M-12202;
     (=daikanwa		. 12202)	; &M-12202;
+    (=hanziku-5		. #xDBAC)	; &I-HZK05-DBAC;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22B87)	; 𢮇
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=cns11643-5	. #x2D6E)	; &C5-2D6E; [13-78]
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -6878,7 +7043,8 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x636E)	; 据
-    (=jis-x0208@1997	. #x3F78)	; 据 [31-88]
+    (=>jis-x0208	. #x3F78)	; 据 [31-88]
+    (=>jis-x0213-1	. #x3F78)	; 据 [31-88]
     (->subsumptive
      ((=jis-x0208@1978	  . #x3F78)	; &GT-15394; [31-88]
       (=jis-x0208@1983	  . #x3F78)	; &I-J83-3F78; [31-88]
@@ -6932,7 +7098,8 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x6372)	; 捲
-    (=jis-x0208@1997	. #x377E)	; 捲 [23-94]
+    (=>jis-x0208	. #x377E)	; 捲 [23-94]
+    (=>jis-x0213-1	. #x377E)	; 捲 [23-94]
     ))
 (define-char
   '((<-denotational
@@ -6943,15 +7110,32 @@
     (total-strokes	 . 11)
     (=ucs@big5		. #x6372)	; &B-B1B2;
     (=big5		. #xB1B2)	; &B-B1B2;
-    (->subsumptive
-     ((=jis-x0208@1978	  . #x377E)	; &M-12208; [23-94]
-      (=ks-x1001	  . #x4F6C)	; &I-K0-4F6C; [47-76]
-      (=daikanwa	  . 12208)	; &I-M-12208;
-      )
-     ((=ucs@unicode	  . #x6372)	; &C1-5A56;
-      (=cns11643-1	  . #x5A56)	; &C1-5A56; [58-54]
-      (=gb12345		  . #x7847)	; &C1-5A56; [88-39]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs@big5	  . #x6372)	; &B-B1B2;
+      (=big5		  . #xB1B2)	; &B-B1B2;
       ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (=ucs@jis/2004	. #x6372)	; &M-12208;
+    (=jis-x0208@1978	. #x377E)	; &M-12208; [23-94]
+    (=ks-x1001		. #x4F6C)	; &I-K0-4F6C; [47-76]
+    (=jis-x0213-1@2004	. #x377E)	; &I-JX3-377E; [23-94]
+    (=daikanwa		. 12208)	; &I-M-12208;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs@big5	  . #x6372)	; &B-B1B2;
+      (=big5		  . #xB1B2)	; &B-B1B2;
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (=ucs@unicode	. #x6372)	; &C1-5A56;
+    (=cns11643-1	. #x5A56)	; &C1-5A56; [58-54]
+    (=gb12345		. #x7847)	; &C1-5A56; [88-39]
     ))
 (define-char
   '((<-denotational
@@ -6960,10 +7144,11 @@
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs@jis		. #x6372)	; &GT-15578;
+    (=ucs@jis/1990	. #x6372)	; &GT-15578;
+    (=ucs@jis/2000	. #x6372)	; &GT-15578;
     (=jis-x0208@1983	. #x377E)	; &GT-15578; [23-94]
     (=jis-x0208@1990	. #x377E)	; &I-J90-377E; [23-94]
-    (=jis-x0213-1	. #x377E)	; &I-JX1-377E; [23-94]
+    (=jis-x0213-1@2000	. #x377E)	; &I-JX1-377E; [23-94]
     (=gt		. 15578)	; &I-GT-15578;
     (=gt-pj-1		. #x377E)	; &I-GT-15578; [23-94]
     (=jef-china3	. #x4FA2)	; &I-JC3-4FA2;
@@ -7373,22 +7558,13 @@
       ))
     ))
 (define-char
-  '((<-denotational
-     ((=ucs		  . #x62FC)	; 拼
-      ))
-    (=>daikanwa		. 12236)	; &GT-15509;
-    (ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=jef-china3	. #x4FC0)	; &JC3-4FC0;
-    ))
-(define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x6383)	; 掃
+    (=>jis-x0208	. #x415D)	; 掃 [33-61]
+    (=>jis-x0213-1	. #x415D)	; 掃 [33-61]
     (=big5		. #xB1BD)	; &I-B-B1BD;
-    (=jis-x0208@1997	. #x415D)	; 掃 [33-61]
     ))
 (define-char
   '((<-denotational
@@ -7448,21 +7624,33 @@
     (=jef-china3	. #x91D6)	; &I-JC3-91D6;
     ))
 (define-char
-  '((=>ucs		. #x6385)	; 掅
+  '((ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (=ucs		. #x6385)	; 掅
+    (=big5		. #xD5A2)	; &I-B-D5A2;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6385)	; 掅
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs@big5		. #x6385)	; &M-12239;
-    (=big5		. #xD5A2)	; &M-12239;
-    (=daikanwa		. 12239)	; &I-M-12239;
+    (=daikanwa		. 12239)	; &M-12239;
     ))
 (define-char
-  '((morohashi-daikanwa	12239 0 4)
+  '((<-denotational
+     ((=ucs		  . #x6385)	; 掅
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x6385)	; 掅
-    (=cns11643-2	. #x3564)	; &I-C2-3564; [21-68]
+    (->subsumptive
+     ((=ucs@unicode	  . #x6385)	; &UU+6385;
+      )
+     ((=cns11643-2	  . #x3564)	; &C2-3564; [21-68]
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -7478,23 +7666,19 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x6387)	; 掇
-    (=gb2312		. #x365E)	; &I-G0-365E; [22-62]
-    (=jis-x0212		. #x4027)	; &I-JSP-4027; [32-07]
-    (=cns11643-2	. #x3557)	; &I-C2-3557; [21-55]
     (=big5		. #xD573)	; &I-B-D573;
-    (=daikanwa		. 12241)	; &I-M-12241;
-    (=jef-china3	. #x4FDC)	; &I-JC3-4FDC;
-    ))
-(define-char
-  '((=>ucs		. #x6388)	; 授
-    (ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=daikanwa		. 12242)	; &M-12242;
+    (->subsumptive
+     ((=ucs@unicode	  . #x6387)	; &M-12241;
+      (=gb2312		  . #x365E)	; &M-12241; [22-62]
+      (=jis-x0212	  . #x4027)	; &I-JSP-4027; [32-07]
+      (=daikanwa	  . 12241)	; &I-M-12241;
+      )
+     ((=cns11643-2	  . #x3557)	; &C2-3557; [21-55]
+      (=jef-china3	  . #x4FDC)	; &I-JC3-4FDC;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	12242 0 2)
-    (ideographic-radical . 64)	; ⼿
+  '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x6388)	; 授
@@ -7506,6 +7690,8 @@
     (=big5		. #xB1C2)	; &I-B-B1C2;
     (=gt		. 15429)	; &I-GT-15429;
     (=gt-pj-1		. #x3C78)	; &I-GT-15429; [28-88]
+    (=daikanwa		. 12242)	; &I-M-12242;
+    (=shinjigen@1ed	.  2968)	; 授
     (=shinjigen@rev	.  2971)	; 授
     ))
 (define-char
@@ -8754,14 +8940,6 @@
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (hanyu-dazidian	3 1891 2)
-    (=ucs		. #x22B87)	; 𢮇
-    (=hanziku-5		. #xDBAC)	; &I-HZK05-DBAC;
-    ))
-(define-char
-  '((ideographic-radical . 64)	; ⼿
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
     (hanyu-dazidian	3 1897 2)
     (=ucs		. #x22B9A)	; 𢮚
     (=hanziku-5		. #xDCCF)	; &I-HZK05-DCCF;
@@ -8834,50 +9012,79 @@
     (=cbeta		. 00939)	; &I-CB00939;
     ))
 (define-char
-  '((=>ucs		. #x63BD)	; 掽
+  '((ideographic-radical . 64)	; ⼿
+    (=ucs		. #x63BD)	; 掽
+    (=big5		. #xD56B)	; &I-B-D56B;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x63BD)	; 掽
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs@jis		. #x63BD)	; &M-12312;
-    (=ucs@big5		. #x63BD)	; &M-12312;
     (=jis-x0212		. #x4034)	; &M-12312; [32-20]
     (=jis-x0213-2	. #x2D3B)	; &I-JX2-2D3B; [13-27]
-    (=big5		. #xD56B)	; &I-B-D56B;
     (=daikanwa		. 12312)	; &I-M-12312;
     ))
 (define-char
-  '((morohashi-daikanwa	12312 0 3)
+  '((<-denotational
+     ((=ucs		  . #x63BD)	; 掽
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
-    (=ucs		. #x63BD)	; 掽
-    (=cns11643-2	. #x354F)	; &I-C2-354F; [21-47]
+    (=ucs@unicode	. #x63BD)	; &C2-354F;
+    (=cns11643-2	. #x354F)	; &C2-354F; [21-47]
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x63BE)	; 掾
-    (=jis-x0208		. #x5961)	; &I-J90-5961; [57-65]
-    (=gb2312		. #x5E72)	; &I-G0-5E72; [62-82]
-    (=cns11643-2	. #x3C29)	; &I-C2-3C29; [28-09]
-    (=jis-x0213-1	. #x5961)	; &I-JX1-5961; [57-65]
     (=big5		. #xD964)	; &I-B-D964;
-    (=gt		. 15549)	; &I-GT-15549;
-    (=gt-k		. 09190)	; &I-GT-K09190;
-    (=gt-pj-1		. #x5961)	; &I-GT-15549; [57-65]
-    (=daikanwa		. 12313)	; &I-M-12313;
-    (=shinjigen@rev	.  3004)	; 掾
+    (->subsumptive
+     ((=ucs@jis		  . #x63BE)	; &GT-15549;
+      (=jis-x0208	  . #x5961)	; &GT-15549; [57-65]
+      (=jis-x0213-1	  . #x5961)	; &I-JX1-5961; [57-65]
+      (=gt		  . 15549)	; &I-GT-15549;
+      (=gt-k		  . 09190)	; &I-GT-K09190;
+      (=gt-pj-1		  . #x5961)	; &I-GT-15549; [57-65]
+      (=daikanwa	  . 12313)	; &I-M-12313;
+      (=shinjigen@1ed	  .  3002)	; &GT-15549;
+      (=shinjigen@rev	  .  3004)	; &GT-15549;
+      )
+     ((=ucs@unicode	  . #x63BE)	; &G0-5E72;
+      (=gb2312		  . #x5E72)	; &G0-5E72; [62-82]
+      )
+     ((=cns11643-2	  . #x3C29)	; &C2-3C29; [28-09]
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
+    (=ucs		. #x63BF)	; 掿
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x63BF)	; 掿
+      ))
+    (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs		. #x63BF)	; 掿
-    (=cns11643-3	. #x3B71)	; &I-C3-3B71; [27-81]
+    (=cns11643-3	. #x3B71)	; &M-12314; [27-81]
     (=daikanwa		. 12314)	; &I-M-12314;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x63BF)	; 掿
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (=ucs@unicode	. #x63BF)	; &UU+63BF;
+    ))
+(define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
@@ -8891,7 +9098,14 @@
     (=gt		. 15565)	; &I-GT-15565;
     (=gt-pj-1		. #x5963)	; &I-GT-15565; [57-67]
     (=daikanwa		. 12315)	; &I-M-12315;
-    (=shinjigen@rev	.  3537)	; 揀
+    (=shinjigen		.  3537)	; 揀
+    (<-formed
+     ((=ucs		  . #x67EC)	; 柬
+      (=jis-x0208	  . #x5B4B)	; &I-J90-5B4B; [59-43]
+      (=shinjigen	  .  3536)	; 柬
+      ))
+    (<-formed*sources
+     shinjigen)
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -8913,28 +9127,41 @@
     (=daikanwa		. 12317)	; &I-M-12317;
     ))
 (define-char
-  '((=>ucs		. #x63C2)	; 揂
+  '((ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (=ucs		. #x63C2)	; 揂
+    (=big5		. #xD96A)	; &I-B-D96A;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x63C2)	; 揂
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs@big5		. #x63C2)	; &M-12318;
-    (=big5		. #xD96A)	; &M-12318;
-    (=daikanwa		. 12318)	; &I-M-12318;
+    (=daikanwa		. 12318)	; &M-12318;
     ))
 (define-char
-  '((morohashi-daikanwa	12318 0 3)
+  '((<-denotational
+     ((=ucs		  . #x63C2)	; 揂
+      ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs		. #x63C2)	; 揂
-    (=cns11643-2	. #x3C2F)	; &I-C2-3C2F; [28-15]
+    (->subsumptive
+     ((=cns11643-2	  . #x3C2F)	; &C2-3C2F; [28-15]
+      )
+     ((=ucs@unicode	  . #x63C2)	; &UU+63C2;
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x63C3)	; 揃
-    (=jef-china3	. #x50BA)	; &I-JC3-50BA;
+    (=>jis-x0208	. #x4237)	; 揃 [34-23]
+    (=>jis-x0213-1	. #x4237)	; 揃 [34-23]
     ))
 (define-char
   '((<-denotational
@@ -8943,7 +9170,9 @@
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=daikanwa		. 12319)	; &M-12319;
+    (=ucs@jis/2004	. #x63C3)	; &M-12319;
+    (=jis-x0213-1@2004	. #x4237)	; &M-12319; [34-23]
+    (=daikanwa		. 12319)	; &I-M-12319;
     ))
 (define-char
   '((<-denotational
@@ -8952,13 +9181,19 @@
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
+    (=big5		. #xD959)	; &B-D959;
     (->subsumptive
      ((=ucs@unicode	  . #x63C3)	; &GT-15626;
       (=jis-x0208	  . #x4237)	; &GT-15626; [34-23]
-      (=jis-x0213-1	  . #x4237)	; &I-JX1-4237; [34-23]
-      (=big5		  . #xD959)	; &I-B-D959;
+      (=jis-x0213-1@2000  . #x4237)	; &I-JX1-4237; [34-23]
       (=gt		  . 15626)	; &I-GT-15626;
       (=gt-pj-1		  . #x4237)	; &I-GT-15626; [34-23]
+      (=jef-china3	  . #x50BA)	; &I-JC3-50BA;
+      (<-simplified@JP/extra/design
+       ((=ucs@jis/2004	    . #x63C3)	; &M-12319;
+	(=jis-x0213-1@2004  . #x4237)	; &M-12319; [34-23]
+	(=daikanwa	    . 12319)	; &I-M-12319;
+	))
       )
      ((=ucs@cns		  . #x63C3)	; &C2-3B7C;
       (=cns11643-2	  . #x3B7C)	; &C2-3B7C; [27-92]
@@ -8985,6 +9220,7 @@
     (=gt-k		. 09193)	; &I-GT-K09193;
     (=gt-pj-1		. #x5969)	; &I-GT-15697; [57-73]
     (=daikanwa		. 12320)	; &I-M-12320;
+    (=shinjigen@1ed	.  3018)	; &GT-15697;
     (=shinjigen@rev	.  3021)	; &GT-15697;
     ))
 (define-char
@@ -11355,10 +11591,9 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x640E)	; 搎
+    (=big5		. #xDDBB)	; &I-B-DDBB;
     (->subsumptive
-     ((=ucs@big5	  . #x640E)	; &M-12464;
-      (=big5		  . #xDDBB)	; &M-12464;
-      (=daikanwa	  . 12464)	; &I-M-12464;
+     ((=daikanwa	  . 12464)	; &M-12464;
       )
      ((=ucs@unicode	  . #x640E)	; &UU+640E;
       )
@@ -11379,7 +11614,9 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x640F)	; 搏
-    (=jis-x0208@1997	. #x5973)	; 搏 [57-83]
+    (=>jis-x0208	. #x5973)	; 搏 [57-83]
+    (=>jis-x0213-1	. #x5973)	; 搏 [57-83]
+    (=big5		. #xB769)	; &I-B-B769;
     (->subsumptive
      ((=daikanwa	  . 12466)	; &M-12466;
       (=shinjigen@1ed	  .  3050)	; &M-12466;
@@ -11389,7 +11626,6 @@
       (=gb2312		  . #x322B)	; &J90-5973; [18-11]
       (=jis-x0208@1990	  . #x5973)	; &I-J90-5973; [57-83]
       (=jis-x0213-1	  . #x5973)	; &I-JX1-5973; [57-83]
-      (=big5		  . #xB769)	; &I-B-B769;
       )
      ((=jis-x0208@1978	  . #x5973)	; &J83-5973; [57-83]
       (=jis-x0208@1983	  . #x5973)	; &I-J83-5973; [57-83]
@@ -11582,34 +11818,47 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 64)	; ⼿
+    (=>jis-x0208@1997	. #x415F)	; &J97-415F; [33-63]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x415F)	; &J97-415F; [33-63]
+     ((=>jis-x0208@1997	  . #x415F)	; &J97-415F; [33-63]
       ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x6414)	; 搔
-    (->subsumptive
-     ((=ucs@jis		  . #x6414)	; &M-12477;
-      (=jis-x0208@1978	  . #x415F)	; &M-12477; [33-63]
-      (=ks-x1001	  . #x6138)	; &I-K0-6138; [65-24]
-      (=jis-x0212	  . #x404B)	; &I-JSP-404B; [32-43]
-      (=jis-x0213-1	  . #x7476)	; &I-JX1-7476; [84-86]
-      (=daikanwa	  . 12477)	; &I-M-12477;
-      )
-     ((=ucs@unicode	  . #x6414)	; &C1-6433;
-      (=gb2312		  . #x4926)	; &C1-6433; [41-06]
-      (=cns11643-1	  . #x6433)	; &I-C1-6433; [68-19]
-      (=big5		  . #xB76B)	; &I-B-B76B;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6414)	; 搔
       ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs@jis		. #x6414)	; &M-12477;
+    (=jis-x0208@1978	. #x415F)	; &M-12477; [33-63]
+    (=ks-x1001		. #x6138)	; &I-K0-6138; [65-24]
+    (=jis-x0212		. #x404B)	; &I-JSP-404B; [32-43]
+    (=cns11643-1	. #x6433)	; &I-C1-6433; [68-19]
+    (=jis-x0213-1	. #x7476)	; &I-JX1-7476; [84-86]
+    (=big5		. #xB76B)	; &I-B-B76B;
+    (=daikanwa		. 12477)	; &I-M-12477;
     ))
 (define-char
-  '((ideographic-radical . 64)	; ⼿
-    (=jis-x0208@1997	. #x415F)	; &J97-415F; [33-63]
+  '((<-denotational
+     ((=ucs		  . #x6414)	; 搔
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs@unicode	. #x6414)	; &G0-4926;
+    (=gb2312		. #x4926)	; &G0-4926; [41-06]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x415F)	; &J97-415F; [33-63]
+     ((=>jis-x0208@1997	  . #x415F)	; &J97-415F; [33-63]
       ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 8)
@@ -11621,6 +11870,15 @@
     (=gt		. 15460)	; &I-GT-15460;
     (=gt-pj-1		. #x415F)	; &I-GT-15460; [33-63]
     (=jef-china3	. #x50B9)	; &I-JC3-50B9;
+    (<-simplified@JP/extra
+     ((=ucs@jis		  . #x6414)	; &M-12477;
+      (=jis-x0208@1978	  . #x415F)	; &M-12477; [33-63]
+      (=ks-x1001	  . #x6138)	; &I-K0-6138; [65-24]
+      (=jis-x0212	  . #x404B)	; &I-JSP-404B; [32-43]
+      (=cns11643-1	  . #x6433)	; &I-C1-6433; [68-19]
+      (=jis-x0213-1	  . #x7476)	; &I-JX1-7476; [84-86]
+      (=daikanwa	  . 12477)	; &I-M-12477;
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
@@ -13338,8 +13596,12 @@
     (=hanziku-5		. #xE6F2)	; &I-HZK05-E6F2;
     ))
 (define-char
+  '((ideographic-radical . 64)	; ⼿
+    (=>jis-x0208@1997	. #x444F)	; &J97-444F; [36-47]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x444F)	; &J97-444F; [36-47]
+     ((=>jis-x0208@1997	  . #x444F)	; &J97-444F; [36-47]
       ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 11)
@@ -13354,12 +13616,8 @@
     (=daikanwa		. 12572)	; &I-M-12572;
     ))
 (define-char
-  '((ideographic-radical . 64)	; ⼿
-    (=jis-x0208@1997	. #x444F)	; &J97-444F; [36-47]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x444F)	; &J97-444F; [36-47]
+     ((=>jis-x0208@1997	  . #x444F)	; &J97-444F; [36-47]
       ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 8)
@@ -14526,27 +14784,56 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
     (=ucs		. #x647A)	; 摺
+    (=>jis-x0208	. #x4022)	; 摺 [32-02]
+    (=>jis-x0213-1	. #x4022)	; 摺 [32-02]
     (=big5		. #xBA50)	; &I-B-BA50;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x647A)	; 摺
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
     (->subsumptive
-     ((=jis-x0208@1978	  . #x4022)	; &GT-15936; [32-02]
-      (=ks-x1001	  . #x6F49)	; &I-K0-6F49; [79-41]
+     ((=ucs@jis/2004	  . #x647A)	; &M-12647;
+      (=jis-x0208@1978	  . #x4022)	; &M-12647; [32-02]
+      (=jis-x0213-1@2004  . #x4022)	; &I-JX3-4022; [32-02]
+      (=daikanwa	  . 12647)	; &I-M-12647;
+      )
+     ((=ks-x1001	  . #x6F49)	; &GT-15936; [79-41]
       (=gt		  . 15936)	; &I-GT-15936;
       (=gt-k		  . 11156)	; &I-GT-K11156;
       (=gt-pj-3		  . #x6364)	; &I-GT-15936; [67-68]
-      (=daikanwa	  . 12647)	; &I-M-12647;
-      )
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x647A)	; 摺
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (->subsumptive
      ((=ucs@unicode	  . #x647A)	; &G0-5F21;
       (=gb2312		  . #x5F21)	; &G0-5F21; [63-01]
       (=jef-china3	  . #x50B7)	; &I-JC3-50B7;
       )
-     ((=ucs@jis		  . #x647A)	; &GT-15937;
+     ((=ucs@jis/1990	  . #x647A)	; &GT-15937;
+      (=ucs@jis/2000	  . #x647A)	; &GT-15937;
       (=jis-x0208@1983	  . #x4022)	; &GT-15937; [32-02]
       (=jis-x0208@1990	  . #x4022)	; &I-J90-4022; [32-02]
       (=cns11643-1	  . #x6877)	; &I-C1-6877; [72-87]
-      (=jis-x0213-1	  . #x4022)	; &I-JX1-4022; [32-02]
+      (=jis-x0213-1@2000  . #x4022)	; &I-JX1-4022; [32-02]
       (=gt		  . 15937)	; &I-GT-15937;
       (=gt-k		  . 11138)	; &I-GT-K11138;
       (=gt-pj-1		  . #x4022)	; &I-GT-15937; [32-02]
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x647A)	; &M-12647;
+	(=jis-x0208@1978    . #x4022)	; &M-12647; [32-02]
+	(=jis-x0213-1@2004  . #x4022)	; &I-JX3-4022; [32-02]
+	(=daikanwa	    . 12647)	; &I-M-12647;
+	))
       ))
     ))
 (define-char
@@ -16273,7 +16560,8 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x64B0)	; 撰
-    (=jis-x0208@1997	. #x4071)	; 撰 [32-81]
+    (=>jis-x0208	. #x4071)	; 撰 [32-81]
+    (=>jis-x0213-1	. #x4071)	; 撰 [32-81]
     ))
 (define-char
   '((<-denotational
@@ -16282,12 +16570,13 @@
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (=big5		. #xBCB6)	; &B-BCB6;
     (->subsumptive
      ((=ucs@unicode	  . #x64B0)	; &M-12753;
       (=jis-x0208@1978	  . #x4071)	; &M-12753; [32-81]
       (=gb2312		  . #x572B)	; &I-G0-572B; [55-11]
       (=ks-x1001	  . #x733C)	; &I-K0-733C; [83-28]
-      (=big5		  . #xBCB6)	; &I-B-BCB6;
+      (=jis-x0213-1@2004  . #x4071)	; &I-JX3-4071; [32-81]
       (=daikanwa	  . 12753)	; &I-M-12753;
       )
      ((=cns11643-1	  . #x6C7E)	; &C1-6C7E; [76-94]
@@ -16300,23 +16589,32 @@
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs@jis		. #x64B0)	; &GT-16090;
+    (=ucs@jis/1990	. #x64B0)	; &GT-16090;
+    (=ucs@jis/2000	. #x64B0)	; &GT-16090;
     (=jis-x0208@1983	. #x4071)	; &GT-16090; [32-81]
     (=jis-x0208@1990	. #x4071)	; &I-J90-4071; [32-81]
-    (=jis-x0213-1	. #x4071)	; &I-JX1-4071; [32-81]
+    (=jis-x0213-1@2000	. #x4071)	; &I-JX1-4071; [32-81]
     (=gt		. 16090)	; &I-GT-16090;
     (=gt-pj-1		. #x4071)	; &I-GT-16090; [32-81]
     (=jef-china3	. #x50B8)	; &I-JC3-50B8;
+    (<-simplified@JP/jis
+     ((=ucs@unicode	  . #x64B0)	; &M-12753;
+      (=jis-x0208@1978	  . #x4071)	; &M-12753; [32-81]
+      (=gb2312		  . #x572B)	; &I-G0-572B; [55-11]
+      (=ks-x1001	  . #x733C)	; &I-K0-733C; [83-28]
+      (=jis-x0213-1@2004  . #x4071)	; &I-JX3-4071; [32-81]
+      (=daikanwa	  . 12753)	; &I-M-12753;
+      ))
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x64B1)	; 撱
+    (=big5		. #xE5BB)	; &I-B-E5BB;
     (->subsumptive
      ((=ucs@unicode	  . #x64B1)	; &M-12754;
-      (=big5		  . #xE5BB)	; &M-12754;
-      (=daikanwa	  . 12754)	; &I-M-12754;
+      (=daikanwa	  . 12754)	; &M-12754;
       )
      ((=ucs@cns		  . #x64B1)	; &C2-5062;
       (=cns11643-2	  . #x5062)	; &C2-5062; [48-66]
@@ -18166,7 +18464,7 @@
     (=gt		. 16282)	; &I-GT-16282;
     (=gt-pj-1		. #x5A2C)	; &I-GT-16282; [58-12]
     (=daikanwa		. 12851)	; &I-M-12851;
-    (=shinjigen@rev	.  3122)	; 擡
+    (=shinjigen		.  3122)	; 擡
     (=cbeta		. 01769)	; &I-CB01769;
     ))
 (define-char
@@ -18174,23 +18472,59 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x64E2)	; 擢
+    (=>jis-x0208	. #x4527)	; 擢 [37-07]
+    (=>jis-x0213-1	. #x4527)	; 擢 [37-07]
     (=big5		. #xC0C2)	; &I-B-C0C2;
-    (=jis-x0208@1997	. #x4527)	; 擢 [37-07]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x64E2)	; 擢
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
     (->subsumptive
-     ((=jis-x0208@1978	  . #x4527)	; &GT-16292; [37-07]
-      (=ks-x1001	  . #x7677)	; &I-K0-7677; [86-87]
+     ((=ucs@jis/2004	  . #x64E2)	; &M-12852;
+      (=jis-x0208@1978	  . #x4527)	; &M-12852; [37-07]
+      (=jis-x0213-1@2004  . #x4527)	; &I-JX3-4527; [37-07]
+      (=daikanwa	  . 12852)	; &I-M-12852;
+      )
+     ((=ks-x1001	  . #x7677)	; &GT-16292; [86-87]
       (=gt		  . 16292)	; &I-GT-16292;
       (=gt-pj-3		  . #x6564)	; &I-GT-16292; [69-68]
+      (=shinjigen	  .  3124)	; &GT-16292;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x64E2)	; 擢
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs@jis/1990	. #x64E2)	; &GT-16293;
+    (=ucs@jis/2000	. #x64E2)	; &GT-16293;
+    (=jis-x0208@1983	. #x4527)	; &GT-16293; [37-07]
+    (=jis-x0208@1990	. #x4527)	; &I-J90-4527; [37-07]
+    (=jis-x0213-1@2000	. #x4527)	; &I-JX1-4527; [37-07]
+    (=gt		. 16293)	; &I-GT-16293;
+    (=gt-pj-1		. #x4527)	; &I-GT-16293; [37-07]
+    (=jef-china3	. #x70BE)	; &I-JC3-70BE;
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x64E2)	; &M-12852;
+      (=jis-x0208@1978	  . #x4527)	; &M-12852; [37-07]
+      (=jis-x0213-1@2004  . #x4527)	; &I-JX3-4527; [37-07]
       (=daikanwa	  . 12852)	; &I-M-12852;
-      )
-     ((=ucs@jis		  . #x64E2)	; &GT-16293;
-      (=jis-x0208@1983	  . #x4527)	; &GT-16293; [37-07]
-      (=jis-x0208@1990	  . #x4527)	; &I-J90-4527; [37-07]
-      (=jis-x0213-1	  . #x4527)	; &I-JX1-4527; [37-07]
-      (=gt		  . 16293)	; &I-GT-16293;
-      (=gt-pj-1		  . #x4527)	; &I-GT-16293; [37-07]
-      (=jef-china3	  . #x70BE)	; &I-JC3-70BE;
-      )
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x64E2)	; 擢
+      ))
+    (ideographic-radical . 64)	; ⼿
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (->subsumptive
      ((=ucs@unicode	  . #x64E2)	; &G0-5F2A;
       (=gb2312		  . #x5F2A)	; &G0-5F2A; [63-10]
       )
@@ -18209,7 +18543,7 @@
     (=gt		. 16294)	; &I-GT-16294;
     (=gt-pj-1		. #x5A2E)	; &I-GT-16294; [58-14]
     (=daikanwa		. 12853)	; &I-M-12853;
-    (=shinjigen@rev	.  3125)	; 擣
+    (=shinjigen		.  3125)	; 擣
     ))
 (define-char
   '((=>ucs		. #x3A5A)	; 㩚
@@ -19472,6 +19806,7 @@
 (define-char
   '((ideographic-radical . 64)	; ⼿
     (=ucs		. #x6503)	; 攃
+    (=big5		. #xEFD6)	; &I-B-EFD6;
     ))
 (define-char
   '((<-denotational
@@ -19494,21 +19829,20 @@
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs@unicode	. #x6503)	; &B-EFD6;
-    (=big5		. #xEFD6)	; &B-EFD6;
+    (=ucs@unicode	. #x6503)	; &UU+6503;
     ))
 (define-char
   '((ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (=ucs		. #x6504)	; 攄
+    (=big5		. #xEFD2)	; &I-B-EFD2;
     (->subsumptive
      ((=ucs@unicode	  . #x6504)	; &M-12932;
       (=ks-x1001	  . #x774C)	; &M-12932; [87-44]
       (=jis-x0212	  . #x4136)	; &I-JSP-4136; [33-22]
       (=jis-x0213-2	  . #x2D5A)	; &I-JX2-2D5A; [13-58]
       (=gb12345		  . #x5E73)	; &M-12932; [62-83]
-      (=big5		  . #xEFD2)	; &I-B-EFD2;
       (=daikanwa	  . 12932)	; &I-M-12932;
       (=jef-china3	  . #x50B0)	; &I-JC3-50B0;
       )
@@ -19517,8 +19851,12 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 64)	; ⼿
+    (=>jis-x0208@1997	. #x5A39)	; &J97-5A39; [58-25]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5A39)	; &J97-5A39; [58-25]
+     ((=>jis-x0208@1997	  . #x5A39)	; &J97-5A39; [58-25]
       ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 15)
@@ -19531,12 +19869,13 @@
     (=gt		. 16332)	; &I-GT-16332;
     (=gt-pj-1		. #x5A39)	; &I-GT-16332; [58-25]
     (=daikanwa		. 12933)	; &I-M-12933;
-    (=shinjigen@rev	.  3147)	; 攅
+    (=shinjigen		.  3147)	; 攅
     (=jef-china3	. #x50B1)	; &I-JC3-50B1;
-    ))
-(define-char
-  '((ideographic-radical . 64)	; ⼿
-    (=jis-x0208@1997	. #x5A39)	; &J97-5A39; [58-25]
+    (<-simplified@JP/jis
+     ((=ucs		  . #x6522)	; 攢
+      (=jis-x0208@1978	  . #x5A39)	; &I-J78-5A39; [58-25]
+      (=jis-x0212	  . #x4142)	; &I-JSP-4142; [33-34]
+      ))
     ))
 (define-char
   '((=>ucs		. #x22E01)	; 𢸁
@@ -20803,8 +21142,9 @@
     (ideographic-strokes . 18)
     (total-strokes	 . 21)
     (=ucs		. #x651D)	; 攝
+    (=>jis-x0208	. #x5970)	; 攝 [57-80]
+    (=>jis-x0213-1	. #x5970)	; 攝 [57-80]
     (=big5		. #xC4E1)	; &I-B-C4E1;
-    (=jis-x0208@1997	. #x5970)	; 攝 [57-80]
     (->subsumptive
      ((=gt		  . 16457)	; &GT-16457;
       (=gt-pj-1		  . #x5970)	; &GT-16457; [57-80]
@@ -21164,7 +21504,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5A39)	; &J97-5A39; [58-25]
+     ((=>jis-x0208@1997	  . #x5A39)	; &J97-5A39; [58-25]
       ))
     (ideographic-radical . 64)	; ⼿
     (ideographic-strokes . 19)
diff --git a/lisp/utf-2000/Ideograph-R066-Rap.el b/lisp/utf-2000/Ideograph-R066-Rap.el
index 1c65291..40900e1 100644
--- a/lisp/utf-2000/Ideograph-R066-Rap.el
+++ b/lisp/utf-2000/Ideograph-R066-Rap.el
@@ -2020,6 +2020,13 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 66)	; ⽁
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=ucs@big5		. #x656A)	; &B-D974;
+    (=big5		. #xD974)	; &B-D974;
+    ))
+(define-char
   '((<-denotational
      ((=ucs@big5	  . #x656A)	; &B-D974;
       (=big5		  . #xD974)	; &B-D974;
@@ -2039,13 +2046,6 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=ucs@big5		. #x656A)	; &B-D974;
-    (=big5		. #xD974)	; &B-D974;
-    ))
-(define-char
   '((<-denotational
      ((=ucs@big5	  . #x656A)	; &B-D974;
       (=big5		  . #xD974)	; &B-D974;
@@ -2144,36 +2144,45 @@
 (define-char
   '((ideographic-radical . 66)	; ⽁
     (=ucs		. #x6562)	; 敢
-    (=jis-x0208@1997	. #x343A)	; 敢 [20-26]
+    (=big5		. #xB4B1)	; &I-B-B4B1;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6562)	; 敢
+      ))
+    (ideographic-radical . 66)	; ⽁
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=>jis-x0208	. #x343A)	; &J97-343A; [20-26]
+    (=>jis-x0213-1	. #x343A)	; &J97-343A; [20-26]
     (->subsumptive
-     ((ideographic-strokes . 8)
-      (total-strokes	   . 12)
-      (->subsumptive
-       ((=ucs@jis	    . #x6562)	; &GT-16742;
-	(=ucs@big5	    . #x6562)	; &GT-16742;
-	(=ks-x1001	    . #x4A72)	; &GT-16742; [42-82]
-	(=jis-x0208@1990    . #x343A)	; &I-J90-343A; [20-26]
-	(=cns11643-1	    . #x5F56)	; &I-C1-5F56; [63-54]
-	(=jis-x0213-1	    . #x343A)	; &I-JX1-343A; [20-26]
-	(=big5		    . #xB4B1)	; &I-B-B4B1;
-	(=gt		    . 16742)	; &I-GT-16742;
-	(=gt-k		    . 09015)	; &I-GT-K09015;
-	(=gt-pj-1	    . #x343A)	; &I-GT-16742; [20-26]
-	(=daikanwa	    . 13260)	; &I-M-13260;
-	(=shinjigen@rev	    .  3176)	; &GT-16742;
-	)
-       ((=jis-x0208@1978    . #x343A)	; &J83-343A; [20-26]
-	(=jis-x0208@1983    . #x343A)	; &I-J83-343A; [20-26]
-	(mojikyo	    . 013260)	; &MCS-600033CC;
-	))
+     ((=ucs@jis		  . #x6562)	; &GT-16742;
+      (=ks-x1001	  . #x4A72)	; &GT-16742; [42-82]
+      (=jis-x0208@1990	  . #x343A)	; &I-J90-343A; [20-26]
+      (=cns11643-1	  . #x5F56)	; &I-C1-5F56; [63-54]
+      (=jis-x0213-1	  . #x343A)	; &I-JX1-343A; [20-26]
+      (=gt		  . 16742)	; &I-GT-16742;
+      (=gt-k		  . 09015)	; &I-GT-K09015;
+      (=gt-pj-1		  . #x343A)	; &I-GT-16742; [20-26]
+      (=daikanwa	  . 13260)	; &I-M-13260;
+      (=shinjigen	  .  3176)	; &GT-16742;
       )
-     ((ideographic-strokes . 7)
-      (total-strokes	   . 11)
-      (=ucs@unicode	  . #x6562)	; &G0-3852;
-      (=gb2312		  . #x3852)	; &G0-3852; [24-50]
+     ((=jis-x0208@1978	  . #x343A)	; &J83-343A; [20-26]
+      (=jis-x0208@1983	  . #x343A)	; &I-J83-343A; [20-26]
+      (mojikyo		  . 013260)	; &MCS-600033CC;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x6562)	; 敢
+      ))
+    (ideographic-radical . 66)	; ⽁
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=ucs@unicode	. #x6562)	; &G0-3852;
+    (=gb2312		. #x3852)	; &G0-3852; [24-50]
+    ))
+(define-char
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
@@ -3634,35 +3643,6 @@
       ))
     ))
 (define-char
-  '((<-denotational
-     ((=ucs@big5	  . #x657B)	; &B-E5C0;
-      (=big5		  . #xE5C0)	; &B-E5C0;
-      (=jis-x0208@1997	  . #x546B)	; &B-E5C0; [52-75]
-      ))
-    (=>daikanwa		. 13355)	; &M-13355;
-    (ideographic-radical . 66)	; ⽁
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x657B)	; 敻
-    (->subsumptive
-     ((=ucs@cns		  . #x657B)	; &C2-5067;
-      (=cns11643-2	  . #x5067)	; &C2-5067; [48-71]
-      )
-     ((=ucs@unicode	  . #x657B)	; &UU+657B;
-      ))
-    ))
-(define-char
-  '((ideographic-radical@cns . 66)	; ⽁
-    (ideographic-radical@cns*sources
-     cns11643-2 ucs=0x657B)
-    (ideographic-radical@jis . 35)	; â¼¢
-    (ideographic-radical@jis*sources
-     daikanwa jis-x0208 cns11643-3 ucs=0x5910)
-    (=ucs@big5		. #x657B)	; &B-E5C0;
-    (=big5		. #xE5C0)	; &B-E5C0;
-    (=jis-x0208@1997	. #x546B)	; &B-E5C0; [52-75]
-    ))
-(define-char
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
@@ -3746,7 +3726,13 @@
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 13360)	; &M-13360;
+    (=ucs		. #x22FCE)	; 𢿎
+    (->subsumptive
+     ((=daikanwa	  . 13360)	; &M-13360;
+      )
+     ((=ucs@iso		  . #x22FCE)	; &C5-4D46;
+      (=cns11643-5	  . #x4D46)	; &C5-4D46; [45-38]
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -3773,6 +3759,7 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x6578)	; 數
+    (=big5		. #xBCC6)	; &I-B-BCC6;
     (->subsumptive
      ((=ucs@jis		  . #x6578)	; &M-13363;
       (=jis-x0208	  . #x5A4B)	; &M-13363; [58-43]
@@ -3782,7 +3769,6 @@
      ((=ucs@unicode	  . #x6578)	; &GT-16891;
       (=ks-x1001	  . #x6226)	; &GT-16891; [66-06]
       (=gb12345		  . #x4A7D)	; &GT-16891; [42-93]
-      (=big5		  . #xBCC6)	; &I-B-BCC6;
       (=gt		  . 16891)	; &I-GT-16891;
       (=gt-k		  . 11976)	; &I-GT-K11976;
       (=gt-pj-1		  . #x5A4B)	; &I-GT-16891; [58-43]
@@ -3907,7 +3893,12 @@
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=daikanwa		. 13373)	; &M-13373;
+    (=ucs		. #x22FDA)	; 𢿚
+    (->subsumptive
+     ((=daikanwa	  . 13373)	; &M-13373;
+      )
+     ((=ucs@iso		  . #x22FDA)	; &U-00022FDA;
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
@@ -3918,18 +3909,43 @@
     (=daikanwa		. 49145)	; &I-M-49145;
     ))
 (define-char
-  '((ideographic-radical . 66)	; ⽁
+  '((<-denotational
+     ((=ucs@big5	  . #x657B)	; &J97-546B;
+      (=>jis-x0208	  . #x546B)	; &J97-546B; [52-75]
+      ))
+    (ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x22FCE)	; 𢿎
-    (=cns11643-5	. #x4D46)	; &I-C5-4D46; [45-38]
+    (=ucs		. #x657B)	; 敻
+    (->subsumptive
+     ((=ucs@cns		  . #x657B)	; &C2-5067;
+      (=cns11643-2	  . #x5067)	; &C2-5067; [48-71]
+      )
+     ((=ucs@unicode	  . #x657B)	; &UU+657B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x22FD5)	; 𢿕
-    (=cns11643-5	. #x4D43)	; &I-C5-4D43; [45-35]
+    (->subsumptive
+     ((=ucs@iso		  . #x22FD5)	; &U-00022FD5;
+      )
+     ((=cns11643-5	  . #x4D43)	; &C5-4D43; [45-35]
+      ))
+    ))
+(define-char
+  '((ideographic-radical@cns . 66)	; ⽁
+    (ideographic-radical@cns*sources
+     cns11643-2 ucs=0x657B)
+    (ideographic-radical@jis . 35)	; â¼¢
+    (ideographic-radical@jis*sources
+     daikanwa jis-x0208 cns11643-3 ucs=0x5910)
+    (=ucs@big5		. #x657B)	; &J97-546B;
+    (=>jis-x0208	. #x546B)	; &J97-546B; [52-75]
+    (=>jis-x0213-1	. #x546B)	; &J97-546B; [52-75]
+    (=big5		. #xE5C0)	; &J97-546B;
     ))
 (define-char
   '((ideographic-radical . 66)	; ⽁
diff --git a/lisp/utf-2000/Ideograph-R069-Axe.el b/lisp/utf-2000/Ideograph-R069-Axe.el
index 0a25a3d..190a001 100644
--- a/lisp/utf-2000/Ideograph-R069-Axe.el
+++ b/lisp/utf-2000/Ideograph-R069-Axe.el
@@ -52,7 +52,10 @@
   '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
-    (=daikanwa		. 13537)	; &M-13537;
+    (sound@ja/on	"roku")
+    (=ucs		. #x23092)	; 𣂒
+    (=daikanwa		. 13537)	; &I-M-13537;
+    (=hanziku-5		. #xF67A)	; &I-HZK05-F67A;
     ))
 (define-char
   '((ideographic-radical . 69)	; ⽄
@@ -74,75 +77,89 @@
     (=jef-china3	. #x50E1)	; &I-JC3-50E1;
     ))
 (define-char
-  '((=>ucs		. #x65A7)	; 斧
-    (ideographic-radical . 69)	; ⽄
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (=ucs@jis		. #x65A7)	; &GT-17117;
-    (=ucs@big5		. #x65A7)	; &GT-17117;
-    (=jis-x0208		. #x4960)	; &GT-17117; [41-64]
-    (=ks-x1001		. #x5D28)	; &I-K0-5D28; [61-08]
-    (=jis-x0213-1	. #x4960)	; &I-JX1-4960; [41-64]
-    (=big5		. #xA9F2)	; &I-B-A9F2;
-    (=gt		. 17117)	; &I-GT-17117;
-    (=gt-k		. 03809)	; &I-GT-K03809;
-    (=gt-pj-1		. #x4960)	; &I-GT-17117; [41-64]
-    (=daikanwa		. 13539)	; &I-M-13539;
-    (=shinjigen@rev	.  3225)	; &GT-17117;
-    ))
-(define-char
-  '((morohashi-daikanwa	13539 0 0)
-    (ideographic-radical . 69)	; ⽄
+  '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x65A7)	; 斧
-    (=gb2312		. #x382B)	; &I-G0-382B; [24-11]
-    (=cns11643-1	. #x4D74)	; &I-C1-4D74; [45-84]
+    (=>jis-x0208	. #x4960)	; 斧 [41-64]
+    (=>jis-x0213-1	. #x4960)	; 斧 [41-64]
+    (=big5		. #xA9F2)	; &I-B-A9F2;
+    (->subsumptive
+     ((=ucs@jis/1990	  . #x65A7)	; &GT-17117;
+      (=ucs@jis/2000	  . #x65A7)	; &GT-17117;
+      (=jis-x0208	  . #x4960)	; &GT-17117; [41-64]
+      (=ks-x1001	  . #x5D28)	; &I-K0-5D28; [61-08]
+      (=jis-x0213-1@2000  . #x4960)	; &I-JX1-4960; [41-64]
+      (=gt		  . 17117)	; &I-GT-17117;
+      (=gt-k		  . 03809)	; &I-GT-K03809;
+      (=gt-pj-1		  . #x4960)	; &I-GT-17117; [41-64]
+      (=daikanwa	  . 13539)	; &I-M-13539;
+      (=shinjigen	  .  3225)	; &GT-17117;
+      )
+     ((=ucs@unicode	  . #x65A7)	; &JX3-4960;
+      (=gb2312		  . #x382B)	; &JX3-4960; [24-11]
+      (=cns11643-1	  . #x4D74)	; &I-C1-4D74; [45-84]
+      (=jis-x0213-1@2004  . #x4960)	; &I-JX3-4960; [41-64]
+      ))
     ))
 (define-char
   '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x65A8)	; 斨
-    (=iso-ir165		. #x7B27)	; &I-EGB-7B27; [91-07]
-    (=cns11643-2	. #x2723)	; &I-C2-2723; [07-03]
     (=big5		. #xCCC2)	; &I-B-CCC2;
-    (=daikanwa		. 13540)	; &I-M-13540;
+    (->subsumptive
+     ((=ucs@unicode	  . #x65A8)	; &M-13540;
+      (=iso-ir165	  . #x7B27)	; &M-13540; [91-07]
+      (=daikanwa	  . 13540)	; &I-M-13540;
+      )
+     ((=cns11643-2	  . #x2723)	; &C2-2723; [07-03]
+      ))
     ))
 (define-char
   '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x23094)	; 𣂔
-    (=daikanwa		. 13541)	; &I-M-13541;
-    ))
-(define-char
-  '((=>ucs		. #x23094)	; 𣂔
-    (morohashi-daikanwa	13541 0 2)
-    (ideographic-radical . 69)	; ⽄
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (=cns11643-6	. #x2B6F)	; &C6-2B6F; [11-79]
+    (->subsumptive
+     ((=ucs@iso		  . #x23094)	; &M-13541;
+      (=daikanwa	  . 13541)	; &M-13541;
+      )
+     ((=cns11643-6	  . #x2B6F)	; &C6-2B6F; [11-79]
+      ))
     ))
 (define-char
   '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (sound@ja/on	"si")
     (=ucs		. #x23095)	; 𣂕
     (=cns11643-6	. #x2B6E)	; &I-C6-2B6E; [11-78]
     (=daikanwa		. 13542)	; &I-M-13542;
+    (<-ancient
+     ((=ucs		  . #x65AF)	; 斯
+      (=daikanwa	  . 13563)	; &I-M-13563;
+      ))
+    (<-ancient*sources
+     jiyun daikanwa)
     ))
 (define-char
   '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=daikanwa		. 13543)	; &M-13543;
+    (sound@ja/on	"si")
+    (=ucs		. #x23096)	; 𣂖
+    (=daikanwa		. 13543)	; &I-M-13543;
+    (=hanziku-5		. #xF67C)	; &I-HZK05-F67C;
     ))
 (define-char
   '((ideographic-radical . 69)	; ⽄
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=daikanwa		. 13544)	; &M-13544;
+    (sound@ja/on	"kiN")
+    (=ucs		. #x23097)	; 𣂗
+    (=daikanwa		. 13544)	; &I-M-13544;
+    (=hanziku-5		. #xF67D)	; &I-HZK05-F67D;
     ))
 (define-char
   '((ideographic-radical . 69)	; ⽄
diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el
index f05cd37..351541b 100644
--- a/lisp/utf-2000/Ideograph-R072-Sun.el
+++ b/lisp/utf-2000/Ideograph-R072-Sun.el
@@ -853,8 +853,13 @@
     (=daikanwa		. 13782)	; &I-M-13782;
     ))
 (define-char
+  '((ideographic-radical . 72)	; ⽇
+    (=>jis-x0208	. #x3937)	; &J97-3937; [25-23]
+    (=>jis-x0213-1	. #x3937)	; &J97-3937; [25-23]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3937)	; &J97-3937; [25-23]
+     ((=>jis-x0208	  . #x3937)	; &J97-3937; [25-23]
       ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 4)
@@ -875,10 +880,6 @@
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
-    (=jis-x0208@1997	. #x3937)	; &J97-3937; [25-23]
-    ))
-(define-char
-  '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x2315B)	; 𣅛
@@ -2373,7 +2374,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3937)	; &J97-3937; [25-23]
+     ((=>jis-x0208	  . #x3937)	; &J97-3937; [25-23]
       ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 5)
@@ -2383,7 +2384,7 @@
     (=ks-x1001		. #x6469)	; &I-K0-6469; [68-73]
     (=cns11643-3	. #x2D22)	; &I-C3-2D22; [13-02]
     (=daikanwa		. 13885)	; &I-M-13885;
-    (=shinjigen@1ed	.  3278)	; 昻
+    (=shinjigen		.  3278)	; 昻
     (<-vulgar
      ((=ucs		  . #x6602)	; 昂
       (=jis-x0208@1983	  . #x3937)	; &I-J83-3937; [25-23]
@@ -2392,7 +2393,7 @@
       (=shinjigen	  .  3277)	; 昂
       ))
     (<-vulgar*sources
-     pianhai daikanwa shinjigen@1ed)
+     pianhai daikanwa shinjigen)
     ))
 (define-char
   '((total-strokes	 . 9)
@@ -2627,7 +2628,7 @@
 	)
        ((=ucs		    . #x65E5)	; 日
 	)
-       ((=jis-x0208@1978    . #x3872)	; &M-00291; [24-82]
+       ((=jis-x0208@1978    . #x3872)	; &GT-00389; [24-82]
 	(=jis-x0208@1983    . #x3872)	; &I-J83-3872; [24-82]
 	(=ks-x1001	    . #x4E5F)	; &I-K0-4E5F; [46-63]
 	(=daikanwa	    . 00291)	; &I-M-00291;
@@ -3226,6 +3227,7 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x6659)	; 晙
+    (=big5		. #xD5AC)	; &I-B-D5AC;
     ))
 (define-char
   '((<-denotational
@@ -3258,51 +3260,72 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs@jis		. #x6659)	; &JX1-753B;
-    (=ucs@big5		. #x6659)	; &JX1-753B;
     (=ks-x1001		. #x715B)	; &JX1-753B; [81-59]
     (=jis-x0212		. #x423A)	; &I-JSP-423A; [34-26]
     (=jis-x0213-1	. #x753B)	; &I-JX1-753B; [85-27]
-    (=big5		. #xD5AC)	; &I-B-D5AC;
     (=jef-china3	. #x51D4)	; &I-JC3-51D4;
     ))
 (define-char
+  '((ideographic-radical . 72)	; ⽇
+    (=ucs@big5		. #x665A)	; &J97-4855;
+    (=>jis-x0208@1997	. #x4855)	; &J97-4855; [40-53]
+    (=big5		. #xB1DF)	; &J97-4855;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x665A)	; &B-B1DF;
-      (=big5		  . #xB1DF)	; &B-B1DF;
+     ((=ucs@big5	  . #x665A)	; &J97-4855;
+      (=>jis-x0208@1997	  . #x4855)	; &J97-4855; [40-53]
       ))
     (ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x665A)	; 晚
-    (=gb2312		. #x4D6D)	; &I-G0-4D6D; [45-77]
-    (=cns11643-1	. #x5B25)	; &I-C1-5B25; [59-05]
-    (=jis-x0213-1	. #x753C)	; &I-JX1-753C; [85-28]
-    (=daikanwa		. 13940)	; &I-M-13940;
-    (=jef-china3	. #x51D5)	; &I-JC3-51D5;
+    (=>jis-x0213-1	. #x753C)	; 晚 [85-28]
+    (->subsumptive
+     ((=ucs@jis		  . #x665A)	; &M-13940;
+      (=jis-x0213-1	  . #x753C)	; &M-13940; [85-28]
+      (=daikanwa	  . 13940)	; &I-M-13940;
+      (=jef-china3	  . #x51D5)	; &I-JC3-51D5;
+      )
+     ((=ucs@unicode	  . #x665A)	; &C1-5B25;
+      (=gb2312		  . #x4D6D)	; &C1-5B25; [45-77]
+      (=cns11643-1	  . #x5B25)	; &I-C1-5B25; [59-05]
+      ))
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
-    (=ucs@big5		. #x665A)	; &B-B1DF;
-    (=big5		. #xB1DF)	; &B-B1DF;
+    (=ucs		. #x231B6)	; 𣆶
     ))
 (define-char
-  '((ideographic-radical . 72)	; ⽇
-    (=ucs		. #x231B6)	; 𣆶
-    (->subsumptive
-     ((ideographic-strokes . 7)
-      (total-strokes	   . 11)
-      (=ucs@iso		  . #x231B6)	; &M-13941;
-      (=cns11643-4	  . #x323D)	; &M-13941; [18-29]
-      (=daikanwa	  . 13941)	; &I-M-13941;
-      )
-     ((ideographic-strokes . 8)
-      (total-strokes	   . 12)
-      (=ucs@jis		  . #x231B6)	; &GT-17719;
-      (=jis-x0213-2	  . #x2E24)	; &GT-17719; [14-04]
-      (=gt		  . 17719)	; &I-GT-17719;
-      (=gt-pj-9		  . #x5064)	; &I-GT-17719; [48-68]
-      (=adobe-japan1-5	  . 17744)	; &GT-17719;
+  '((<-denotational
+     ((=ucs		  . #x231B6)	; 𣆶
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=ucs@iso		. #x231B6)	; &M-13941;
+    (=cns11643-4	. #x323D)	; &M-13941; [18-29]
+    (=daikanwa		. 13941)	; &I-M-13941;
+    (<-same
+     ((=ucs@jis		  . #x665A)	; &M-13940;
+      (=jis-x0213-1	  . #x753C)	; &M-13940; [85-28]
+      (=daikanwa	  . 13940)	; &I-M-13940;
       ))
+    (<-same*sources
+     zhengzitong daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x231B6)	; 𣆶
+      ))
+    (ideographic-radical . 72)	; ⽇
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=ucs@jis		. #x231B6)	; &GT-17719;
+    (=jis-x0213-2	. #x2E24)	; &GT-17719; [14-04]
+    (=gt		. 17719)	; &I-GT-17719;
+    (=gt-pj-9		. #x5064)	; &I-GT-17719; [48-68]
+    (=adobe-japan1-5	. 17744)	; &GT-17719;
     ))
 (define-char
   '((ideographic-radical . 72)	; ⽇
@@ -3390,11 +3413,18 @@
     (=gt		. 17608)	; &I-GT-17608;
     (=gt-pj-1		. #x5A6B)	; &I-GT-17608; [58-75]
     (=daikanwa		. 13949)	; &I-M-13949;
+    (=shinjigen@1ed	.  3329)	; 晞
     (=shinjigen@rev	.  3331)	; 晞
     ))
 (define-char
+  '((ideographic-radical@daikanwa=01546 . 13)	; ⼌
+    (ideographic-radical@daikanwa=13950 . 72)	; ⽇
+    (=>jis-x0208	. #x5A70)	; &J97-5A70; [58-80]
+    (=>jis-x0213-1	. #x5A70)	; &J97-5A70; [58-80]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5A70)	; &J97-5A70; [58-80]
+     ((=>jis-x0208	  . #x5A70)	; &J97-5A70; [58-80]
       ))
     (ideographic-radical . 72)	; ⽇
     (=ucs		. #x665F)	; 晟
@@ -3406,6 +3436,7 @@
       (=ks-x1001	  . #x6079)	; &I-K0-6079; [64-89]
       (=daikanwa	  . 13950)	; &I-M-13950;
       (=shinjigen@1ed	  .  3333)	; &M-13950;
+      (=shinjigen/+p@rev  .  3326)	; &M-13950;
       (<-unknown
        ((=gt		    . 02031)	; &GT-02031;
 	(=daikanwa	    . 01546)	; &I-M-01546;
@@ -3422,14 +3453,10 @@
       (=gt		  . 17583)	; &I-GT-17583;
       (=gt-k		  . 06601)	; &I-GT-K06601;
       (=gt-pj-1		  . #x5A70)	; &I-GT-17583; [58-80]
+      (=shinjigen@rev	  .  3326)	; &GT-17583;
       ))
     ))
 (define-char
-  '((ideographic-radical@daikanwa=01546 . 13)	; ⼌
-    (ideographic-radical@daikanwa=13950 . 72)	; ⽇
-    (=jis-x0208@1997	. #x5A70)	; &J97-5A70; [58-80]
-    ))
-(define-char
   '((ideographic-radical . 72)	; ⽇
     (ideographic-strokes . 7)
     (japanese-strokes	 . 6)
@@ -3566,7 +3593,8 @@
 (define-char
   '((ideographic-radical . 72)	; ⽇
     (=ucs		. #x6666)	; 晦
-    (=jis-x0208@1997	. #x3322)	; 晦 [19-02]
+    (=>jis-x0208	. #x3322)	; 晦 [19-02]
+    (=>jis-x0213-1	. #x3322)	; 晦 [19-02]
     ))
 (define-char
   '((<-denotational
@@ -3584,6 +3612,7 @@
     (=big5		. #xB1E2)	; &I-B-B1E2;
     (=daikanwa		. 13960)	; &I-M-13960;
     (=shinjigen@1ed	.  3327)	; &M-13960;
+    (=shinjigen@rev	.  3329)	; &M-13960;
     ))
 (define-char
   '((<-denotational
@@ -4596,8 +4625,8 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x665A)	; &B-B1DF;
-      (=big5		  . #xB1DF)	; &B-B1DF;
+     ((=ucs@big5	  . #x665A)	; &J97-4855;
+      (=>jis-x0208@1997	  . #x4855)	; &J97-4855; [40-53]
       ))
     (morohashi-daikanwa	14030 1)
     (ideographic-radical . 72)	; ⽇
@@ -4612,7 +4641,9 @@
     (=gt-pj-1		. #x4855)	; &I-GT-17718; [40-53]
     (mojikyo		. 050215)	; &MCS-6000C427;
     (<-simplified@JP/Jouyou
-     ((=ucs		  . #x665A)	; 晚
+     ((=ucs@jis		  . #x665A)	; &M-13940;
+      (=jis-x0213-1	  . #x753C)	; &M-13940; [85-28]
+      (=daikanwa	  . 13940)	; &I-M-13940;
       ))
     ))
 (define-char
@@ -7019,7 +7050,6 @@
      ((=ucs		  . #x65E5)	; 日
       )
      ((=ucs@jis		  . #x6562)	; &GT-16742;
-      (=ucs@big5	  . #x6562)	; &GT-16742;
       (=ks-x1001	  . #x4A72)	; &GT-16742; [42-82]
       (=jis-x0208@1990	  . #x343A)	; &I-J90-343A; [20-26]
       (=cns11643-1	  . #x5F56)	; &I-C1-5F56; [63-54]
@@ -7977,8 +8007,9 @@
 (define-char
   '((ideographic-radical . 72)	; ⽇
     (=ucs		. #x66D9)	; 曙
+    (=>jis-x0208	. #x3D6C)	; 曙 [29-76]
+    (=>jis-x0213-1	. #x3D6C)	; 曙 [29-76]
     (=big5		. #xC0C6)	; &I-B-C0C6;
-    (=jis-x0208@1997	. #x3D6C)	; 曙 [29-76]
     ))
 (define-char
   '((<-denotational
@@ -8007,7 +8038,7 @@
     (=gt		. 17977)	; &I-GT-17977;
     (=gt-pj-1		. #x3D6C)	; &I-GT-17977; [29-76]
     (=jef-china3	. #x51FE)	; &I-JC3-51FE;
-    (<-simplified@JP
+    (<-simplified@JP/jis
      ((=jis-x0208@1978	  . #x3D6C)	; &M-14220; [29-76]
       (=ks-x1001	  . #x5F75)	; &I-K0-5F75; [63-85]
       (=daikanwa	  . 14220)	; &I-M-14220;
diff --git a/lisp/utf-2000/Ideograph-R073-Say.el b/lisp/utf-2000/Ideograph-R073-Say.el
index b440573..3ca2db5 100644
--- a/lisp/utf-2000/Ideograph-R073-Say.el
+++ b/lisp/utf-2000/Ideograph-R073-Say.el
@@ -82,7 +82,7 @@
     (=gt-k		. 01571)	; &I-GT-K01571;
     (=gt-pj-1		. #x3148)	; &I-GT-18073; [17-40]
     (=daikanwa		. 14282)	; &I-M-14282;
-    (=shinjigen@rev	.  3406)	; 曳
+    (=shinjigen		.  3406)	; 曳
     ))
 (define-char
   '((ideographic-radical . 73)	; ⽈
@@ -99,8 +99,9 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x66F4)	; 更
+    (=>jis-x0208	. #x3939)	; 更 [25-25]
+    (=>jis-x0213-1	. #x3939)	; 更 [25-25]
     (=big5		. #xA7F3)	; &I-B-A7F3;
-    (=jis-x0208@1997	. #x3939)	; 更 [25-25]
     (->subsumptive
      ((=jis-x0208@1978	  . #x3939)	; &M-14283; [25-25]
       (=jis-x0208@1983	  . #x3939)	; &I-J83-3939; [25-25]
@@ -130,7 +131,14 @@
     (=gt		. 18076)	; &I-GT-18076;
     (=gt-pj-1		. #x5B2A)	; &I-GT-18076; [59-10]
     (=daikanwa		. 14284)	; &I-M-14284;
-    (=shinjigen@rev	.  3408)	; 曵
+    (=shinjigen		.  3408)	; 曵
+    (<-wrong
+     ((=ucs		  . #x66F3)	; 曳
+      (=jis-x0208	  . #x3148)	; &I-J90-3148; [17-40]
+      (=shinjigen	  .  3406)	; 曳
+      ))
+    (<-wrong*sources
+     shinjigen)
     ))
 (define-char
   '((ideographic-radical . 73)	; ⽈
diff --git a/lisp/utf-2000/Ideograph-R074-Moon.el b/lisp/utf-2000/Ideograph-R074-Moon.el
index 38c2def..37ea4ec 100644
--- a/lisp/utf-2000/Ideograph-R074-Moon.el
+++ b/lisp/utf-2000/Ideograph-R074-Moon.el
@@ -180,7 +180,8 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x670B)	; 朋
-    (=jis-x0208@1997	. #x4A7E)	; 朋 [42-94]
+    (=>jis-x0208	. #x4A7E)	; 朋 [42-94]
+    (=>jis-x0213-1	. #x4A7E)	; 朋 [42-94]
     ))
 (define-char
   '((<-denotational
@@ -193,7 +194,7 @@
     (=gt-k		. 04938)	; &I-GT-K04938;
     (=gt-pj-3		. #x7370)	; &GT-18172; [83-80]
     (=daikanwa		. 14340)	; &I-M-14340;
-    (=shinjigen@1ed	.  3431)	; &GT-18172;
+    (=shinjigen		.  3431)	; &GT-18172;
     (=jef-china3	. #x52A5)	; &I-JC3-52A5;
     (mojikyo		. 014340)	; &MCS-60003804;
     ))
@@ -215,8 +216,14 @@
     (=gt		. 18173)	; &I-GT-18173;
     (=gt-k		. 03824)	; &I-GT-K03824;
     (=gt-pj-1		. #x4A7E)	; &I-GT-18173; [42-94]
-    (=shinjigen@1ed	.  3430)	; &GT-18173;
+    (=shinjigen		.  3430)	; &GT-18173;
     (mojikyo		. 050219)	; &MCS-6000C42B;
+    (<-same
+     ((=gt		  . 18172)	; &GT-18172;
+      (=daikanwa	  . 14340)	; &I-M-14340;
+      ))
+    (<-same*sources
+     daikanwa)
     ))
 (define-char
   '((ideographic-radical . 74)	; ⽉
@@ -278,7 +285,8 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x670D)	; 服
-    (=jis-x0208@1997	. #x497E)	; 服 [41-94]
+    (=>jis-x0208	. #x497E)	; 服 [41-94]
+    (=>jis-x0213-1	. #x497E)	; 服 [41-94]
     ))
 (define-char
   '((<-denotational
@@ -310,6 +318,11 @@
     (=gt-k		. 03813)	; &I-GT-K03813;
     (=gt-pj-1		. #x497E)	; &I-GT-18171; [41-94]
     (mojikyo		. 050220)	; &MCS-6000C42C;
+    (<-same
+     ((=daikanwa	  . 14345)	; &M-14345;
+      ))
+    (<-same*sources
+     daikanwa)
     ))
 (define-char
   '((ideographic-radical . 74)	; ⽉
@@ -951,38 +964,29 @@
     ))
 (define-char
   '((ideographic-radical . 74)	; ⽉
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=ucs		. #x23379)	; 𣍹
-    (=cns11643-6	. #x405A)	; &I-C6-405A; [32-58]
-    ))
-(define-char
-  '((=>ucs		. #x671C)	; 朜
-    (ideographic-radical . 74)	; ⽉
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=ucs@jis		. #x671C)	; &M-14373;
-    (=jis-x0212		. #x4273)	; &M-14373; [34-83]
-    (=daikanwa		. 14373)	; &I-M-14373;
-    ))
-(define-char
-  '((morohashi-daikanwa	14373 0 0)
-    (ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x671C)	; 朜
-    (=cns11643-4	. #x3829)	; &I-C4-3829; [24-09]
+    (->subsumptive
+     ((=ucs@jis		  . #x671C)	; &M-14373;
+      (=jis-x0212	  . #x4273)	; &M-14373; [34-83]
+      (=daikanwa	  . 14373)	; &I-M-14373;
+      )
+     ((=ucs@unicode	  . #x671C)	; &C4-3829;
+      (=cns11643-4	  . #x3829)	; &C4-3829; [24-09]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x671D)	; 朝
-    (ideographic-radical . 74)	; ⽉
+  '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=jis-x0208@1997	. #x442B)	; &J97-442B; [36-11]
+    (=ucs		. #x671D)	; 朝
+    (=>jis-x0208	. #x442B)	; 朝 [36-11]
+    (=>jis-x0213-1	. #x442B)	; 朝 [36-11]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x442B)	; &J97-442B; [36-11]
+     ((=ucs		  . #x671D)	; 朝
       ))
     (ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 8)
@@ -993,14 +997,14 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x442B)	; &J97-442B; [36-11]
+     ((=ucs		  . #x671D)	; 朝
       ))
     (morohashi-daikanwa	14374 1)
     (ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=ucs		. #x671D)	; 朝
-    (=jis-x0208		. #x442B)	; &I-J90-442B; [36-11]
+    (=ucs@unicode	. #x671D)	; &GT-18245;
+    (=jis-x0208		. #x442B)	; &GT-18245; [36-11]
     (=gb2312		. #x332F)	; &I-G0-332F; [19-15]
     (=ks-x1001		. #x7048)	; &I-K0-7048; [80-40]
     (=cns11643-1	. #x5F67)	; &I-C1-5F67; [63-71]
@@ -1010,6 +1014,11 @@
     (=gt-k		. 09103)	; &I-GT-K09103;
     (=gt-pj-1		. #x442B)	; &I-GT-18245; [36-11]
     (mojikyo		. 050223)	; &MCS-6000C42F;
+    (<-same
+     ((=daikanwa	  . 14374)	; &M-14374;
+      ))
+    (<-same*sources
+     daikanwa)
     ))
 (define-char
   '((=>ucs		. #x23377)	; 𣍷
@@ -1137,6 +1146,32 @@
     ))
 (define-char
   '((ideographic-radical . 74)	; ⽉
+    (=ucs		. #x23379)	; 𣍹
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23379)	; 𣍹
+      ))
+    (ideographic-radical . 74)	; ⽉
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=daikanwa		. 14381)	; &M-14381;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23379)	; 𣍹
+      ))
+    (ideographic-radical . 74)	; ⽉
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (->subsumptive
+     ((=ucs@iso		  . #x23379)	; &U-00023379;
+      )
+     ((=cns11643-6	  . #x405A)	; &C6-405A; [32-58]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 74)	; ⽉
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x2337A)	; 𣍺
diff --git a/lisp/utf-2000/Ideograph-R075-Tree.el b/lisp/utf-2000/Ideograph-R075-Tree.el
index dd2bf9e..b172388 100644
--- a/lisp/utf-2000/Ideograph-R075-Tree.el
+++ b/lisp/utf-2000/Ideograph-R075-Tree.el
@@ -882,8 +882,9 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x6753)	; 杓
+    (=>jis-x0208	. #x3C5D)	; 杓 [28-61]
+    (=>jis-x0213-1	. #x3C5D)	; 杓 [28-61]
     (=big5		. #xA840)	; &I-B-A840;
-    (=jis-x0208@1997	. #x3C5D)	; 杓 [28-61]
     ))
 (define-char
   '((<-denotational
@@ -894,15 +895,17 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x2F8DC)	; 杓
+    (=ucs@jis/2004	. #x6753)	; 杓
     (=ucs@ks		. #x6753)	; 杓
     (=jis-x0208@1978	. #x3C5D)	; &I-J78-3C5D; [28-61]
     (=ks-x1001		. #x7875)	; &I-K0-7875; [88-85]
     (=cns11643-6	. #x282E)	; &I-C6-282E; [08-14]
+    (=jis-x0213-1@2004	. #x3C5D)	; &I-JX3-3C5D; [28-61]
     (=gt		. 18401)	; &I-GT-18401;
     (=gt-k		. 02566)	; &I-GT-K02566;
     (=gt-pj-4		. #x306F)	; &I-GT-18401; [16-79]
     (=daikanwa		. 14466)	; &I-M-14466;
-    (=shinjigen@1ed	.  3486)	; 杓
+    (=shinjigen		.  3486)	; 杓
     ))
 (define-char
   '((<-denotational
@@ -916,16 +919,28 @@
     (=jis-x0208@1983	. #x3C5D)	; &I-J83-3C5D; [28-61]
     (=jis-x0208@1990	. #x3C5D)	; &I-J90-3C5D; [28-61]
     (=cns11643-1	. #x4A61)	; &I-C1-4A61; [42-65]
-    (=jis-x0213-1	. #x3C5D)	; &I-JX1-3C5D; [28-61]
+    (=jis-x0213-1@2000	. #x3C5D)	; &I-JX1-3C5D; [28-61]
     (=gt		. 18403)	; &I-GT-18403;
     (=gt-k		. 02567)	; &I-GT-K02567;
     (=gt-pj-1		. #x3C5D)	; &I-GT-18403; [28-61]
     (=jef-china3	. #x54C9)	; &I-JC3-54C9;
+    (<-simplified@JP/extra/design
+     ((=ucs		  . #x2F8DC)	; 杓
+      (=jis-x0208@1978	  . #x3C5D)	; &I-J78-3C5D; [28-61]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=ucs		  . #x4E47)	; 乇
+      ))
     (=ucs		. #x6754)	; 杔
     (->subsumptive
      ((hanyu-dazidian	  2 1160 8)
@@ -933,7 +948,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x6728)	; 木
+       ((=gt-k		    . 00495)	; &GT-K00495;
 	)
        ((=ucs@unicode	    . #x4E47)	; &GT-00167;
 	(=gb2312	    . #x5831)	; &GT-00167; [56-17]
@@ -946,7 +961,19 @@
       (=hanziku-3	  . #xECDF)	; &I-HZK03-ECDF;
       (=cbeta		  . 03384)	; &I-CB03384;
       )
-     ((=cns11643-3	  . #x2644)	; &C3-2644; [06-36]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((=ucs@cns	    . #x4E47)	; &JX2-2129;
+	(=ucs@jis	    . #x4E47)	; &JX2-2129;
+	(=jis-x0212	    . #x3032)	; &JX2-2129; [16-18]
+	(=cns11643-2	    . #x2128)	; &I-C2-2128; [01-08]
+	(=jis-x0213-2	    . #x2129)	; &I-JX2-2129; [01-09]
+	))
+      (=cns11643-3	  . #x2644)	; &C3-2644; [06-36]
       ))
     ))
 (define-char
@@ -965,20 +992,24 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x6756)	; 杖
+    (=>jis-x0208	. #x3E73)	; 杖 [30-83]
+    (=>jis-x0213-1	. #x3E73)	; 杖 [30-83]
     (=big5		. #xA7FA)	; &I-B-A7FA;
     (->subsumptive
-     ((=ucs@jis		  . #x6756)	; &GT-18407;
+     ((=ucs@jis/1990	  . #x6756)	; &GT-18407;
+      (=ucs@jis/2000	  . #x6756)	; &GT-18407;
       (=jis-x0208	  . #x3E73)	; &GT-18407; [30-83]
       (=ks-x1001	  . #x6D68)	; &I-K0-6D68; [77-72]
-      (=jis-x0213-1	  . #x3E73)	; &I-JX1-3E73; [30-83]
+      (=jis-x0213-1@2000  . #x3E73)	; &I-JX1-3E73; [30-83]
       (=gt		  . 18407)	; &I-GT-18407;
       (=gt-pj-1		  . #x3E73)	; &I-GT-18407; [30-83]
       (=daikanwa	  . 14469)	; &I-M-14469;
       (=shinjigen	  .  3480)	; &GT-18407;
       )
-     ((=ucs@unicode	  . #x6756)	; &C1-4A5C;
-      (=gb2312		  . #x5548)	; &C1-4A5C; [53-40]
+     ((=ucs@unicode	  . #x6756)	; &JX3-3E73;
+      (=gb2312		  . #x5548)	; &JX3-3E73; [53-40]
       (=cns11643-1	  . #x4A5C)	; &I-C1-4A5C; [42-60]
+      (=jis-x0213-1@2004  . #x3E73)	; &I-JX3-3E73; [30-83]
       ))
     ))
 (define-char
@@ -1902,15 +1933,15 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x677E)	; 松
-    (=jis-x0208@1997	. #x3E3E)	; 松 [30-30]
+    (=>jis-x0208	. #x3E3E)	; 松 [30-30]
+    (=>jis-x0213-1	. #x3E3E)	; 松 [30-30]
+    (=big5		. #xAA51)	; &I-B-AA51;
     (->subsumptive
-     ((=ucs@big5	  . #x677E)	; &M-14516;
-      (=jis-x0208@1978	  . #x3E3E)	; &M-14516; [30-30]
+     ((=jis-x0208@1978	  . #x3E3E)	; &M-14516; [30-30]
       (=jis-x0208@1983	  . #x3E3E)	; &I-J83-3E3E; [30-30]
       (=ks-x1001	  . #x6166)	; &I-K0-6166; [65-70]
-      (=big5		  . #xAA51)	; &I-B-AA51;
       (=daikanwa	  . 14516)	; &I-M-14516;
-      (=shinjigen@rev	  .  3502)	; &M-14516;
+      (=shinjigen	  .  3502)	; &M-14516;
       (=jef-china3	  . #x53A8)	; &I-JC3-53A8;
       )
      ((=cns11643-1	  . #x4E34)	; &C1-4E34; [46-20]
@@ -1921,57 +1952,55 @@
       (=jis-x0213-1	  . #x3E3E)	; &I-JX1-3E3E; [30-30]
       (=gt		  . 18480)	; &I-GT-18480;
       (=gt-pj-1		  . #x3E3E)	; &I-GT-18480; [30-30]
+      (=shinjigen	  .  3501)	; &GT-18480;
       ))
     ))
 (define-char
-  '((=>ucs		. #x6780)	; 枀
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (=daikanwa		. 14517)	; &M-14517;
-    (=jef-china3	. #x52EB)	; &I-JC3-52EB;
-    ))
-(define-char
-  '((morohashi-daikanwa	14517 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (hanyu-dazidian	2 1173 6)
     (=ucs		. #x6780)	; 枀
-    (=hanziku-3		. #xEFA6)	; &I-HZK03-EFA6;
-    ))
-(define-char
-  '((=>ucs		. #x6780)	; 枀
-    (morohashi-daikanwa	14517 0 1)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (=cns11643-3	. #x2952)	; &C3-2952; [09-50]
-    ))
-(define-char
-  '((=>ucs		. #x677F)	; 板
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 4)
-    (total-strokes	 . 8)
-    (=ucs@jis		. #x677F)	; &GT-18511;
-    (=ucs@big5		. #x677F)	; &GT-18511;
-    (=jis-x0208		. #x4844)	; &GT-18511; [40-36]
-    (=ks-x1001		. #x7779)	; &I-K0-7779; [87-89]
-    (=cns11643-1	. #x4E32)	; &I-C1-4E32; [46-18]
-    (=jis-x0213-1	. #x4844)	; &I-JX1-4844; [40-36]
-    (=big5		. #xAA4F)	; &I-B-AA4F;
-    (=gt		. 18511)	; &I-GT-18511;
-    (=gt-pj-1		. #x4844)	; &I-GT-18511; [40-36]
-    (=daikanwa		. 14518)	; &I-M-14518;
-    (=shinjigen@rev	.  3517)	; &GT-18511;
+    (->subsumptive
+     ((=daikanwa	  . 14517)	; &M-14517;
+      (=shinjigen	  .  3503)	; &M-14517;
+      (=jef-china3	  . #x52EB)	; &I-JC3-52EB;
+      (<-formed
+       ((=jis-x0208@1978    . #x3E3E)	; &M-14516; [30-30]
+	(=jis-x0208@1983    . #x3E3E)	; &I-J83-3E3E; [30-30]
+	(=ks-x1001	    . #x6166)	; &I-K0-6166; [65-70]
+	(=daikanwa	    . 14516)	; &I-M-14516;
+	(=shinjigen	    .  3502)	; &M-14516;
+	))
+      (<-formed*sources
+       shinjigen)
+      )
+     ((=cns11643-3	  . #x2952)	; &C3-2952; [09-50]
+      )
+     ((hanyu-dazidian	  2 1173 6)
+      (=ucs@unicode	  . #x6780)	; &HZK03-EFA6;
+      (=hanziku-3	  . #xEFA6)	; &HZK03-EFA6;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	14518 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x677F)	; 板
-    (=gb2312		. #x3065)	; &I-G0-3065; [16-69]
+    (=big5		. #xAA4F)	; &I-B-AA4F;
+    (->subsumptive
+     ((=ucs@jis		  . #x677F)	; &GT-18511;
+      (=jis-x0208	  . #x4844)	; &GT-18511; [40-36]
+      (=ks-x1001	  . #x7779)	; &I-K0-7779; [87-89]
+      (=cns11643-1	  . #x4E32)	; &I-C1-4E32; [46-18]
+      (=jis-x0213-1	  . #x4844)	; &I-JX1-4844; [40-36]
+      (=gt		  . 18511)	; &I-GT-18511;
+      (=gt-pj-1		  . #x4844)	; &I-GT-18511; [40-36]
+      (=daikanwa	  . 14518)	; &I-M-14518;
+      (=shinjigen	  .  3517)	; &GT-18511;
+      )
+     ((=ucs@unicode	  . #x677F)	; &G0-3065;
+      (=gb2312		  . #x3065)	; &G0-3065; [16-69]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -2119,16 +2148,21 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x6785)	; 枅
+    (=>jis-x0208	. #x5B47)	; 枅 [59-39]
+    (=>jis-x0213-1	. #x5B47)	; 枅 [59-39]
+    (=big5		. #xCCD3)	; &I-B-CCD3;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x6785)	; &B-CCD3;
-      (=big5		  . #xCCD3)	; &B-CCD3;
-      (=jis-x0208@1997	  . #x5B47)	; &B-CCD3; [59-39]
+     ((=ucs		  . #x6785)	; 枅
       ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
-    (=ucs		. #x6785)	; 枅
-    (=jis-x0208		. #x5B47)	; &I-J90-5B47; [59-39]
+    (=ucs@unicode	. #x6785)	; &GT-18448;
+    (=jis-x0208		. #x5B47)	; &GT-18448; [59-39]
     (=cns11643-2	. #x2734)	; &I-C2-2734; [07-20]
     (=jis-x0213-1	. #x5B47)	; &I-JX1-5B47; [59-39]
     (=gt		. 18448)	; &I-GT-18448;
@@ -2143,19 +2177,13 @@
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (=ucs@big5		. #x6785)	; &B-CCD3;
-    (=big5		. #xCCD3)	; &B-CCD3;
-    (=jis-x0208@1997	. #x5B47)	; &B-CCD3; [59-39]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x6786)	; 枆
+    (=big5		. #xCCDA)	; &I-B-CCDA;
     (->subsumptive
      ((=ucs@unicode	  . #x6786)	; &M-14526;
-      (=big5		  . #xCCDA)	; &M-14526;
-      (=daikanwa	  . 14526)	; &I-M-14526;
+      (=daikanwa	  . 14526)	; &M-14526;
       )
      ((=ucs@cns		  . #x6786)	; &C2-273B;
       (=cns11643-2	  . #x273B)	; &C2-273B; [07-27]
@@ -3021,7 +3049,8 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x67A6)	; 枦
-    (=jis-x0208@1997	. #x5B45)	; 枦 [59-37]
+    (=>jis-x0208	. #x5B45)	; 枦 [59-37]
+    (=>jis-x0213-1	. #x5B45)	; 枦 [59-37]
     ))
 (define-char
   '((<-denotational
@@ -3080,7 +3109,8 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (=ucs		. #x67A9)	; 枩
-    (=jis-x0208@1997	. #x5B40)	; 枩 [59-32]
+    (=>jis-x0208	. #x5B40)	; 枩 [59-32]
+    (=>jis-x0213-1	. #x5B40)	; 枩 [59-32]
     (->subsumptive
      ((=ucs@jis		  . #x67A9)	; &GT-18479;
       (=jis-x0208@1990	  . #x5B40)	; &GT-18479; [59-32]
@@ -3090,9 +3120,10 @@
       )
      ((mojikyo		  . 054579)	; &MCS-6000D533;
       )
-     ((=ucs@unicode	  . #x67A9)	; &J83-5B40;
-      (=jis-x0208@1978	  . #x5B40)	; &J83-5B40; [59-32]
+     ((=jis-x0208@1978	  . #x5B40)	; &J83-5B40; [59-32]
       (=jis-x0208@1983	  . #x5B40)	; &I-J83-5B40; [59-32]
+      )
+     ((=ucs@unicode	  . #x67A9)	; &UU+67A9;
       ))
     ))
 (define-char
@@ -3234,16 +3265,24 @@
     (=gt		. 18570)	; &I-GT-18570;
     (=gt-pj-1		. #x5B4C)	; &I-GT-18570; [59-44]
     (=daikanwa		. 14583)	; &I-M-14583;
-    (=shinjigen@rev	.  3538)	; 枳
+    (=shinjigen		.  3538)	; 枳
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=>jis-x0208	. #x5B4A)	; &J97-5B4A; [59-42]
+    (=>jis-x0213-1	. #x5B4A)	; &J97-5B4A; [59-42]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5B4A)	; &J97-5B4A; [59-42]
+     ((=>jis-x0208	  . #x5B4A)	; &J97-5B4A; [59-42]
       ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x67FA)	; 柺
+    (=big5		. #xCF5E)	; &I-B-CF5E;
     ))
 (define-char
   '((<-denotational
@@ -3262,12 +3301,6 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=jis-x0208@1997	. #x5B4A)	; &J97-5B4A; [59-42]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
     (=ucs		. #x67B5)	; 枵
     (=gb2312		. #x6855)	; &I-G0-6855; [72-53]
     (=jis-x0212		. #x4334)	; &I-JSP-4334; [35-20]
@@ -3619,56 +3652,63 @@
     (=hanziku-3		. #xF1CF)	; &I-HZK03-F1CF;
     ))
 (define-char
-  '((=>ucs		. #x67C8)	; 柈
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=ucs		. #x67C8)	; 柈
+    (=big5		. #xCEFD)	; &I-B-CEFD;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x67C8)	; 柈
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs@jis		. #x67C8)	; &M-14608;
-    (=ucs@big5		. #x67C8)	; &M-14608;
     (=jis-x0212		. #x433D)	; &M-14608; [35-29]
     (=jis-x0213-2	. #x2E4F)	; &I-JX2-2E4F; [14-47]
-    (=big5		. #xCEFD)	; &I-B-CEFD;
     (=daikanwa		. 14608)	; &I-M-14608;
     (=jef-china3	. #x9BDD)	; &I-JC3-9BDD;
     (mojikyo		. 014608)	; &MCS-60003910;
     ))
 (define-char
-  '((morohashi-daikanwa	14608 0 2)
+  '((<-denotational
+     ((=ucs		  . #x67C8)	; 柈
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x67C8)	; 柈
-    (=iso-ir165		. #x7B66)	; &I-EGB-7B66; [91-70]
+    (=ucs@unicode	. #x67C8)	; &C2-2A7E;
+    (=iso-ir165		. #x7B66)	; &C2-2A7E; [91-70]
     (=cns11643-2	. #x2A7E)	; &I-C2-2A7E; [10-94]
     ))
 (define-char
-  '((=>ucs		. #x67C9)	; 柉
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (=ucs@jis		. #x67C9)	; &M-14609;
-    (=ucs@big5		. #x67C9)	; &M-14609;
-    (=jis-x0212		. #x433E)	; &M-14609; [35-30]
-    (=big5		. #xCF5F)	; &I-B-CF5F;
-    (=daikanwa		. 14609)	; &I-M-14609;
-    (=jef-china3	. #x9BDE)	; &I-JC3-9BDE;
-    ))
-(define-char
-  '((morohashi-daikanwa	14609 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x67C9)	; 柉
-    (=cns11643-2	. #x2B41)	; &I-C2-2B41; [11-33]
-    (mojikyo		. 014609)	; &MCS-60003911;
+    (=big5		. #xCF5F)	; &I-B-CF5F;
+    (->subsumptive
+     ((=ucs@jis		  . #x67C9)	; &M-14609;
+      (=jis-x0212	  . #x433E)	; &M-14609; [35-30]
+      (=daikanwa	  . 14609)	; &I-M-14609;
+      (=jef-china3	  . #x9BDE)	; &I-JC3-9BDE;
+      )
+     ((mojikyo		  . 014609)	; &MCS-60003911;
+      )
+     ((=ucs@unicode	  . #x67C9)	; &C2-2B41;
+      (=cns11643-2	  . #x2B41)	; &C2-2B41; [11-33]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x67CA)	; 柊
+    (=>jis-x0208	. #x4922)	; 柊 [41-02]
+    (=>jis-x0213-1	. #x4922)	; 柊 [41-02]
     (=big5		. #xCF60)	; &I-B-CF60;
-    (=jis-x0208@1997	. #x4922)	; 柊 [41-02]
     (->subsumptive
      ((=jis-x0208@1978	  . #x4922)	; &M-14610; [41-02]
       (=daikanwa	  . 14610)	; &I-M-14610;
@@ -3698,10 +3738,10 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x67CB)	; 柋
+    (=big5		. #xCF63)	; &I-B-CF63;
     (->subsumptive
      ((=ucs@unicode	  . #x67CB)	; &M-14612;
-      (=big5		  . #xCF63)	; &M-14612;
-      (=daikanwa	  . 14612)	; &I-M-14612;
+      (=daikanwa	  . 14612)	; &M-14612;
       )
      ((=ucs@cns		  . #x67CB)	; &C2-2B45;
       (=cns11643-2	  . #x2B45)	; &C2-2B45; [11-37]
@@ -3828,54 +3868,53 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x67D3)	; 染
-    (=jis-x0208		. #x4077)	; &I-J90-4077; [32-87]
-    (=gb2312		. #x483E)	; &I-G0-483E; [40-30]
-    (=ks-x1001		. #x6678)	; &I-K0-6678; [70-88]
-    (=jis-x0213-1	. #x4077)	; &I-JX1-4077; [32-87]
     (=big5		. #xAC56)	; &I-B-AC56;
-    (=gt		. 18614)	; &I-GT-18614;
-    (=gt-k		. 05123)	; &I-GT-K05123;
-    (=gt-pj-1		. #x4077)	; &I-GT-18614; [32-87]
-    (=daikanwa		. 14621)	; &I-M-14621;
-    ))
-(define-char
-  '((=>ucs		. #x67D3)	; 染
-    (morohashi-daikanwa	14621 0 1)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (=cns11643-1	. #x5159)	; &C1-5159; [49-57]
+    (->subsumptive
+     ((=ucs@unicode	  . #x67D3)	; &GT-18614;
+      (=jis-x0208	  . #x4077)	; &GT-18614; [32-87]
+      (=gb2312		  . #x483E)	; &I-G0-483E; [40-30]
+      (=ks-x1001	  . #x6678)	; &I-K0-6678; [70-88]
+      (=jis-x0213-1	  . #x4077)	; &I-JX1-4077; [32-87]
+      (=gt		  . 18614)	; &I-GT-18614;
+      (=gt-k		  . 05123)	; &I-GT-K05123;
+      (=gt-pj-1		  . #x4077)	; &I-GT-18614; [32-87]
+      (=daikanwa	  . 14621)	; &I-M-14621;
+      )
+     ((=cns11643-1	  . #x5159)	; &C1-5159; [49-57]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x67D4)	; 柔
-    (=jis-x0208@1997	. #x3D40)	; 柔 [29-32]
+    (=>jis-x0208	. #x3D40)	; 柔 [29-32]
+    (=>jis-x0213-1	. #x3D40)	; 柔 [29-32]
     (->subsumptive
      ((=jis-x0208@1978	  . #x3D40)	; &M-14622; [29-32]
       (=jis-x0208@1983	  . #x3D40)	; &I-J83-3D40; [29-32]
       (=daikanwa	  . 14622)	; &I-M-14622;
-      (=shinjigen@rev	  .  3569)	; &M-14622;
+      (=shinjigen	  .  3569)	; &M-14622;
       )
-     ((=ucs@unicode	  . #x67D4)	; &GT-18606;
-      (=gb2312		  . #x4861)	; &GT-18606; [40-65]
-      (=ks-x1001	  . #x6A75)	; &I-K0-6A75; [74-85]
-      (=jis-x0208@1990	  . #x3D40)	; &I-J90-3D40; [29-32]
-      (=jis-x0213-1	  . #x3D40)	; &I-JX1-3D40; [29-32]
-      (=big5		  . #xAC58)	; &I-B-AC58;
-      (=gt		  . 18606)	; &I-GT-18606;
-      (=gt-k		  . 05100)	; &I-GT-K05100;
-      (=gt-pj-1		  . #x3D40)	; &I-GT-18606; [29-32]
-      )
-     ((=cns11643-1	  . #x515B)	; &C1-515B; [49-59]
+     ((=big5		  . #xAC58)	; &B-AC58;
+      (->subsumptive
+       ((=ucs@unicode	    . #x67D4)	; &GT-18606;
+	(=gb2312	    . #x4861)	; &GT-18606; [40-65]
+	(=ks-x1001	    . #x6A75)	; &I-K0-6A75; [74-85]
+	(=jis-x0208@1990    . #x3D40)	; &I-J90-3D40; [29-32]
+	(=jis-x0213-1	    . #x3D40)	; &I-JX1-3D40; [29-32]
+	(=gt		    . 18606)	; &I-GT-18606;
+	(=gt-k		    . 05100)	; &I-GT-K05100;
+	(=gt-pj-1	    . #x3D40)	; &I-GT-18606; [29-32]
+	)
+       ((=cns11643-1	    . #x515B)	; &C1-515B; [49-59]
+	))
       ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (hanyu-dazidian	2 1192 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -3885,16 +3924,27 @@
      ((=ucs		  . #x77DB)	; 矛
       ))
     (=ucs		. #x67D5)	; 柕
-    (=cns11643-3	. #x2D31)	; &I-C3-2D31; [13-17]
-    (=daikanwa		. 14623)	; &I-M-14623;
-    (=hanziku-3		. #xF36B)	; &I-HZK03-F36B;
-    (=cbeta		. 01847)	; &I-CB01847;
+    (->subsumptive
+     ((hanyu-dazidian	  2 1192 1)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((=ucs		    . #x77DB)	; 矛
+	))
+      (=ucs@unicode	  . #x67D5)	; &M-14623;
+      (=cns11643-3	  . #x2D31)	; &M-14623; [13-17]
+      (=daikanwa	  . 14623)	; &I-M-14623;
+      (=hanziku-3	  . #xF36B)	; &I-HZK03-F36B;
+      (=cbeta		  . 01847)	; &I-CB01847;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (hanyu-dazidian	2 1191 1)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -3904,31 +3954,41 @@
      ((=ucs		  . #x53EC)	; 召
       ))
     (=ucs		. #x67D6)	; 柖
-    (=cns11643-3	. #x2D2B)	; &I-C3-2D2B; [13-11]
-    (=daikanwa		. 14624)	; &I-M-14624;
-    (=hanziku-3		. #xF34B)	; &I-HZK03-F34B;
-    (=cbeta		. 01456)	; &I-CB01456;
-    ))
-(define-char
-  '((=>ucs		. #x67D7)	; 柗
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (=ucs@jis		. #x67D7)	; &M-14625;
-    (=jis-x0212		. #x4340)	; &M-14625; [35-32]
-    (=jis-x0213-1	. #x755B)	; &I-JX1-755B; [85-59]
-    (=daikanwa		. 14625)	; &I-M-14625;
-    (=jef-china3	. #x53B7)	; &I-JC3-53B7;
+    (->subsumptive
+     ((hanyu-dazidian	  2 1191 1)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((=ucs		    . #x53EC)	; 召
+	))
+      (=ucs@unicode	  . #x67D6)	; &M-14624;
+      (=cns11643-3	  . #x2D2B)	; &M-14624; [13-11]
+      (=daikanwa	  . 14624)	; &I-M-14624;
+      (=hanziku-3	  . #xF34B)	; &I-HZK03-F34B;
+      (=cbeta		  . 01456)	; &I-CB01456;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	14625 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (hanyu-dazidian	2 1186 5)
     (=ucs		. #x67D7)	; 柗
-    (=cns11643-3	. #x2D3A)	; &I-C3-2D3A; [13-26]
-    (=hanziku-3		. #xF24C)	; &I-HZK03-F24C;
+    (->subsumptive
+     ((=ucs@jis		  . #x67D7)	; &M-14625;
+      (=jis-x0212	  . #x4340)	; &M-14625; [35-32]
+      (=jis-x0213-1	  . #x755B)	; &I-JX1-755B; [85-59]
+      (=daikanwa	  . 14625)	; &I-M-14625;
+      (=jef-china3	  . #x53B7)	; &I-JC3-53B7;
+      )
+     ((=cns11643-3	  . #x2D3A)	; &C3-2D3A; [13-26]
+      )
+     ((hanyu-dazidian	  2 1186 5)
+      (=ucs@unicode	  . #x67D7)	; &HZK03-F24C;
+      (=hanziku-3	  . #xF24C)	; &HZK03-F24C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -3944,7 +4004,7 @@
     (=gt-k		. 05148)	; &I-GT-K05148;
     (=gt-pj-1		. #x4453)	; &I-GT-18601; [36-51]
     (=daikanwa		. 14626)	; &I-M-14626;
-    (=shinjigen@rev	.  3555)	; 柘
+    (=shinjigen		.  3555)	; 柘
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -4198,23 +4258,30 @@
     (=daikanwa		. 14642)	; &I-M-14642;
     ))
 (define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=>jis-x0208	. #x3A3A)	; &J97-3A3A; [26-26]
+    (=>jis-x0213-1	. #x3A3A)	; &J97-3A3A; [26-26]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3A3A)	; &J97-3A3A; [26-26]
+     ((=>jis-x0208	  . #x3A3A)	; &J97-3A3A; [26-26]
       ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=ucs		  . #x4E14)	; 且
+      ))
     (=ucs		. #x67FB)	; 査
     (->subsumptive
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-	(=ucs		    . #x2FF1)	; ⿱
-	)
-       ((=ucs		    . #x6728)	; 木
-	)
-       ((=ucs		    . #x4E14)	; 且
-	))
-      (=ucs@unicode	  . #x67FB)	; &GT-18586;
+     ((=ucs@unicode	  . #x67FB)	; &GT-18586;
       (=jis-x0208	  . #x3A3A)	; &GT-18586; [26-26]
       (=ks-x1001	  . #x5E5B)	; &I-K0-5E5B; [62-59]
       (=jis-x0213-1	  . #x3A3A)	; &I-JX1-3A3A; [26-26]
@@ -4222,32 +4289,37 @@
       (=gt-k		  . 05082)	; &I-GT-K05082;
       (=gt-pj-1		  . #x3A3A)	; &I-GT-18586; [26-26]
       (=daikanwa	  . 14643)	; &I-M-14643;
-      (=shinjigen@rev	  .  3545)	; &GT-18586;
+      (=shinjigen	  .  3545)	; &GT-18586;
       (=cbeta		  . 05372)	; &I-CB05372;
       )
      ((=cns11643-3	  . #x2D34)	; &C3-2D34; [13-20]
       ))
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 5)
-    (total-strokes	 . 9)
-    (=jis-x0208@1997	. #x3A3A)	; &J97-3A3A; [26-26]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3A3A)	; &J97-3A3A; [26-26]
+     ((=>jis-x0208	  . #x3A3A)	; &J97-3A3A; [26-26]
       ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x67E5)	; 查
+    (=big5		. #xAC64)	; &I-B-AC64;
     (->subsumptive
      ((=ucs@unicode	  . #x67E5)	; &G0-3269;
       (=gb2312		  . #x3269)	; &G0-3269; [18-73]
-      (=big5		  . #xAC64)	; &I-B-AC64;
+      (=shinjigen	  .  3546)	; &G0-3269;
       (=jef-china3	  . #x52E9)	; &I-JC3-52E9;
       (mojikyo		  . 057016)	; &MCS-6000DEB8;
+      (<-wrong
+       ((=ucs@unicode	    . #x67FB)	; &GT-18586;
+	(=jis-x0208	    . #x3A3A)	; &GT-18586; [26-26]
+	(=ks-x1001	    . #x5E5B)	; &I-K0-5E5B; [62-59]
+	(=jis-x0213-1	    . #x3A3A)	; &I-JX1-3A3A; [26-26]
+	(=daikanwa	    . 14643)	; &I-M-14643;
+	(=shinjigen	    .  3545)	; &GT-18586;
+	))
+      (<-wrong*sources
+       shinjigen)
       )
      ((=cns11643-1	  . #x5167)	; &C1-5167; [49-71]
       ))
@@ -4472,16 +4544,36 @@
     (=gt-k		. 05256)	; &I-GT-K05256;
     (=gt-pj-1		. #x5B4B)	; &I-GT-18569; [59-43]
     (=daikanwa		. 14655)	; &I-M-14655;
-    (=shinjigen@rev	.  3536)	; 柬
+    (=shinjigen		.  3536)	; 柬
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
     (=ucs		. #x67ED)	; 柭
-    (=cns11643-2	. #x2B3B)	; &I-C2-2B3B; [11-27]
-    (=big5		. #xCF59)	; &I-B-CF59;
-    (=daikanwa		. 14656)	; &I-M-14656;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x67ED)	; 柭
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=big5		. #xCF59)	; &B-CF59;
+    (->subsumptive
+     ((=daikanwa	  . 14656)	; &M-14656;
+      )
+     ((=cns11643-2	  . #x2B3B)	; &C2-2B3B; [11-27]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x67ED)	; 柭
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 5)
+    (total-strokes	 . 9)
+    (=ucs@unicode	. #x67ED)	; &UU+67ED;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -4610,51 +4702,56 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (=ucs		. #x67F4)	; 柴
+    (=big5		. #xAEE3)	; &I-B-AEE3;
     (->subsumptive
      ((=ucs@unicode	  . #x67F4)	; &GT-18739;
       (=jis-x0208	  . #x3C46)	; &GT-18739; [28-38]
       (=gb2312		  . #x3271)	; &I-G0-3271; [18-81]
       (=ks-x1001	  . #x6343)	; &I-K0-6343; [67-35]
       (=jis-x0213-1	  . #x3C46)	; &I-JX1-3C46; [28-38]
-      (=big5		  . #xAEE3)	; &I-B-AEE3;
       (=gt		  . 18739)	; &I-GT-18739;
       (=gt-k		  . 06450)	; &I-GT-K06450;
       (=gt-pj-1		  . #x3C46)	; &I-GT-18739; [28-38]
       (=daikanwa	  . 14664)	; &I-M-14664;
-      (=shinjigen@1ed	  .  3547)	; &GT-18739;
+      (=shinjigen	  .  3547)	; &GT-18739;
       )
      ((=cns11643-1	  . #x5627)	; &C1-5627; [54-07]
       ))
     ))
 (define-char
-  '((<-denotational
-     ((=jis-x0208@1997	  . #x3A74)	; &J97-3A74; [26-84]
-      ))
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=ucs		. #x67F5)	; 柵
-    (=jis-x0208@1983	. #x3A74)	; &I-J83-3A74; [26-84]
-    (=ks-x1001		. #x737D)	; &I-K0-737D; [83-93]
-    (=jis-x0208@1990	. #x3A74)	; &I-J90-3A74; [26-84]
-    (=cns11643-1	. #x5160)	; &I-C1-5160; [49-64]
-    (=jis-x0213-1	. #x3A74)	; &I-JX1-3A74; [26-84]
-    (=big5		. #xAC5D)	; &I-B-AC5D;
-    (=gt		. 18589)	; &I-GT-18589;
-    (=gt-pj-1		. #x3A74)	; &I-GT-18589; [26-84]
-    (=daikanwa		. 14665)	; &I-M-14665;
-    (=shinjigen@1ed	.  3548)	; 柵
-    (=jef-china3	. #x53BE)	; &I-JC3-53BE;
+    (=>jis-x0208	. #x3A74)	; &J97-3A74; [26-84]
+    (=>jis-x0213-1	. #x3A74)	; &J97-3A74; [26-84]
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=>jis-x0208	  . #x3A74)	; &J97-3A74; [26-84]
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
-    (=jis-x0208@1997	. #x3A74)	; &J97-3A74; [26-84]
+    (=ucs		. #x67F5)	; 柵
+    (->subsumptive
+     ((=ucs@unicode	  . #x67F5)	; &GT-18589;
+      (=jis-x0208@1983	  . #x3A74)	; &GT-18589; [26-84]
+      (=ks-x1001	  . #x737D)	; &I-K0-737D; [83-93]
+      (=jis-x0208@1990	  . #x3A74)	; &I-J90-3A74; [26-84]
+      (=cns11643-1	  . #x5160)	; &I-C1-5160; [49-64]
+      (=jis-x0213-1	  . #x3A74)	; &I-JX1-3A74; [26-84]
+      (=big5		  . #xAC5D)	; &I-B-AC5D;
+      (=gt		  . 18589)	; &I-GT-18589;
+      (=gt-pj-1		  . #x3A74)	; &I-GT-18589; [26-84]
+      (=daikanwa	  . 14665)	; &I-M-14665;
+      (=jef-china3	  . #x53BE)	; &I-JC3-53BE;
+      )
+     ((=shinjigen	  .  3548)	; &SJG2-3548;
+      ))
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3A74)	; &J97-3A74; [26-84]
+     ((=>jis-x0208	  . #x3A74)	; &J97-3A74; [26-84]
       ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
@@ -4664,8 +4761,13 @@
     (=jis-x0208@1978	. #x3A74)	; &I-J78-3A74; [26-84]
     (=gb2312		. #x5524)	; &I-G0-5524; [53-04]
     (=cns11643-3	. #x2D38)	; &I-C3-2D38; [13-24]
-    (=shinjigen@1ed	.  3549)	; 栅
+    (=shinjigen		.  3549)	; 栅
     (=hanziku-3		. #xF268)	; &I-HZK03-F268;
+    (<-formed
+     ((=shinjigen	  .  3548)	; &SJG2-3548;
+      ))
+    (<-formed*sources
+     shinjigen)
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -4678,7 +4780,7 @@
       (=ks-x1001	  . #x5E5A)	; &M-14666; [62-58]
       (=jis-x0212	  . #x4347)	; &I-JSP-4347; [35-39]
       (=daikanwa	  . 14666)	; &I-M-14666;
-      (=shinjigen@1ed	  .  3553)	; &M-14666;
+      (=shinjigen	  .  3553)	; &M-14666;
       )
      ((=ucs@unicode	  . #x67F6)	; &UU+67F6;
       )
@@ -4695,7 +4797,7 @@
     (=jis-x0213-2	. #x2E54)	; &I-JX2-2E54; [14-52]
     (=big5		. #xCF4D)	; &I-B-CF4D;
     (=daikanwa		. 14667)	; &I-M-14667;
-    (=shinjigen@1ed	.  3557)	; 柷
+    (=shinjigen		.  3557)	; 柷
     (=jef-china3	. #x53BF)	; &I-JC3-53BF;
     ))
 (define-char
@@ -4994,7 +5096,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5B4A)	; &J97-5B4A; [59-42]
+     ((=>jis-x0208	  . #x5B4A)	; &J97-5B4A; [59-42]
       ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 5)
@@ -5039,7 +5141,6 @@
     (=ucs@cns		. #x2F8DF)	; 柺
     (=jis-x0208@1978	. #x5B4A)	; &I-J78-5B4A; [59-42]
     (=cns11643-3	. #x2D35)	; &I-C3-2D35; [13-21]
-    (=big5		. #xCF5E)	; &I-B-CF5E;
     (=daikanwa		. 49162)	; &I-M-49162;
     (<-wrong
      ((=ucs@cns		  . #x67FA)	; &M-14584;
@@ -5475,6 +5576,14 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x5E75)	; å¹µ
+      )
+     ((=ucs		  . #x6728)	; 木
+      ))
     (=ucs		. #x681E)	; 栞
     (->subsumptive
      ((hanyu-dazidian	  2 1193 2)
@@ -5496,7 +5605,7 @@
       (=gt-k		  . 06602)	; &I-GT-K06602;
       (=gt-pj-1		  . #x5B59)	; &I-GT-18694; [59-57]
       (=daikanwa	  . 14708)	; &I-M-14708;
-      (=shinjigen@rev	  .  3593)	; &GT-18694;
+      (=shinjigen	  .  3593)	; &GT-18694;
       (=hanziku-3	  . #xF3AE)	; &I-HZK03-F3AE;
       )
      ((ideographic-structure
@@ -5526,9 +5635,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x6785)	; &B-CCD3;
-      (=big5		  . #xCCD3)	; &B-CCD3;
-      (=jis-x0208@1997	  . #x5B47)	; &B-CCD3; [59-39]
+     ((=ucs		  . #x6785)	; 枅
       ))
     (=>ucs*		. #x6785)	; 枅
     (ideographic-radical . 75)	; ⽊
@@ -5567,10 +5674,10 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6820)	; æ  
+    (=big5		. #xD1F4)	; &I-B-D1F4;
     (->subsumptive
      ((=ucs@unicode	  . #x6820)	; &M-14711;
-      (=big5		  . #xD1F4)	; &M-14711;
-      (=daikanwa	  . 14711)	; &I-M-14711;
+      (=daikanwa	  . 14711)	; &M-14711;
       )
      ((=ucs@cns		  . #x6820)	; &C2-2F76;
       (=cns11643-2	  . #x2F76)	; &C2-2F76; [15-86]
@@ -5727,27 +5834,44 @@
     (=hanziku-3		. #xF4B5)	; &I-HZK03-F4B5;
     ))
 (define-char
-  '((=>ucs		. #x6829)	; æ ©
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=ucs		. #x3B5C)	; 㭜
+    (=cns11643-3	. #x3152)	; &I-C3-3152; [17-50]
+    (=daikanwa		. 14720)	; &I-M-14720;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=ucs		. #x6829)	; æ ©
+    (=big5		. #xAEDD)	; &I-B-AEDD;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6829)	; æ ©
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs@jis		. #x6829)	; &GT-18709;
-    (=ucs@big5		. #x6829)	; &GT-18709;
     (=jis-x0208		. #x5B5B)	; &GT-18709; [59-59]
     (=jis-x0213-1	. #x5B5B)	; &I-JX1-5B5B; [59-59]
-    (=big5		. #xAEDD)	; &I-B-AEDD;
     (=gt		. 18709)	; &I-GT-18709;
     (=gt-pj-1		. #x5B5B)	; &I-GT-18709; [59-59]
     (=daikanwa		. 14721)	; &I-M-14721;
-    (=shinjigen@rev	.  3597)	; &GT-18709;
+    (=shinjigen		.  3597)	; &GT-18709;
     ))
 (define-char
-  '((morohashi-daikanwa	14721 0 2)
+  '((<-denotational
+     ((=ucs		  . #x6829)	; æ ©
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=ucs		. #x6829)	; æ ©
-    (=gb2312		. #x6872)	; &I-G0-6872; [72-82]
+    (=ucs@unicode	. #x6829)	; &C1-5621;
+    (=gb2312		. #x6872)	; &C1-5621; [72-82]
     (=cns11643-1	. #x5621)	; &I-C1-5621; [54-01]
     ))
 (define-char
@@ -5764,7 +5888,7 @@
     (=gt		. 18753)	; &I-GT-18753;
     (=gt-pj-1		. #x3374)	; &I-GT-18753; [19-84]
     (=daikanwa		. 14723)	; &I-M-14723;
-    (=shinjigen@rev	.  3611)	; æ ª
+    (=shinjigen		.  3611)	; æ ª
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -5783,6 +5907,18 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=ucs		. #x3B5D)	; 㭝
+    (->subsumptive
+     ((=ucs@unicode	  . #x3B5D)	; &M-14725;
+      (=daikanwa	  . 14725)	; &M-14725;
+      )
+     ((=cns11643-5	  . #x2E2B)	; &C5-2E2B; [14-11]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
     (hanyu-dazidian	2 1205 2)
     (=ucs		. #x682C)	; æ ¬
     (=jis-x0212		. #x4350)	; &I-JSP-4350; [35-48]
@@ -5822,11 +5958,11 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x682F)	; æ ¯
+    (=big5		. #xD1E7)	; &I-B-D1E7;
     (->subsumptive
      ((=ucs@unicode	  . #x682F)	; &M-14729;
       (=ks-x1001	  . #x6971)	; &M-14729; [73-81]
       (=jis-x0212	  . #x4352)	; &I-JSP-4352; [35-50]
-      (=big5		  . #xD1E7)	; &I-B-D1E7;
       (=daikanwa	  . 14729)	; &I-M-14729;
       )
      ((=ucs@cns		  . #x682F)	; &C2-2F69;
@@ -5837,6 +5973,26 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (=ucs		. #x3B5E)	; 㭞
+    (->subsumptive
+     ((=daikanwa	  . 14730)	; &M-14730;
+      )
+     ((=ucs@unicode	  . #x3B5E)	; &C4-2D52;
+      (=cns11643-4	  . #x2D52)	; &C4-2D52; [13-50]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=ucs		  . #x4F10)	; 伐
+      ))
     (=ucs		. #x6830)	; æ °
     (->subsumptive
      ((hanyu-dazidian	  2 1201 1)
@@ -5844,7 +6000,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x6728)	; 木
+       ((=gt-k		    . 00495)	; &GT-K00495;
 	)
        ((=ucs@unicode	    . #x4F10)	; &GT-00585;
 	(=jis-x0208	    . #x4832)	; &GT-00585; [40-18]
@@ -5863,7 +6019,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x6728)	; 木
+       ((=gt-k		    . 00495)	; &GT-K00495;
 	)
        ((=cns11643-1	    . #x4731)	; &C1-4731; [39-17]
 	))
@@ -5886,37 +6042,78 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=ucs		. #x6832)	; æ ²
-    (=jis-x0208		. #x5B5E)	; &I-J90-5B5E; [59-62]
-    (=gb2312		. #x6860)	; &I-G0-6860; [72-64]
-    (=cns11643-2	. #x2F5E)	; &I-C2-2F5E; [15-62]
-    (=jis-x0213-1	. #x5B5E)	; &I-JX1-5B5E; [59-62]
-    (=big5		. #xD1DC)	; &I-B-D1DC;
-    (=gt		. 18730)	; &I-GT-18730;
-    (=gt-pj-1		. #x5B5E)	; &I-GT-18730; [59-62]
-    (=daikanwa		. 14734)	; &I-M-14734;
-    (=shinjigen@rev	.  3604)	; æ ²
+    (=ucs		. #x3B5F)	; 㭟
+    (->subsumptive
+     ((=daikanwa	  . 14733)	; &M-14733;
+      )
+     ((=ucs@unicode	  . #x3B5F)	; &UU+3B5F;
+      )
+     ((=cns11643-4	  . #x2D5B)	; &C4-2D5B; [13-59]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=ucs		. #x6832)	; æ ²
+    (=big5		. #xD1DC)	; &I-B-D1DC;
+    (->subsumptive
+     ((=ucs@jis		  . #x6832)	; &M-14734;
+      (=jis-x0208	  . #x5B5E)	; &M-14734; [59-62]
+      (=cns11643-2	  . #x2F5E)	; &I-C2-2F5E; [15-62]
+      (=jis-x0213-1	  . #x5B5E)	; &I-JX1-5B5E; [59-62]
+      (=daikanwa	  . 14734)	; &I-M-14734;
+      )
+     ((=ucs@unicode	  . #x6832)	; &G0-6860;
+      (=gb2312		  . #x6860)	; &G0-6860; [72-64]
+      )
+     ((=gt		  . 18730)	; &GT-18730;
+      (=gt-pj-1		  . #x5B5E)	; &GT-18730; [59-62]
+      (=shinjigen	  .  3604)	; &GT-18730;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x23465)	; 𣑥
-    (=cns11643-6	. #x384C)	; &I-C6-384C; [24-44]
-    (=jis-x0213-2	. #x2E5B)	; &I-JX2-2E5B; [14-59]
-    (=daikanwa		. 14735)	; &I-M-14735;
+    (->subsumptive
+     ((=ucs@jis		  . #x23465)	; &M-14735;
+      (=jis-x0213-2	  . #x2E5B)	; &M-14735; [14-59]
+      (=daikanwa	  . 14735)	; &I-M-14735;
+      (<-same
+       ((=ucs@jis	    . #x6832)	; &M-14734;
+	(=jis-x0208	    . #x5B5E)	; &M-14734; [59-62]
+	(=cns11643-2	    . #x2F5E)	; &I-C2-2F5E; [15-62]
+	(=jis-x0213-1	    . #x5B5E)	; &I-JX1-5B5E; [59-62]
+	(=daikanwa	    . 14734)	; &I-M-14734;
+	))
+      (<-same*sources
+       longkanshoujian daikanwa)
+      )
+     ((=ucs@iso		  . #x23465)	; &U-00023465;
+      (=shinjigen	  .  3605)	; &U-00023465;
+      (<-formed
+       ((=gt		    . 18730)	; &GT-18730;
+	(=shinjigen	    .  3604)	; &GT-18730;
+	))
+      (<-formed*sources
+       shinjigen)
+      )
+     ((=cns11643-6	  . #x384C)	; &C6-384C; [24-44]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6833)	; æ ³
+    (=big5		. #xD1DD)	; &I-B-D1DD;
     (->subsumptive
      ((=ucs@unicode	  . #x6833)	; &M-14736;
       (=gb2312		  . #x6861)	; &M-14736; [72-65]
       (=jis-x0212	  . #x4355)	; &I-JSP-4355; [35-53]
       (=jis-x0213-2	  . #x2E5C)	; &I-JX2-2E5C; [14-60]
-      (=big5		  . #xD1DD)	; &I-B-D1DD;
       (=daikanwa	  . 14736)	; &I-M-14736;
       (=jef-china3	  . #x53C4)	; &I-JC3-53C4;
       )
@@ -5929,16 +6126,16 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6834)	; æ ´
+    (=big5		. #xD1EA)	; &I-B-D1EA;
     (->subsumptive
      ((=ucs@jis		  . #x6834)	; &GT-18772;
-      (=ucs@big5	  . #x6834)	; &GT-18772;
       (=jis-x0208	  . #x4073)	; &GT-18772; [32-83]
       (=jis-x0213-1	  . #x4073)	; &I-JX1-4073; [32-83]
-      (=big5		  . #xD1EA)	; &I-B-D1EA;
       (=gt		  . 18772)	; &I-GT-18772;
       (=gt-pj-1		  . #x4073)	; &I-GT-18772; [32-83]
       (=daikanwa	  . 14737)	; &I-M-14737;
-      (=shinjigen@rev	  .  3613)	; &GT-18772;
+      )
+     ((=shinjigen	  .  3613)	; &SJG2-3613;
       )
      ((=ucs@unicode	  . #x6834)	; &C2-2F6C;
       (=cns11643-2	  . #x2F6C)	; &C2-2F6C; [15-76]
@@ -5948,6 +6145,15 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
+    (sound@ja/on	"seN")
+    (=ucs		. #x3B60)	; ã­ 
+    (=cns11643-3	. #x3155)	; &I-C3-3155; [17-53]
+    (=daikanwa		. 14738)	; &I-M-14738;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
     (=ucs		. #x6835)	; æ µ
     (=cns11643-2	. #x2F66)	; &I-C2-2F66; [15-70]
     (=big5		. #xD1E4)	; &I-B-D1E4;
@@ -5957,11 +6163,23 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (hanyu-dazidian	2 1199 3)
+    (=ucs		. #x3B61)	; ã­¡
+    (=cns11643-4	. #x2D56)	; &I-C4-2D56; [13-54]
+    (=daikanwa		. 14740)	; &I-M-14740;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
     (=ucs		. #x6836)	; æ ¶
-    (=cns11643-3	. #x3154)	; &I-C3-3154; [17-52]
-    (=daikanwa		. 14741)	; &I-M-14741;
-    (=hanziku-3		. #xF4D2)	; &I-HZK03-F4D2;
+    (->subsumptive
+     ((=daikanwa	  . 14741)	; &M-14741;
+      )
+     ((hanyu-dazidian	  2 1199 3)
+      (=ucs@unicode	  . #x6836)	; &HZK03-F4D2;
+      (=cns11643-3	  . #x3154)	; &HZK03-F4D2; [17-52]
+      (=hanziku-3	  . #xF4D2)	; &I-HZK03-F4D2;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -5976,37 +6194,30 @@
     (=jef-china3	. #x82A7)	; &I-JC3-82A7;
     ))
 (define-char
-  '((=>ucs		. #x6838)	; æ ¸
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=ucs@jis		. #x6838)	; &GT-18690;
-    (=ucs@big5		. #x6838)	; &GT-18690;
-    (=jis-x0208		. #x334B)	; &GT-18690; [19-43]
-    (=ks-x1001		. #x7A37)	; &I-K0-7A37; [90-23]
-    (=jis-x0213-1	. #x334B)	; &I-JX1-334B; [19-43]
-    (=big5		. #xAED6)	; &I-B-AED6;
-    (=gt		. 18690)	; &I-GT-18690;
-    (=gt-pj-1		. #x334B)	; &I-GT-18690; [19-43]
-    (=daikanwa		. 14743)	; &I-M-14743;
-    (=shinjigen@rev	.  3589)	; &GT-18690;
-    ))
-(define-char
-  '((morohashi-daikanwa	14743 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6838)	; æ ¸
-    (=gb2312		. #x3A4B)	; &I-G0-3A4B; [26-43]
-    (=cns11643-1	. #x5578)	; &I-C1-5578; [53-88]
-    ))
-(define-char
-  '((=>ucs		. #x6838)	; æ ¸
-    (morohashi-daikanwa	14743 0 1)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=jef-china3	. #x53C6)	; &JC3-53C6;
+    (->subsumptive
+     ((=big5		  . #xAED6)	; &B-AED6;
+      (->subsumptive
+       ((=ucs@jis	    . #x6838)	; &GT-18690;
+	(=jis-x0208	    . #x334B)	; &GT-18690; [19-43]
+	(=ks-x1001	    . #x7A37)	; &I-K0-7A37; [90-23]
+	(=jis-x0213-1	    . #x334B)	; &I-JX1-334B; [19-43]
+	(=gt		    . 18690)	; &I-GT-18690;
+	(=gt-pj-1	    . #x334B)	; &I-GT-18690; [19-43]
+	(=daikanwa	    . 14743)	; &I-M-14743;
+	(=shinjigen	    .  3589)	; &GT-18690;
+	)
+       ((=ucs@unicode	    . #x6838)	; &C1-5578;
+	(=gb2312	    . #x3A4B)	; &C1-5578; [26-43]
+	(=cns11643-1	    . #x5578)	; &I-C1-5578; [53-88]
+	))
+      )
+     ((=shinjigen	  .  3590)	; &JC3-53C6;
+      (=jef-china3	  . #x53C6)	; &JC3-53C6;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -6214,14 +6425,23 @@
     (=gt-k		. 06414)	; &I-GT-K06414;
     (=gt-pj-1		. #x374B)	; &I-GT-18714; [23-43]
     (=daikanwa		. 14755)	; &I-M-14755;
-    (=shinjigen@rev	.  3598)	; 桂
+    (=shinjigen		.  3598)	; 桂
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=ucs		. #x3B62)	; ã­¢
+    (=cns11643-3	. #x3151)	; &I-C3-3151; [17-49]
+    (=daikanwa		. 14756)	; &I-M-14756;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x6843)	; 桃
-    (=jis-x0208@1997	. #x456D)	; 桃 [37-77]
+    (=>jis-x0208	. #x456D)	; 桃 [37-77]
+    (=>jis-x0213-1	. #x456D)	; 桃 [37-77]
     (->subsumptive
      ((=jis-x0208@1978	  . #x456D)	; &M-14757; [37-77]
       (=jis-x0208@1983	  . #x456D)	; &I-J83-456D; [37-77]
@@ -6237,7 +6457,7 @@
       (=gt		  . 18794)	; &I-GT-18794;
       (=gt-k		  . 06519)	; &I-GT-K06519;
       (=gt-pj-1		  . #x456D)	; &I-GT-18794; [37-77]
-      (=shinjigen@rev	  .  3619)	; &GT-18794;
+      (=shinjigen	  .  3619)	; &GT-18794;
       ))
     ))
 (define-char
@@ -6808,19 +7028,35 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x2346D)	; 𣑭
-    (=cns11643-6	. #x384E)	; &I-C6-384E; [24-46]
-    (=daikanwa		. 49164)	; &I-M-49164;
-    (<-same
-     ((=ucs		  . #x67F5)	; 柵
-      (=daikanwa	  . 14665)	; &I-M-14665;
+    (->subsumptive
+     ((=ucs@iso		  . #x2346D)	; &M-49164;
+      (=cns11643-6	  . #x384E)	; &M-49164; [24-46]
+      (=daikanwa	  . 49164)	; &I-M-49164;
+      (<-same
+       ((=ucs@unicode	    . #x67F5)	; &GT-18589;
+	(=jis-x0208@1983    . #x3A74)	; &GT-18589; [26-84]
+	(=ks-x1001	    . #x737D)	; &I-K0-737D; [83-93]
+	(=cns11643-1	    . #x5160)	; &I-C1-5160; [49-64]
+	(=jis-x0213-1	    . #x3A74)	; &I-JX1-3A74; [26-84]
+	(=daikanwa	    . 14665)	; &I-M-14665;
+	))
+      (<-same*sources
+       daikanwa)
       ))
-    (<-same*sources
-     daikanwa)
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=ucs		  . #x821B)	; 舛
+      ))
     (=ucs		. #x685D)	; 桝
-    (=jis-x0208@1997	. #x4B71)	; 桝 [43-81]
+    (=>jis-x0208	. #x4B71)	; 桝 [43-81]
+    (=>jis-x0213-1	. #x4B71)	; 桝 [43-81]
     (->subsumptive
      ((ideographic-strokes . 6)
       (total-strokes	   . 10)
@@ -6866,55 +7102,6 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=ucs		. #x3B5C)	; 㭜
-    (=cns11643-3	. #x3152)	; &I-C3-3152; [17-50]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=ucs		. #x3B5D)	; 㭝
-    (=cns11643-5	. #x2E2B)	; &I-C5-2E2B; [14-11]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=ucs		. #x3B5E)	; 㭞
-    (=cns11643-4	. #x2D52)	; &I-C4-2D52; [13-50]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=ucs		. #x3B5F)	; 㭟
-    (=cns11643-4	. #x2D5B)	; &I-C4-2D5B; [13-59]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=ucs		. #x3B60)	; ã­ 
-    (=cns11643-3	. #x3155)	; &I-C3-3155; [17-53]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=ucs		. #x3B61)	; ã­¡
-    (=cns11643-4	. #x2D56)	; &I-C4-2D56; [13-54]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=ucs		. #x3B62)	; ã­¢
-    (=cns11643-3	. #x3151)	; &I-C3-3151; [17-49]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 6)
-    (total-strokes	 . 10)
     (=ucs		. #x685E)	; 桞
     (mojikyo		. 059672)	; &MCS-6000E918;
     ))
@@ -7760,8 +7947,15 @@
     (=daikanwa		. 14838)	; &I-M-14838;
     ))
 (define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=>jis-x0208	. #x5B74)	; &J97-5B74; [59-84]
+    (=>jis-x0213-1	. #x5B74)	; &J97-5B74; [59-84]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5B74)	; &J97-5B74; [59-84]
+     ((=>jis-x0208	  . #x5B74)	; &J97-5B74; [59-84]
       ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 7)
@@ -7787,14 +7981,8 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=jis-x0208@1997	. #x5B74)	; &J97-5B74; [59-84]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5B74)	; &J97-5B74; [59-84]
+     ((=>jis-x0208	  . #x5B74)	; &J97-5B74; [59-84]
       ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 7)
@@ -7959,40 +8147,61 @@
     (=daikanwa		. 14848)	; &I-M-14848;
     ))
 (define-char
-  '((=>ucs		. #x6897)	; 梗
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs@jis		. #x6897)	; &GT-18866;
-    (=ucs@big5		. #x6897)	; &GT-18866;
-    (=jis-x0208		. #x393C)	; &GT-18866; [25-28]
-    (=ks-x1001		. #x4C5B)	; &I-K0-4C5B; [44-59]
-    (=jis-x0213-1	. #x393C)	; &I-JX1-393C; [25-28]
+    (=ucs		. #x6897)	; 梗
+    (=>jis-x0208	. #x393C)	; 梗 [25-28]
+    (=>jis-x0213-1	. #x393C)	; 梗 [25-28]
     (=big5		. #xB1F0)	; &I-B-B1F0;
-    (=gt		. 18866)	; &I-GT-18866;
-    (=gt-pj-1		. #x393C)	; &I-GT-18866; [25-28]
-    (=daikanwa		. 14849)	; &I-M-14849;
-    (=shinjigen@rev	.  3630)	; &GT-18866;
+    (->subsumptive
+     ((=ucs@jis/1990	  . #x6897)	; &GT-18866;
+      (=ucs@jis/2000	  . #x6897)	; &GT-18866;
+      (=jis-x0208	  . #x393C)	; &GT-18866; [25-28]
+      (=ks-x1001	  . #x4C5B)	; &I-K0-4C5B; [44-59]
+      (=jis-x0213-1@2000  . #x393C)	; &I-JX1-393C; [25-28]
+      (=gt		  . 18866)	; &I-GT-18866;
+      (=gt-pj-1		  . #x393C)	; &I-GT-18866; [25-28]
+      (=daikanwa	  . 14849)	; &I-M-14849;
+      (=shinjigen	  .  3630)	; &GT-18866;
+      )
+     ((=ucs@unicode	  . #x6897)	; &JX3-393C;
+      (=gb2312		  . #x3923)	; &JX3-393C; [25-03]
+      (=jis-x0213-1@2004  . #x393C)	; &I-JX3-393C; [25-28]
+      )
+     ((=cns11643-1	  . #x5B36)	; &C1-5B36; [59-22]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=ucs		. #x3B6D)	; ã­­
     ))
 (define-char
-  '((morohashi-daikanwa	14849 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3B6D)	; ã­­
+      ))
     (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 36)
-    (kangxi-strokes	 . 7)
+    (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #x6897)	; 梗
-    (=gb2312		. #x3923)	; &I-G0-3923; [25-03]
-    (=cns11643-1	. #x5B36)	; &I-C1-5B36; [59-22]
+    (->subsumptive
+     ((=daikanwa	  . 14850)	; &M-14850;
+      )
+     ((=ucs@jis		  . #x3B6D)	; &JX2-2E6D;
+      (=cns11643-4	  . #x3242)	; &JX2-2E6D; [18-34]
+      (=jis-x0213-2	  . #x2E6D)	; &I-JX2-2E6D; [14-77]
+      (=jef-china3	  . #x53D4)	; &I-JC3-53D4;
+      ))
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x3B6D)	; ã­­
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (=ucs		. #x3B6D)	; ã­­
-    (=cns11643-4	. #x3242)	; &I-C4-3242; [18-34]
-    (=jis-x0213-2	. #x2E6D)	; &I-JX2-2E6D; [14-77]
-    (=daikanwa		. 14850)	; &I-M-14850;
-    (=jef-china3	. #x53D4)	; &I-JC3-53D4;
+    (=ucs@unicode	. #x3B6D)	; &UU+3B6D;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -8013,7 +8222,6 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (hanyu-dazidian	2 1214 5)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -8023,17 +8231,28 @@
      ((=ucs		  . #x4E32)	; 串
       ))
     (=ucs		. #x6899)	; 梙
-    (=cns11643-3	. #x365C)	; &I-C3-365C; [22-60]
-    (=jis-x0213-2	. #x2E6F)	; &I-JX2-2E6F; [14-79]
-    (=daikanwa		. 14854)	; &I-M-14854;
-    (=hanziku-3		. #xF7DD)	; &I-HZK03-F7DD;
-    (=cbeta		. 04519)	; &I-CB04519;
+    (->subsumptive
+     ((hanyu-dazidian	  2 1214 5)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((=ucs		    . #x4E32)	; 串
+	))
+      (=ucs@unicode	  . #x6899)	; &M-14854;
+      (=cns11643-3	  . #x365C)	; &M-14854; [22-60]
+      (=jis-x0213-2	  . #x2E6F)	; &I-JX2-2E6F; [14-79]
+      (=daikanwa	  . 14854)	; &I-M-14854;
+      (=hanziku-3	  . #xF7DD)	; &I-HZK03-F7DD;
+      (=cbeta		  . 04519)	; &I-CB04519;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
-    (hanyu-dazidian	2 1218 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -8043,24 +8262,42 @@
      ((=ucs		  . #x514D)	; 免
       ))
     (=ucs		. #x689A)	; 梚
-    (=jis-x0212		. #x4371)	; &I-JSP-4371; [35-81]
-    (=cns11643-3	. #x3650)	; &I-C3-3650; [22-48]
-    (=jis-x0213-2	. #x2E70)	; &I-JX2-2E70; [14-80]
-    (=daikanwa		. 14855)	; &I-M-14855;
-    (=hanziku-3		. #xF8BE)	; &I-HZK03-F8BE;
-    (=cbeta		. 01532)	; &I-CB01532;
-    (=jef-china3	. #x53D5)	; &I-JC3-53D5;
+    (->subsumptive
+     ((=ucs@jis		  . #x689A)	; &M-14855;
+      (=jis-x0212	  . #x4371)	; &M-14855; [35-81]
+      (=jis-x0213-2	  . #x2E70)	; &I-JX2-2E70; [14-80]
+      (=daikanwa	  . 14855)	; &I-M-14855;
+      (=jef-china3	  . #x53D5)	; &I-JC3-53D5;
+      )
+     ((hanyu-dazidian	  2 1218 3)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((=ucs@unicode	    . #x514D)	; &C1-492D;
+	(=gb2312	    . #x4362)	; &C1-492D; [35-66]
+	(=ks-x1001	    . #x5873)	; &I-K0-5873; [56-83]
+	(=cns11643-1	    . #x492D)	; &I-C1-492D; [41-13]
+	))
+      (=ucs@unicode	  . #x689A)	; &CB01532;
+      (=cns11643-3	  . #x3650)	; &CB01532; [22-48]
+      (=hanziku-3	  . #xF8BE)	; &I-HZK03-F8BE;
+      (=cbeta		  . 01532)	; &I-CB01532;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x689B)	; 梛
-    (=jis-x0208@1997	. #x5B6B)	; 梛 [59-75]
+    (=>jis-x0208	. #x5B6B)	; 梛 [59-75]
+    (=>jis-x0213-1	. #x5B6B)	; 梛 [59-75]
     (->subsumptive
      ((=jis-x0208@1978	  . #x5B6B)	; &M-14856; [59-75]
       (=daikanwa	  . 14856)	; &I-M-14856;
-      (=shinjigen@1ed	  .  3645)	; &M-14856;
+      (=shinjigen	  .  3645)	; &M-14856;
       (=jef-china3	  . #x70CB)	; &I-JC3-70CB;
       )
      ((=ucs@unicode	  . #x689B)	; &GT-18913;
@@ -8242,8 +8479,9 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x68A2)	; 梢
+    (=>jis-x0208	. #x3E3F)	; 梢 [30-31]
+    (=>jis-x0213-1	. #x3E3F)	; 梢 [30-31]
     (=big5		. #xB1E9)	; &I-B-B1E9;
-    (=jis-x0208@1997	. #x3E3F)	; 梢 [30-31]
     ))
 (define-char
   '((<-denotational
@@ -8255,6 +8493,7 @@
     (=ks-x1001		. #x747E)	; &M-14866; [84-94]
     (=daikanwa		. 14866)	; &I-M-14866;
     (=shinjigen@1ed	.  3641)	; &M-14866;
+    (=shinjigen/+p@rev	.  3641)	; &M-14866;
     ))
 (define-char
   '((<-denotational
@@ -8272,6 +8511,7 @@
       (=gt		  . 18891)	; &I-GT-18891;
       (=gt-k		  . 07794)	; &I-GT-K07794;
       (=gt-pj-1		  . #x3E3F)	; &I-GT-18891; [30-31]
+      (=shinjigen@rev	  .  3641)	; &GT-18891;
       (=jef-china3	  . #x52E4)	; &I-JC3-52E4;
       )
      ((=cns11643-1	  . #x5B2F)	; &C1-5B2F; [59-15]
@@ -8378,10 +8618,10 @@
     (<-vulgar
      ((=cns11643-1	  . #x6842)	; &M-05802; [72-34]
       (=daikanwa	  . 05802)	; &I-M-05802;
-      (=shinjigen@1ed	  .  1550)	; &M-05802;
+      (=shinjigen	  .  1550)	; &M-05802;
       ))
     (<-vulgar*sources
-     songyuan-yilai-suzipu zihui daikanwa shinjigen@1ed)
+     songyuan-yilai-suzipu zihui daikanwa shinjigen)
     (->subsumptive
      ((ideographic-radical . 36)	; â¼£
       (ideographic-strokes . 8)
@@ -8497,8 +8737,9 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x68AD)	; 梭
+    (=>jis-x0208	. #x5B68)	; 梭 [59-72]
+    (=>jis-x0213-1	. #x5B68)	; 梭 [59-72]
     (=big5		. #xB1F4)	; &I-B-B1F4;
-    (=jis-x0208@1997	. #x5B68)	; 梭 [59-72]
     ))
 (define-char
   '((<-denotational
@@ -9597,46 +9838,50 @@
     (=jef-china3	. #x53DB)	; &I-JC3-53DB;
     ))
 (define-char
-  '((=>ucs		. #x68D7)	; 棗
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 8)
-    (total-strokes	 . 12)
-    (=ucs@jis		. #x68D7)	; &GT-19120;
-    (=jis-x0208		. #x5C27)	; &GT-19120; [60-07]
-    (=cns11643-1	. #x5F6C)	; &I-C1-5F6C; [63-76]
-    (=jis-x0213-1	. #x5C27)	; &I-JX1-5C27; [60-07]
-    (=gt		. 19120)	; &I-GT-19120;
-    (=gt-k		. 09202)	; &I-GT-K09202;
-    (=gt-pj-1		. #x5C27)	; &I-GT-19120; [60-07]
-    (=daikanwa		. 14937)	; &I-M-14937;
-    (=shinjigen@rev	.  3682)	; &GT-19120;
-    ))
-(define-char
-  '((morohashi-daikanwa	14937 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x68D7)	; 棗
-    (=ks-x1001		. #x704A)	; &I-K0-704A; [80-42]
-    (=gb12345		. #x5466)	; 棗 [52-70]
     (=big5		. #xB4C7)	; &I-B-B4C7;
+    (->subsumptive
+     ((=ucs@unicode	  . #x68D7)	; &M-14937;
+      (=jis-x0208	  . #x5C27)	; &M-14937; [60-07]
+      (=ks-x1001	  . #x704A)	; &I-K0-704A; [80-42]
+      (=cns11643-1	  . #x5F6C)	; &I-C1-5F6C; [63-76]
+      (=jis-x0213-1	  . #x5C27)	; &I-JX1-5C27; [60-07]
+      (=gb12345		  . #x5466)	; &M-14937; [52-70]
+      (=daikanwa	  . 14937)	; &I-M-14937;
+      )
+     ((=gt		  . 19120)	; &GT-19120;
+      (=gt-k		  . 09202)	; &I-GT-K09202;
+      (=gt-pj-1		  . #x5C27)	; &GT-19120; [60-07]
+      (=shinjigen	  .  3682)	; &GT-19120;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x68D8)	; 棘
-    (=jis-x0208		. #x5B79)	; &I-J90-5B79; [59-89]
-    (=gb2312		. #x3C2C)	; &I-G0-3C2C; [28-12]
-    (=ks-x1001		. #x503E)	; &I-K0-503E; [48-30]
-    (=cns11643-1	. #x5F6B)	; &I-C1-5F6B; [63-75]
-    (=jis-x0213-1	. #x5B79)	; &I-JX1-5B79; [59-89]
+    (=>jis-x0208	. #x5B79)	; 棘 [59-89]
+    (=>jis-x0213-1	. #x5B79)	; 棘 [59-89]
     (=big5		. #xB4C6)	; &I-B-B4C6;
-    (=gt		. 19033)	; &I-GT-19033;
-    (=gt-k		. 09198)	; &I-GT-K09198;
-    (=gt-pj-1		. #x5B79)	; &I-GT-19033; [59-89]
-    (=daikanwa		. 14938)	; &I-M-14938;
-    (=shinjigen@rev	.  3668)	; 棘
+    (->subsumptive
+     ((=ucs@unicode	  . #x68D8)	; &M-14938;
+      (=jis-x0208	  . #x5B79)	; &M-14938; [59-89]
+      (=gb2312		  . #x3C2C)	; &I-G0-3C2C; [28-12]
+      (=jis-x0213-1@2000  . #x5B79)	; &I-JX1-5B79; [59-89]
+      (=daikanwa	  . 14938)	; &I-M-14938;
+      (=shinjigen	  .  3668)	; &M-14938;
+      )
+     ((=ucs@jis/2004	  . #x68D8)	; &GT-19033;
+      (=ks-x1001	  . #x503E)	; &GT-19033; [48-30]
+      (=cns11643-1	  . #x5F6B)	; &I-C1-5F6B; [63-75]
+      (=jis-x0213-1@2004  . #x5B79)	; &I-JX3-5B79; [59-89]
+      (=gt		  . 19033)	; &I-GT-19033;
+      (=gt-k		  . 09198)	; &I-GT-K09198;
+      (=gt-pj-1		  . #x5B79)	; &I-GT-19033; [59-89]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -12202,8 +12447,9 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x6930)	; 椰
+    (=>jis-x0208	. #x5C3F)	; 椰 [60-31]
+    (=>jis-x0213-1	. #x5C3F)	; 椰 [60-31]
     (=big5		. #xB7A6)	; &I-B-B7A6;
-    (=jis-x0208@1997	. #x5C3F)	; 椰 [60-31]
     (->subsumptive
      ((=ucs@jis		  . #x6930)	; &GT-19413;
       (=jis-x0208@1990	  . #x5C3F)	; &GT-19413; [60-31]
@@ -12367,7 +12613,8 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x6936)	; 椶
-    (=jis-x0208@1997	. #x5C24)	; 椶 [60-04]
+    (=>jis-x0208	. #x5C24)	; 椶 [60-04]
+    (=>jis-x0213-1	. #x5C24)	; 椶 [60-04]
     ))
 (define-char
   '((<-denotational
@@ -13539,9 +13786,11 @@
     (->subsumptive
      ((=daikanwa	  . 15154)	; &M-15154;
       )
-     ((=jis-x0208@1978	  . #x466A)	; &J78-466A; [38-74]
+     ((=ucs@jis/2004	  . #x6962)	; &JX3-466A;
+      (=jis-x0208@1978	  . #x466A)	; &JX3-466A; [38-74]
       (=ks-x1001	  . #x6A79)	; &I-K0-6A79; [74-89]
-      (=shinjigen@1ed	  .  3721)	; &J78-466A;
+      (=jis-x0213-1@2004  . #x466A)	; &I-JX3-466A; [38-74]
+      (=shinjigen	  .  3721)	; &JX3-466A;
       ))
     ))
 (define-char
@@ -13555,15 +13804,18 @@
      ((=ucs@cns		  . #x6962)	; &C2-4353;
       (=cns11643-2	  . #x4353)	; &C2-4353; [35-51]
       )
-     ((=ucs@jis		  . #x6962)	; &GT-19314;
+     ((=ucs@jis/1990	  . #x6962)	; &GT-19314;
+      (=ucs@jis/2000	  . #x6962)	; &GT-19314;
       (=jis-x0208@1983	  . #x466A)	; &GT-19314; [38-74]
       (=jis-x0208@1990	  . #x466A)	; &I-J90-466A; [38-74]
-      (=jis-x0213-1	  . #x466A)	; &I-JX1-466A; [38-74]
+      (=jis-x0213-1@2000  . #x466A)	; &I-JX1-466A; [38-74]
       (=gt		  . 19314)	; &I-GT-19314;
       (=gt-pj-1		  . #x466A)	; &I-GT-19314; [38-74]
-      (<-simplified@JP/misc
-       ((=jis-x0208@1978    . #x466A)	; &J78-466A; [38-74]
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x6962)	; &JX3-466A;
+	(=jis-x0208@1978    . #x466A)	; &JX3-466A; [38-74]
 	(=ks-x1001	    . #x6A79)	; &I-K0-6A79; [74-89]
+	(=jis-x0213-1@2004  . #x466A)	; &I-JX3-466A; [38-74]
 	))
       )
      ((=ucs@unicode	  . #x6962)	; &EGB-7C21;
@@ -13884,7 +14136,7 @@
       (=gt-k		  . 10193)	; &I-GT-K10193;
       (=gt-pj-1		  . #x3648)	; &I-GT-19258; [22-40]
       (=daikanwa	  . 15170)	; &I-M-15170;
-      (=shinjigen@rev	  .  3711)	; &GT-19258;
+      (=shinjigen	  .  3711)	; &GT-19258;
       )
      ((=cns11643-1	  . #x6446)	; &C1-6446; [68-38]
       ))
@@ -13902,33 +14154,51 @@
      ((=ucs		  . #x662F)	; 是
       ))
     (=ucs		. #x3B9B)	; 㮛
-    (=cns11643-3	. #x4161)	; &I-C3-4161; [33-65]
-    (=daikanwa		. 15171)	; &I-M-15171;
-    (=cbeta		. 02845)	; &I-CB02845;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((=ucs		    . #x662F)	; 是
+	))
+      (=ucs@unicode	  . #x3B9B)	; &M-15171;
+      (=cns11643-3	  . #x4161)	; &M-15171; [33-65]
+      (=daikanwa	  . 15171)	; &I-M-15171;
+      (=cbeta		  . 02845)	; &I-CB02845;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x696E)	; 楮
+    (=big5		. #xB4D8)	; &I-B-B4D8;
     ))
 (define-char
-  '((=>ucs		. #x696E)	; 楮
+  '((<-denotational
+     ((=ucs		  . #x696E)	; 楮
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs@jis		. #x696E)	; &GT-19361;
-    (=ucs@big5		. #x696E)	; &GT-19361;
     (=jis-x0208		. #x5C3A)	; &GT-19361; [60-26]
     (=ks-x1001		. #x6E3F)	; &I-K0-6E3F; [78-31]
     (=jis-x0213-1	. #x5C3A)	; &I-JX1-5C3A; [60-26]
-    (=big5		. #xB4D8)	; &I-B-B4D8;
     (=gt		. 19361)	; &I-GT-19361;
     (=gt-pj-1		. #x5C3A)	; &I-GT-19361; [60-26]
     (=daikanwa		. 15172)	; &I-M-15172;
     (=shinjigen		.  3725)	; &GT-19361;
     ))
 (define-char
-  '((morohashi-daikanwa	15172 0 2)
+  '((<-denotational
+     ((=ucs		  . #x696E)	; 楮
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=ucs		. #x696E)	; 楮
-    (=gb2312		. #x687A)	; &I-G0-687A; [72-90]
+    (=ucs@unicode	. #x696E)	; &C1-5F7D;
+    (=gb2312		. #x687A)	; &C1-5F7D; [72-90]
     (=cns11643-1	. #x5F7D)	; &I-C1-5F7D; [63-93]
     ))
 (define-char
@@ -13936,22 +14206,25 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x696F)	; 楯
-    (=jis-x0208@1997	. #x3D5D)	; 楯 [29-61]
+    (=>jis-x0208	. #x3D5D)	; 楯 [29-61]
+    (=>jis-x0213-1	. #x3D5D)	; 楯 [29-61]
+    (=big5		. #xDDE3)	; &I-B-DDE3;
     (->subsumptive
      ((=ucs@cns		  . #x696F)	; &M-15173;
-      (=ucs@jis		  . #x696F)	; &M-15173;
+      (=ucs@jis/1990	  . #x696F)	; &M-15173;
+      (=ucs@jis/2000	  . #x696F)	; &M-15173;
       (=jis-x0208@1990	  . #x3D5D)	; &M-15173; [29-61]
       (=cns11643-2	  . #x4369)	; &I-C2-4369; [35-73]
-      (=jis-x0213-1	  . #x3D5D)	; &I-JX1-3D5D; [29-61]
+      (=jis-x0213-1@2000  . #x3D5D)	; &I-JX1-3D5D; [29-61]
       (=daikanwa	  . 15173)	; &I-M-15173;
-      (=shinjigen@rev	  .  3722)	; &M-15173;
+      (=shinjigen	  .  3722)	; &M-15173;
       )
      ((=ucs@unicode	  . #x696F)	; &GT-19318;
       (=jis-x0208@1978	  . #x3D5D)	; &GT-19318; [29-61]
       (=jis-x0208@1983	  . #x3D5D)	; &I-J83-3D5D; [29-61]
       (=ks-x1001	  . #x6264)	; &I-K0-6264; [66-68]
       (=iso-ir165	  . #x7B7D)	; &I-EGB-7B7D; [91-93]
-      (=big5		  . #xDDE3)	; &I-B-DDE3;
+      (=jis-x0213-1@2004  . #x3D5D)	; &I-JX3-3D5D; [29-61]
       (=gt		  . 19318)	; &I-GT-19318;
       (=gt-pj-1		  . #x3D5D)	; &I-GT-19318; [29-61]
       ))
@@ -14573,6 +14846,11 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs@big5		. #x6982)	; &B-B7A7;
+    (=big5		. #xB7A7)	; &B-B7A7;
+    ))
+(define-char
   '((<-denotational
      ((=ucs@big5	  . #x6982)	; &B-B7A7;
       (=big5		  . #xB7A7)	; &B-B7A7;
@@ -14620,11 +14898,6 @@
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
-    (=ucs@big5		. #x6982)	; &B-B7A7;
-    (=big5		. #xB7A7)	; &B-B7A7;
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x23581)	; 𣖁
@@ -15101,7 +15374,8 @@
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x6994)	; 榔
-    (=jis-x0208@1997	. #x4F31)	; 榔 [47-17]
+    (=>jis-x0208	. #x4F31)	; 榔 [47-17]
+    (=>jis-x0213-1	. #x4F31)	; 榔 [47-17]
     ))
 (define-char
   '((<-denotational
@@ -15110,7 +15384,9 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=ucs@jis/2004	. #x6994)	; &M-15226;
     (=jis-x0208@1978	. #x4F31)	; &M-15226; [47-17]
+    (=jis-x0213-1@2004	. #x4F31)	; &I-JX3-4F31; [47-17]
     (=daikanwa		. 15226)	; &I-M-15226;
     ))
 (define-char
@@ -15120,24 +15396,27 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs@big5		. #x6994)	; &B-B77D;
-    (=big5		. #xB77D)	; &B-B77D;
+    (=ucs@big5		. #x6994)	; &JC3-70C8;
+    (=big5		. #xB77D)	; &JC3-70C8;
+    (=jef-china3	. #x70C8)	; &I-JC3-70C8;
     (->subsumptive
-     ((=ucs@jis		  . #x6994)	; &GT-19429;
+     ((=ucs@jis/1990	  . #x6994)	; &GT-19429;
+      (=ucs@jis/2000	  . #x6994)	; &GT-19429;
       (=jis-x0208@1983	  . #x4F31)	; &GT-19429; [47-17]
       (=jis-x0208@1990	  . #x4F31)	; &I-J90-4F31; [47-17]
-      (=jis-x0213-1	  . #x4F31)	; &I-JX1-4F31; [47-17]
+      (=jis-x0213-1@2000  . #x4F31)	; &I-JX1-4F31; [47-17]
       (=gt		  . 19429)	; &I-GT-19429;
       (=gt-pj-1		  . #x4F31)	; &I-GT-19429; [47-17]
-      (<-simplified@JP/misc
-       ((=jis-x0208@1978    . #x4F31)	; &M-15226; [47-17]
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x6994)	; &M-15226;
+	(=jis-x0208@1978    . #x4F31)	; &M-15226; [47-17]
+	(=jis-x0213-1@2004  . #x4F31)	; &I-JX3-4F31; [47-17]
 	(=daikanwa	    . 15226)	; &I-M-15226;
 	))
       )
      ((=ucs@unicode	  . #x6994)	; &C1-6445;
       (=gb2312		  . #x4046)	; &C1-6445; [32-38]
       (=cns11643-1	  . #x6445)	; &I-C1-6445; [68-37]
-      (=jef-china3	  . #x70C8)	; &I-JC3-70C8;
       ))
     ))
 (define-char
@@ -15635,6 +15914,14 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=ucs		. #x3BA9)	; 㮩
+    (=cns11643-3	. #x473F)	; &I-C3-473F; [39-31]
+    (=daikanwa		. 15255)	; &I-M-15255;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
     (=ucs		. #x69A5)	; 榥
     (=ks-x1001		. #x7C4E)	; &I-K0-7C4E; [92-46]
     (=jis-x0212		. #x445B)	; &I-JSP-445B; [36-59]
@@ -15649,30 +15936,29 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x69A6)	; 榦
-    (=jis-x0212		. #x445C)	; &I-JSP-445C; [36-60]
-    (=jis-x0213-2	. #x2F37)	; &I-JX2-2F37; [15-23]
     (=big5		. #xBA6D)	; &I-B-BA6D;
-    (=daikanwa		. 15257)	; &I-M-15257;
-    (=jef-china3	. #x52FA)	; &I-JC3-52FA;
-    ))
-(define-char
-  '((=>ucs		. #x69A6)	; 榦
-    (morohashi-daikanwa	15257 0 1)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=cns11643-1	. #x6936)	; &C1-6936; [73-22]
+    (->subsumptive
+     ((=ucs@jis		  . #x69A6)	; &M-15257;
+      (=jis-x0212	  . #x445C)	; &M-15257; [36-60]
+      (=jis-x0213-2	  . #x2F37)	; &I-JX2-2F37; [15-23]
+      (=daikanwa	  . 15257)	; &I-M-15257;
+      (=jef-china3	  . #x52FA)	; &I-JC3-52FA;
+      )
+     ((=ucs@unicode	  . #x69A6)	; &UU+69A6;
+      )
+     ((=cns11643-1	  . #x6936)	; &C1-6936; [73-22]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x69A7)	; 榧
-    (=jis-x0208@1997	. #x5C52)	; 榧 [60-50]
+    (=>jis-x0208	. #x5C52)	; 榧 [60-50]
+    (=>jis-x0213-1	. #x5C52)	; 榧 [60-50]
+    (=big5		. #xE249)	; &I-B-E249;
     (->subsumptive
-     ((=ucs@big5	  . #x69A7)	; &B-E249;
-      (=big5		  . #xE249)	; &B-E249;
-      (->subsumptive
+     ((->subsumptive
        ((=jis-x0208@1978    . #x5C52)	; &GT-19603; [60-50]
 	(=jis-x0208@1983    . #x5C52)	; &I-J83-5C52; [60-50]
 	(=ks-x1001	    . #x5D6E)	; &I-K0-5D6E; [61-78]
@@ -15694,32 +15980,37 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x69A8)	; 榨
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs@jis		. #x69A8)	; &M-15259;
-    (=ucs@big5		. #x69A8)	; &M-15259;
-    (=jis-x0212		. #x445D)	; &M-15259; [36-61]
+    (=ucs		. #x69A8)	; 榨
     (=big5		. #xBA5E)	; &I-B-BA5E;
-    (=daikanwa		. 15259)	; &I-M-15259;
-    (=jef-china3	. #x53F2)	; &I-JC3-53F2;
     ))
 (define-char
-  '((=>ucs		. #x69A8)	; 榨
-    (morohashi-daikanwa	15259 0 0)
+  '((<-denotational
+     ((=ucs		  . #x69A8)	; 榨
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=cns11643-1	. #x6927)	; &C1-6927; [73-07]
+    (->subsumptive
+     ((=ucs@jis		  . #x69A8)	; &M-15259;
+      (=jis-x0212	  . #x445D)	; &M-15259; [36-61]
+      (=daikanwa	  . 15259)	; &I-M-15259;
+      (=jef-china3	  . #x53F2)	; &I-JC3-53F2;
+      )
+     ((=cns11643-1	  . #x6927)	; &C1-6927; [73-07]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15259 0 1)
+  '((<-denotational
+     ((=ucs		  . #x69A8)	; 榨
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x69A8)	; 榨
-    (=gb2312		. #x5525)	; &I-G0-5525; [53-05]
+    (=ucs@unicode	. #x69A8)	; &G0-5525;
+    (=gb2312		. #x5525)	; &G0-5525; [53-05]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -16044,11 +16335,19 @@
     (=gt		. 19630)	; &I-GT-19630;
     (=gt-pj-1		. #x5C58)	; &I-GT-19630; [60-56]
     (=daikanwa		. 15280)	; &I-M-15280;
+    (=shinjigen@1ed	.  3778)	; 榴
     (=shinjigen@rev	.  3779)	; 榴
+    (<-vulgar
+     ((=ucs		  . #x6A4A)	; 橊
+      (=daikanwa	  . 15525)	; &I-M-15525;
+      ))
+    (<-vulgar*sources
+     zhengzitong daikanwa)
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x69B5)	; 榵
+    (=big5		. #xE260)	; &I-B-E260;
     ))
 (define-char
   '((<-denotational
@@ -16071,50 +16370,51 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=ucs@big5		. #x69B5)	; &B-E260;
-    (=big5		. #xE260)	; &B-E260;
-    (->subsumptive
-     ((=ucs@unicode	  . #x69B5)	; &UU+69B5;
-      ))
-    ))
-(define-char
-  '((=>ucs		. #x69B6)	; 榶
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs@big5		. #x69B6)	; &M-15282;
-    (=big5		. #xE1FD)	; &M-15282;
-    (=daikanwa		. 15282)	; &I-M-15282;
+    (=ucs@unicode	. #x69B5)	; &UU+69B5;
     ))
 (define-char
-  '((morohashi-daikanwa	15282 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x69B6)	; 榶
-    (=cns11643-2	. #x4A64)	; &I-C2-4A64; [42-68]
+    (=big5		. #xE1FD)	; &I-B-E1FD;
+    (->subsumptive
+     ((=daikanwa	  . 15282)	; &M-15282;
+      )
+     ((=ucs@unicode	  . #x69B6)	; &C2-4A64;
+      (=cns11643-2	  . #x4A64)	; &C2-4A64; [42-68]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x69B7)	; 榷
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs@jis		. #x69B7)	; &M-15283;
-    (=ucs@big5		. #x69B7)	; &M-15283;
-    (=jis-x0212		. #x4461)	; &M-15283; [36-65]
-    (=jis-x0213-2	. #x2F39)	; &I-JX2-2F39; [15-25]
+    (=ucs		. #x69B7)	; 榷
     (=big5		. #xBA65)	; &I-B-BA65;
-    (=daikanwa		. 15283)	; &I-M-15283;
-    (=jef-china3	. #x53F5)	; &I-JC3-53F5;
+    (->subsumptive
+     ((=ucs@jis		  . #x69B7)	; &M-15283;
+      (=jis-x0212	  . #x4461)	; &M-15283; [36-65]
+      (=jis-x0213-2	  . #x2F39)	; &I-JX2-2F39; [15-25]
+      (=daikanwa	  . 15283)	; &I-M-15283;
+      (=jef-china3	  . #x53F5)	; &I-JC3-53F5;
+      )
+     ((=ucs@unicode	  . #x69B7)	; &C1-692E;
+      (=gb2312		  . #x4836)	; &C1-692E; [40-22]
+      (=cns11643-1	  . #x692E)	; &I-C1-692E; [73-14]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15283 0 1)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x69B7)	; 榷
-    (=gb2312		. #x4836)	; &I-G0-4836; [40-22]
-    (=cns11643-1	. #x692E)	; &I-C1-692E; [73-14]
+    (=ucs		. #x3BAE)	; ã®®
+    (->subsumptive
+     ((=daikanwa	  . 15284)	; &M-15284;
+      )
+     ((=cns11643-3	  . #x474A)	; &C3-474A; [39-42]
+      )
+     ((=ucs@unicode	  . #x3BAE)	; &UU+3BAE;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -16129,15 +16429,27 @@
      ((=ucs		  . #x5702)	; 圂
       ))
     (=ucs		. #x3BAF)	; 㮯
-    (=cns11643-4	. #x437D)	; &I-C4-437D; [35-93]
-    (=daikanwa		. 15286)	; &I-M-15286;
-    (=cbeta		. 02268)	; &I-CB02268;
+    (->subsumptive
+     ((=daikanwa	  . 15286)	; &M-15286;
+      )
+     ((=cns11643-4	  . #x437D)	; &C4-437D; [35-93]
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((=ucs@unicode	    . #x5702)	; &UU+5702;
+	))
+      (=ucs@unicode	  . #x3BAF)	; &CB02268;
+      (=cbeta		  . 02268)	; &CB02268;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (hanyu-dazidian	2 1260 3)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -16146,75 +16458,189 @@
       )
      ((=ucs		  . #x57CB)	; 埋
       ))
+    (sound@ja/on	"tai")
     (=ucs		. #x69B8)	; 榸
-    (=jis-x0212		. #x4462)	; &I-JSP-4462; [36-66]
-    (=cns11643-4	. #x4377)	; &I-C4-4377; [35-87]
-    (=daikanwa		. 15287)	; &I-M-15287;
-    (=hanziku-4		. #xABA2)	; &I-HZK04-ABA2;
-    (=cbeta		. 01271)	; &I-CB01271;
+    (->subsumptive
+     ((hanyu-dazidian	  2 1260 3)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((=ucs		    . #x57CB)	; 埋
+	))
+      (=ucs@unicode	  . #x69B8)	; &M-15287;
+      (=jis-x0212	  . #x4462)	; &M-15287; [36-66]
+      (=cns11643-4	  . #x4377)	; &I-C4-4377; [35-87]
+      (=daikanwa	  . 15287)	; &I-M-15287;
+      (=hanziku-4	  . #xABA2)	; &I-HZK04-ABA2;
+      (=cbeta		  . 01271)	; &I-CB01271;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x69B9)	; 榹
-    (=cns11643-2	. #x4A79)	; &I-C2-4A79; [42-89]
     (=big5		. #xE253)	; &I-B-E253;
-    (=daikanwa		. 15288)	; &I-M-15288;
     ))
 (define-char
-  '((=>ucs		. #x69BA)	; 榺
+  '((<-denotational
+     ((=ucs		  . #x69B9)	; 榹
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (->subsumptive
+     ((=daikanwa	  . 15288)	; &M-15288;
+      )
+     ((=cns11643-2	  . #x4A79)	; &C2-4A79; [42-89]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x69B9)	; 榹
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x69B9)	; &UU+69B9;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x3BB0)	; ã®°
+    (->subsumptive
+     ((=ucs@unicode	  . #x3BB0)	; &M-15289;
+      (=daikanwa	  . 15289)	; &M-15289;
+      )
+     ((=cns11643-4	  . #x437E)	; &C4-437E; [35-94]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x69BA)	; 榺
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x69BA)	; 榺
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (hanyu-dazidian	3 2102 17)
     (=ucs@jis		. #x69BA)	; &M-15290;
     (=jis-x0212		. #x4463)	; &M-15290; [36-67]
     (=jis-x0213-2	. #x2F3A)	; &I-JX2-2F3A; [15-26]
     (=daikanwa		. 15290)	; &I-M-15290;
-    (=hanziku-6		. #xB0E5)	; &I-HZK06-B0E5;
-    (=jef-china3	. #x52FB)	; &I-JC3-52FB;
     ))
 (define-char
-  '((morohashi-daikanwa	15290 0 2)
+  '((<-denotational
+     ((=ucs		  . #x69BA)	; 榺
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x69BA)	; 榺
+    (->subsumptive
+     ((=jef-china3	  . #x52FB)	; &JC3-52FB;
+      )
+     ((hanyu-dazidian	  3 2102 17)
+      (=hanziku-6	  . #xB0E5)	; &HZK06-B0E5;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x69BA)	; 榺
-    (morohashi-daikanwa	15290 0 3)
+  '((<-denotational
+     ((=ucs		  . #x69BA)	; 榺
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=cns11643-4	. #x4379)	; &C4-4379; [35-89]
+    (->subsumptive
+     ((=ucs@unicode	  . #x69BA)	; &UU+69BA;
+      )
+     ((=cns11643-4	  . #x4379)	; &C4-4379; [35-89]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x69BB)	; 榻
+  '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x3BB1)	; ã®±
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3BB1)	; ã®±
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=cns11643-4	. #x437A)	; &M-15291; [35-90]
+    (=daikanwa		. 15291)	; &I-M-15291;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3BB1)	; ã®±
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=ucs@unicode	. #x3BB1)	; &UU+3BB1;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x69BB)	; 榻
+    (=big5		. #xBA66)	; &I-B-BA66;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x69BB)	; 榻
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=daikanwa		. 15292)	; &M-15292;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x69BB)	; 榻
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x69BB)	; &C1-692F;
+    (=gb2312		. #x693D)	; &C1-692F; [73-29]
+    (=cns11643-1	. #x692F)	; &I-C1-692F; [73-15]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x69BB)	; 榻
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs@jis		. #x69BB)	; &GT-19589;
-    (=ucs@big5		. #x69BB)	; &GT-19589;
     (=jis-x0208		. #x5C50)	; &GT-19589; [60-48]
     (=ks-x1001		. #x7734)	; &I-K0-7734; [87-20]
     (=jis-x0213-1	. #x5C50)	; &I-JX1-5C50; [60-48]
-    (=big5		. #xBA66)	; &I-B-BA66;
     (=gt		. 19589)	; &I-GT-19589;
     (=gt-pj-1		. #x5C50)	; &I-GT-19589; [60-48]
-    (=daikanwa		. 15292)	; &I-M-15292;
     (=jef-china3	. #x80D4)	; &I-JC3-80D4;
     (mojikyo		. 015292)	; &MCS-60003BBC;
     ))
 (define-char
-  '((morohashi-daikanwa	15292 0 2)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x69BB)	; 榻
-    (=gb2312		. #x693D)	; &I-G0-693D; [73-29]
-    (=cns11643-1	. #x692F)	; &I-C1-692F; [73-15]
+    (=ucs		. #x3BB2)	; 㮲
+    (->subsumptive
+     ((=ucs@unicode	  . #x3BB2)	; &M-15293;
+      (=daikanwa	  . 15293)	; &M-15293;
+      )
+     ((=cns11643-4	  . #x4422)	; &C4-4422; [36-02]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -16311,88 +16737,126 @@
     (=daikanwa		. 15298)	; &I-M-15298;
     ))
 (define-char
-  '((=>ucs		. #x69C0)	; 槀
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
       )
-     ((=ucs@jis		  . #x9AD8)	; &GT-60968;
-      (=ucs@ks		  . #x9AD8)	; &GT-60968;
-      (=jis-x0208	  . #x3962)	; &GT-60968; [25-66]
-      (=ks-x1001	  . #x4D54)	; &I-K0-4D54; [45-52]
-      (=jis-x0213-1	  . #x3962)	; &I-JX1-3962; [25-66]
-      (=daikanwa	  . 45313)	; &I-M-45313;
+     ((=ucs		  . #x9AD8)	; 高
       )
      ((=ucs		  . #x6728)	; 木
       ))
-    (=ucs@jis		. #x69C0)	; &M-15299;
-    (=jis-x0213-2	. #x2F3C)	; &M-15299; [15-28]
-    (=daikanwa		. 15299)	; &I-M-15299;
-    (=cbeta		. 00506)	; &I-CB00506;
-    (=jef-china3	. #x52F5)	; &I-JC3-52F5;
+    (=ucs		. #x69C0)	; 槀
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs@jis	    . #x9AD8)	; &GT-60968;
+	(=ucs@ks	    . #x9AD8)	; &GT-60968;
+	(=jis-x0208	    . #x3962)	; &GT-60968; [25-66]
+	(=ks-x1001	    . #x4D54)	; &I-K0-4D54; [45-52]
+	(=jis-x0213-1	    . #x3962)	; &I-JX1-3962; [25-66]
+	(=daikanwa	    . 45313)	; &I-M-45313;
+	)
+       ((=ucs		    . #x6728)	; 木
+	))
+      (=ucs@jis		  . #x69C0)	; &M-15299;
+      (=jis-x0213-2	  . #x2F3C)	; &M-15299; [15-28]
+      (=daikanwa	  . 15299)	; &I-M-15299;
+      (=shinjigen@1ed	  .  3751)	; &M-15299;
+      (=shinjigen@rev	  .  3752)	; &M-15299;
+      (=cbeta		  . 00506)	; &I-CB00506;
+      (=jef-china3	  . #x52F5)	; &I-JC3-52F5;
+      (<-original
+       ((=ucs@jis	    . #x69C1)	; &GT-19490;
+	(=jis-x0208	    . #x5C49)	; &GT-19490; [60-41]
+	(=ks-x1001	    . #x4D3E)	; &I-K0-4D3E; [45-30]
+	(=jis-x0213-1	    . #x5C49)	; &I-JX1-5C49; [60-41]
+	(=daikanwa	    . 15300)	; &I-M-15300;
+	(=shinjigen@1ed	    .  3750)	; &GT-19490;
+	(=shinjigen@rev	    .  3751)	; &GT-19490;
+	))
+      (<-original*sources
+       shinjigen@1ed shinjigen@rev)
+      )
+     ((hanyu-dazidian	  2 1267 9)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs@unicode	    . #x9AD8)	; &C1-586D;
+	(=gb2312	    . #x385F)	; &C1-586D; [24-63]
+	(=cns11643-1	    . #x586D)	; &I-C1-586D; [56-77]
+	)
+       ((=ucs		    . #x6728)	; 木
+	))
+      (=ucs@unicode	  . #x69C0)	; &HZK04-ACEB;
+      (=hanziku-4	  . #xACEB)	; &HZK04-ACEB;
+      )
+     ((=cns11643-3	  . #x4743)	; &C3-4743; [39-35]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15299 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (hanyu-dazidian	2 1267 9)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
-      (=ucs		  . #x2FF1)	; ⿱
-      )
-     ((=ucs		  . #x9AD8)	; 高
+    (=ucs		. #x69C1)	; 槁
+    (=big5		. #xBA60)	; &I-B-BA60;
+    (->subsumptive
+     ((=ucs@jis		  . #x69C1)	; &GT-19490;
+      (=jis-x0208	  . #x5C49)	; &GT-19490; [60-41]
+      (=ks-x1001	  . #x4D3E)	; &I-K0-4D3E; [45-30]
+      (=jis-x0213-1	  . #x5C49)	; &I-JX1-5C49; [60-41]
+      (=gt		  . 19490)	; &I-GT-19490;
+      (=gt-pj-1		  . #x5C49)	; &I-GT-19490; [60-41]
+      (=daikanwa	  . 15300)	; &I-M-15300;
+      (=shinjigen@1ed	  .  3750)	; &GT-19490;
+      (=shinjigen@rev	  .  3751)	; &GT-19490;
       )
-     ((=ucs		  . #x6728)	; 木
+     ((=ucs@unicode	  . #x69C1)	; &C1-6929;
+      (=gb2312		  . #x6942)	; &C1-6929; [73-34]
+      (=cns11643-1	  . #x6929)	; &I-C1-6929; [73-09]
       ))
-    (=ucs		. #x69C0)	; 槀
-    (=hanziku-4		. #xACEB)	; &I-HZK04-ACEB;
     ))
 (define-char
-  '((=>ucs		. #x69C0)	; 槀
-    (morohashi-daikanwa	15299 0 1)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=cns11643-3	. #x4743)	; &C3-4743; [39-35]
+    (=ucs		. #x3BB3)	; 㮳
     ))
 (define-char
-  '((=>ucs		. #x69C1)	; 槁
+  '((<-denotational
+     ((=ucs		  . #x3BB3)	; 㮳
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs@jis		. #x69C1)	; &GT-19490;
-    (=ucs@big5		. #x69C1)	; &GT-19490;
-    (=jis-x0208		. #x5C49)	; &GT-19490; [60-41]
-    (=ks-x1001		. #x4D3E)	; &I-K0-4D3E; [45-30]
-    (=jis-x0213-1	. #x5C49)	; &I-JX1-5C49; [60-41]
-    (=big5		. #xBA60)	; &I-B-BA60;
-    (=gt		. 19490)	; &I-GT-19490;
-    (=gt-pj-1		. #x5C49)	; &I-GT-19490; [60-41]
-    (=daikanwa		. 15300)	; &I-M-15300;
-    (=shinjigen@rev	.  3751)	; &GT-19490;
+    (=daikanwa		. 15301)	; &M-15301;
     ))
 (define-char
-  '((morohashi-daikanwa	15300 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3BB3)	; 㮳
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x69C1)	; 槁
-    (=gb2312		. #x6942)	; &I-G0-6942; [73-34]
-    (=cns11643-1	. #x6929)	; &I-C1-6929; [73-09]
+    (->subsumptive
+     ((=ucs@unicode	  . #x3BB3)	; &UU+3BB3;
+      )
+     ((=cns11643-3	  . #x474F)	; &C3-474F; [39-47]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x69C2)	; 槂
+    (=big5		. #xE25F)	; &I-B-E25F;
     (->subsumptive
-     ((=ucs@big5	  . #x69C2)	; &M-15302;
-      (=big5		  . #xE25F)	; &M-15302;
-      (=daikanwa	  . 15302)	; &I-M-15302;
+     ((=daikanwa	  . 15302)	; &M-15302;
       )
      ((=ucs@unicode	  . #x69C2)	; &UU+69C2;
       )
@@ -16671,16 +17135,30 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=ucs		. #x3BB4)	; ã®´
+    (->subsumptive
+     ((=daikanwa	  . 15315)	; &M-15315;
+      )
+     ((=cns11643-3	  . #x4740)	; &C3-4740; [39-32]
+      )
+     ((=ucs@unicode	  . #x3BB4)	; &UU+3BB4;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
     (=ucs		. #x69CA)	; 槊
+    (=big5		. #xE254)	; &I-B-E254;
     (->subsumptive
      ((=ucs@unicode	  . #x69CA)	; &GT-19507;
       (=jis-x0208	  . #x5C4E)	; &GT-19507; [60-46]
       (=gb2312		  . #x6943)	; &I-G0-6943; [73-35]
       (=jis-x0213-1	  . #x5C4E)	; &I-JX1-5C4E; [60-46]
-      (=big5		  . #xE254)	; &I-B-E254;
       (=gt		  . 19507)	; &I-GT-19507;
       (=gt-pj-1		  . #x5C4E)	; &I-GT-19507; [60-46]
       (=daikanwa	  . 15316)	; &I-M-15316;
+      (=shinjigen@1ed	  .  3760)	; &GT-19507;
       (=shinjigen@rev	  .  3761)	; &GT-19507;
       )
      ((=ucs@cns		  . #x69CA)	; &C2-4A7A;
@@ -16724,8 +17202,9 @@
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x69CC)	; 槌
+    (=>jis-x0208	. #x4448)	; 槌 [36-40]
+    (=>jis-x0213-1	. #x4448)	; 槌 [36-40]
     (=big5		. #xBA6C)	; &I-B-BA6C;
-    (=jis-x0208@1997	. #x4448)	; 槌 [36-40]
     ))
 (define-char
   '((<-denotational
@@ -16734,8 +17213,10 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=ucs@jis/2004	. #x69CC)	; &M-15318;
     (=jis-x0208@1978	. #x4448)	; &M-15318; [36-40]
     (=ks-x1001		. #x7759)	; &I-K0-7759; [87-57]
+    (=jis-x0213-1@2004	. #x4448)	; &I-JX3-4448; [36-40]
     (=daikanwa		. 15318)	; &I-M-15318;
     ))
 (define-char
@@ -16758,13 +17239,15 @@
     (=gb2312		. #x6933)	; &GT-19365; [73-19]
     (=jis-x0208@1983	. #x4448)	; &I-J83-4448; [36-40]
     (=jis-x0208@1990	. #x4448)	; &I-J90-4448; [36-40]
-    (=jis-x0213-1	. #x4448)	; &I-JX1-4448; [36-40]
+    (=jis-x0213-1@2000	. #x4448)	; &I-JX1-4448; [36-40]
     (=gt		. 19365)	; &I-GT-19365;
     (=gt-pj-1		. #x4448)	; &I-GT-19365; [36-40]
     (=jef-china3	. #x70C4)	; &I-JC3-70C4;
-    (<-simplified@JP/misc
-     ((=jis-x0208@1978	  . #x4448)	; &M-15318; [36-40]
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x69CC)	; &M-15318;
+      (=jis-x0208@1978	  . #x4448)	; &M-15318; [36-40]
       (=ks-x1001	  . #x7759)	; &I-K0-7759; [87-57]
+      (=jis-x0213-1@2004  . #x4448)	; &I-JX3-4448; [36-40]
       (=daikanwa	  . 15318)	; &I-M-15318;
       ))
     ))
@@ -16851,6 +17334,34 @@
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x3BB5)	; 㮵
+    (->subsumptive
+     ((=daikanwa	  . 15322)	; &M-15322;
+      (<-same
+       ((=ucs@jis	    . #x6834)	; &GT-18772;
+	(=jis-x0208	    . #x4073)	; &GT-18772; [32-83]
+	(=jis-x0213-1	    . #x4073)	; &I-JX1-4073; [32-83]
+	(=daikanwa	    . 14737)	; &I-M-14737;
+	))
+      (<-same*sources
+       zhengzitong daikanwa)
+      )
+     ((=shinjigen	  .  3614)	; &SJG2-3614;
+      (<-formed
+       ((=shinjigen	    .  3613)	; &SJG2-3613;
+	))
+      (<-formed*sources
+       shinjigen)
+      )
+     ((=ucs@unicode	  . #x3BB5)	; &UU+3BB5;
+      )
+     ((=cns11643-4	  . #x4425)	; &C4-4425; [36-05]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x69D0)	; 槐
     (=big5		. #xBA69)	; &I-B-BA69;
     (->subsumptive
@@ -16876,7 +17387,6 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (hanyu-dazidian	2 1263 18)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -16886,12 +17396,16 @@
      ((=ucs		  . #x5446)	; 呆
       ))
     (=ucs		. #x69D1)	; 槑
-    (=jis-x0212		. #x4467)	; &I-JSP-4467; [36-71]
-    (=cns11643-3	. #x4745)	; &I-C3-4745; [39-37]
-    (=jis-x0213-2	. #x2F3D)	; &I-JX2-2F3D; [15-29]
-    (=daikanwa		. 15324)	; &I-M-15324;
-    (=hanziku-4		. #xAC52)	; &I-HZK04-AC52;
-    (=cbeta		. 00318)	; &I-CB00318;
+    (->subsumptive
+     ((hanyu-dazidian	  2 1263 18)
+      (=ucs@unicode	  . #x69D1)	; &M-15324;
+      (=jis-x0212	  . #x4467)	; &M-15324; [36-71]
+      (=cns11643-3	  . #x4745)	; &I-C3-4745; [39-37]
+      (=jis-x0213-2	  . #x2F3D)	; &I-JX2-2F3D; [15-29]
+      (=daikanwa	  . 15324)	; &I-M-15324;
+      (=hanziku-4	  . #xAC52)	; &I-HZK04-AC52;
+      (=cbeta		  . 00318)	; &I-CB00318;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -16905,6 +17419,18 @@
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x3BB7)	; ã®·
+    (->subsumptive
+     ((=ucs@unicode	  . #x3BB7)	; &M-15326;
+      (=daikanwa	  . 15326)	; &M-15326;
+      )
+     ((=cns11643-5	  . #x464B)	; &C5-464B; [38-43]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x3BB8)	; 㮸
     ))
 (define-char
@@ -17142,7 +17668,15 @@
     (=jis-x0212		. #x4469)	; &I-JSP-4469; [36-73]
     (=cns11643-4	. #x4428)	; &I-C4-4428; [36-08]
     (=daikanwa		. 15351)	; &I-M-15351;
+    (=shinjigen		.  3811)	; 槗
     (=hanziku-12	. #xED58)	; &I-HZK12-ED58;
+    (<-vulgar
+     ((=ucs		  . #x6A4B)	; 橋
+      (=jis-x0208	  . #x3636)	; &I-J90-3636; [22-22]
+      (=shinjigen	  .  3810)	; 橋
+      ))
+    (<-vulgar*sources
+     shinjigen)
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -17155,7 +17689,9 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=ucs@jis/2004	. #x698A)	; &M-15352;
     (=jis-x0208@1978	. #x3A67)	; &M-15352; [26-71]
+    (=jis-x0213-1@2004	. #x3A67)	; &I-JX3-3A67; [26-71]
     (=daikanwa		. 15352)	; &I-M-15352;
     ))
 (define-char
@@ -17166,15 +17702,18 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (->subsumptive
-     ((=ucs@jis		  . #x698A)	; &GT-19292;
+     ((=ucs@jis/1990	  . #x698A)	; &GT-19292;
+      (=ucs@jis/2000	  . #x698A)	; &GT-19292;
       (=jis-x0208@1983	  . #x3A67)	; &GT-19292; [26-71]
       (=jis-x0208@1990	  . #x3A67)	; &I-J90-3A67; [26-71]
-      (=jis-x0213-1	  . #x3A67)	; &I-JX1-3A67; [26-71]
+      (=jis-x0213-1@2000  . #x3A67)	; &I-JX1-3A67; [26-71]
       (=gt		  . 19292)	; &I-GT-19292;
       (=gt-pj-1		  . #x3A67)	; &I-GT-19292; [26-71]
       (=jef-china3	  . #x54C8)	; &I-JC3-54C8;
-      (<-simplified@JP/misc
-       ((=jis-x0208@1978    . #x3A67)	; &M-15352; [26-71]
+      (<-simplified@JP/extra
+       ((=ucs@jis/2004	    . #x698A)	; &M-15352;
+	(=jis-x0208@1978    . #x3A67)	; &M-15352; [26-71]
+	(=jis-x0213-1@2004  . #x3A67)	; &I-JX3-3A67; [26-71]
 	(=daikanwa	    . 15352)	; &I-M-15352;
 	))
       )
@@ -17296,69 +17835,6 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs		. #x3BA9)	; 㮩
-    (=cns11643-3	. #x473F)	; &I-C3-473F; [39-31]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x3BAE)	; ã®®
-    (=cns11643-3	. #x474A)	; &I-C3-474A; [39-42]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x3BB0)	; ã®°
-    (=cns11643-4	. #x437E)	; &I-C4-437E; [35-94]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x3BB1)	; ã®±
-    (=cns11643-4	. #x437A)	; &I-C4-437A; [35-90]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x3BB2)	; 㮲
-    (=cns11643-4	. #x4422)	; &I-C4-4422; [36-02]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x3BB3)	; 㮳
-    (=cns11643-3	. #x474F)	; &I-C3-474F; [39-47]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x3BB4)	; ã®´
-    (=cns11643-3	. #x4740)	; &I-C3-4740; [39-32]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x3BB5)	; 㮵
-    (=cns11643-4	. #x4425)	; &I-C4-4425; [36-05]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x3BB7)	; ã®·
-    (=cns11643-5	. #x464B)	; &I-C5-464B; [38-43]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
     (hanyu-dazidian	2 1263 15)
     (=ucs		. #x69DB)	; 槛
     (=gb2312		. #x3C77)	; &I-G0-3C77; [28-87]
@@ -17999,6 +18475,10 @@
       (=gt-pj-4		  . #x3844)	; &GT-19655; [24-36]
       (=daikanwa	  . 15364)	; &I-M-15364;
       )
+     ((=>ucs*		  . #x69EA)	; 槪
+      (=ucs		  . #x2F8EA)	; 槪
+      (=cns11643-7	  . #x2372)	; &I-C7-2372; [03-82]
+      )
      ((=jef-china3	  . #x53FA)	; &JC3-53FA;
       )
      ((=cns11643-3	  . #x4C60)	; &C3-4C60; [44-64]
@@ -18907,16 +19387,17 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x6A0A)	; 樊
+    (=big5		. #xBCD4)	; &I-B-BCD4;
     (->subsumptive
      ((=ucs@unicode	  . #x6A0A)	; &GT-19796;
       (=jis-x0208	  . #x5C68)	; &GT-19796; [60-72]
       (=gb2312		  . #x372E)	; &I-G0-372E; [23-14]
       (=ks-x1001	  . #x5B60)	; &I-K0-5B60; [59-64]
       (=jis-x0213-1	  . #x5C68)	; &I-JX1-5C68; [60-72]
-      (=big5		  . #xBCD4)	; &I-B-BCD4;
       (=gt		  . 19796)	; &I-GT-19796;
       (=gt-pj-1		  . #x5C68)	; &I-GT-19796; [60-72]
       (=daikanwa	  . 15414)	; &I-M-15414;
+      (=shinjigen@1ed	  .  3798)	; &GT-19796;
       (=shinjigen@rev	  .  3799)	; &GT-19796;
       )
      ((=cns11643-1	  . #x6D3E)	; &C1-6D3E; [77-30]
@@ -18933,9 +19414,12 @@
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=ucs@jis/2004	. #x6A0B)	; &M-15415;
     (=jis-x0208@1978	. #x4875)	; &M-15415; [40-85]
+    (=jis-x0213-1@2004	. #x4875)	; &I-JX3-4875; [40-85]
     (=daikanwa		. 15415)	; &I-M-15415;
     (=shinjigen@1ed	.  3797)	; &M-15415;
+    (=shinjigen@rev	.  3798)	; &M-15415;
     ))
 (define-char
   '((<-denotational
@@ -18958,13 +19442,15 @@
     (=jis-x0208@1983	. #x4875)	; &GT-19587; [40-85]
     (=iso-ir165		. #x7C28)	; &I-EGB-7C28; [92-08]
     (=jis-x0208@1990	. #x4875)	; &I-J90-4875; [40-85]
-    (=jis-x0213-1	. #x4875)	; &I-JX1-4875; [40-85]
+    (=jis-x0213-1@2000	. #x4875)	; &I-JX1-4875; [40-85]
     (=gt		. 19587)	; &I-GT-19587;
     (=gt-pj-1		. #x4875)	; &I-GT-19587; [40-85]
     (=hanziku-4		. #xADD0)	; &I-HZK04-ADD0;
     (=jef-china3	. #x70C6)	; &I-JC3-70C6;
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4875)	; &M-15415; [40-85]
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x6A0B)	; &M-15415;
+      (=jis-x0208@1978	  . #x4875)	; &M-15415; [40-85]
+      (=jis-x0213-1@2004  . #x4875)	; &I-JX3-4875; [40-85]
       (=daikanwa	  . 15415)	; &I-M-15415;
       ))
     ))
@@ -19460,41 +19946,46 @@
     (=cns11643-4	. #x4A35)	; &I-C4-4A35; [42-21]
     ))
 (define-char
-  '((=>ucs		. #x6A19)	; 標
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=cns11643-1	. #x6D3A)	; &M-15442; [77-26]
-    (=daikanwa		. 15442)	; &I-M-15442;
-    (=shinjigen@rev	.  3800)	; 標
-    ))
-(define-char
-  '((morohashi-daikanwa	15442 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x6A19)	; 標
-    (=jis-x0208		. #x4938)	; &I-J90-4938; [41-24]
-    (=ks-x1001		. #x7876)	; &I-K0-7876; [88-86]
-    (=jis-x0213-1	. #x4938)	; &I-JX1-4938; [41-24]
-    (=gb12345		. #x316A)	; 標 [17-74]
     (=big5		. #xBCD0)	; &I-B-BCD0;
-    (=gt		. 19800)	; &I-GT-19800;
-    (=gt-k		. 11942)	; &I-GT-K11942;
-    (=gt-pj-1		. #x4938)	; &I-GT-19800; [41-24]
-    (=shinjigen@rev	.  3800)	; 標
+    (->subsumptive
+     ((=cns11643-1	  . #x6D3A)	; &M-15442; [77-26]
+      (=daikanwa	  . 15442)	; &I-M-15442;
+      )
+     ((=ucs@unicode	  . #x6A19)	; &GT-19800;
+      (=jis-x0208	  . #x4938)	; &GT-19800; [41-24]
+      (=ks-x1001	  . #x7876)	; &I-K0-7876; [88-86]
+      (=jis-x0213-1	  . #x4938)	; &I-JX1-4938; [41-24]
+      (=gb12345		  . #x316A)	; &GT-19800; [17-74]
+      (=gt		  . 19800)	; &I-GT-19800;
+      (=gt-k		  . 11942)	; &I-GT-K11942;
+      (=gt-pj-1		  . #x4938)	; &I-GT-19800; [41-24]
+      (=shinjigen@1ed	  .  3799)	; &GT-19800;
+      (=shinjigen@rev	  .  3800)	; &GT-19800;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=ucs		  . #x9E7F)	; 鹿
+      ))
     (=ucs		. #x6A1A)	; 樚
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x6728)	; 木
+       ((=gt-k		    . 00495)	; &GT-K00495;
 	)
        ((=ucs@jis	    . #x9E7F)	; &GT-64754;
 	(=ucs@ks	    . #x9E7F)	; &GT-64754;
@@ -19514,7 +20005,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x6728)	; 木
+       ((=gt-k		    . 00495)	; &GT-K00495;
 	)
        ((=ucs@unicode	    . #x9E7F)	; &G0-4239;
 	(=gb2312	    . #x4239)	; &G0-4239; [34-25]
@@ -19526,7 +20017,7 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x6728)	; 木
+       ((=gt-k		    . 00495)	; &GT-K00495;
 	)
        ((=ucs@cns	    . #x9E7F)	; &C1-5E26;
 	(=cns11643-1	    . #x5E26)	; &C1-5E26; [62-06]
@@ -19538,6 +20029,14 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=ucs		. #x23629)	; 𣘩
+    (=cns11643-7	. #x2373)	; &I-C7-2373; [03-83]
+    (=daikanwa		. 15444)	; &I-M-15444;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
     (=ucs		. #x6A1B)	; 樛
     (=big5		. #xE5D6)	; &I-B-E5D6;
     ))
@@ -19554,6 +20053,7 @@
     (=gt		. 19671)	; &I-GT-19671;
     (=gt-pj-1		. #x5C5C)	; &I-GT-19671; [60-60]
     (=daikanwa		. 15445)	; &I-M-15445;
+    (=shinjigen@1ed	.  3784)	; &GT-19671;
     (=shinjigen@rev	.  3785)	; &GT-19671;
     ))
 (define-char
@@ -20056,6 +20556,42 @@
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23630)	; 𣘰
+    (->subsumptive
+     ((=daikanwa	  . 15467)	; &M-15467;
+      )
+     ((=ucs@iso		  . #x23630)	; &C7-2369;
+      (=cns11643-7	  . #x2369)	; &C7-2369; [03-73]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23631)	; 𣘱
+    (->subsumptive
+     ((=daikanwa	  . 15468)	; &M-15468;
+      )
+     ((=ucs@iso		  . #x23631)	; &C4-4A41;
+      (=cns11643-4	  . #x4A41)	; &C4-4A41; [42-33]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23632)	; 𣘲
+    (->subsumptive
+     ((=daikanwa	  . 15469)	; &M-15469;
+      )
+     ((=ucs@iso		  . #x23632)	; &C5-4D5D;
+      (=cns11643-5	  . #x4D5D)	; &C5-4D5D; [45-61]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x3BCC)	; 㯌
     ))
 (define-char
@@ -20133,6 +20669,19 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=ucs		. #x23670)	; 𣙰
+    (->subsumptive
+     ((=daikanwa	  . 15473)	; &M-15473;
+      )
+     ((=ucs@iso		  . #x23670)	; &U-00023670;
+      )
+     ((=cns11643-5	  . #x4D68)	; &C5-4D68; [45-72]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
     (=ucs		. #x3BCE)	; 㯎
     (->subsumptive
      ((=daikanwa	  . 15474)	; &M-15474;
@@ -20159,6 +20708,14 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=ucs		. #x23671)	; 𣙱
+    (=cns11643-5	. #x4D66)	; &I-C5-4D66; [45-70]
+    (=daikanwa		. 15476)	; &I-M-15476;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
     (=ucs		. #x23672)	; 𣙲
     (->subsumptive
      ((=ucs@iso		  . #x23672)	; &M-15477;
@@ -20171,6 +20728,48 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (=ucs		. #x23673)	; 𣙳
+    (->subsumptive
+     ((=daikanwa	  . 15478)	; &M-15478;
+      )
+     ((=ucs@iso		  . #x23673)	; &U-00023673;
+      )
+     ((=cns11643-7	  . #x236D)	; &C7-236D; [03-77]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23674)	; 𣙴
+    (->subsumptive
+     ((=daikanwa	  . 15479)	; &M-15479;
+      )
+     ((=cns11643-5	  . #x4D60)	; &C5-4D60; [45-64]
+      )
+     ((=ucs@iso		  . #x23674)	; &U-00023674;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23675)	; 𣙵
+    (=cns11643-5	. #x4D5A)	; &I-C5-4D5A; [45-58]
+    (=daikanwa		. 15480)	; &I-M-15480;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs		. #x23676)	; 𣙶
+    (=cns11643-5	. #x4D62)	; &I-C5-4D62; [45-66]
+    (=daikanwa		. 15481)	; &I-M-15481;
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
     (=ucs		. #x2365B)	; 𣙛
     (->subsumptive
      ((=daikanwa	  . 15482)	; &M-15482;
@@ -20268,6 +20867,7 @@
     (=gt		. 19660)	; &I-GT-19660;
     (=gt-pj-1		. #x335F)	; &I-GT-19660; [19-63]
     (=daikanwa		. 15485)	; &I-M-15485;
+    (=shinjigen@1ed	.  3803)	; 樫
     (=shinjigen@rev	.  3804)	; 樫
     (=hanziku-4		. #xAECD)	; &I-HZK04-AECD;
     ))
@@ -20275,6 +20875,14 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=ucs		  . #x727D)	; 牽
+      ))
     (=ucs		. #x3BE0)	; 㯠
     (->subsumptive
      ((morohashi-daikanwa	15485 1)
@@ -20282,22 +20890,22 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x6728)	; 木
+       ((=gt-k		    . 00495)	; &GT-K00495;
 	)
-       ((=ucs@jis	    . #x727D)	; &GT-25686;
-	(=jis-x0208	    . #x3823)	; &GT-25686; [24-03]
-	(=ks-x1001	    . #x4C32)	; &I-K0-4C32; [44-18]
-	(=jis-x0213-1	    . #x3823)	; &I-JX1-3823; [24-03]
+       ((=ucs@jis/2004	    . #x727D)	; &GT-25686;
+	(=ks-x1001	    . #x4C32)	; &GT-25686; [44-18]
+	(=jis-x0213-1@2004  . #x3823)	; &I-JX3-3823; [24-03]
 	(=daikanwa	    . 20025)	; &I-M-20025;
 	))
       (=gt		  . 19689)	; &GT-19689;
       (=gt-pj-4		  . #x394A)	; &GT-19689; [25-42]
+      (mojikyo		  . 050234)	; &MCS-6000C43A;
       )
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs		    . #x6728)	; 木
+       ((=gt-k		    . 00495)	; &GT-K00495;
 	)
        ((=ucs@unicode	    . #x727D)	; &C1-5B74;
 	(=cns11643-1	    . #x5B74)	; &C1-5B74; [59-84]
@@ -20348,25 +20956,6 @@
     (=cns11643-7	. #x2366)	; &I-C7-2366; [03-70]
     ))
 (define-char
-  '((=>ucs		. #x3BE0)	; 㯠
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6728)	; 木
-      )
-     ((=ucs@jis		  . #x727D)	; &GT-25686;
-      (=jis-x0208	  . #x3823)	; &GT-25686; [24-03]
-      (=ks-x1001	  . #x4C32)	; &I-K0-4C32; [44-18]
-      (=jis-x0213-1	  . #x3823)	; &I-JX1-3823; [24-03]
-      (=daikanwa	  . 20025)	; &I-M-20025;
-      ))
-    (mojikyo		. 050234)	; &MCS-6000C43A;
-    ))
-(define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
@@ -20411,129 +21000,60 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs@jis		. #x6A30)	; &JX2-2F41;
-    (=jis-x0212		. #x447D)	; &JX2-2F41; [36-93]
-    (=jis-x0213-2	. #x2F41)	; &I-JX2-2F41; [15-33]
-    (=jef-china3	. #x70D3)	; &I-JC3-70D3;
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (hanyu-dazidian	2 1280 5)
-    (=ucs		. #x6A31)	; 樱
-    (=gb2312		. #x5323)	; &I-G0-5323; [51-03]
-    (=hanziku-4		. #xAFB0)	; &I-HZK04-AFB0;
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x6A74)	; æ©´
-    (=gb12345		. #x7D53)	; æ©´ [93-51]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23629)	; 𣘩
-    (=cns11643-7	. #x2373)	; &I-C7-2373; [03-83]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23630)	; 𣘰
-    (=cns11643-7	. #x2369)	; &I-C7-2369; [03-73]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23631)	; 𣘱
-    (=cns11643-4	. #x4A41)	; &I-C4-4A41; [42-33]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23632)	; 𣘲
-    (=cns11643-5	. #x4D5D)	; &I-C5-4D5D; [45-61]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x2363F)	; 𣘿
-    (=cns11643-4	. #x4A45)	; &I-C4-4A45; [42-37]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23641)	; 𣙁
-    (=cns11643-4	. #x4A49)	; &I-C4-4A49; [42-41]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23643)	; 𣙃
-    (=cns11643-7	. #x236A)	; &I-C7-236A; [03-74]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23670)	; 𣙰
-    (=cns11643-5	. #x4D68)	; &I-C5-4D68; [45-72]
-    ))
-(define-char
-  '((ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 11)
-    (total-strokes	 . 15)
-    (=ucs		. #x23671)	; 𣙱
-    (=cns11643-5	. #x4D66)	; &I-C5-4D66; [45-70]
+    (=jis-x0212		. #x447D)	; &JX2-2F41; [36-93]
+    (=jis-x0213-2	. #x2F41)	; &I-JX2-2F41; [15-33]
+    (=jef-china3	. #x70D3)	; &I-JC3-70D3;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23673)	; 𣙳
-    (=cns11643-7	. #x236D)	; &I-C7-236D; [03-77]
+    (hanyu-dazidian	2 1280 5)
+    (=ucs		. #x6A31)	; 樱
+    (=gb2312		. #x5323)	; &I-G0-5323; [51-03]
+    (=hanziku-4		. #xAFB0)	; &I-HZK04-AFB0;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23674)	; 𣙴
-    (=cns11643-5	. #x4D60)	; &I-C5-4D60; [45-64]
+    (=ucs		. #x6A74)	; æ©´
+    (=gb12345		. #x7D53)	; æ©´ [93-51]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23675)	; 𣙵
-    (=cns11643-5	. #x4D5A)	; &I-C5-4D5A; [45-58]
+    (=ucs		. #x2363A)	; 𣘺
+    (=shinjigen		.  3812)	; 𣘺
+    (<-vulgar
+     ((=ucs		  . #x6A4B)	; 橋
+      (=jis-x0208	  . #x3636)	; &I-J90-3636; [22-22]
+      (=shinjigen	  .  3810)	; 橋
+      ))
+    (<-vulgar*sources
+     shinjigen)
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x23676)	; 𣙶
-    (=cns11643-5	. #x4D62)	; &I-C5-4D62; [45-66]
+    (=ucs		. #x2363F)	; 𣘿
+    (=cns11643-4	. #x4A45)	; &I-C4-4A45; [42-37]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=ucs		. #x236A3)	; 𣚣
-    (=cns11643-4	. #x4A44)	; &I-C4-4A44; [42-36]
+    (=ucs		. #x23641)	; 𣙁
+    (=cns11643-4	. #x4A49)	; &I-C4-4A49; [42-41]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
-    (=cns11643-7	. #x2372)	; &C7-2372; [03-82]
+    (=ucs		. #x23643)	; 𣙃
+    (=cns11643-7	. #x236A)	; &I-C7-236A; [03-74]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -20790,9 +21310,11 @@
     (->subsumptive
      ((=daikanwa	  . 15500)	; &M-15500;
       )
-     ((=jis-x0208@1978	  . #x432E)	; &J78-432E; [35-14]
+     ((=ucs@jis/2004	  . #x6A3D)	; &JX3-432E;
+      (=jis-x0208@1978	  . #x432E)	; &JX3-432E; [35-14]
       (=ks-x1001	  . #x715C)	; &I-K0-715C; [81-60]
-      (=shinjigen@1ed	  .  3825)	; &J78-432E;
+      (=jis-x0213-1@2004  . #x432E)	; &I-JX3-432E; [35-14]
+      (=shinjigen	  .  3825)	; &JX3-432E;
       ))
     ))
 (define-char
@@ -20805,16 +21327,19 @@
     (->subsumptive
      ((=cns11643-1	  . #x7073)	; &C1-7073; [80-83]
       )
-     ((=ucs@jis		  . #x6A3D)	; &GT-19953;
+     ((=ucs@jis/1990	  . #x6A3D)	; &GT-19953;
+      (=ucs@jis/2000	  . #x6A3D)	; &GT-19953;
       (=jis-x0208@1983	  . #x432E)	; &GT-19953; [35-14]
       (=jis-x0208@1990	  . #x432E)	; &I-J90-432E; [35-14]
-      (=jis-x0213-1	  . #x432E)	; &I-JX1-432E; [35-14]
+      (=jis-x0213-1@2000  . #x432E)	; &I-JX1-432E; [35-14]
       (=gt		  . 19953)	; &I-GT-19953;
       (=gt-pj-1		  . #x432E)	; &I-GT-19953; [35-14]
       (=jef-china3	  . #x70C3)	; &I-JC3-70C3;
-      (<-simplified@JP
-       ((=jis-x0208@1978    . #x432E)	; &J78-432E; [35-14]
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x6A3D)	; &JX3-432E;
+	(=jis-x0208@1978    . #x432E)	; &JX3-432E; [35-14]
 	(=ks-x1001	    . #x715C)	; &I-K0-715C; [81-60]
+	(=jis-x0213-1@2004  . #x432E)	; &I-JX3-432E; [35-14]
 	))
       )
      ((=ucs@unicode	  . #x6A3D)	; &G0-6957;
@@ -20825,6 +21350,14 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=ucs		  . #x7FD5)	; 翕
+      ))
     (=ucs		. #x3BD3)	; 㯓
     ))
 (define-char
@@ -20838,7 +21371,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x6728)	; 木
+     ((=gt-k		  . 00495)	; &GT-K00495;
       )
      ((=ucs@jis		  . #x7FD5)	; &GT-36979;
       (=jis-x0208	  . #x6645)	; &GT-36979; [70-37]
@@ -20860,7 +21393,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x6728)	; 木
+     ((=gt-k		  . 00495)	; &GT-K00495;
       )
      ((=ucs@unicode	  . #x7FD5)	; &C1-6145;
       (=gb2312		  . #x7462)	; &C1-6145; [84-66]
@@ -21161,7 +21694,17 @@
     (=jis-x0212		. #x4529)	; &I-JSP-4529; [37-09]
     (=cns11643-3	. #x513B)	; &I-C3-513B; [49-27]
     (=daikanwa		. 15525)	; &I-M-15525;
+    (=shinjigen@1ed	.  3779)	; 橊
+    (=shinjigen@rev	.  3780)	; 橊
     (=hanziku-4		. #xB0F4)	; &I-HZK04-B0F4;
+    (<-original
+     ((=ucs		  . #x69B4)	; 榴
+      (=jis-x0208	  . #x5C58)	; &I-J90-5C58; [60-56]
+      (=shinjigen@1ed	  .  3778)	; 榴
+      (=shinjigen@rev	  .  3779)	; 榴
+      ))
+    (<-original*sources
+     shinjigen@1ed shinjigen@rev)
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -21177,7 +21720,7 @@
     (=gt		. 19878)	; &I-GT-19878;
     (=gt-pj-1		. #x3636)	; &I-GT-19878; [22-22]
     (=daikanwa		. 15526)	; &I-M-15526;
-    (=shinjigen@rev	.  3810)	; 橋
+    (=shinjigen		.  3810)	; 橋
     ))
 (define-char
   '((=>ucs		. #x6A4C)	; 橌
@@ -21430,16 +21973,27 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
     (=ucs		. #x6A59)	; 橙
-    (=jis-x0208		. #x5C74)	; &I-J90-5C74; [60-84]
-    (=gb2312		. #x3348)	; &I-G0-3348; [19-40]
-    (=ks-x1001		. #x5472)	; &I-K0-5472; [52-82]
-    (=cns11643-1	. #x7076)	; &I-C1-7076; [80-86]
-    (=jis-x0213-1	. #x5C74)	; &I-JX1-5C74; [60-84]
-    (=big5		. #xBEED)	; &I-B-BEED;
-    (=gt		. 19985)	; &I-GT-19985;
-    (=gt-pj-1		. #x5C74)	; &I-GT-19985; [60-84]
-    (=daikanwa		. 15552)	; &I-M-15552;
-    (=shinjigen@rev	.  3833)	; 橙
+    (=>jis-x0208	. #x5C74)	; 橙 [60-84]
+    (=>jis-x0213-1	. #x5C74)	; 橙 [60-84]
+    (->subsumptive
+     ((=ucs@jis/1990	  . #x6A59)	; &M-15552;
+      (=ucs@jis/2000	  . #x6A59)	; &M-15552;
+      (=jis-x0208	  . #x5C74)	; &M-15552; [60-84]
+      (=ks-x1001	  . #x5472)	; &I-K0-5472; [52-82]
+      (=jis-x0213-1@2000  . #x5C74)	; &I-JX1-5C74; [60-84]
+      (=daikanwa	  . 15552)	; &I-M-15552;
+      (=shinjigen	  .  3833)	; &M-15552;
+      )
+     ((=ucs@jis/2004	  . #x6A59)	; &JX3-5C74;
+      (=jis-x0213-1@2004  . #x5C74)	; &JX3-5C74; [60-84]
+      )
+     ((=ucs@unicode	  . #x6A59)	; &GT-19985;
+      (=gb2312		  . #x3348)	; &GT-19985; [19-40]
+      (=cns11643-1	  . #x7076)	; &I-C1-7076; [80-86]
+      (=big5		  . #xBEED)	; &I-B-BEED;
+      (=gt		  . 19985)	; &I-GT-19985;
+      (=gt-pj-1		  . #x5C74)	; &I-GT-19985; [60-84]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -21808,11 +22362,15 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (hanyu-dazidian	2 1294 8)
     (=ucs		. #x6A6E)	; æ©®
-    (=cns11643-3	. #x5132)	; &I-C3-5132; [49-18]
-    (=daikanwa		. 15600)	; &I-M-15600;
-    (=hanziku-4		. #xB27A)	; &I-HZK04-B27A;
+    (->subsumptive
+     ((=cns11643-3	  . #x5132)	; &M-15600; [49-18]
+      (=daikanwa	  . 15600)	; &I-M-15600;
+      )
+     ((hanyu-dazidian	  2 1294 8)
+      (=ucs@unicode	  . #x6A6E)	; &HZK04-B27A;
+      (=hanziku-4	  . #xB27A)	; &HZK04-B27A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -21827,34 +22385,69 @@
      ((=ucs		  . #x5DFD)	; å·½
       ))
     (=ucs		. #x3BE2)	; 㯢
-    (=daikanwa		. 15601)	; &I-M-15601;
-    (=cbeta		. 02038)	; &I-CB02038;
-    (=jef-china3	. #x54AE)	; &I-JC3-54AE;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((=ucs		    . #x2F884)	; 巽
+	))
+      (=ucs@unicode	  . #x3BE2)	; &M-15601;
+      (=daikanwa	  . 15601)	; &M-15601;
+      (=cbeta		  . 02038)	; &I-CB02038;
+      (=jef-china3	  . #x54AE)	; &I-JC3-54AE;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((=ucs@cns	    . #x5DFD)	; &C1-5E78;
+	(=cns11643-1	    . #x5E78)	; &C1-5E78; [62-88]
+	))
+      (=cns11643-3	  . #x512D)	; &C3-512D; [49-13]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x3BE2)	; 㯢
-    (morohashi-daikanwa	15601 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+    (=ucs		. #x6A6F)	; 橯
+    (=big5		. #xE9D4)	; &I-B-E9D4;
+    (->subsumptive
+     ((=daikanwa	  . 15603)	; &M-15603;
       )
-     ((=ucs		  . #x6728)	; 木
+     ((=ucs@unicode	  . #x6A6F)	; &UU+6A6F;
       )
-     ((=cns11643-1	  . #x5E78)	; &C1-5E78; [62-88]
+     ((=cns11643-2	  . #x575F)	; &C2-575F; [55-63]
       ))
-    (=cns11643-3	. #x512D)	; &C3-512D; [49-13]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
+    (=ucs		. #x236A3)	; 𣚣
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x236A3)	; 𣚣
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 12)
     (total-strokes	 . 16)
-    (=ucs		. #x6A6F)	; 橯
-    (=cns11643-2	. #x575F)	; &I-C2-575F; [55-63]
-    (=big5		. #xE9D4)	; &I-B-E9D4;
-    (=daikanwa		. 15603)	; &I-M-15603;
+    (=daikanwa		. 15605)	; &M-15605;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x236A3)	; 𣚣
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=ucs@iso		. #x236A3)	; &HZK04-B1DF;
+    (=cns11643-4	. #x4A44)	; &HZK04-B1DF; [42-36]
+    (=hanziku-4		. #xB1DF)	; &I-HZK04-B1DF;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -22816,50 +23409,70 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (=ucs		. #x3BF0)	; 㯰
-    (=cns11643-7	. #x3855)	; &I-C7-3855; [24-53]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3BF0)	; 㯰
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 13)
+    (total-strokes	 . 17)
+    (=ucs@jis		. #x3BF0)	; &M-15654;
+    (=cns11643-7	. #x3855)	; &M-15654; [24-53]
     (=jis-x0213-2	. #x2F5D)	; &I-JX2-2F5D; [15-61]
     (=daikanwa		. 15654)	; &I-M-15654;
     (=jef-china3	. #x54B2)	; &I-JC3-54B2;
     ))
 (define-char
-  '((ideographic-radical . 75)	; ⽊
+  '((<-denotational
+     ((=ucs		  . #x3BF0)	; 㯰
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (=ucs		. #x6A8C)	; 檌
-    (=cns11643-2	. #x5D35)	; &I-C2-5D35; [61-21]
-    (=big5		. #xED49)	; &I-B-ED49;
-    (=daikanwa		. 15655)	; &I-M-15655;
+    (=ucs@unicode	. #x3BF0)	; &UU+3BF0;
     ))
 (define-char
-  '((=>ucs		. #x6A8D)	; 檍
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (=ucs@jis		. #x6A8D)	; &GT-20052;
-    (=ucs@big5		. #x6A8D)	; &GT-20052;
-    (=jis-x0208		. #x5C7A)	; &GT-20052; [60-90]
-    (=ks-x1001		. #x6565)	; &I-K0-6565; [69-69]
-    (=jis-x0213-1	. #x5C7A)	; &I-JX1-5C7A; [60-90]
-    (=big5		. #xECF3)	; &I-B-ECF3;
-    (=gt		. 20052)	; &I-GT-20052;
-    (=gt-pj-1		. #x5C7A)	; &I-GT-20052; [60-90]
-    (=daikanwa		. 15656)	; &I-M-15656;
+    (=ucs		. #x6A8C)	; 檌
+    (=big5		. #xED49)	; &I-B-ED49;
+    (->subsumptive
+     ((=daikanwa	  . 15655)	; &M-15655;
+      )
+     ((=cns11643-2	  . #x5D35)	; &C2-5D35; [61-21]
+      )
+     ((=ucs@unicode	  . #x6A8C)	; &UU+6A8C;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15656 0 0)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (=ucs		. #x6A8D)	; 檍
-    (=cns11643-2	. #x5C7E)	; &I-C2-5C7E; [60-94]
+    (=big5		. #xECF3)	; &I-B-ECF3;
+    (->subsumptive
+     ((=ucs@jis		  . #x6A8D)	; &GT-20052;
+      (=jis-x0208	  . #x5C7A)	; &GT-20052; [60-90]
+      (=ks-x1001	  . #x6565)	; &I-K0-6565; [69-69]
+      (=jis-x0213-1	  . #x5C7A)	; &I-JX1-5C7A; [60-90]
+      (=gt		  . 20052)	; &I-GT-20052;
+      (=gt-pj-1		  . #x5C7A)	; &I-GT-20052; [60-90]
+      (=daikanwa	  . 15656)	; &I-M-15656;
+      )
+     ((=ucs@unicode	  . #x6A8D)	; &C2-5C7E;
+      (=cns11643-2	  . #x5C7E)	; &C2-5C7E; [60-94]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (=ucs		. #x6A8E)	; 檎
+    (=>jis-x0208	. #x3869)	; 檎 [24-73]
+    (=>jis-x0213-1	. #x3869)	; 檎 [24-73]
     (=big5		. #xECFE)	; &I-B-ECFE;
-    (=jis-x0208@1997	. #x3869)	; 檎 [24-73]
     (->subsumptive
      ((=jis-x0208@1978	  . #x3869)	; &M-15657; [24-73]
       (=jis-x0208@1983	  . #x3869)	; &I-J83-3869; [24-73]
@@ -22871,7 +23484,7 @@
       (=jis-x0213-1	  . #x3869)	; &I-JX1-3869; [24-73]
       (=gt		  . 19829)	; &I-GT-19829;
       (=gt-pj-1		  . #x3869)	; &I-GT-19829; [24-73]
-      (=shinjigen@1ed	  .  3853)	; &GT-19829;
+      (=shinjigen	  .  3853)	; &GT-19829;
       )
      ((=ucs@unicode	  . #x6A8E)	; &G0-6955;
       (=gb2312		  . #x6955)	; &G0-6955; [73-53]
@@ -22884,7 +23497,6 @@
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (hanyu-dazidian	2 1301 7)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -22894,25 +23506,35 @@
      ((=ucs		  . #x696D)	; 業
       ))
     (=ucs		. #x6A8F)	; 檏
-    (=daikanwa		. 15658)	; &I-M-15658;
-    (=hanziku-4		. #xB3DE)	; &I-HZK04-B3DE;
-    (=cbeta		. 05177)	; &I-CB05177;
-    ))
-(define-char
-  '((=>ucs		. #x6A8F)	; 檏
-    (morohashi-daikanwa	15658 0 1)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 13)
-    (total-strokes	 . 17)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
-      )
-     ((=ucs		  . #x6728)	; 木
+    (->subsumptive
+     ((hanyu-dazidian	  2 1301 7)
+      (ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((=ucs@unicode	    . #x696D)	; &GT-19258;
+	(=jis-x0208	    . #x3648)	; &GT-19258; [22-40]
+	(=ks-x1001	    . #x6576)	; &I-K0-6576; [69-86]
+	(=jis-x0213-1	    . #x3648)	; &I-JX1-3648; [22-40]
+	(=daikanwa	    . 15170)	; &I-M-15170;
+	))
+      (=ucs@unicode	  . #x6A8F)	; &M-15658;
+      (=daikanwa	  . 15658)	; &M-15658;
+      (=hanziku-4	  . #xB3DE)	; &I-HZK04-B3DE;
+      (=cbeta		  . 05177)	; &I-CB05177;
       )
-     ((=cns11643-1	  . #x6446)	; &C1-6446; [68-38]
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 00495)	; &GT-K00495;
+	)
+       ((=cns11643-1	    . #x6446)	; &C1-6446; [68-38]
+	))
+      (=cns11643-3	  . #x5527)	; &C3-5527; [53-07]
       ))
-    (=cns11643-3	. #x5527)	; &C3-5527; [53-07]
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -25568,8 +26190,9 @@
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x6ADB)	; 櫛
+    (=>jis-x0208	. #x367B)	; 櫛 [22-91]
+    (=>jis-x0213-1	. #x367B)	; 櫛 [22-91]
     (=big5		. #xC0CD)	; &I-B-C0CD;
-    (=jis-x0208@1997	. #x367B)	; 櫛 [22-91]
     ))
 (define-char
   '((<-denotational
@@ -25590,13 +26213,6 @@
      ((ideographic-strokes . 14)
       (total-strokes	   . 18)
       (=ucs@iso		  . #x2F8ED)	; &U-0002F8ED;
-      )
-     ((ideographic-strokes . 15)
-      (total-strokes	   . 19)
-      (=ucs@ks		  . #x6ADB)	; &J78-367B;
-      (=jis-x0208@1978	  . #x367B)	; &J78-367B; [22-91]
-      (=ks-x1001	  . #x716E)	; &I-K0-716E; [81-78]
-      (=shinjigen@1ed	  .  3871)	; &J78-367B;
       ))
     ))
 (define-char
@@ -25604,6 +26220,20 @@
      ((=ucs		  . #x6ADB)	; 櫛
       ))
     (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
+    (=ucs@jis/2004	. #x6ADB)	; &JX3-367B;
+    (=ucs@ks		. #x6ADB)	; &JX3-367B;
+    (=jis-x0208@1978	. #x367B)	; &JX3-367B; [22-91]
+    (=ks-x1001		. #x716E)	; &I-K0-716E; [81-78]
+    (=jis-x0213-1@2004	. #x367B)	; &I-JX3-367B; [22-91]
+    (=shinjigen		.  3871)	; &JX3-367B;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6ADB)	; 櫛
+      ))
+    (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
     (=jef-china3	. #x54C7)	; &JC3-54C7;
@@ -25619,14 +26249,16 @@
     (=jis-x0208@1983	. #x367B)	; &GT-20091; [22-91]
     (=jis-x0208@1990	. #x367B)	; &I-J90-367B; [22-91]
     (=cns11643-1	. #x7376)	; &I-C1-7376; [83-86]
-    (=jis-x0213-1	. #x367B)	; &I-JX1-367B; [22-91]
+    (=jis-x0213-1@2000	. #x367B)	; &I-JX1-367B; [22-91]
     (=gb12345		. #x684E)	; &GT-20091; [72-46]
     (=gt		. 20091)	; &I-GT-20091;
     (=gt-pj-1		. #x367B)	; &I-GT-20091; [22-91]
-    (<-simplified@JP
-     ((=ucs@ks		  . #x6ADB)	; &J78-367B;
-      (=jis-x0208@1978	  . #x367B)	; &J78-367B; [22-91]
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x6ADB)	; &JX3-367B;
+      (=ucs@ks		  . #x6ADB)	; &JX3-367B;
+      (=jis-x0208@1978	  . #x367B)	; &JX3-367B; [22-91]
       (=ks-x1001	  . #x716E)	; &I-K0-716E; [81-78]
+      (=jis-x0213-1@2004  . #x367B)	; &I-JX3-367B; [22-91]
       ))
     ))
 (define-char
@@ -25634,6 +26266,14 @@
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
     (=ucs		. #x6ADC)	; 櫜
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6ADC)	; 櫜
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
     (->subsumptive
      ((=ucs@jis		  . #x6ADC)	; &M-15818;
       (=jis-x0212	  . #x4553)	; &M-15818; [37-51]
@@ -25641,10 +26281,19 @@
       (=daikanwa	  . 15818)	; &I-M-15818;
       )
      ((=ucs@unicode	  . #x6ADC)	; &UU+6ADC;
-      )
-     ((=ucs@big5	  . #x6ADC)	; &JC3-52F9;
-      (=big5		  . #xF253)	; &JC3-52F9;
-      (=jef-china3	  . #x52F9)	; &I-JC3-52F9;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6ADC)	; 櫜
+      ))
+    (ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
+    (=ucs@big5		. #x6ADC)	; &B-F253;
+    (=big5		. #xF253)	; &B-F253;
+    (->subsumptive
+     ((=jef-china3	  . #x52F9)	; &JC3-52F9;
       )
      ((=ucs@cns		  . #x6ADC)	; &C2-655E;
       (=cns11643-2	  . #x655E)	; &C2-655E; [69-62]
@@ -25663,12 +26312,11 @@
      ((=ucs		  . #x6851)	; 桑
       ))
     (=ucs		. #x23799)	; 𣞙
-    (=daikanwa		. 15820)	; &I-M-15820;
-    (=cbeta		. 01115)	; &I-CB01115;
     ))
 (define-char
-  '((=>ucs		. #x23799)	; 𣞙
-    (morohashi-daikanwa	15820 0 0)
+  '((<-denotational
+     ((=ucs		  . #x23799)	; 𣞙
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
@@ -25676,95 +26324,148 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x58F4)	; 壴
+     ((=gt-k		  . 05309)	; &GT-K05309;
       )
-     ((=cns11643-1	  . #x5625)	; &C1-5625; [54-05]
+     ((=ucs		  . #x6851)	; 桑
+      ))
+    (->subsumptive
+     ((=daikanwa	  . 15820)	; &M-15820;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 05309)	; &GT-K05309;
+	)
+       ((=ucs@unicode	    . #x6851)	; &GT-18778;
+	(=jis-x0208	    . #x372C)	; &GT-18778; [23-12]
+	(=gb2312	    . #x4923)	; &I-G0-4923; [41-03]
+	(=ks-x1001	    . #x5F4D)	; &I-K0-5F4D; [63-45]
+	(=jis-x0213-1	    . #x372C)	; &I-JX1-372C; [23-12]
+	(=daikanwa	    . 14772)	; &I-M-14772;
+	))
+      (=ucs@iso		  . #x23799)	; &U-00023799;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((=gt-k		    . 05309)	; &GT-K05309;
+	)
+       ((=cns11643-1	    . #x5625)	; &C1-5625; [54-05]
+	))
+      (=cns11643-4	  . #x5F74)	; &C4-5F74; [63-84]
       ))
-    (=cns11643-4	. #x5F74)	; &C4-5F74; [63-84]
     ))
 (define-char
-  '((=>ucs		. #x6ADD)	; 櫝
+  '((<-denotational
+     ((=ucs		  . #x23799)	; 𣞙
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs@jis		. #x6ADD)	; &M-15821;
-    (=ucs@big5		. #x6ADD)	; &M-15821;
-    (=jis-x0212		. #x4554)	; &M-15821; [37-52]
-    (=jis-x0213-2	. #x2F68)	; &I-JX2-2F68; [15-72]
-    (=big5		. #xC370)	; &I-B-C370;
-    (=daikanwa		. 15821)	; &I-M-15821;
+    (=cbeta		. 01115)	; &CB01115;
     ))
 (define-char
-  '((morohashi-daikanwa	15821 0 2)
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
     (=ucs		. #x6ADD)	; 櫝
-    (=cns11643-1	. #x783D)	; &I-C1-783D; [88-29]
-    (=gb12345		. #x687C)	; 櫝 [72-92]
+    (=big5		. #xC370)	; &I-B-C370;
     ))
 (define-char
-  '((=>ucs		. #x6ADE)	; 櫞
+  '((<-denotational
+     ((=ucs		  . #x6ADD)	; 櫝
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs@jis		. #x6ADE)	; &GT-20282;
-    (=ucs@big5		. #x6ADE)	; &GT-20282;
-    (=jis-x0208		. #x5D29)	; &GT-20282; [61-09]
-    (=jis-x0213-1	. #x5D29)	; &I-JX1-5D29; [61-09]
-    (=big5		. #xF258)	; &I-B-F258;
-    (=gt		. 20282)	; &I-GT-20282;
-    (=gt-pj-1		. #x5D29)	; &I-GT-20282; [61-09]
-    (=daikanwa		. 15822)	; &I-M-15822;
+    (=ucs@jis		. #x6ADD)	; &M-15821;
+    (=jis-x0212		. #x4554)	; &M-15821; [37-52]
+    (=jis-x0213-2	. #x2F68)	; &I-JX2-2F68; [15-72]
+    (=daikanwa		. 15821)	; &I-M-15821;
     ))
 (define-char
-  '((morohashi-daikanwa	15822 0 1)
+  '((<-denotational
+     ((=ucs		  . #x6ADD)	; 櫝
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
+    (=ucs@unicode	. #x6ADD)	; &C1-783D;
+    (=cns11643-1	. #x783D)	; &C1-783D; [88-29]
+    (=gb12345		. #x687C)	; &C1-783D; [72-92]
+    ))
+(define-char
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
     (=ucs		. #x6ADE)	; 櫞
-    (=cns11643-2	. #x6563)	; &I-C2-6563; [69-67]
-    (=gb12345		. #x695A)	; 櫞 [73-58]
+    (=big5		. #xF258)	; &I-B-F258;
+    (->subsumptive
+     ((=ucs@jis		  . #x6ADE)	; &GT-20282;
+      (=jis-x0208	  . #x5D29)	; &GT-20282; [61-09]
+      (=jis-x0213-1	  . #x5D29)	; &I-JX1-5D29; [61-09]
+      (=gt		  . 20282)	; &I-GT-20282;
+      (=gt-pj-1		  . #x5D29)	; &I-GT-20282; [61-09]
+      (=daikanwa	  . 15822)	; &I-M-15822;
+      )
+     ((=ucs@unicode	  . #x6ADE)	; &UU+6ADE;
+      (=gb12345		  . #x695A)	; &UU+6ADE; [73-58]
+      )
+     ((=cns11643-2	  . #x6563)	; &C2-6563; [69-67]
+      ))
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
     (=ucs		. #x6ADF)	; 櫟
+    (=big5		. #xF252)	; &I-B-F252;
     (->subsumptive
      ((=ucs@unicode	  . #x6ADF)	; &GT-20358;
       (=jis-x0208	  . #x5D2B)	; &GT-20358; [61-11]
       (=jis-x0213-1	  . #x5D2B)	; &I-JX1-5D2B; [61-11]
       (=gb12345		  . #x685D)	; &GT-20358; [72-61]
-      (=big5		  . #xF252)	; &I-B-F252;
       (=gt		  . 20358)	; &I-GT-20358;
       (=gt-pj-1		  . #x5D2B)	; &I-GT-20358; [61-11]
       (=daikanwa	  . 15823)	; &I-M-15823;
-      (=shinjigen@rev	  .  3874)	; &GT-20358;
+      (=shinjigen	  .  3874)	; &GT-20358;
       )
      ((=ucs@cns		  . #x6ADF)	; &C2-655D;
       (=cns11643-2	  . #x655D)	; &C2-655D; [69-61]
       ))
     ))
 (define-char
-  '((=>ucs		. #x6AE0)	; æ« 
-    (ideographic-radical . 75)	; ⽊
+  '((ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
-    (=ucs@big5		. #x6AE0)	; &M-15824;
-    (=big5		. #xF24D)	; &M-15824;
-    (=daikanwa		. 15824)	; &I-M-15824;
+    (=ucs		. #x6AE0)	; æ« 
+    (=big5		. #xF24D)	; &I-B-F24D;
+    (->subsumptive
+     ((=daikanwa	  . 15824)	; &M-15824;
+      )
+     ((=cns11643-2	  . #x6558)	; &C2-6558; [69-56]
+      )
+     ((=ucs@unicode	  . #x6AE0)	; &UU+6AE0;
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	15824 0 0)
-    (ideographic-radical . 75)	; ⽊
-    (ideographic-strokes . 15)
-    (total-strokes	 . 19)
-    (=ucs		. #x6AE0)	; æ« 
-    (=cns11643-2	. #x6558)	; &I-C2-6558; [69-56]
+  '((ideographic-radical . 75)	; ⽊
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((=ucs		  . #x9069)	; 適
+      ))
+    (=ucs		. #x3C05)	; 㰅
     ))
 (define-char
-  '((=>ucs		. #x3C05)	; 㰅
+  '((<-denotational
+     ((=ucs		  . #x3C05)	; 㰅
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
@@ -25772,7 +26473,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x6728)	; 木
+     ((=gt-k		  . 00495)	; &GT-K00495;
       )
      ((=ks-x1001	  . #x6E6A)	; &GT-52561; [78-74]
       (=daikanwa	  . 39076)	; &I-M-39076;
@@ -25781,8 +26482,9 @@
     (=cbeta		. 03800)	; &I-CB03800;
     ))
 (define-char
-  '((=>ucs		. #x3C05)	; 㰅
-    (morohashi-daikanwa	15825 0 2)
+  '((<-denotational
+     ((=ucs		  . #x3C05)	; 㰅
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 15)
     (total-strokes	 . 19)
@@ -25790,14 +26492,16 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x6728)	; 木
+     ((=gt-k		  . 00495)	; &GT-K00495;
       )
      ((=cns11643-1	  . #x6F4B)	; &C1-6F4B; [79-43]
       ))
     (=cns11643-3	. #x5A4C)	; &C3-5A4C; [58-44]
     ))
 (define-char
-  '((morohashi-daikanwa	15825 0 3)
+  '((<-denotational
+     ((=ucs		  . #x3C05)	; 㰅
+      ))
     (ideographic-radical . 75)	; ⽊
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
@@ -25805,11 +26509,12 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x6728)	; 木
+     ((=gt-k		  . 00495)	; &GT-K00495;
       )
-     ((=ucs		  . #x9069)	; 適
+     ((=ucs@unicode	  . #x9069)	; &UU+9069;
+      (=gb12345		  . #x4A4A)	; &UU+9069; [42-42]
       ))
-    (=ucs		. #x3C05)	; 㰅
+    (=ucs@unicode	. #x3C05)	; &UU+3C05;
     ))
 (define-char
   '((ideographic-radical . 75)	; ⽊
@@ -28997,7 +29702,8 @@
 (define-char
   '((ideographic-radical . 75)	; ⽊
     (=ucs		. #x6B1D)	; 欝
-    (=jis-x0208@1997	. #x3135)	; 欝 [17-21]
+    (=>jis-x0208	. #x3135)	; 欝 [17-21]
+    (=>jis-x0213-1	. #x3135)	; 欝 [17-21]
     ))
 (define-char
   '((<-denotational
@@ -29027,7 +29733,7 @@
     (=gt-pj-1		. #x3135)	; &I-GT-20537; [17-21]
     (=hanziku-4		. #xB8F1)	; &I-HZK04-B8F1;
     (=jef-china3	. #x54C5)	; &I-JC3-54C5;
-    (<-simplified@JP
+    (<-simplified@JP/jis
      ((=jis-x0208@1978	  . #x3135)	; &M-15978; [17-21]
       (=daikanwa	  . 15978)	; &I-M-15978;
       ))
diff --git a/lisp/utf-2000/Ideograph-R076-Lack.el b/lisp/utf-2000/Ideograph-R076-Lack.el
index 9340de0..470c9ba 100644
--- a/lisp/utf-2000/Ideograph-R076-Lack.el
+++ b/lisp/utf-2000/Ideograph-R076-Lack.el
@@ -4,6 +4,7 @@
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
     (=ucs		. #x6B20)	; 欠
+    (=big5		. #xA4ED)	; &I-B-A4ED;
     (->subsumptive
      ((=ucs@jis		  . #x6B20)	; &GT-20571;
       (=jis-x0208	  . #x3767)	; &GT-20571; [23-71]
@@ -25,7 +26,6 @@
       )
      ((=ucs@unicode	  . #x6B20)	; &G0-4737;
       (=gb2312		  . #x4737)	; &G0-4737; [39-23]
-      (=big5		  . #xA4ED)	; &I-B-A4ED;
       ))
     ))
 (define-char
@@ -33,8 +33,9 @@
     (ideographic-strokes . 0)
     (total-strokes	 . 4)
     (=ucs		. #x6B21)	; 次
+    (=>jis-x0208	. #x3C21)	; 次 [28-01]
+    (=>jis-x0213-1	. #x3C21)	; 次 [28-01]
     (=big5		. #xA6B8)	; &I-B-A6B8;
-    (=jis-x0208@1997	. #x3C21)	; 次 [28-01]
     ))
 (define-char
   '((<-denotational
@@ -74,7 +75,12 @@
       (=ucs@jis		  . #x6B21)	; &J90-3C21;
       (=jis-x0208	  . #x3C21)	; &J90-3C21; [28-01]
       (=jis-x0213-1	  . #x3C21)	; &I-JX1-3C21; [28-01]
-      (mojikyo		  . 050236)	; &MCS-6000C43C;
+      (<-same
+       ((=ks-x1001	    . #x732D)	; &M-15992; [83-13]
+	(=daikanwa	    . 15992)	; &I-M-15992;
+	))
+      (<-same*sources
+       daikanwa)
       )
      ((=gt		  . 20574)	; &GT-20574;
       (=gt-k		  . 01626)	; &I-GT-K01626;
@@ -85,6 +91,8 @@
       )
      ((=ucs@iso		  . #x2F8EF)	; &U-0002F8EF;
       )
+     ((mojikyo		  . 050236)	; &MCS-6000C43C;
+      )
      ((=ucs@unicode	  . #x6B21)	; &G0-344E;
       (=gb2312		  . #x344E)	; &G0-344E; [20-46]
       ))
@@ -3337,7 +3345,8 @@
 (define-char
   '((ideographic-radical . 76)	; ⽋
     (=ucs		. #x6B4E)	; 歎
-    (=jis-x0208@1997	. #x4337)	; 歎 [35-23]
+    (=>jis-x0208	. #x4337)	; 歎 [35-23]
+    (=>jis-x0213-1	. #x4337)	; 歎 [35-23]
     ))
 (define-char
   '((<-denotational
@@ -3348,8 +3357,10 @@
     (total-strokes	 . 15)
     (=big5		. #xBCDB)	; &B-BCDB;
     (->subsumptive
-     ((=ks-x1001	  . #x7727)	; &M-16182; [87-07]
+     ((=ucs@jis/2004	  . #x6B4E)	; &M-16182;
+      (=ks-x1001	  . #x7727)	; &M-16182; [87-07]
       (=cns11643-1	  . #x6D45)	; &I-C1-6D45; [77-37]
+      (=jis-x0213-1@2004  . #x4337)	; &I-JX3-4337; [35-23]
       (=daikanwa	  . 16182)	; &I-M-16182;
       (=jef-china3	  . #x54D3)	; &I-JC3-54D3;
       )
@@ -3368,9 +3379,17 @@
       (=gt-k		  . 11150)	; &I-GT-K11150;
       (=gt-pj-1		  . #x4337)	; &GT-20780; [35-23]
       )
-     ((=ucs@jis		  . #x6B4E)	; &J90-4337;
+     ((=ucs@jis/1990	  . #x6B4E)	; &J90-4337;
+      (=ucs@jis/2000	  . #x6B4E)	; &J90-4337;
       (=jis-x0208	  . #x4337)	; &J90-4337; [35-23]
-      (=jis-x0213-1	  . #x4337)	; &I-JX1-4337; [35-23]
+      (=jis-x0213-1@2000  . #x4337)	; &I-JX1-4337; [35-23]
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x6B4E)	; &M-16182;
+	(=ks-x1001	    . #x7727)	; &M-16182; [87-07]
+	(=cns11643-1	    . #x6D45)	; &I-C1-6D45; [77-37]
+	(=jis-x0213-1@2004  . #x4337)	; &I-JX3-4337; [35-23]
+	(=daikanwa	    . 16182)	; &I-M-16182;
+	))
       ))
     ))
 (define-char
@@ -4416,7 +4435,6 @@
      ((=daikanwa	  . 16234)	; &M-16234;
       (<-same
        ((=ucs@jis	    . #x5859)	; &GT-06721;
-	(=ucs@big5	    . #x5859)	; &GT-06721;
 	(=jis-x0208	    . #x4839)	; &GT-06721; [40-25]
 	(=jis-x0213-1	    . #x4839)	; &I-JX1-4839; [40-25]
 	(=daikanwa	    . 05341)	; &I-M-05341;
@@ -4716,8 +4734,10 @@
      ((=cns11643-4	  . #x6D56)	; &M-16252; [77-54]
       (=daikanwa	  . 16252)	; &I-M-16252;
       (<-Large-Seal
-       ((=ks-x1001	    . #x7727)	; &M-16182; [87-07]
+       ((=ucs@jis/2004	    . #x6B4E)	; &M-16182;
+	(=ks-x1001	    . #x7727)	; &M-16182; [87-07]
 	(=cns11643-1	    . #x6D45)	; &I-C1-6D45; [77-37]
+	(=jis-x0213-1@2004  . #x4337)	; &I-JX3-4337; [35-23]
 	(=daikanwa	    . 16182)	; &I-M-16182;
 	))
       (<-Large-Seal*sources
diff --git a/lisp/utf-2000/Ideograph-R077-Stop.el b/lisp/utf-2000/Ideograph-R077-Stop.el
index 562c03a..c8fbd6e 100644
--- a/lisp/utf-2000/Ideograph-R077-Stop.el
+++ b/lisp/utf-2000/Ideograph-R077-Stop.el
@@ -1186,8 +1186,7 @@
     (=cns11643-3	. #x3C49)	; &I-C3-3C49; [28-41]
     (=daikanwa		. 16317)	; &I-M-16317;
     (<-same
-     ((=ucs		  . #x6F80)	; 澀
-      (=daikanwa	  . 18311)	; &I-M-18311;
+     ((=daikanwa	  . 18311)	; &M-18311;
       ))
     (<-same*sources
      zihui-bu daikanwa)
@@ -1444,8 +1443,15 @@
     (=daikanwa		. 16325)	; &I-M-16325;
     ))
 (define-char
+  '((ideographic-radical . 77)	; ⽌
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=>jis-x0208	. #x3A50)	; &J97-3A50; [26-48]
+    (=>jis-x0213-1	. #x3A50)	; &J97-3A50; [26-48]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3A50)	; &J97-3A50; [26-48]
+     ((=>jis-x0208	  . #x3A50)	; &J97-3A50; [26-48]
       ))
     (ideographic-radical . 77)	; ⽌
     (ideographic-strokes . 9)
@@ -1459,19 +1465,13 @@
       (=daikanwa	  . 16326)	; &I-M-16326;
       )
      ((=ks-x1001	  . #x6128)	; &K0-6128; [65-08]
-      (=shinjigen@1ed	  .  3956)	; &K0-6128;
+      (=shinjigen	  .  3956)	; &K0-6128;
       (=jef-china3	  . #x54DD)	; &I-JC3-54DD;
       ))
     ))
 (define-char
-  '((ideographic-radical . 77)	; ⽌
-    (ideographic-strokes . 9)
-    (total-strokes	 . 13)
-    (=jis-x0208@1997	. #x3A50)	; &J97-3A50; [26-48]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3A50)	; &J97-3A50; [26-48]
+     ((=>jis-x0208	  . #x3A50)	; &J97-3A50; [26-48]
       ))
     (morohashi-daikanwa	16326 1)
     (ideographic-radical . 77)	; ⽌
diff --git a/lisp/utf-2000/Ideograph-R078-Death.el b/lisp/utf-2000/Ideograph-R078-Death.el
index 4a42a5d..3e0118a 100644
--- a/lisp/utf-2000/Ideograph-R078-Death.el
+++ b/lisp/utf-2000/Ideograph-R078-Death.el
@@ -3010,7 +3010,6 @@
      ((=daikanwa	  . 16539)	; &M-16539;
       (<-synonyms
        ((=ucs@jis	    . #x69C1)	; &GT-19490;
-	(=ucs@big5	    . #x69C1)	; &GT-19490;
 	(=jis-x0208	    . #x5C49)	; &GT-19490; [60-41]
 	(=ks-x1001	    . #x4D3E)	; &I-K0-4D3E; [45-30]
 	(=jis-x0213-1	    . #x5C49)	; &I-JX1-5C49; [60-41]
diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el
index 104029d..3239d16 100644
--- a/lisp/utf-2000/Ideograph-R079-Weapon.el
+++ b/lisp/utf-2000/Ideograph-R079-Weapon.el
@@ -604,7 +604,6 @@
      ((=daikanwa	  . 16637)	; &M-16637;
       (<-ancient
        ((=ucs@jis	    . #x6562)	; &GT-16742;
-	(=ucs@big5	    . #x6562)	; &GT-16742;
 	(=ks-x1001	    . #x4A72)	; &GT-16742; [42-82]
 	(=jis-x0208@1990    . #x343A)	; &I-J90-343A; [20-26]
 	(=cns11643-1	    . #x5F56)	; &I-C1-5F56; [63-54]
diff --git a/lisp/utf-2000/Ideograph-R080-Do-Not.el b/lisp/utf-2000/Ideograph-R080-Do-Not.el
index 834dcd7..0c4cc0a 100644
--- a/lisp/utf-2000/Ideograph-R080-Do-Not.el
+++ b/lisp/utf-2000/Ideograph-R080-Do-Not.el
@@ -109,8 +109,12 @@
     (=daikanwa		. 16724)	; &I-M-16724;
     ))
 (define-char
+  '((ideographic-radical . 80)	; ⽏
+    (=>jis-x0208@1997	. #x4B68)	; &J97-4B68; [43-72]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4B68)	; &J97-4B68; [43-72]
+     ((=>jis-x0208@1997	  . #x4B68)	; &J97-4B68; [43-72]
       ))
     (morohashi-daikanwa	16724 1)
     (ideographic-radical . 80)	; ⽏
@@ -129,12 +133,8 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 80)	; ⽏
-    (=jis-x0208@1997	. #x4B68)	; &J97-4B68; [43-72]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4B68)	; &J97-4B68; [43-72]
+     ((=>jis-x0208@1997	  . #x4B68)	; &J97-4B68; [43-72]
       ))
     (ideographic-radical . 80)	; ⽏
     (ideographic-strokes . 3)
diff --git a/lisp/utf-2000/Ideograph-R082-Fur.el b/lisp/utf-2000/Ideograph-R082-Fur.el
index 5184223..c01410a 100644
--- a/lisp/utf-2000/Ideograph-R082-Fur.el
+++ b/lisp/utf-2000/Ideograph-R082-Fur.el
@@ -2774,7 +2774,8 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (=ucs		. #x6C08)	; 氈
-    (=jis-x0208@1997	. #x5D61)	; 氈 [61-65]
+    (=>jis-x0208	. #x5D61)	; 氈 [61-65]
+    (=>jis-x0213-1	. #x5D61)	; 氈 [61-65]
     ))
 (define-char
   '((<-denotational
@@ -2783,19 +2784,24 @@
     (ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
-    (=big5		. #xC0D6)	; &B-C0D6;
     (->subsumptive
-     ((=ucs@jis		  . #x6C08)	; &GT-21755;
-      (=jis-x0208@1990	  . #x5D61)	; &GT-21755; [61-65]
-      (=jis-x0213-1	  . #x5D61)	; &I-JX1-5D61; [61-65]
-      (=gt		  . 21755)	; &I-GT-21755;
-      (=gt-pj-1		  . #x5D61)	; &I-GT-21755; [61-65]
-      (=daikanwa	  . 16982)	; &I-M-16982;
-      )
-     ((=ucs@unicode	  . #x6C08)	; &UU+6C08;
-      (=gb12345		  . #x5531)	; &UU+6C08; [53-17]
+     ((=big5		  . #xC0D6)	; &B-C0D6;
+      (->subsumptive
+       ((=ucs@jis	    . #x6C08)	; &GT-21755;
+	(=jis-x0208@1990    . #x5D61)	; &GT-21755; [61-65]
+	(=jis-x0213-1	    . #x5D61)	; &I-JX1-5D61; [61-65]
+	(=gt		    . 21755)	; &I-GT-21755;
+	(=gt-pj-1	    . #x5D61)	; &I-GT-21755; [61-65]
+	(=daikanwa	    . 16982)	; &I-M-16982;
+	)
+       ((=ucs@unicode	    . #x6C08)	; &UU+6C08;
+	(=gb12345	    . #x5531)	; &UU+6C08; [53-17]
+	)
+       ((=cns11643-1	    . #x7421)	; &C1-7421; [84-01]
+	))
       )
-     ((=cns11643-1	  . #x7421)	; &C1-7421; [84-01]
+     ((=ks-x1001	  . #x6E7D)	; &K0-6E7D; [78-93]
+      (=shinjigen	  .  4033)	; &K0-6E7D;
       ))
     ))
 (define-char
@@ -2809,16 +2815,6 @@
     (=jis-x0208@1983	. #x5D61)	; &I-J83-5D61; [61-65]
     ))
 (define-char
-  '((<-denotational
-     ((=ucs		  . #x6C08)	; 氈
-      ))
-    (ideographic-radical . 82)	; ⽑
-    (ideographic-strokes . 13)
-    (total-strokes	 . 17)
-    (=ks-x1001		. #x6E7D)	; &K0-6E7D; [78-93]
-    (=shinjigen@rev	.  4033)	; &K0-6E7D;
-    ))
-(define-char
   '((ideographic-radical . 82)	; ⽑
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el
index 26916a1..289b91b 100644
--- a/lisp/utf-2000/Ideograph-R085-Water.el
+++ b/lisp/utf-2000/Ideograph-R085-Water.el
@@ -1122,6 +1122,8 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x6C72)	; æ±²
+    (=>jis-x0208	. #x3562)	; æ±² [21-66]
+    (=>jis-x0213-1	. #x3562)	; æ±² [21-66]
     (=big5		. #xA856)	; &I-B-A856;
     ))
 (define-char
@@ -1131,8 +1133,10 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
+    (=ucs@jis/2004	. #x6C72)	; &M-17163;
     (=ks-x1001		. #x5063)	; &M-17163; [48-67]
     (=cns11643-1	. #x4A77)	; &I-C1-4A77; [42-87]
+    (=jis-x0213-1@2004	. #x3562)	; &I-JX3-3562; [21-66]
     (=daikanwa		. 17163)	; &I-M-17163;
     ))
 (define-char
@@ -1145,10 +1149,17 @@
     (=ucs@unicode	. #x6C72)	; &GT-21917;
     (=jis-x0208		. #x3562)	; &GT-21917; [21-66]
     (=gb2312		. #x3C33)	; &I-G0-3C33; [28-19]
-    (=jis-x0213-1	. #x3562)	; &I-JX1-3562; [21-66]
+    (=jis-x0213-1@2000	. #x3562)	; &I-JX1-3562; [21-66]
     (=gt		. 21917)	; &I-GT-21917;
     (=gt-pj-1		. #x3562)	; &I-GT-21917; [21-66]
     (=jef-china3	. #x70D4)	; &I-JC3-70D4;
+    (<-simplified@JP/extra/design
+     ((=ucs@jis/2004	  . #x6C72)	; &M-17163;
+      (=ks-x1001	  . #x5063)	; &M-17163; [48-67]
+      (=cns11643-1	  . #x4A77)	; &I-C1-4A77; [42-87]
+      (=jis-x0213-1@2004  . #x3562)	; &I-JX3-3562; [21-66]
+      (=daikanwa	  . 17163)	; &I-M-17163;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -6003,8 +6014,9 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x6D69)	; 浩
+    (=>jis-x0208	. #x3940)	; 浩 [25-32]
+    (=>jis-x0213-1	. #x3940)	; 浩 [25-32]
     (=big5		. #xAF45)	; &I-B-AF45;
-    (=jis-x0208@1997	. #x3940)	; 浩 [25-32]
     ))
 (define-char
   '((<-denotational
@@ -6314,8 +6326,9 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x6D78)	; 浸
+    (=>jis-x0208	. #x3F3B)	; 浸 [31-27]
+    (=>jis-x0213-1	. #x3F3B)	; 浸 [31-27]
     (=big5		. #xAEFB)	; &I-B-AEFB;
-    (=jis-x0208@1997	. #x3F3B)	; 浸 [31-27]
     ))
 (define-char
   '((<-denotational
@@ -8817,6 +8830,7 @@
     (=gt		. 22673)	; &I-GT-22673;
     (=gt-pj-1		. #x5E4D)	; &I-GT-22673; [62-45]
     (=daikanwa		. 17675)	; &I-M-17675;
+    (=shinjigen@1ed	.  4311)	; æ·ª
     (=shinjigen@rev	.  4312)	; æ·ª
     ))
 (define-char
@@ -8824,8 +8838,9 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x6DEB)	; æ·«
+    (=>jis-x0208	. #x307C)	; æ·« [16-92]
+    (=>jis-x0213-1	. #x307C)	; æ·« [16-92]
     (=big5		. #xB25D)	; &I-B-B25D;
-    (=jis-x0208@1997	. #x307C)	; æ·« [16-92]
     ))
 (define-char
   '((<-denotational
@@ -8860,7 +8875,7 @@
     (=gt-k		. 07720)	; &I-GT-K07720;
     (=gt-pj-1		. #x307C)	; &I-GT-22466; [16-92]
     (=jef-china3	. #x57C8)	; &I-JC3-57C8;
-    (<-simplified@JP
+    (<-simplified@JP/jis
      ((=ucs@jis/2004	  . #x6DEB)	; &GT-22462;
       (=jis-x0208@1978	  . #x307C)	; &GT-22462; [16-92]
       (=ks-x1001	  . #x6B62)	; &I-K0-6B62; [75-66]
@@ -9145,26 +9160,34 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x6DF7)	; æ··
+    (=big5		. #xB256)	; &I-B-B256;
     (->subsumptive
      ((=ucs@unicode	  . #x6DF7)	; &GT-22532;
       (=jis-x0208	  . #x3A2E)	; &GT-22532; [26-14]
       (=gb2312		  . #x3B6C)	; &I-G0-3B6C; [27-76]
       (=ks-x1001	  . #x7B68)	; &I-K0-7B68; [91-72]
       (=jis-x0213-1	  . #x3A2E)	; &I-JX1-3A2E; [26-14]
-      (=big5		  . #xB256)	; &I-B-B256;
       (=gt		  . 22532)	; &I-GT-22532;
       (=gt-pj-1		  . #x3A2E)	; &I-GT-22532; [26-14]
       (=daikanwa	  . 17694)	; &I-M-17694;
-      (=shinjigen@rev	  .  4274)	; &GT-22532;
+      (=shinjigen	  .  4274)	; &GT-22532;
       )
      ((=cns11643-1	  . #x5B5B)	; &C1-5B5B; [59-59]
       ))
     ))
 (define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (=ucs@big5		. #x6E05)	; &J97-4036;
+    (=>jis-x0208	. #x4036)	; &J97-4036; [32-22]
+    (=>jis-x0213-1	. #x4036)	; &J97-4036; [32-22]
+    (=big5		. #xB24D)	; &J97-4036;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x6E05)	; &B-B24D;
-      (=big5		  . #xB24D)	; &B-B24D;
-      (=jis-x0208@1997	  . #x4036)	; &B-B24D; [32-22]
+     ((=ucs@big5	  . #x6E05)	; &J97-4036;
+      (=>jis-x0208	  . #x4036)	; &J97-4036; [32-22]
       ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
@@ -9180,18 +9203,9 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 8)
-    (total-strokes	 . 11)
-    (=ucs@big5		. #x6E05)	; &B-B24D;
-    (=big5		. #xB24D)	; &B-B24D;
-    (=jis-x0208@1997	. #x4036)	; &B-B24D; [32-22]
-    ))
-(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x6E05)	; &B-B24D;
-      (=big5		  . #xB24D)	; &B-B24D;
-      (=jis-x0208@1997	  . #x4036)	; &B-B24D; [32-22]
+     ((=ucs@big5	  . #x6E05)	; &J97-4036;
+      (=>jis-x0208	  . #x4036)	; &J97-4036; [32-22]
       ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 8)
@@ -9216,17 +9230,17 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 11)
     (=ucs		. #x6DF9)	; æ·¹
+    (=big5		. #xB254)	; &I-B-B254;
     (->subsumptive
      ((=ucs@unicode	  . #x6DF9)	; &GT-22473;
       (=jis-x0208	  . #x5E3B)	; &GT-22473; [62-27]
       (=gb2312		  . #x514D)	; &I-G0-514D; [49-45]
       (=ks-x1001	  . #x6574)	; &I-K0-6574; [69-84]
       (=jis-x0213-1	  . #x5E3B)	; &I-JX1-5E3B; [62-27]
-      (=big5		  . #xB254)	; &I-B-B254;
       (=gt		  . 22473)	; &I-GT-22473;
       (=gt-pj-1		  . #x5E3B)	; &I-GT-22473; [62-27]
       (=daikanwa	  . 17696)	; &I-M-17696;
-      (=shinjigen@rev	  .  4260)	; &GT-22473;
+      (=shinjigen	  .  4260)	; &GT-22473;
       )
      ((=cns11643-1	  . #x5B59)	; &C1-5B59; [59-57]
       ))
@@ -10678,23 +10692,24 @@
     (=gt		. 22814)	; &I-GT-22814;
     (=gt-pj-1		. #x422C)	; &I-GT-22814; [34-12]
     (=daikanwa		. 17780)	; &I-M-17780;
-    (=shinjigen@rev	.  4344)	; 測
+    (=shinjigen		.  4344)	; 測
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x6E2D)	; 渭
+    (=big5		. #xB4F4)	; &I-B-B4F4;
     (->subsumptive
      ((=ucs@unicode	  . #x6E2D)	; &GT-22686;
       (=jis-x0208	  . #x5E4F)	; &GT-22686; [62-47]
       (=gb2312		  . #x4E3C)	; &I-G0-4E3C; [46-28]
       (=ks-x1001	  . #x6A52)	; &I-K0-6A52; [74-50]
       (=jis-x0213-1	  . #x5E4F)	; &I-JX1-5E4F; [62-47]
-      (=big5		  . #xB4F4)	; &I-B-B4F4;
       (=gt		  . 22686)	; &I-GT-22686;
       (=gt-pj-1		  . #x5E4F)	; &I-GT-22686; [62-47]
       (=daikanwa	  . 17781)	; &I-M-17781;
+      (=shinjigen@1ed	  .  4316)	; &GT-22686;
       (=shinjigen@rev	  .  4317)	; &GT-22686;
       )
      ((=cns11643-1	  . #x603B)	; &C1-603B; [64-27]
@@ -10703,7 +10718,9 @@
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (=ucs		. #x6E2E)	; 渮
-    (=jis-x0208@1997	. #x5E51)	; 渮 [62-49]
+    (=>jis-x0208	. #x5E51)	; 渮 [62-49]
+    (=>jis-x0213-1	. #x5E51)	; 渮 [62-49]
+    (=big5		. #xD9FD)	; &I-B-D9FD;
     ))
 (define-char
   '((<-denotational
@@ -10726,7 +10743,6 @@
     (=ucs@unicode	. #x6E2E)	; &GT-22488;
     (=jis-x0208		. #x5E51)	; &GT-22488; [62-49]
     (=jis-x0213-1	. #x5E51)	; &I-JX1-5E51; [62-49]
-    (=big5		. #xD9FD)	; &I-B-D9FD;
     (=gt		. 22488)	; &I-GT-22488;
     (=gt-pj-1		. #x5E51)	; &I-GT-22488; [62-49]
     ))
@@ -10735,7 +10751,8 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x6E2F)	; 港
-    (=jis-x0208@1997	. #x3941)	; 港 [25-33]
+    (=>jis-x0208	. #x3941)	; 港 [25-33]
+    (=>jis-x0213-1	. #x3941)	; 港 [25-33]
     ))
 (define-char
   '((<-denotational
@@ -12118,8 +12135,9 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x6E6E)	; æ¹®
+    (=>jis-x0208	. #x5E50)	; æ¹® [62-48]
+    (=>jis-x0213-1	. #x5E50)	; æ¹® [62-48]
     (=big5		. #xB4F3)	; &I-B-B4F3;
-    (=jis-x0208@1997	. #x5E50)	; æ¹® [62-48]
     ))
 (define-char
   '((<-denotational
@@ -12151,7 +12169,7 @@
     (=gt-k		. 09111)	; &I-GT-K09111;
     (=gt-pj-1		. #x4572)	; &I-GT-22840; [37-82]
     (=daikanwa		. 17874)	; &I-M-17874;
-    (=shinjigen@rev	.  4349)	; 湯
+    (=shinjigen		.  4349)	; 湯
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -12692,15 +12710,21 @@
     (=daikanwa		. 17919)	; &I-M-17919;
     ))
 (define-char
+  '((ideographic-radical . 85)	; ⽔
+    (=ucs		. #x6ECB)	; 滋
+    (=>jis-x0208	. #x3C22)	; 滋 [28-02]
+    (=>jis-x0213-1	. #x3C22)	; 滋 [28-02]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3C22)	; &J97-3C22; [28-02]
+     ((=ucs		  . #x6ECB)	; 滋
       ))
     (morohashi-daikanwa	17919 1)
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
-    (=ucs		. #x6ECB)	; 滋
-    (=jis-x0208		. #x3C22)	; &I-J90-3C22; [28-02]
+    (=ucs@unicode	. #x6ECB)	; &GT-22764;
+    (=jis-x0208		. #x3C22)	; &GT-22764; [28-02]
     (=gb2312		. #x574C)	; &I-G0-574C; [55-44]
     (=ks-x1001		. #x6D32)	; &I-K0-6D32; [77-18]
     (=cns11643-1	. #x6045)	; &I-C1-6045; [64-37]
@@ -12720,10 +12744,6 @@
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (=jis-x0208@1997	. #x3C22)	; &J97-3C22; [28-02]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 9)
     (total-strokes	 . 12)
     (=ucs		. #x6E7E)	; æ¹¾
@@ -12731,7 +12751,6 @@
      ((=jis-x0208@1978	  . #x4F51)	; &M-17920; [47-49]
       (=jis-x0208@1983	  . #x4F51)	; &I-J83-4F51; [47-49]
       (=daikanwa	  . 17920)	; &I-M-17920;
-      (=shinjigen@rev	  .  4364)	; &M-17920;
       )
      ((=ucs@unicode	  . #x6E7E)	; &G0-4D65;
       (=gb2312		  . #x4D65)	; &G0-4D65; [45-69]
@@ -12741,6 +12760,7 @@
       (=jis-x0213-1	  . #x4F51)	; &I-JX1-4F51; [47-49]
       (=gt		  . 22896)	; &I-GT-22896;
       (=gt-pj-1		  . #x4F51)	; &I-GT-22896; [47-49]
+      (=shinjigen	  .  4364)	; &GT-22896;
       (<-simplified@JP/Jouyou
        ((=ucs@jis	    . #x7063)	; &GT-24126;
 	(=jis-x0208	    . #x5F54)	; &GT-24126; [63-52]
@@ -13437,8 +13457,9 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x6EA2)	; 溢
+    (=>jis-x0208	. #x306E)	; 溢 [16-78]
+    (=>jis-x0213-1	. #x306E)	; 溢 [16-78]
     (=big5		. #xB7B8)	; &I-B-B7B8;
-    (=jis-x0208@1997	. #x306E)	; 溢 [16-78]
     ))
 (define-char
   '((<-denotational
@@ -13451,7 +13472,8 @@
      ((=jis-x0208@1978	  . #x306E)	; &M-17951; [16-78]
       (=daikanwa	  . 17951)	; &I-M-17951;
       )
-     ((=ks-x1001	  . #x6C6E)	; &GT-22899; [76-78]
+     ((=ucs@jis/2004	  . #x6EA2)	; &GT-22899;
+      (=ks-x1001	  . #x6C6E)	; &GT-22899; [76-78]
       (=jis-x0213-1@2004  . #x306E)	; &I-JX3-306E; [16-78]
       (=gt		  . 22899)	; &I-GT-22899;
       (=gt-pj-4		  . #x5146)	; &I-GT-22899; [49-38]
@@ -13465,7 +13487,8 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (->subsumptive
-     ((=ucs@jis		  . #x6EA2)	; &GT-22900;
+     ((=ucs@jis/1990	  . #x6EA2)	; &GT-22900;
+      (=ucs@jis/2000	  . #x6EA2)	; &GT-22900;
       (=jis-x0208@1983	  . #x306E)	; &GT-22900; [16-78]
       (=jis-x0208@1990	  . #x306E)	; &I-J90-306E; [16-78]
       (=jis-x0213-1@2000  . #x306E)	; &I-JX1-306E; [16-78]
@@ -13477,7 +13500,8 @@
 	(=daikanwa	    . 17951)	; &I-M-17951;
 	))
       (<-simplified@JP/jis/2004
-       ((=ks-x1001	    . #x6C6E)	; &GT-22899; [76-78]
+       ((=ucs@jis/2004	    . #x6EA2)	; &GT-22899;
+	(=ks-x1001	    . #x6C6E)	; &GT-22899; [76-78]
 	(=jis-x0213-1@2004  . #x306E)	; &I-JX3-306E; [16-78]
 	))
       )
@@ -13980,40 +14004,57 @@
     (=gt		. 22949)	; &I-GT-22949;
     (=gt-pj-1		. #x5E67)	; &I-GT-22949; [62-71]
     (=daikanwa		. 17986)	; &I-M-17986;
-    (=shinjigen@rev	.  4376)	; 溷
+    (=shinjigen		.  4376)	; 溷
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x6EB8)	; 溸
-    (=cns11643-3	. #x422D)	; &I-C3-422D; [34-13]
-    (=daikanwa		. 17987)	; &I-M-17987;
+    (->subsumptive
+     ((=cns11643-3	  . #x422D)	; &M-17987; [34-13]
+      (=daikanwa	  . 17987)	; &I-M-17987;
+      )
+     ((=ucs@unicode	  . #x6EB8)	; &UU+6EB8;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs		. #x3D2D)	; ã´­
     ))
 (define-char
-  '((=>ucs		. #x3D2D)	; ã´­
+  '((<-denotational
+     ((=ucs		  . #x3D2D)	; ã´­
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=daikanwa		. 17988)	; &M-17988;
+    (->subsumptive
+     ((=daikanwa	  . 17988)	; &M-17988;
+      )
+     ((=cns11643-4	  . #x3E2D)	; &C4-3E2D; [30-13]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	17988 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3D2D)	; ã´­
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=ucs		. #x3D2D)	; ã´­
-    (=cns11643-4	. #x3E2D)	; &I-C4-3E2D; [30-13]
+    (=ucs@unicode	. #x3D2D)	; &UU+3D2D;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x6EB9)	; 溹
+    (=big5		. #xDE4D)	; &I-B-DE4D;
     (->subsumptive
      ((=ucs@cns		  . #x6EB9)	; &M-17989;
       (=cns11643-2	  . #x4433)	; &M-17989; [36-19]
-      (=big5		  . #xDE4D)	; &I-B-DE4D;
       (=daikanwa	  . 17989)	; &I-M-17989;
       (mojikyo		  . 017989)	; &MCS-60004645;
       )
@@ -14034,8 +14075,10 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
+    (=ucs@jis/2004	. #x6EBA)	; &GT-23029;
     (=jis-x0208@1978	. #x452E)	; &GT-23029; [37-14]
     (=ks-x1001		. #x527C)	; &I-K0-527C; [50-92]
+    (=jis-x0213-1@2004	. #x452E)	; &I-JX3-452E; [37-14]
     (=gt		. 23029)	; &I-GT-23029;
     (=gt-pj-4		. #x5167)	; &I-GT-23029; [49-71]
     (=daikanwa		. 17990)	; &I-M-17990;
@@ -14052,13 +14095,15 @@
     (=jis-x0208@1983	. #x452E)	; &I-J83-452E; [37-14]
     (=jis-x0208@1990	. #x452E)	; &I-J90-452E; [37-14]
     (=cns11643-1	. #x646A)	; &I-C1-646A; [68-74]
-    (=jis-x0213-1	. #x452E)	; &I-JX1-452E; [37-14]
+    (=jis-x0213-1@2000	. #x452E)	; &I-JX1-452E; [37-14]
     (=gt		. 23030)	; &I-GT-23030;
     (=gt-pj-1		. #x452E)	; &I-GT-23030; [37-14]
     (=jef-china3	. #x70D6)	; &I-JC3-70D6;
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x452E)	; &GT-23029; [37-14]
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x6EBA)	; &GT-23029;
+      (=jis-x0208@1978	  . #x452E)	; &GT-23029; [37-14]
       (=ks-x1001	  . #x527C)	; &I-K0-527C; [50-92]
+      (=jis-x0213-1@2004  . #x452E)	; &I-JX3-452E; [37-14]
       (=daikanwa	  . 17990)	; &I-M-17990;
       ))
     ))
@@ -14629,7 +14674,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3C22)	; &J97-3C22; [28-02]
+     ((=ucs		  . #x6ECB)	; 滋
       ))
     (=>ucs*		. #x6ECB)	; 滋
     (ideographic-radical . 85)	; ⽔
@@ -16801,6 +16846,8 @@
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (=ucs		. #x6F23)	; æ¼£
+    (=>jis-x0208	. #x4E7A)	; æ¼£ [46-90]
+    (=>jis-x0213-1	. #x4E7A)	; æ¼£ [46-90]
     (=big5		. #xBAA7)	; &I-B-BAA7;
     ))
 (define-char
@@ -16810,8 +16857,10 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 11)
     (total-strokes	 . 14)
+    (=ucs@jis/2004	. #x6F23)	; &M-18155;
     (=jis-x0208@1978	. #x4E7A)	; &M-18155; [46-90]
     (=ks-x1001		. #x557E)	; &I-K0-557E; [53-94]
+    (=jis-x0213-1@2004	. #x4E7A)	; &I-JX3-4E7A; [46-90]
     (=daikanwa		. 18155)	; &I-M-18155;
     ))
 (define-char
@@ -16833,15 +16882,17 @@
     (=ucs@unicode	. #x6F23)	; &GT-23087;
     (=jis-x0208@1983	. #x4E7A)	; &GT-23087; [46-90]
     (=jis-x0208@1990	. #x4E7A)	; &I-J90-4E7A; [46-90]
-    (=jis-x0213-1	. #x4E7A)	; &I-JX1-4E7A; [46-90]
+    (=jis-x0213-1@2000	. #x4E7A)	; &I-JX1-4E7A; [46-90]
     (=gb12345		. #x4130)	; &GT-23087; [33-16]
     (=gt		. 23087)	; &I-GT-23087;
     (=gt-k		. 10288)	; &I-GT-K10288;
     (=gt-pj-1		. #x4E7A)	; &I-GT-23087; [46-90]
     (=jef-china3	. #x70DC)	; &I-JC3-70DC;
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x4E7A)	; &M-18155; [46-90]
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x6F23)	; &M-18155;
+      (=jis-x0208@1978	  . #x4E7A)	; &M-18155; [46-90]
       (=ks-x1001	  . #x557E)	; &I-K0-557E; [53-94]
+      (=jis-x0213-1@2004  . #x4E7A)	; &I-JX3-4E7A; [46-90]
       (=daikanwa	  . 18155)	; &I-M-18155;
       ))
     ))
@@ -18325,17 +18376,21 @@
     (=gt-k		. 11893)	; &I-GT-K11893;
     (=gt-pj-1		. #x3363)	; &I-GT-23399; [19-67]
     (=daikanwa		. 18247)	; &I-M-18247;
-    (=shinjigen@rev	.  4466)	; 潟
+    (=shinjigen		.  4466)	; 潟
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x6F60)	; æ½ 
-    (=cns11643-1	. #x6D5C)	; &I-C1-6D5C; [77-60]
-    (=jis-x0213-2	. #x6F36)	; &I-JX2-6F36; [79-22]
     (=big5		. #xBCF2)	; &I-B-BCF2;
-    (=daikanwa		. 18248)	; &I-M-18248;
+    (->subsumptive
+     ((=ucs@unicode	  . #x6F60)	; &M-18248;
+      (=jis-x0213-2	  . #x6F36)	; &M-18248; [79-22]
+      (=daikanwa	  . 18248)	; &I-M-18248;
+      )
+     ((=cns11643-1	  . #x6D5C)	; &C1-6D5C; [77-60]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -18356,6 +18411,26 @@
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x23F4A)	; 𣽊
+    (->subsumptive
+     ((=ucs@iso		  . #x23F4A)	; &M-18250;
+      (=daikanwa	  . 18250)	; &M-18250;
+      (=shinjigen	  .  4507)	; &M-18250;
+      (<-formed
+       ((=ucs		    . #x6FEC)	; 濬
+	(=jis-x0208	    . #x5F3D)	; &I-J90-5F3D; [63-29]
+	(=shinjigen	    .  4506)	; 濬
+	))
+      (<-formed*sources
+       shinjigen)
+      )
+     ((=cns11643-4	  . #x4A65)	; &C4-4A65; [42-69]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
     (=ucs		. #x6F62)	; æ½¢
     ))
 (define-char
@@ -18365,12 +18440,12 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (=big5		. #xE643)	; &B-E643;
     (->subsumptive
      ((=ucs@jis		  . #x6F62)	; &M-18251;
       (=ks-x1001	  . #x7C52)	; &M-18251; [92-50]
       (=jis-x0212	  . #x485E)	; &I-JSP-485E; [40-62]
       (=jis-x0213-1	  . #x772D)	; &I-JX1-772D; [87-13]
-      (=big5		  . #xE643)	; &I-B-E643;
       (=daikanwa	  . 18251)	; &I-M-18251;
       (=jef-china3	  . #x56F7)	; &I-JC3-56F7;
       )
@@ -18389,8 +18464,15 @@
     (=gb2312		. #x646A)	; &G0-646A; [68-74]
     ))
 (define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=>jis-x0208	. #x3442)	; &J97-3442; [20-34]
+    (=>jis-x0213-1	. #x3442)	; &J97-3442; [20-34]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3442)	; &J97-3442; [20-34]
+     ((=>jis-x0208	  . #x3442)	; &J97-3442; [20-34]
       ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
@@ -18406,14 +18488,8 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=jis-x0208@1997	. #x3442)	; &J97-3442; [20-34]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3442)	; &J97-3442; [20-34]
+     ((=>jis-x0208	  . #x3442)	; &J97-3442; [20-34]
       ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
@@ -18429,7 +18505,7 @@
     (=gt		. 23319)	; &I-GT-23319;
     (=gt-pj-1		. #x3442)	; &I-GT-23319; [20-34]
     (=jef-china3	. #x57A6)	; &I-JC3-57A6;
-    (<-simplified@JP
+    (<-simplified@JP/jis
      ((=ucs@unicode	  . #x3D4E)	; &CB00589;
       (=jis-x0208@1978	  . #x3442)	; &CB00589; [20-34]
       (=cns11643-3	  . #x4C7C)	; &I-C3-4C7C; [44-92]
@@ -18451,36 +18527,74 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x6F64)	; 潤
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x6F64)	; 潤
+    (->subsumptive
+     ((=daikanwa	  . 18255)	; &M-18255;
+      )
+     ((=ucs@unicode	  . #x6F64)	; &GT-23373;
+      (=jis-x0208	  . #x3D61)	; &GT-23373; [29-65]
+      (=ks-x1001	  . #x6B48)	; &I-K0-6B48; [75-40]
+      (=cns11643-1	  . #x6D57)	; &I-C1-6D57; [77-55]
+      (=jis-x0213-1	  . #x3D61)	; &I-JX1-3D61; [29-65]
+      (=gb12345		  . #x4873)	; &GT-23373; [40-83]
+      (=big5		  . #xBCED)	; &I-B-BCED;
+      (=gt		  . 23373)	; &I-GT-23373;
+      (=gt-pj-1		  . #x3D61)	; &I-GT-23373; [29-65]
+      (=shinjigen	  .  4464)	; &GT-23373;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x6F65)	; æ½¥
+    (->subsumptive
+     ((=ucs@unicode	  . #x6F65)	; &M-18256;
+      (=daikanwa	  . 18256)	; &M-18256;
+      )
+     ((=cns11643-3	  . #x4C6B)	; &C3-4C6B; [44-75]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x23F4B)	; 𣽋
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23F4B)	; 𣽋
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=daikanwa		. 18255)	; &M-18255;
-    (=shinjigen@rev	.  4464)	; 潤
+    (=daikanwa		. 18257)	; &M-18257;
     ))
 (define-char
-  '((morohashi-daikanwa	18255 0 0)
+  '((<-denotational
+     ((=ucs		  . #x23F4B)	; 𣽋
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x6F64)	; 潤
-    (=jis-x0208		. #x3D61)	; &I-J90-3D61; [29-65]
-    (=ks-x1001		. #x6B48)	; &I-K0-6B48; [75-40]
-    (=cns11643-1	. #x6D57)	; &I-C1-6D57; [77-55]
-    (=jis-x0213-1	. #x3D61)	; &I-JX1-3D61; [29-65]
-    (=gb12345		. #x4873)	; 潤 [40-83]
-    (=big5		. #xBCED)	; &I-B-BCED;
-    (=gt		. 23373)	; &I-GT-23373;
-    (=gt-pj-1		. #x3D61)	; &I-GT-23373; [29-65]
-    (=shinjigen@rev	.  4464)	; 潤
+    (=ucs@iso		. #x23F4B)	; &C4-4A67;
+    (=cns11643-4	. #x4A67)	; &C4-4A67; [42-71]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x6F65)	; æ½¥
-    (=cns11643-3	. #x4C6B)	; &I-C3-4C6B; [44-75]
-    (=daikanwa		. 18256)	; &I-M-18256;
+    (=ucs		. #x23F4C)	; 𣽌
+    (->subsumptive
+     ((=daikanwa	  . 18258)	; &M-18258;
+      )
+     ((=cns11643-5	  . #x4E25)	; &C5-4E25; [46-05]
+      )
+     ((=ucs@iso		  . #x23F4C)	; &U-00023F4C;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -18496,23 +18610,58 @@
     (=gt-k		. 11988)	; &I-GT-K11988;
     (=gt-pj-1		. #x5F33)	; &I-GT-23496; [63-19]
     (=daikanwa		. 18259)	; &I-M-18259;
-    (=shinjigen@rev	.  4484)	; 潦
+    (=shinjigen		.  4484)	; 潦
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x6F67)	; 潧
+    (=big5		. #xE657)	; &I-B-E657;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6F67)	; 潧
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=daikanwa		. 18260)	; &M-18260;
     ))
 (define-char
-  '((=>ucs		. #x6F67)	; 潧
+  '((<-denotational
+     ((=ucs		  . #x6F67)	; 潧
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=big5		. #xE657)	; &M-18260;
-    (=daikanwa		. 18260)	; &I-M-18260;
+    (=ucs@unicode	. #x6F67)	; &C2-515F;
+    (=cns11643-2	. #x515F)	; &C2-515F; [49-63]
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x23F84)	; 𣾄
     ))
 (define-char
-  '((morohashi-daikanwa	18260 0 3)
+  '((<-denotational
+     ((=ucs		  . #x23F84)	; 𣾄
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x6F67)	; 潧
-    (=cns11643-2	. #x515F)	; &I-C2-515F; [49-63]
+    (=daikanwa		. 18261)	; &M-18261;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23F84)	; 𣾄
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs@iso		. #x23F84)	; &C5-4E27;
+    (=cns11643-5	. #x4E27)	; &C5-4E27; [46-07]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -18776,6 +18925,18 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (=ucs		. #x23F55)	; 𣽕
+    (->subsumptive
+     ((=ucs@iso		  . #x23F55)	; &M-18284;
+      (=daikanwa	  . 18284)	; &M-18284;
+      )
+     ((=cns11643-5	  . #x4E21)	; &C5-4E21; [46-01]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
     (=ucs		. #x6F72)	; æ½²
     (=big5		. #xE64C)	; &I-B-E64C;
     ))
@@ -18918,64 +19079,108 @@
     (=cns11643-7	. #x2465)	; &C7-2465; [04-69]
     ))
 (define-char
-  '((=>ucs		. #x6F78)	; 潸
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=daikanwa		. 18293)	; &M-18293;
-    (=shinjigen		.  4461)	; &M-18293;
+    (=ucs		. #x6F78)	; 潸
     ))
 (define-char
-  '((=>ucs		. #x6F78)	; 潸
-    (morohashi-daikanwa	18293 0 0)
+  '((<-denotational
+     ((=ucs		  . #x6F78)	; 潸
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs@jis		. #x6F78)	; &GT-23355;
-    (=jis-x0208		. #x5F26)	; &GT-23355; [63-06]
-    (=jis-x0213-1	. #x5F26)	; &I-JX1-5F26; [63-06]
-    (=big5		. #xBCE8)	; &I-B-BCE8;
-    (=gt		. 23355)	; &I-GT-23355;
-    (=gt-pj-1		. #x5F26)	; &I-GT-23355; [63-06]
+    (=big5		. #xBCE8)	; &B-BCE8;
+    (->subsumptive
+     ((=ucs@jis		  . #x6F78)	; &GT-23355;
+      (=jis-x0208	  . #x5F26)	; &GT-23355; [63-06]
+      (=jis-x0213-1	  . #x5F26)	; &I-JX1-5F26; [63-06]
+      (=gt		  . 23355)	; &I-GT-23355;
+      (=gt-pj-1		  . #x5F26)	; &I-GT-23355; [63-06]
+      (=daikanwa	  . 18293)	; &I-M-18293;
+      )
+     ((=shinjigen	  .  4461)	; &SJG2-4461;
+      )
+     ((=cns11643-1	  . #x6D52)	; &C1-6D52; [77-50]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6F78)	; 潸
-    (morohashi-daikanwa	18293 0 0 1)
+  '((<-denotational
+     ((=ucs		  . #x6F78)	; 潸
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=cns11643-1	. #x6D52)	; &C1-6D52; [77-50]
+    (=ucs@unicode	. #x6F78)	; &G0-647A;
+    (=gb2312		. #x647A)	; &G0-647A; [68-90]
     ))
 (define-char
-  '((morohashi-daikanwa	18293 0 1)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x6F78)	; 潸
-    (=gb2312		. #x647A)	; &I-G0-647A; [68-90]
+    (=ucs		. #x6F98)	; 澘
     ))
 (define-char
-  '((=>ucs		. #x6F98)	; 澘
+  '((<-denotational
+     ((=ucs		  . #x6F98)	; 澘
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (=daikanwa		. 18294)	; &M-18294;
     ))
 (define-char
-  '((morohashi-daikanwa	18294 0 1)
+  '((<-denotational
+     ((=ucs		  . #x6F98)	; 澘
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x6F98)	; 澘
-    (=cns11643-4	. #x4A64)	; &I-C4-4A64; [42-68]
-    (=jis-x0213-2	. #x6F38)	; &I-JX2-6F38; [79-24]
+    (->subsumptive
+     ((=ucs@unicode	  . #x6F98)	; &JX2-6F38;
+      (=jis-x0213-2	  . #x6F38)	; &JX2-6F38; [79-24]
+      (mojikyo		  . 053365)	; &MCS-6000D075;
+      )
+     ((=cbeta		  . 02958)	; &CB02958;
+      )
+     ((=cns11643-4	  . #x4A64)	; &C4-4A64; [42-68]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x23F7D)	; 𣽽
+    (->subsumptive
+     ((=ucs@iso		  . #x23F7D)	; &M-18295;
+      (=daikanwa	  . 18295)	; &M-18295;
+      )
+     ((=cns11643-7	  . #x2451)	; &C7-2451; [04-49]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x23F57)	; 𣽗
+    (->subsumptive
+     ((=daikanwa	  . 18296)	; &M-18296;
+      )
+     ((=ucs@iso		  . #x23F57)	; &U-00023F57;
+      )
+     ((=cns11643-7	  . #x2447)	; &C7-2447; [04-39]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x6F79)	; æ½¹
-    (=cns11643-3	. #x4C79)	; &I-C3-4C79; [44-89]
-    (=daikanwa		. 18297)	; &I-M-18297;
+    (->subsumptive
+     ((=ucs@unicode	  . #x6F79)	; &M-18297;
+      (=daikanwa	  . 18297)	; &M-18297;
+      )
+     ((=cns11643-3	  . #x4C79)	; &C3-4C79; [44-89]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -18991,40 +19196,80 @@
     (=gt		. 23407)	; &I-GT-23407;
     (=gt-pj-1		. #x5F25)	; &I-GT-23407; [63-05]
     (=daikanwa		. 18298)	; &I-M-18298;
-    (=shinjigen@rev	.  4460)	; 潺
+    (=shinjigen		.  4460)	; 潺
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x23F58)	; 𣽘
+    (->subsumptive
+     ((=daikanwa	  . 18299)	; &M-18299;
+      )
+     ((=ucs@iso		  . #x23F58)	; &U-00023F58;
+      )
+     ((=cns11643-7	  . #x2444)	; &C7-2444; [04-36]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x6F7B)	; æ½»
-    (=cns11643-2	. #x5169)	; &I-C2-5169; [49-73]
     (=big5		. #xE661)	; &I-B-E661;
-    (=daikanwa		. 18300)	; &I-M-18300;
+    (->subsumptive
+     ((=daikanwa	  . 18300)	; &M-18300;
+      )
+     ((=ucs@unicode	  . #x6F7B)	; &UU+6F7B;
+      )
+     ((=cns11643-2	  . #x5169)	; &C2-5169; [49-73]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6F7C)	; æ½¼
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs@jis		. #x6F7C)	; &GT-23450;
-    (=jis-x0208		. #x5F2E)	; &GT-23450; [63-14]
-    (=ks-x1001		. #x5458)	; &I-K0-5458; [52-56]
-    (=jis-x0213-1	. #x5F2E)	; &I-JX1-5F2E; [63-14]
-    (=big5		. #xBCE0)	; &I-B-BCE0;
-    (=gt		. 23450)	; &I-GT-23450;
-    (=gt-pj-1		. #x5F2E)	; &I-GT-23450; [63-14]
-    (=daikanwa		. 18302)	; &I-M-18302;
-    (=shinjigen@rev	.  4479)	; &GT-23450;
+    (=ucs		. #x23F59)	; 𣽙
+    (->subsumptive
+     ((=ucs@iso		  . #x23F59)	; &M-18301;
+      (=daikanwa	  . 18301)	; &M-18301;
+      )
+     ((=cns11643-4	  . #x4A66)	; &C4-4A66; [42-70]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	18302 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x6F7C)	; æ½¼
-    (=gb2312		. #x647C)	; &I-G0-647C; [68-92]
-    (=cns11643-1	. #x6D4A)	; &I-C1-6D4A; [77-42]
+    (=big5		. #xBCE0)	; &I-B-BCE0;
+    (->subsumptive
+     ((=ucs@jis		  . #x6F7C)	; &GT-23450;
+      (=jis-x0208	  . #x5F2E)	; &GT-23450; [63-14]
+      (=ks-x1001	  . #x5458)	; &I-K0-5458; [52-56]
+      (=jis-x0213-1	  . #x5F2E)	; &I-JX1-5F2E; [63-14]
+      (=gt		  . 23450)	; &I-GT-23450;
+      (=gt-pj-1		  . #x5F2E)	; &I-GT-23450; [63-14]
+      (=daikanwa	  . 18302)	; &I-M-18302;
+      )
+     ((=ucs@unicode	  . #x6F7C)	; &C1-6D4A;
+      (=gb2312		  . #x647C)	; &C1-6D4A; [68-92]
+      (=cns11643-1	  . #x6D4A)	; &I-C1-6D4A; [77-42]
+      )
+     ((=shinjigen	  .  4479)	; &SJG2-4479;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x23F5A)	; 𣽚
+    (->subsumptive
+     ((=daikanwa	  . 18303)	; &M-18303;
+      )
+     ((=ucs@iso		  . #x23F5A)	; &C5-4D7B;
+      (=cns11643-5	  . #x4D7B)	; &C5-4D7B; [45-91]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -19041,13 +19286,26 @@
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x23F5C)	; 𣽜
+    (->subsumptive
+     ((=daikanwa	  . 18307)	; &M-18307;
+      )
+     ((=cns11643-7	  . #x2464)	; &C7-2464; [04-68]
+      )
+     ((=ucs@iso		  . #x23F5C)	; &U-00023F5C;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
     (=ucs		. #x6F7E)	; æ½¾
+    (=big5		. #xE5FB)	; &I-B-E5FB;
     (->subsumptive
      ((ideographic-strokes . 12)
       (total-strokes	   . 15)
       (=ucs@unicode	  . #x6F7E)	; &M-18308;
-      (=big5		  . #xE5FB)	; &M-18308;
-      (=daikanwa	  . 18308)	; &I-M-18308;
+      (=daikanwa	  . 18308)	; &M-18308;
       (=jef-china3	  . #x56FD)	; &I-JC3-56FD;
       )
      ((ideographic-strokes . 12)
@@ -19067,32 +19325,55 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x6F7F)	; 潿
-    (=cns11643-2	. #x5164)	; &I-C2-5164; [49-68]
-    (=gb12345		. #x6436)	; 潿 [68-22]
-    (=big5		. #xE65C)	; &I-B-E65C;
-    (=daikanwa		. 18310)	; &I-M-18310;
+    (=ucs		. #x23F5D)	; 𣽝
+    (->subsumptive
+     ((=daikanwa	  . 18309)	; &M-18309;
+      )
+     ((=ucs@iso		  . #x23F5D)	; &C4-4A5B;
+      (=cns11643-4	  . #x4A5B)	; &C4-4A5B; [42-59]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
-    (total-strokes	 . 17)
-    (=ucs		. #x6F80)	; 澀
-    (=jis-x0208		. #x5F28)	; &I-J90-5F28; [63-08]
-    (=jis-x0213-1	. #x5F28)	; &I-JX1-5F28; [63-08]
-    (=gb12345		. #x492C)	; 澀 [41-12]
-    (=gt		. 23696)	; &I-GT-23696;
-    (=gt-pj-1		. #x5F28)	; &I-GT-23696; [63-08]
-    (=daikanwa		. 18311)	; &I-M-18311;
+    (total-strokes	 . 15)
+    (=ucs		. #x6F7F)	; 潿
+    (=big5		. #xE65C)	; &I-B-E65C;
+    (->subsumptive
+     ((=daikanwa	  . 18310)	; &M-18310;
+      )
+     ((=ucs@unicode	  . #x6F7F)	; &UU+6F7F;
+      (=gb12345		  . #x6436)	; &UU+6F7F; [68-22]
+      )
+     ((=cns11643-2	  . #x5164)	; &C2-5164; [49-68]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6F80)	; 澀
-    (morohashi-daikanwa	18311 0 1)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=cns11643-1	. #x742A)	; &C1-742A; [84-10]
+    (=ucs		. #x6F80)	; 澀
     (=big5		. #xC0DF)	; &I-B-C0DF;
+    (->subsumptive
+     ((=daikanwa	  . 18311)	; &M-18311;
+      (=shinjigen	  .  4279)	; &M-18311;
+      (<-original
+       ((=ucs		    . #x6F81)	; 澁
+	(=jis-x0208	    . #x5F27)	; &I-J90-5F27; [63-07]
+	(=shinjigen	    .  4278)	; 澁
+	))
+      (<-original*sources
+       shinjigen)
+      )
+     ((=cns11643-1	  . #x742A)	; &C1-742A; [84-10]
+      )
+     ((=ucs@unicode	  . #x6F80)	; &GT-23696;
+      (=jis-x0208	  . #x5F28)	; &GT-23696; [63-08]
+      (=jis-x0213-1	  . #x5F28)	; &I-JX1-5F28; [63-08]
+      (=gb12345		  . #x492C)	; &GT-23696; [41-12]
+      (=gt		  . 23696)	; &I-GT-23696;
+      (=gt-pj-1		  . #x5F28)	; &I-GT-23696; [63-08]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -19106,7 +19387,7 @@
     (=gt		. 23370)	; &I-GT-23370;
     (=gt-pj-1		. #x5F27)	; &I-GT-23370; [63-07]
     (=daikanwa		. 18312)	; &I-M-18312;
-    (=shinjigen@rev	.  4278)	; 澁
+    (=shinjigen		.  4278)	; 澁
     (=cbeta		. 00612)	; &I-CB00612;
     ))
 (define-char
@@ -19114,6 +19395,7 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x6F82)	; 澂
+    (=big5		. #xE64A)	; &I-B-E64A;
     ))
 (define-char
   '((<-denotational
@@ -19126,7 +19408,6 @@
      ((=ucs@jis		  . #x6F82)	; &GT-23439;
       (=jis-x0208	  . #x5F2D)	; &GT-23439; [63-13]
       (=jis-x0213-1	  . #x5F2D)	; &I-JX1-5F2D; [63-13]
-      (=big5		  . #xE64A)	; &I-B-E64A;
       (=gt		  . 23439)	; &I-GT-23439;
       (=gt-pj-1		  . #x5F2D)	; &I-GT-23439; [63-13]
       (=daikanwa	  . 18313)	; &I-M-18313;
@@ -19298,6 +19579,19 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (=ucs		. #x23F5F)	; 𣽟
+    (->subsumptive
+     ((=daikanwa	  . 18324)	; &M-18324;
+      )
+     ((=cns11643-4	  . #x4A5A)	; &C4-4A5A; [42-58]
+      )
+     ((=ucs@iso		  . #x23F5F)	; &U-00023F5F;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
     (=ucs		. #x6F8B)	; 澋
     (=big5		. #xE65A)	; &I-B-E65A;
     (->subsumptive
@@ -19341,6 +19635,30 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (=ucs		. #x23F61)	; 𣽡
+    (->subsumptive
+     ((=ucs@iso		  . #x23F61)	; &M-18330;
+      (=daikanwa	  . 18330)	; &M-18330;
+      )
+     ((=cns11643-5	  . #x4D7E)	; &C5-4D7E; [45-94]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x23F62)	; 𣽢
+    (->subsumptive
+     ((=daikanwa	  . 18331)	; &M-18331;
+      )
+     ((=ucs@iso		  . #x23F62)	; &C7-2443;
+      (=cns11643-7	  . #x2443)	; &C7-2443; [04-35]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
     (=ucs		. #x6F8E)	; 澎
     (=jis-x0208		. #x5F30)	; &I-J90-5F30; [63-16]
     (=gb2312		. #x456C)	; &I-G0-456C; [37-76]
@@ -19351,7 +19669,7 @@
     (=gt		. 23480)	; &I-GT-23480;
     (=gt-pj-1		. #x5F30)	; &I-GT-23480; [63-16]
     (=daikanwa		. 18332)	; &I-M-18332;
-    (=shinjigen@rev	.  4482)	; 澎
+    (=shinjigen		.  4482)	; 澎
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -19453,7 +19771,54 @@
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x23F63)	; 𣽣
+    (=cns11643-7	. #x2467)	; &I-C7-2467; [04-71]
+    (=daikanwa		. 18339)	; &I-M-18339;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x23F66)	; 𣽦
+    (->subsumptive
+     ((=daikanwa	  . 18342)	; &M-18342;
+      )
+     ((=ucs@iso		  . #x23F66)	; &U-00023F66;
+      )
+     ((=cns11643-7	  . #x2453)	; &C7-2453; [04-51]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x23F67)	; 𣽧
+    (->subsumptive
+     ((=daikanwa	  . 18343)	; &M-18343;
+      )
+     ((=ucs@iso		  . #x23F67)	; &C7-2442;
+      (=cns11643-7	  . #x2442)	; &C7-2442; [04-34]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x23F69)	; 𣽩
+    (->subsumptive
+     ((=daikanwa	  . 18345)	; &M-18345;
+      )
+     ((=ucs@iso		  . #x23F69)	; &U-00023F69;
+      )
+     ((=cns11643-7	  . #x2445)	; &C7-2445; [04-37]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
     (=ucs		. #x6F95)	; 澕
+    (=big5		. #xE65D)	; &I-B-E65D;
     ))
 (define-char
   '((<-denotational
@@ -19475,21 +19840,33 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
-    (=ucs@unicode	. #x6F95)	; &B-E65D;
-    (=big5		. #xE65D)	; &B-E65D;
+    (=ucs@unicode	. #x6F95)	; &UU+6F95;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs		. #x23F6B)	; 𣽫
+    (->subsumptive
+     ((=daikanwa	  . 18348)	; &M-18348;
+      )
+     ((=cns11643-5	  . #x4E22)	; &C5-4E22; [46-02]
+      )
+     ((=ucs@iso		  . #x23F6B)	; &U-00023F6B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
     (=ucs		. #x6F96)	; 澖
+    (=big5		. #xE647)	; &I-B-E647;
     (->subsumptive
      ((=daikanwa	  . 18349)	; &M-18349;
       )
      ((=ucs@jis		  . #x6F96)	; &JX2-6F3B;
       (=jis-x0212	  . #x486D)	; &JX2-6F3B; [40-77]
       (=jis-x0213-2	  . #x6F3B)	; &I-JX2-6F3B; [79-27]
-      (=big5		  . #xE647)	; &I-B-E647;
       (mojikyo		  . 018349)	; &MCS-600047AD;
       )
      ((=ucs@unicode	  . #x6F96)	; &C2-514F;
@@ -19891,27 +20268,6 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x23F4A)	; 𣽊
-    (=cns11643-4	. #x4A65)	; &I-C4-4A65; [42-69]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x23F4B)	; 𣽋
-    (=cns11643-4	. #x4A67)	; &I-C4-4A67; [42-71]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x23F4C)	; 𣽌
-    (=cns11643-5	. #x4E25)	; &I-C5-4E25; [46-05]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
     (=ucs		. #x23F4E)	; 𣽎
     (=cns11643-7	. #x2463)	; &I-C7-2463; [04-67]
     ))
@@ -19926,41 +20282,6 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x23F55)	; 𣽕
-    (=cns11643-5	. #x4E21)	; &I-C5-4E21; [46-01]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x23F57)	; 𣽗
-    (=cns11643-7	. #x2447)	; &I-C7-2447; [04-39]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x23F58)	; 𣽘
-    (=cns11643-7	. #x2444)	; &I-C7-2444; [04-36]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x23F59)	; 𣽙
-    (=cns11643-4	. #x4A66)	; &I-C4-4A66; [42-70]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x23F5A)	; 𣽚
-    (=cns11643-5	. #x4D7B)	; &I-C5-4D7B; [45-91]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
     (=ucs		. #x23F5B)	; 𣽛
     (=cns11643-5	. #x4E24)	; &I-C5-4E24; [46-04]
     ))
@@ -19968,20 +20289,6 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x23F5C)	; 𣽜
-    (=cns11643-7	. #x2464)	; &I-C7-2464; [04-68]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x23F5D)	; 𣽝
-    (=cns11643-4	. #x4A5B)	; &I-C4-4A5B; [42-59]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
     (=ucs		. #x23F5E)	; 𣽞
     (=cns11643-7	. #x245B)	; &I-C7-245B; [04-59]
     ))
@@ -19989,13 +20296,6 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x23F5F)	; 𣽟
-    (=cns11643-4	. #x4A5A)	; &I-C4-4A5A; [42-58]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
     (=ucs		. #x23F60)	; 𣽠
     (=cns11643-7	. #x2459)	; &I-C7-2459; [04-57]
     ))
@@ -20003,27 +20303,6 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x23F61)	; 𣽡
-    (=cns11643-5	. #x4D7E)	; &I-C5-4D7E; [45-94]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x23F62)	; 𣽢
-    (=cns11643-7	. #x2443)	; &I-C7-2443; [04-35]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x23F63)	; 𣽣
-    (=cns11643-7	. #x2467)	; &I-C7-2467; [04-71]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
     (=ucs		. #x23F64)	; 𣽤
     (=cns11643-5	. #x4E23)	; &I-C5-4E23; [46-03]
     ))
@@ -20038,27 +20317,6 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x23F66)	; 𣽦
-    (=cns11643-7	. #x2453)	; &I-C7-2453; [04-51]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x23F67)	; 𣽧
-    (=cns11643-7	. #x2442)	; &I-C7-2442; [04-34]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x23F69)	; 𣽩
-    (=cns11643-7	. #x2445)	; &I-C7-2445; [04-37]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
     (=ucs		. #x23F6A)	; 𣽪
     (=cns11643-7	. #x2468)	; &I-C7-2468; [04-72]
     ))
@@ -20066,34 +20324,6 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs		. #x23F6B)	; 𣽫
-    (=cns11643-5	. #x4E22)	; &I-C5-4E22; [46-02]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x23F7D)	; 𣽽
-    (=cns11643-7	. #x2451)	; &I-C7-2451; [04-49]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x23F84)	; 𣾄
-    (=cns11643-5	. #x4E27)	; &I-C5-4E27; [46-07]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=cbeta		. 02958)	; &CB02958;
-    (mojikyo		. 053365)	; &MCS-6000D075;
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
     (=cns11643-7	. #x2458)	; &C7-2458; [04-56]
     ))
 (define-char
@@ -20180,54 +20410,54 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x6FA0)	; æ¾ 
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs@jis		. #x6FA0)	; &M-18378;
-    (=jis-x0212		. #x4870)	; &M-18378; [40-80]
-    (=jis-x0213-1	. #x7733)	; &I-JX1-7733; [87-19]
-    (=daikanwa		. 18378)	; &I-M-18378;
-    (=jef-china3	. #x98B2)	; &I-JC3-98B2;
-    ))
-(define-char
-  '((=>ucs		. #x6FA0)	; æ¾ 
-    (morohashi-daikanwa	18378 0 0)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=cns11643-1	. #x7133)	; &C1-7133; [81-19]
-    ))
-(define-char
-  '((morohashi-daikanwa	18378 0 1)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (=ucs		. #x6FA0)	; æ¾ 
-    (=gb12345		. #x6445)	; æ¾  [68-37]
     (=big5		. #xBF49)	; &I-B-BF49;
+    (->subsumptive
+     ((=ucs@jis		  . #x6FA0)	; &M-18378;
+      (=jis-x0212	  . #x4870)	; &M-18378; [40-80]
+      (=jis-x0213-1	  . #x7733)	; &I-JX1-7733; [87-19]
+      (=daikanwa	  . 18378)	; &I-M-18378;
+      (=jef-china3	  . #x98B2)	; &I-JC3-98B2;
+      )
+     ((=cns11643-1	  . #x7133)	; &C1-7133; [81-19]
+      )
+     ((=ucs@unicode	  . #x6FA0)	; &UU+6FA0;
+      (=gb12345		  . #x6445)	; &UU+6FA0; [68-37]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (=ucs		. #x6FA1)	; 澡
-    (=jis-x0208		. #x5F36)	; &I-J90-5F36; [63-22]
-    (=gb2312		. #x5468)	; &I-G0-5468; [52-72]
-    (=jis-x0213-1	. #x5F36)	; &I-JX1-5F36; [63-22]
     (=big5		. #xBEFE)	; &I-B-BEFE;
-    (=gt		. 23582)	; &I-GT-23582;
-    (=gt-pj-1		. #x5F36)	; &I-GT-23582; [63-22]
-    (=daikanwa		. 18379)	; &I-M-18379;
-    (=shinjigen@rev	.  4490)	; 澡
+    (->subsumptive
+     ((=ucs@unicode	  . #x6FA1)	; &GT-23582;
+      (=jis-x0208	  . #x5F36)	; &GT-23582; [63-22]
+      (=gb2312		  . #x5468)	; &I-G0-5468; [52-72]
+      (=jis-x0213-1	  . #x5F36)	; &I-JX1-5F36; [63-22]
+      (=gt		  . 23582)	; &I-GT-23582;
+      (=gt-pj-1		  . #x5F36)	; &I-GT-23582; [63-22]
+      (=daikanwa	  . 18379)	; &I-M-18379;
+      (=shinjigen	  .  4490)	; &GT-23582;
+      )
+     ((=cns11643-1	  . #x7129)	; &C1-7129; [81-09]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6FA1)	; 澡
-    (morohashi-daikanwa	18379 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=cns11643-1	. #x7129)	; &C1-7129; [81-09]
+    (=ucs		. #x23FC8)	; 𣿈
+    (->subsumptive
+     ((=daikanwa	  . 18380)	; &M-18380;
+      )
+     ((=ucs@iso		  . #x23FC8)	; &C5-5528;
+      (=cns11643-5	  . #x5528)	; &C5-5528; [53-08]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -20282,7 +20512,38 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
+    (=ucs		. #x2400E)	; 𤀎
+    (=cns11643-7	. #x2F44)	; &I-C7-2F44; [15-36]
+    (=daikanwa		. 18384)	; &I-M-18384;
+    (<-same
+     ((=ucs@jis		  . #x6FA4)	; &GT-23588;
+      (=jis-x0208	  . #x5F37)	; &GT-23588; [63-23]
+      (=ks-x1001	  . #x774A)	; &I-K0-774A; [87-42]
+      (=jis-x0213-1	  . #x5F37)	; &I-JX1-5F37; [63-23]
+      (=daikanwa	  . 18383)	; &I-M-18383;
+      ))
+    (<-same*sources
+     shuowen daikanwa)
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x23FDC)	; 𣿜
+    (->subsumptive
+     ((=daikanwa	  . 18386)	; &M-18386;
+      )
+     ((=ucs@iso		  . #x23FDC)	; &U-00023FDC;
+      )
+     ((=cns11643-7	  . #x2F32)	; &C7-2F32; [15-18]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
     (=ucs		. #x6FA5)	; æ¾¥
+    (=big5		. #xE9F7)	; &I-B-E9F7;
     ))
 (define-char
   '((<-denotational
@@ -20296,7 +20557,6 @@
     (=jis-x0212		. #x4871)	; &M-18387; [40-81]
     (=cns11643-2	. #x5824)	; &I-C2-5824; [56-04]
     (=jis-x0213-2	. #x6F3E)	; &I-JX2-6F3E; [79-30]
-    (=big5		. #xE9F7)	; &I-B-E9F7;
     (=daikanwa		. 18387)	; &I-M-18387;
     (=jef-china3	. #x9BE1)	; &I-JC3-9BE1;
     (mojikyo		. 018387)	; &MCS-600047D3;
@@ -20325,6 +20585,19 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
+    (=ucs		. #x23FC9)	; 𣿉
+    (->subsumptive
+     ((=daikanwa	  . 18389)	; &M-18389;
+      )
+     ((=ucs@iso		  . #x23FC9)	; &U-00023FC9;
+      )
+     ((=cns11643-5	  . #x5529)	; &C5-5529; [53-09]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
     (=ucs		. #x6FA7)	; 澧
     (=gb2312		. #x6522)	; &I-G0-6522; [69-02]
     (=ks-x1001		. #x5648)	; &I-K0-5648; [54-40]
@@ -20348,6 +20621,14 @@
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x23FCA)	; 𣿊
+    (=cns11643-5	. #x552B)	; &I-C5-552B; [53-11]
+    (=daikanwa		. 18393)	; &I-M-18393;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (=ucs		. #x6FA9)	; 澩
     (=cns11643-2	. #x5D3B)	; &I-C2-5D3B; [61-27]
@@ -20359,16 +20640,28 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
+    (=ucs		. #x23FCB)	; 𣿋
+    (->subsumptive
+     ((=ucs@iso		  . #x23FCB)	; &M-18396;
+      (=daikanwa	  . 18396)	; &M-18396;
+      )
+     ((=cns11643-7	  . #x2F33)	; &C7-2F33; [15-19]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
     (=ucs		. #x6FAA)	; 澪
+    (=big5		. #xE9FB)	; &I-B-E9FB;
     (->subsumptive
      ((=ucs@jis		  . #x6FAA)	; &GT-23641;
       (=jis-x0208	  . #x5F3A)	; &GT-23641; [63-26]
       (=jis-x0213-1	  . #x5F3A)	; &I-JX1-5F3A; [63-26]
-      (=big5		  . #xE9FB)	; &I-B-E9FB;
       (=gt		  . 23641)	; &I-GT-23641;
       (=gt-pj-1		  . #x5F3A)	; &I-GT-23641; [63-26]
       (=daikanwa	  . 18398)	; &I-M-18398;
-      (=shinjigen@rev	  .  4499)	; &GT-23641;
+      (=shinjigen	  .  4499)	; &GT-23641;
       )
      ((=ucs@cns		  . #x6FAA)	; &C2-5828;
       (=cns11643-2	  . #x5828)	; &C2-5828; [56-08]
@@ -20378,6 +20671,37 @@
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
+    (=ucs		. #x23FCC)	; 𣿌
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23FCC)	; 𣿌
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=daikanwa		. 18400)	; &M-18400;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23FCC)	; 𣿌
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=cns11643-5	. #x5530)	; &C5-5530; [53-16]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23FCC)	; 𣿌
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs@iso		. #x23FCC)	; &U-00023FCC;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
     (=ucs		. #x6FAB)	; 澫
     ))
 (define-char
@@ -20580,6 +20904,18 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
+    (=ucs		. #x24008)	; 𤀈
+    (->subsumptive
+     ((=ucs@iso		  . #x24008)	; &M-18413;
+      (=daikanwa	  . 18413)	; &M-18413;
+      )
+     ((=cns11643-7	  . #x2F4A)	; &C7-2F4A; [15-42]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
     (=ucs		. #x6FB4)	; æ¾´
     (=iso-ir165		. #x7D31)	; &I-EGB-7D31; [93-17]
     (=cns11643-1	. #x7134)	; &I-C1-7134; [81-20]
@@ -20613,33 +20949,63 @@
     (=ucs		. #x6FB5)	; æ¾µ
     ))
 (define-char
-  '((=>ucs		. #x6FB6)	; 澶
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=ucs@jis		. #x6FB6)	; &M-18416;
-    (=jis-x0212		. #x4879)	; &M-18416; [40-89]
-    (=jis-x0213-1	. #x7735)	; &I-JX1-7735; [87-21]
+    (=ucs		. #x6FB6)	; 澶
     (=big5		. #xBF47)	; &I-B-BF47;
-    (=daikanwa		. 18416)	; &I-M-18416;
+    (->subsumptive
+     ((=ucs@jis		  . #x6FB6)	; &M-18416;
+      (=jis-x0212	  . #x4879)	; &M-18416; [40-89]
+      (=jis-x0213-1	  . #x7735)	; &I-JX1-7735; [87-21]
+      (=daikanwa	  . 18416)	; &I-M-18416;
+      (=jef-china3	  . #x57AF)	; &I-JC3-57AF;
+      )
+     ((=ucs@unicode	  . #x6FB6)	; &C1-7131;
+      (=gb2312		  . #x6524)	; &C1-7131; [69-04]
+      (=cns11643-1	  . #x7131)	; &I-C1-7131; [81-17]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x6FB7)	; æ¾·
     ))
 (define-char
-  '((morohashi-daikanwa	18416 0 0)
+  '((<-denotational
+     ((=ucs		  . #x6FB7)	; æ¾·
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=ucs		. #x6FB6)	; 澶
-    (=gb2312		. #x6524)	; &I-G0-6524; [69-04]
-    (=cns11643-1	. #x7131)	; &I-C1-7131; [81-17]
-    (=jef-china3	. #x57AF)	; &I-JC3-57AF;
+    (->subsumptive
+     ((=daikanwa	  . 18417)	; &M-18417;
+      )
+     ((=cns11643-3	  . #x5158)	; &C3-5158; [49-56]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6FB7)	; æ¾·
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs@unicode	. #x6FB7)	; &UU+6FB7;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=ucs		. #x6FB7)	; æ¾·
-    (=cns11643-3	. #x5158)	; &I-C3-5158; [49-56]
-    (=daikanwa		. 18417)	; &I-M-18417;
+    (=ucs		. #x23FCD)	; 𣿍
+    (->subsumptive
+     ((=daikanwa	  . 18418)	; &M-18418;
+      )
+     ((=ucs@iso		  . #x23FCD)	; &U-00023FCD;
+      )
+     ((=cns11643-7	  . #x2F47)	; &C7-2F47; [15-39]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -20651,51 +21017,80 @@
     (=daikanwa		. 18419)	; &I-M-18419;
     ))
 (define-char
-  '((=>ucs		. #x6FB9)	; æ¾¹
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x23FCE)	; 𣿎
+    (=cns11643-7	. #x2F40)	; &I-C7-2F40; [15-32]
+    (=daikanwa		. 18420)	; &I-M-18420;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=ucs@jis		. #x6FB9)	; &GT-23596;
-    (=jis-x0208		. #x5F38)	; &GT-23596; [63-24]
-    (=ks-x1001		. #x5342)	; &I-K0-5342; [51-34]
-    (=jis-x0213-1	. #x5F38)	; &I-JX1-5F38; [63-24]
+    (=ucs		. #x6FB9)	; æ¾¹
     (=big5		. #xBF46)	; &I-B-BF46;
-    (=gt		. 23596)	; &I-GT-23596;
-    (=gt-pj-1		. #x5F38)	; &I-GT-23596; [63-24]
-    (=daikanwa		. 18421)	; &I-M-18421;
-    (=shinjigen@rev	.  4493)	; &GT-23596;
+    (->subsumptive
+     ((=ucs@jis		  . #x6FB9)	; &GT-23596;
+      (=jis-x0208	  . #x5F38)	; &GT-23596; [63-24]
+      (=ks-x1001	  . #x5342)	; &I-K0-5342; [51-34]
+      (=jis-x0213-1	  . #x5F38)	; &I-JX1-5F38; [63-24]
+      (=gt		  . 23596)	; &I-GT-23596;
+      (=gt-pj-1		  . #x5F38)	; &I-GT-23596; [63-24]
+      (=daikanwa	  . 18421)	; &I-M-18421;
+      (=shinjigen	  .  4493)	; &GT-23596;
+      )
+     ((=cns11643-1	  . #x7130)	; &C1-7130; [81-16]
+      )
+     ((=ucs@unicode	  . #x6FB9)	; &G0-6523;
+      (=gb2312		  . #x6523)	; &G0-6523; [69-03]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6FB9)	; æ¾¹
-    (morohashi-daikanwa	18421 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x6FBA)	; 澺
+    (=big5		. #xE9F9)	; &I-B-E9F9;
+    (->subsumptive
+     ((=daikanwa	  . 18422)	; &M-18422;
+      )
+     ((=ucs@unicode	  . #x6FBA)	; &C2-5826;
+      (=cns11643-2	  . #x5826)	; &C2-5826; [56-06]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=cns11643-1	. #x7130)	; &C1-7130; [81-16]
+    (=ucs		. #x23FCF)	; 𣿏
     ))
 (define-char
-  '((morohashi-daikanwa	18421 0 1)
+  '((<-denotational
+     ((=ucs		  . #x23FCF)	; 𣿏
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=ucs		. #x6FB9)	; æ¾¹
-    (=gb2312		. #x6523)	; &I-G0-6523; [69-03]
+    (=ucs@iso		. #x23FCF)	; &M-18423;
+    (=daikanwa		. 18423)	; &M-18423;
     ))
 (define-char
-  '((=>ucs		. #x6FBA)	; 澺
+  '((<-denotational
+     ((=ucs		  . #x23FCF)	; 𣿏
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=big5		. #xE9F9)	; &M-18422;
-    (=daikanwa		. 18422)	; &I-M-18422;
+    (=cns11643-7	. #x2F3A)	; &C7-2F3A; [15-26]
     ))
 (define-char
-  '((morohashi-daikanwa	18422 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=ucs		. #x6FBA)	; 澺
-    (=cns11643-2	. #x5826)	; &I-C2-5826; [56-06]
+    (=ucs		. #x23FD0)	; 𣿐
+    (=cns11643-4	. #x5079)	; &I-C4-5079; [48-89]
+    (=daikanwa		. 18425)	; &I-M-18425;
     ))
 (define-char
   '((=>ucs		. #x6FBB)	; æ¾»
@@ -20720,33 +21115,81 @@
     (=ucs		. #x6FBB)	; æ¾»
     ))
 (define-char
-  '((=>ucs		. #x6FBC)	; æ¾¼
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=ucs@jis		. #x6FBC)	; &M-18428;
-    (=jis-x0212		. #x487A)	; &M-18428; [40-90]
-    (=jis-x0213-1	. #x7736)	; &I-JX1-7736; [87-22]
+    (=ucs		. #x6FBC)	; æ¾¼
     (=big5		. #xE9ED)	; &I-B-E9ED;
-    (=daikanwa		. 18428)	; &I-M-18428;
+    (->subsumptive
+     ((=ucs@jis		  . #x6FBC)	; &M-18428;
+      (=jis-x0212	  . #x487A)	; &M-18428; [40-90]
+      (=jis-x0213-1	  . #x7736)	; &I-JX1-7736; [87-22]
+      (=daikanwa	  . 18428)	; &I-M-18428;
+      )
+     ((=ucs@unicode	  . #x6FBC)	; &C2-5778;
+      (=iso-ir165	  . #x7D32)	; &C2-5778; [93-18]
+      (=cns11643-2	  . #x5778)	; &I-C2-5778; [55-88]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	18428 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 17)
+    (=ucs		. #x3D68)	; 㵨
+    (->subsumptive
+     ((=daikanwa	  . 18429)	; &M-18429;
+      )
+     ((=ucs@unicode	  . #x3D68)	; &UU+3D68;
+      )
+     ((=cns11643-4	  . #x5656)	; &C4-5656; [54-54]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=ucs		. #x6FBC)	; æ¾¼
-    (=iso-ir165		. #x7D32)	; &I-EGB-7D32; [93-18]
-    (=cns11643-2	. #x5778)	; &I-C2-5778; [55-88]
+    (=ucs		. #x23FD1)	; 𣿑
+    (=cns11643-7	. #x2F39)	; &I-C7-2F39; [15-25]
+    (=daikanwa		. 18430)	; &I-M-18430;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x23FD2)	; 𣿒
+    (->subsumptive
+     ((=daikanwa	  . 18431)	; &M-18431;
+      )
+     ((=ucs@iso		  . #x23FD2)	; &C4-507E;
+      (=cns11643-4	  . #x507E)	; &C4-507E; [48-94]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x23FD3)	; 𣿓
+    (->subsumptive
+     ((=daikanwa	  . 18432)	; &M-18432;
+      )
+     ((=cns11643-5	  . #x5533)	; &C5-5533; [53-19]
+      )
+     ((=ucs@iso		  . #x23FD3)	; &U-00023FD3;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (=ucs		. #x6FBD)	; æ¾½
-    (=cns11643-2	. #x577D)	; &I-C2-577D; [55-93]
     (=big5		. #xE9F2)	; &I-B-E9F2;
-    (=daikanwa		. 18433)	; &I-M-18433;
+    (->subsumptive
+     ((=daikanwa	  . 18433)	; &M-18433;
+      )
+     ((=ucs@unicode	  . #x6FBD)	; &UU+6FBD;
+      )
+     ((=cns11643-2	  . #x577D)	; &C2-577D; [55-93]
+      ))
     ))
 (define-char
   '((=>ucs		. #x6FBE)	; æ¾¾
@@ -20778,17 +21221,48 @@
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
+    (=ucs		. #x23FD4)	; 𣿔
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23FD4)	; 𣿔
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=daikanwa		. 18435)	; &M-18435;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23FD4)	; 𣿔
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=cns11643-7	. #x2F3D)	; &C7-2F3D; [15-29]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x23FD4)	; 𣿔
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs@iso		. #x23FD4)	; &U-00023FD4;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (=ucs		. #x6FBF)	; 澿
+    (=big5		. #xE9FD)	; &I-B-E9FD;
     (->subsumptive
      ((=daikanwa	  . 18436)	; &M-18436;
       )
      ((=ucs@cns		  . #x6FBF)	; &C2-582A;
       (=cns11643-2	  . #x582A)	; &C2-582A; [56-10]
       )
-     ((=ucs@unicode	  . #x6FBF)	; &B-E9FD;
-      (=big5		  . #xE9FD)	; &B-E9FD;
+     ((=ucs@unicode	  . #x6FBF)	; &UU+6FBF;
       ))
     ))
 (define-char
@@ -20805,7 +21279,7 @@
       (=gt		  . 23539)	; &I-GT-23539;
       (=gt-pj-1		  . #x3763)	; &I-GT-23539; [23-67]
       (=daikanwa	  . 18438)	; &I-M-18438;
-      (=shinjigen@rev	  .  4487)	; &GT-23539;
+      (=shinjigen	  .  4487)	; &GT-23539;
       )
      ((=ucs@unicode	  . #x6FC0)	; &C1-712F;
       (=gb2312		  . #x3C24)	; &C1-712F; [28-04]
@@ -20890,19 +21364,19 @@
     ))
 (define-char
   '((<-denotational
-     ((=big5		  . #xE9F1)	; &B-E9F1;
+     ((=ucs		  . #x6FC4)	; 濄
       ))
     (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=daikanwa		. 18443)	; &M-18443;
+    (=big5		. #xE9F1)	; &B-E9F1;
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x6FC4)	; 濄
+     ((=big5		  . #xE9F1)	; &B-E9F1;
       ))
     (ideographic-radical . 85)	; ⽔
-    (=big5		. #xE9F1)	; &B-E9F1;
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=daikanwa		. 18443)	; &M-18443;
     ))
 (define-char
   '((<-denotational
@@ -20924,6 +21398,18 @@
     (=ucs@unicode	. #x6FC4)	; &UU+6FC4;
     ))
 (define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x23FD5)	; 𣿕
+    (->subsumptive
+     ((=daikanwa	  . 18444)	; &M-18444;
+      )
+     ((=ucs@iso		  . #x23FD5)	; &C7-2F31;
+      (=cns11643-7	  . #x2F31)	; &C7-2F31; [15-17]
+      ))
+    ))
+(define-char
   '((=>ucs		. #x6FC5)	; 濅
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
@@ -21041,35 +21527,70 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
+    (=ucs		. #x23FD7)	; 𣿗
+    (->subsumptive
+     ((=daikanwa	  . 18452)	; &M-18452;
+      )
+     ((=cns11643-7	  . #x2F46)	; &C7-2F46; [15-38]
+      )
+     ((=ucs@iso		  . #x23FD7)	; &U-00023FD7;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x23FD8)	; 𣿘
+    (=cns11643-7	. #x2F3B)	; &I-C7-2F3B; [15-27]
+    (=daikanwa		. 18453)	; &I-M-18453;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
     (=ucs		. #x6FCA)	; 濊
-    (=ks-x1001		. #x6758)	; &I-K0-6758; [71-56]
-    (=jis-x0212		. #x487E)	; &I-JSP-487E; [40-94]
-    (=cns11643-2	. #x5821)	; &I-C2-5821; [56-01]
-    (=jis-x0213-1	. #x7738)	; &I-JX1-7738; [87-24]
     (=big5		. #xE9F4)	; &I-B-E9F4;
-    (=daikanwa		. 18454)	; &I-M-18454;
+    (->subsumptive
+     ((=ucs@jis		  . #x6FCA)	; &M-18454;
+      (=ks-x1001	  . #x6758)	; &M-18454; [71-56]
+      (=jis-x0212	  . #x487E)	; &I-JSP-487E; [40-94]
+      (=jis-x0213-1	  . #x7738)	; &I-JX1-7738; [87-24]
+      (=daikanwa	  . 18454)	; &I-M-18454;
+      )
+     ((=ucs@unicode	  . #x6FCA)	; &C2-5821;
+      (=cns11643-2	  . #x5821)	; &C2-5821; [56-01]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (=ucs		. #x6FCB)	; 濋
-    (=cns11643-2	. #x5775)	; &I-C2-5775; [55-85]
     (=big5		. #xE9EA)	; &I-B-E9EA;
-    (=daikanwa		. 18455)	; &I-M-18455;
+    (->subsumptive
+     ((=daikanwa	  . 18455)	; &M-18455;
+      )
+     ((=ucs@unicode	  . #x6FCB)	; &C2-5775;
+      (=cns11643-2	  . #x5775)	; &C2-5775; [55-85]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 17)
     (=ucs		. #x6FCC)	; 濌
-    (=cns11643-2	. #x5D3A)	; &I-C2-5D3A; [61-26]
     (=big5		. #xED4E)	; &I-B-ED4E;
-    (=daikanwa		. 18456)	; &I-M-18456;
+    (->subsumptive
+     ((=ucs@unicode	  . #x6FCC)	; &M-18456;
+      (=daikanwa	  . 18456)	; &M-18456;
+      )
+     ((=cns11643-2	  . #x5D3A)	; &C2-5D3A; [61-26]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (=ucs		. #x6FCD)	; 濍
+    (=big5		. #xEA43)	; &I-B-EA43;
     ))
 (define-char
   '((<-denotational
@@ -21089,38 +21610,145 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
-    (=ucs@unicode	. #x6FCD)	; &B-EA43;
-    (=big5		. #xEA43)	; &B-EA43;
+    (=ucs@unicode	. #x6FCD)	; &UU+6FCD;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
     (=ucs		. #x6FCE)	; 濎
+    (=big5		. #xE9EE)	; &I-B-E9EE;
     (->subsumptive
      ((=ucs@unicode	  . #x6FCE)	; &M-18458;
-      (=big5		  . #xE9EE)	; &M-18458;
-      (=daikanwa	  . 18458)	; &I-M-18458;
+      (=daikanwa	  . 18458)	; &M-18458;
       )
      ((=ucs@cns		  . #x6FCE)	; &C2-5779;
       (=cns11643-2	  . #x5779)	; &C2-5779; [55-89]
       ))
     ))
 (define-char
-  '((=>ucs		. #x3D6D)	; ãµ­
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=daikanwa		. 18463)	; &M-18463;
-    (=cbeta		. 01992)	; &I-CB01992;
-    ))
-(define-char
-  '((morohashi-daikanwa	18463 0 2)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 12)
-    (total-strokes	 . 15)
-    (=ucs		. #x3D6D)	; ãµ­
-    (=cns11643-4	. #x4A62)	; &I-C4-4A62; [42-66]
+    (=ucs		. #x23FD9)	; 𣿙
+    (=cns11643-7	. #x2F38)	; &I-C7-2F38; [15-24]
+    (=daikanwa		. 18459)	; &I-M-18459;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x23FDA)	; 𣿚
+    (->subsumptive
+     ((=ucs@iso		  . #x23FDA)	; &M-18460;
+      (=daikanwa	  . 18460)	; &M-18460;
+      )
+     ((=cns11643-7	  . #x2F43)	; &C7-2F43; [15-35]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x23FDB)	; 𣿛
+    (=cns11643-7	. #x2F36)	; &I-C7-2F36; [15-22]
+    (=daikanwa		. 18462)	; &I-M-18462;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (=ucs		. #x3D6D)	; ãµ­
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3D6D)	; ãµ­
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=daikanwa		. 18463)	; &M-18463;
+    (=cbeta		. 01992)	; &I-CB01992;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3D6D)	; ãµ­
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs@unicode	. #x3D6D)	; &C4-4A62;
+    (=cns11643-4	. #x4A62)	; &C4-4A62; [42-66]
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x23FDD)	; 𣿝
+    (=cns11643-5	. #x5531)	; &I-C5-5531; [53-17]
+    (=daikanwa		. 18464)	; &I-M-18464;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x23FDE)	; 𣿞
+    (->subsumptive
+     ((=daikanwa	  . 18465)	; &M-18465;
+      )
+     ((=ucs@iso		  . #x23FDE)	; &C5-552A;
+      (=cns11643-5	  . #x552A)	; &C5-552A; [53-10]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes@ucs . 13)
+    (total-strokes@ucs	     . 16)
+    (ideographic-strokes@ucs*sources
+     daikanwa)
+    (ideographic-strokes@cns . 14)
+    (total-strokes@cns	     . 17)
+    (total-strokes@cns*sources
+     cns11643)
+    (=ucs		. #x23FDF)	; 𣿟
+    (->subsumptive
+     ((ideographic-strokes . 13)
+      (total-strokes	   . 16)
+      (=daikanwa	  . 18466)	; &M-18466;
+      )
+     ((=ucs@iso		  . #x23FDF)	; &C5-5B77;
+      (=cns11643-5	  . #x5B77)	; &C5-5B77; [59-87]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x23FE0)	; 𣿠
+    (=cns11643-7	. #x2F3C)	; &I-C7-2F3C; [15-28]
+    (=daikanwa		. 18467)	; &I-M-18467;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x23FE1)	; 𣿡
+    (=cns11643-7	. #x2F49)	; &I-C7-2F49; [15-41]
+    (=daikanwa		. 18468)	; &I-M-18468;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x23FE2)	; 𣿢
+    (=cns11643-5	. #x552C)	; &I-C5-552C; [53-12]
+    (=daikanwa		. 18469)	; &I-M-18469;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs		. #x23FE4)	; 𣿤
+    (=cns11643-5	. #x5532)	; &I-C5-5532; [53-18]
+    (=daikanwa		. 18470)	; &I-M-18470;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -21413,344 +22041,165 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=ucs		. #x23FC8)	; 𣿈
-    (=cns11643-5	. #x5528)	; &I-C5-5528; [53-08]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FC9)	; 𣿉
-    (=cns11643-5	. #x5529)	; &I-C5-5529; [53-09]
+    (=ucs		. #x23FF1)	; 𣿱
+    (=cns11643-7	. #x2F2F)	; &I-C7-2F2F; [15-15]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=ucs		. #x23FCA)	; 𣿊
-    (=cns11643-5	. #x552B)	; &I-C5-552B; [53-11]
+    (=ucs		. #x24011)	; 𤀑
+    (->subsumptive
+     ((=ucs@iso		  . #x24011)	; &U-00024011;
+      )
+     ((=cns11643-4	  . #x5121)	; &C4-5121; [49-01]
+      ))
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FCB)	; 𣿋
-    (=cns11643-7	. #x2F33)	; &I-C7-2F33; [15-19]
+  '((=>ucs		. #x23FE3)	; 𣿣
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=daikanwa		. 18481)	; &M-18481;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FCC)	; 𣿌
-    (=cns11643-5	. #x5530)	; &I-C5-5530; [53-16]
+  '((morohashi-daikanwa	18481 0 1)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x23FE3)	; 𣿣
+    (=cns11643-5	. #x5B79)	; &I-C5-5B79; [59-89]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FCD)	; 𣿍
-    (=cns11643-7	. #x2F47)	; &I-C7-2F47; [15-39]
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x6FD4)	; 濔
+    (=jis-x0208		. #x5F3E)	; &I-J90-5F3E; [63-30]
+    (=cns11643-2	. #x5D3D)	; &I-C2-5D3D; [61-29]
+    (=jis-x0213-1	. #x5F3E)	; &I-JX1-5F3E; [63-30]
+    (=big5		. #xED51)	; &I-B-ED51;
+    (=gt		. 23721)	; &I-GT-23721;
+    (=gt-pj-1		. #x5F3E)	; &I-GT-23721; [63-30]
+    (=daikanwa		. 18482)	; &I-M-18482;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FCE)	; 𣿎
-    (=cns11643-7	. #x2F40)	; &I-C7-2F40; [15-32]
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x6FD5)	; 濕
+    (=jis-x0208		. #x5F3C)	; &I-J90-5F3C; [63-28]
+    (=ks-x1001		. #x6325)	; &I-K0-6325; [67-05]
+    (=cns11643-1	. #x742E)	; &I-C1-742E; [84-14]
+    (=jis-x0213-1	. #x5F3C)	; &I-JX1-5F3C; [63-28]
+    (=gb12345		. #x4A2A)	; 濕 [42-10]
+    (=big5		. #xC0E3)	; &I-B-C0E3;
+    (=gt		. 23692)	; &I-GT-23692;
+    (=gt-pj-1		. #x5F3C)	; &I-GT-23692; [63-28]
+    (=daikanwa		. 18483)	; &I-M-18483;
+    (=shinjigen@rev	.  4335)	; 濕
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FCF)	; 𣿏
-    (=cns11643-7	. #x2F3A)	; &I-C7-2F3A; [15-26]
+  '((=>ucs		. #x6FD6)	; 濖
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=daikanwa		. 18484)	; &M-18484;
+    (=cbeta		. 03893)	; &I-CB03893;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	18484 0 2)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FD0)	; 𣿐
-    (=cns11643-4	. #x5079)	; &I-C4-5079; [48-89]
+    (total-strokes	 . 17)
+    (=ucs		. #x6FD6)	; 濖
+    (=cns11643-3	. #x5530)	; &I-C3-5530; [53-16]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FD1)	; 𣿑
-    (=cns11643-7	. #x2F39)	; &I-C7-2F39; [15-25]
+    (=ucs		. #x6FD7)	; 濗
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FD2)	; 𣿒
-    (=cns11643-4	. #x507E)	; &I-C4-507E; [48-94]
+  '((<-denotational
+     ((=ucs		  . #x6FD7)	; 濗
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=cns11643-3	. #x552F)	; &M-18485; [53-15]
+    (=daikanwa		. 18485)	; &I-M-18485;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational
+     ((=ucs		  . #x6FD7)	; 濗
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 13)
     (total-strokes	 . 16)
-    (=ucs		. #x23FD3)	; 𣿓
-    (=cns11643-5	. #x5533)	; &I-C5-5533; [53-19]
+    (=ucs@unicode	. #x6FD7)	; &UU+6FD7;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FD4)	; 𣿔
-    (=cns11643-7	. #x2F3D)	; &I-C7-2F3D; [15-29]
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x3D6F)	; 㵯
+    (=cns11643-3	. #x5532)	; &I-C3-5532; [53-18]
+    (=daikanwa		. 18486)	; &I-M-18486;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FD5)	; 𣿕
-    (=cns11643-7	. #x2F31)	; &I-C7-2F31; [15-17]
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x6FD8)	; 濘
+    (=big5		. #xC0D7)	; &I-B-C0D7;
+    (->subsumptive
+     ((=ucs@jis		  . #x6FD8)	; &GT-23729;
+      (=jis-x0208	  . #x5F3F)	; &GT-23729; [63-31]
+      (=jis-x0213-1	  . #x5F3F)	; &I-JX1-5F3F; [63-31]
+      (=gt		  . 23729)	; &I-GT-23729;
+      (=gt-pj-1		  . #x5F3F)	; &I-GT-23729; [63-31]
+      (=daikanwa	  . 18487)	; &I-M-18487;
+      (=shinjigen	  .  4510)	; &GT-23729;
+      )
+     ((=ucs@unicode	  . #x6FD8)	; &C1-7422;
+      (=cns11643-1	  . #x7422)	; &C1-7422; [84-02]
+      (=gb12345		  . #x4522)	; &C1-7422; [37-02]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FD7)	; 𣿗
-    (=cns11643-7	. #x2F46)	; &I-C7-2F46; [15-38]
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x6FD9)	; 濙
+    (=daikanwa		. 18488)	; &I-M-18488;
+    (=cbeta		. 05546)	; &I-CB05546;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FD8)	; 𣿘
-    (=cns11643-7	. #x2F3B)	; &I-C7-2F3B; [15-27]
+  '((=>ucs		. #x6FD9)	; 濙
+    (morohashi-daikanwa	18488 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=cns11643-3	. #x5535)	; &C3-5535; [53-21]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FD9)	; 𣿙
-    (=cns11643-7	. #x2F38)	; &I-C7-2F38; [15-24]
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x6FDA)	; 濚
+    (=ks-x1001		. #x6739)	; &I-K0-6739; [71-25]
+    (=jis-x0212		. #x4921)	; &I-JSP-4921; [41-01]
+    (=jis-x0213-2	. #x6F44)	; &I-JX2-6F44; [79-36]
+    (=daikanwa		. 18489)	; &I-M-18489;
+    (=jef-china3	. #x57B4)	; &I-JC3-57B4;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FDA)	; 𣿚
-    (=cns11643-7	. #x2F43)	; &I-C7-2F43; [15-35]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FDB)	; 𣿛
-    (=cns11643-7	. #x2F36)	; &I-C7-2F36; [15-22]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FDC)	; 𣿜
-    (=cns11643-7	. #x2F32)	; &I-C7-2F32; [15-18]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FDD)	; 𣿝
-    (=cns11643-5	. #x5531)	; &I-C5-5531; [53-17]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FDE)	; 𣿞
-    (=cns11643-5	. #x552A)	; &I-C5-552A; [53-10]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FE0)	; 𣿠
-    (=cns11643-7	. #x2F3C)	; &I-C7-2F3C; [15-28]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FE1)	; 𣿡
-    (=cns11643-7	. #x2F49)	; &I-C7-2F49; [15-41]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FE2)	; 𣿢
-    (=cns11643-5	. #x552C)	; &I-C5-552C; [53-12]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FE4)	; 𣿤
-    (=cns11643-5	. #x5532)	; &I-C5-5532; [53-18]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x23FF1)	; 𣿱
-    (=cns11643-7	. #x2F2F)	; &I-C7-2F2F; [15-15]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x24008)	; 𤀈
-    (=cns11643-7	. #x2F4A)	; &I-C7-2F4A; [15-42]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x2400E)	; 𤀎
-    (=cns11643-7	. #x2F44)	; &I-C7-2F44; [15-36]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x24011)	; 𤀑
-    (=cns11643-4	. #x5121)	; &I-C4-5121; [49-01]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs		. #x24037)	; 𤀷
-    (=cns11643-5	. #x5537)	; &I-C5-5537; [53-23]
-    ))
-(define-char
-  '((=>ucs		. #x23FE3)	; 𣿣
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=daikanwa		. 18481)	; &M-18481;
-    ))
-(define-char
-  '((morohashi-daikanwa	18481 0 1)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x23FE3)	; 𣿣
-    (=cns11643-5	. #x5B79)	; &I-C5-5B79; [59-89]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x6FD4)	; 濔
-    (=jis-x0208		. #x5F3E)	; &I-J90-5F3E; [63-30]
-    (=cns11643-2	. #x5D3D)	; &I-C2-5D3D; [61-29]
-    (=jis-x0213-1	. #x5F3E)	; &I-JX1-5F3E; [63-30]
-    (=big5		. #xED51)	; &I-B-ED51;
-    (=gt		. 23721)	; &I-GT-23721;
-    (=gt-pj-1		. #x5F3E)	; &I-GT-23721; [63-30]
-    (=daikanwa		. 18482)	; &I-M-18482;
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x6FD5)	; 濕
-    (=jis-x0208		. #x5F3C)	; &I-J90-5F3C; [63-28]
-    (=ks-x1001		. #x6325)	; &I-K0-6325; [67-05]
-    (=cns11643-1	. #x742E)	; &I-C1-742E; [84-14]
-    (=jis-x0213-1	. #x5F3C)	; &I-JX1-5F3C; [63-28]
-    (=gb12345		. #x4A2A)	; 濕 [42-10]
-    (=big5		. #xC0E3)	; &I-B-C0E3;
-    (=gt		. 23692)	; &I-GT-23692;
-    (=gt-pj-1		. #x5F3C)	; &I-GT-23692; [63-28]
-    (=daikanwa		. 18483)	; &I-M-18483;
-    (=shinjigen@rev	.  4335)	; 濕
-    ))
-(define-char
-  '((=>ucs		. #x6FD6)	; 濖
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=daikanwa		. 18484)	; &M-18484;
-    (=cbeta		. 03893)	; &I-CB03893;
-    ))
-(define-char
-  '((morohashi-daikanwa	18484 0 2)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 17)
-    (=ucs		. #x6FD6)	; 濖
-    (=cns11643-3	. #x5530)	; &I-C3-5530; [53-16]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x6FD7)	; 濗
-    (=cns11643-3	. #x552F)	; &I-C3-552F; [53-15]
-    (=daikanwa		. 18485)	; &I-M-18485;
-    ))
-(define-char
-  '((=>ucs		. #x6FD8)	; 濘
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs@jis		. #x6FD8)	; &GT-23729;
-    (=jis-x0208		. #x5F3F)	; &GT-23729; [63-31]
-    (=jis-x0213-1	. #x5F3F)	; &I-JX1-5F3F; [63-31]
-    (=big5		. #xC0D7)	; &I-B-C0D7;
-    (=gt		. 23729)	; &I-GT-23729;
-    (=gt-pj-1		. #x5F3F)	; &I-GT-23729; [63-31]
-    (=daikanwa		. 18487)	; &I-M-18487;
-    (=shinjigen@rev	.  4510)	; &GT-23729;
-    ))
-(define-char
-  '((morohashi-daikanwa	18487 0 0)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x6FD8)	; 濘
-    (=cns11643-1	. #x7422)	; &I-C1-7422; [84-02]
-    (=gb12345		. #x4522)	; 濘 [37-02]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x6FD9)	; 濙
-    (=daikanwa		. 18488)	; &I-M-18488;
-    (=cbeta		. 05546)	; &I-CB05546;
-    ))
-(define-char
-  '((=>ucs		. #x6FD9)	; 濙
-    (morohashi-daikanwa	18488 0 0)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=cns11643-3	. #x5535)	; &C3-5535; [53-21]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x6FDA)	; 濚
-    (=ks-x1001		. #x6739)	; &I-K0-6739; [71-25]
-    (=jis-x0212		. #x4921)	; &I-JSP-4921; [41-01]
-    (=jis-x0213-2	. #x6F44)	; &I-JX2-6F44; [79-36]
-    (=daikanwa		. 18489)	; &I-M-18489;
-    (=jef-china3	. #x57B4)	; &I-JC3-57B4;
-    ))
-(define-char
-  '((=>ucs		. #x6FDA)	; 濚
-    (morohashi-daikanwa	18489 0 0)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=cns11643-3	. #x5536)	; &C3-5536; [53-22]
+  '((=>ucs		. #x6FDA)	; 濚
+    (morohashi-daikanwa	18489 0 0)
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=cns11643-3	. #x5536)	; &C3-5536; [53-22]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -21815,11 +22264,23 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
+    (=ucs		. #x3D70)	; ãµ°
+    (->subsumptive
+     ((=ucs@unicode	  . #x3D70)	; &M-18493;
+      (=daikanwa	  . 18493)	; &M-18493;
+      )
+     ((=cns11643-3	  . #x5538)	; &C3-5538; [53-24]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
     (=ucs		. #x6FDD)	; 濝
+    (=big5		. #xED59)	; &I-B-ED59;
     (->subsumptive
      ((=ucs@cns		  . #x6FDD)	; &M-18494;
       (=cns11643-2	  . #x5D45)	; &M-18494; [61-37]
-      (=big5		  . #xED59)	; &I-B-ED59;
       (=daikanwa	  . 18494)	; &I-M-18494;
       (=jef-china3	  . #x57B5)	; &I-JC3-57B5;
       (mojikyo		  . 018494)	; &MCS-6000483E;
@@ -21831,6 +22292,31 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
+    (=ucs		. #x24023)	; 𤀣
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24023)	; 𤀣
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=daikanwa		. 18495)	; &M-18495;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24023)	; 𤀣
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs@iso		. #x24023)	; &C5-5B7C;
+    (=cns11643-5	. #x5B7C)	; &C5-5B7C; [59-92]
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
     (=ucs		. #x6FDE)	; 濞
     (=gb2312		. #x6528)	; &I-G0-6528; [69-08]
     (=jis-x0212		. #x4922)	; &I-JSP-4922; [41-02]
@@ -21840,108 +22326,149 @@
     (=daikanwa		. 18496)	; &I-M-18496;
     ))
 (define-char
-  '((=>ucs		. #x3D71)	; ãµ±
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=cns11643-1	  . #x6946)	; &M-18102; [73-38]
-      (=daikanwa	  . 18102)	; &I-M-18102;
+     ((name		  . "CJK RADICAL WATER ONE")
+      (=ucs		  . #x2EA1)	; ⺡
       )
-     ((=ucs		  . #x5BF8)	; 寸
+     ((=ucs		  . #x21B3D)	; 𡬽
       ))
-    (=cns11643-4	. #x565E)	; &M-18497; [54-62]
-    (=daikanwa		. 18497)	; &I-M-18497;
-    ))
-(define-char
-  '((morohashi-daikanwa	18497 0 0)
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
     (=ucs		. #x3D71)	; ãµ±
-    (=cbeta		. 00579)	; &I-CB00579;
+    (->subsumptive
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((name		    . "CJK RADICAL WATER ONE")
+	(=ucs		    . #x2EA1)	; ⺡
+	)
+       ((=cns11643-6	    . #x5C30)	; &M-07456; [60-16]
+	(=daikanwa	    . 07456)	; &I-M-07456;
+	))
+      (=cns11643-4	  . #x565E)	; &M-18497; [54-62]
+      (=daikanwa	  . 18497)	; &I-M-18497;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	(=ucs		    . #x2FF0)	; â¿°
+	)
+       ((name		    . "CJK RADICAL WATER ONE")
+	(=ucs		    . #x2EA1)	; ⺡
+	)
+       ((=ucs@iso	    . #x21B3D)	; &U-00021B3D;
+	))
+      (=ucs@unicode	  . #x3D71)	; &CB00579;
+      (=cbeta		  . 00579)	; &CB00579;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6FDF)	; 濟
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs@jis		. #x6FDF)	; &GT-23685;
-    (=jis-x0208		. #x5F3B)	; &GT-23685; [63-27]
-    (=ks-x1001		. #x702D)	; &I-K0-702D; [80-13]
-    (=jis-x0213-1	. #x5F3B)	; &I-JX1-5F3B; [63-27]
+    (=ucs		. #x6FDF)	; 濟
     (=big5		. #xC0D9)	; &I-B-C0D9;
-    (=gt		. 23685)	; &I-GT-23685;
-    (=gt-pj-1		. #x5F3B)	; &I-GT-23685; [63-27]
-    (=daikanwa		. 18498)	; &I-M-18498;
-    (=shinjigen@rev	.  4293)	; &GT-23685;
+    (->subsumptive
+     ((=ucs@jis		  . #x6FDF)	; &GT-23685;
+      (=jis-x0208	  . #x5F3B)	; &GT-23685; [63-27]
+      (=ks-x1001	  . #x702D)	; &I-K0-702D; [80-13]
+      (=jis-x0213-1	  . #x5F3B)	; &I-JX1-5F3B; [63-27]
+      (=gt		  . 23685)	; &I-GT-23685;
+      (=gt-pj-1		  . #x5F3B)	; &I-GT-23685; [63-27]
+      (=daikanwa	  . 18498)	; &I-M-18498;
+      (=shinjigen@1ed	  .  4291)	; &GT-23685;
+      (=shinjigen@rev	  .  4293)	; &GT-23685;
+      )
+     ((=ucs@unicode	  . #x6FDF)	; &C1-7424;
+      (=cns11643-1	  . #x7424)	; &C1-7424; [84-04]
+      (=gb12345		  . #x3C43)	; &C1-7424; [28-35]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	18498 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x6FDF)	; 濟
-    (=cns11643-1	. #x7424)	; &I-C1-7424; [84-04]
-    (=gb12345		. #x3C43)	; 濟 [28-35]
+    (=ucs		. #x24024)	; 𤀤
+    (=cns11643-4	. #x565A)	; &I-C4-565A; [54-58]
+    (=daikanwa		. 18499)	; &I-M-18499;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x24025)	; 𤀥
-    (=cns11643-4	. #x565F)	; &I-C4-565F; [54-63]
-    (=daikanwa		. 18501)	; &I-M-18501;
-    ))
+    (=ucs		. #x3D7A)	; 㵺
+    (->subsumptive
+     ((=cns11643-4	  . #x565B)	; &M-18500; [54-59]
+      (=daikanwa	  . 18500)	; &I-M-18500;
+      )
+     ((=ucs@unicode	  . #x3D7A)	; &UU+3D7A;
+      ))
+    ))
 (define-char
-  '((=>ucs		. #x6FE0)	; æ¿ 
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs@jis		. #x6FE0)	; &GT-23683;
-    (=jis-x0208		. #x396A)	; &GT-23683; [25-74]
-    (=ks-x1001		. #x7B4C)	; &I-K0-7B4C; [91-44]
-    (=jis-x0213-1	. #x396A)	; &I-JX1-396A; [25-74]
-    (=big5		. #xC0DA)	; &I-B-C0DA;
-    (=gt		. 23683)	; &I-GT-23683;
-    (=gt-pj-1		. #x396A)	; &I-GT-23683; [25-74]
-    (=daikanwa		. 18502)	; &I-M-18502;
-    (=shinjigen@rev	.  4504)	; &GT-23683;
+    (=ucs		. #x24025)	; 𤀥
+    (=cns11643-4	. #x565F)	; &I-C4-565F; [54-63]
+    (=daikanwa		. 18501)	; &I-M-18501;
     ))
 (define-char
-  '((morohashi-daikanwa	18502 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x6FE0)	; æ¿ 
-    (=gb2312		. #x6529)	; &I-G0-6529; [69-09]
-    (=cns11643-1	. #x7425)	; &I-C1-7425; [84-05]
+    (=big5		. #xC0DA)	; &I-B-C0DA;
+    (->subsumptive
+     ((=ucs@jis		  . #x6FE0)	; &GT-23683;
+      (=jis-x0208	  . #x396A)	; &GT-23683; [25-74]
+      (=ks-x1001	  . #x7B4C)	; &I-K0-7B4C; [91-44]
+      (=jis-x0213-1	  . #x396A)	; &I-JX1-396A; [25-74]
+      (=gt		  . 23683)	; &I-GT-23683;
+      (=gt-pj-1		  . #x396A)	; &I-GT-23683; [25-74]
+      (=daikanwa	  . 18502)	; &I-M-18502;
+      (=shinjigen	  .  4504)	; &GT-23683;
+      )
+     ((=ucs@unicode	  . #x6FE0)	; &G0-6529;
+      (=gb2312		  . #x6529)	; &G0-6529; [69-09]
+      )
+     ((=cns11643-1	  . #x7425)	; &C1-7425; [84-05]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x6FE1)	; æ¿¡
-    (=jis-x0208		. #x4728)	; &I-J90-4728; [39-08]
-    (=gb2312		. #x6526)	; &I-G0-6526; [69-06]
-    (=ks-x1001		. #x6B21)	; &I-K0-6B21; [75-01]
-    (=jis-x0213-1	. #x4728)	; &I-JX1-4728; [39-08]
-    (=big5		. #xC0E1)	; &I-B-C0E1;
-    (=gt		. 23693)	; &I-GT-23693;
-    (=gt-pj-1		. #x4728)	; &I-GT-23693; [39-08]
-    (=daikanwa		. 18504)	; &I-M-18504;
-    (=shinjigen@rev	.  4505)	; æ¿¡
+    (=ucs		. #x3D72)	; ãµ²
+    (->subsumptive
+     ((=cns11643-4	  . #x5660)	; &M-18503; [54-64]
+      (=daikanwa	  . 18503)	; &I-M-18503;
+      )
+     ((=ucs@unicode	  . #x3D72)	; &UU+3D72;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x6FE1)	; æ¿¡
-    (morohashi-daikanwa	18504 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=cns11643-1	. #x742C)	; &C1-742C; [84-12]
+    (=ucs		. #x6FE1)	; æ¿¡
+    (=big5		. #xC0E1)	; &I-B-C0E1;
+    (->subsumptive
+     ((=ucs@unicode	  . #x6FE1)	; &GT-23693;
+      (=jis-x0208	  . #x4728)	; &GT-23693; [39-08]
+      (=gb2312		  . #x6526)	; &I-G0-6526; [69-06]
+      (=ks-x1001	  . #x6B21)	; &I-K0-6B21; [75-01]
+      (=jis-x0213-1	  . #x4728)	; &I-JX1-4728; [39-08]
+      (=gt		  . 23693)	; &I-GT-23693;
+      (=gt-pj-1		  . #x4728)	; &I-GT-23693; [39-08]
+      (=daikanwa	  . 18504)	; &I-M-18504;
+      (=shinjigen	  .  4505)	; &GT-23693;
+      )
+     ((=cns11643-1	  . #x742C)	; &C1-742C; [84-12]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -21978,9 +22505,21 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x6FE3)	; æ¿£
-    (=cns11643-2	. #x5D3E)	; &I-C2-5D3E; [61-30]
     (=big5		. #xED52)	; &I-B-ED52;
-    (=daikanwa		. 18506)	; &I-M-18506;
+    (->subsumptive
+     ((=ucs@unicode	  . #x6FE3)	; &M-18506;
+      (=daikanwa	  . 18506)	; &M-18506;
+      )
+     ((=cns11643-2	  . #x5D3E)	; &C2-5D3E; [61-30]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x24026)	; 𤀦
+    (=cns11643-5	. #x5B7A)	; &I-C5-5B7A; [59-90]
+    (=daikanwa		. 18507)	; &I-M-18507;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -21998,7 +22537,7 @@
     (=gt		. 23725)	; &I-GT-23725;
     (=gt-pj-1		. #x5E39)	; &I-GT-23725; [62-25]
     (=daikanwa		. 18508)	; &I-M-18508;
-    (=shinjigen@rev	.  4509)	; 濤
+    (=shinjigen		.  4509)	; 濤
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -22017,15 +22556,7 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x6FE6)	; 濦
-    ))
-(define-char
-  '((<-denotational
-     ((=big5		  . #xED56)	; &B-ED56;
-      ))
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=daikanwa		. 18510)	; &M-18510;
+    (=big5		. #xED56)	; &I-B-ED56;
     ))
 (define-char
   '((<-denotational
@@ -22034,7 +22565,7 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=big5		. #xED56)	; &B-ED56;
+    (=daikanwa		. 18510)	; &M-18510;
     ))
 (define-char
   '((<-denotational
@@ -22047,7 +22578,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=big5		  . #xED56)	; &B-ED56;
+     ((=ucs		  . #x6FE6)	; 濦
       ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
@@ -22065,7 +22596,15 @@
     (=daikanwa		. 18511)	; &I-M-18511;
     ))
 (define-char
-  '((=>ucs		. #x3D73)	; ãµ³
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x3D73)	; ãµ³
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3D73)	; ãµ³
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
@@ -22073,12 +22612,17 @@
     (=cbeta		. 06625)	; &I-CB06625;
     ))
 (define-char
-  '((morohashi-daikanwa	18512 0 2)
+  '((<-denotational
+     ((=ucs		  . #x3D73)	; ãµ³
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x3D73)	; ãµ³
-    (=cns11643-3	. #x5534)	; &I-C3-5534; [53-20]
+    (->subsumptive
+     ((=ucs@unicode	  . #x3D73)	; &UU+3D73;
+      )
+     ((=cns11643-3	  . #x5534)	; &C3-5534; [53-20]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -22093,55 +22637,116 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x3D74)	; ãµ´
-    (=cns11643-4	. #x5658)	; &I-C4-5658; [54-56]
-    (=daikanwa		. 18514)	; &I-M-18514;
+    (->subsumptive
+     ((=daikanwa	  . 18514)	; &M-18514;
+      )
+     ((=ucs@unicode	  . #x3D74)	; &UU+3D74;
+      )
+     ((=cns11643-4	  . #x5658)	; &C4-5658; [54-56]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (=ucs		. #x6FE8)	; 濨
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6FE8)	; 濨
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=daikanwa		. 18515)	; &M-18515;
+    (mojikyo		. 018515)	; &MCS-60004853;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6FE8)	; 濨
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs@jis		. #x6FE8)	; &JSP-4923;
+    (=jis-x0212		. #x4923)	; &JSP-4923; [41-03]
+    (mojikyo		. 056056)	; &MCS-6000DAF8;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6FE8)	; 濨
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (total-strokes@cns	     . 17)
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs@unicode	. #x6FE8)	; &C2-5D47;
+    (=cns11643-2	. #x5D47)	; &C2-5D47; [61-39]
+    (=big5		. #xED5B)	; &I-B-ED5B;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x3D75)	; ãµµ
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3D75)	; ãµµ
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
     (->subsumptive
-     ((ideographic-strokes . 14)
-      (total-strokes	   . 17)
-      (=daikanwa	  . 18515)	; &M-18515;
-      (mojikyo		  . 018515)	; &MCS-60004853;
-      )
-     ((ideographic-strokes . 13)
-      (total-strokes	   . 16)
-      (=ucs@jis		  . #x6FE8)	; &JSP-4923;
-      (=jis-x0212	  . #x4923)	; &JSP-4923; [41-03]
-      (mojikyo		  . 056056)	; &MCS-6000DAF8;
+     ((=daikanwa	  . 18516)	; &M-18516;
       )
-     ((total-strokes@cns       . 17)
-      (ideographic-strokes . 13)
-      (total-strokes	   . 16)
-      (=ucs@unicode	  . #x6FE8)	; &C2-5D47;
-      (=cns11643-2	  . #x5D47)	; &C2-5D47; [61-39]
-      (=big5		  . #xED5B)	; &I-B-ED5B;
+     ((=ucs@unicode	  . #x3D75)	; &UU+3D75;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3D75)	; ãµµ
       ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=cns11643-3	. #x552E)	; &C3-552E; [53-14]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (=ucs		. #x6FE9)	; æ¿©
     (=big5		. #xC0E2)	; &I-B-C0E2;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6FE9)	; æ¿©
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=daikanwa		. 18517)	; &M-18517;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6FE9)	; æ¿©
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=cns11643-1	. #x742D)	; &C1-742D; [84-13]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6FE9)	; æ¿©
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
     (->subsumptive
-     ((ideographic-strokes . 14)
-      (total-strokes	   . 17)
-      (=daikanwa	  . 18517)	; &M-18517;
-      )
-     ((ideographic-strokes . 13)
-      (total-strokes	   . 16)
-      (=ucs@jis		  . #x6FE9)	; &JX2-6F46;
+     ((=ucs@jis		  . #x6FE9)	; &JX2-6F46;
       (=ks-x1001	  . #x7B4D)	; &JX2-6F46; [91-45]
       (=jis-x0212	  . #x4924)	; &I-JSP-4924; [41-04]
       (=jis-x0213-2	  . #x6F46)	; &I-JX2-6F46; [79-38]
       )
-     ((ideographic-strokes . 14)
-      (total-strokes	   . 17)
-      (=cns11643-1	  . #x742D)	; &C1-742D; [84-13]
-      )
-     ((ideographic-strokes . 13)
-      (total-strokes	   . 16)
-      (=ucs@unicode	  . #x6FE9)	; &UU+6FE9;
+     ((=ucs@unicode	  . #x6FE9)	; &UU+6FE9;
       ))
     ))
 (define-char
@@ -22149,9 +22754,24 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x6FEA)	; 濪
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6FEA)	; 濪
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=daikanwa		. 18518)	; &M-18518;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6FEA)	; 濪
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
     (->subsumptive
-     ((=daikanwa	  . 18518)	; &M-18518;
-      )
      ((=ucs@unicode	  . #x6FEA)	; &UU+6FEA;
       )
      ((=cns11643-3	  . #x5537)	; &C3-5537; [53-23]
@@ -22162,9 +22782,24 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x24028)	; 𤀨
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24028)	; 𤀨
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=daikanwa		. 18519)	; &M-18519;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24028)	; 𤀨
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
     (->subsumptive
-     ((=daikanwa	  . 18519)	; &M-18519;
-      )
      ((=ucs@iso		  . #x24028)	; &U-00024028;
       )
      ((=cns11643-7	  . #x386E)	; &C7-386E; [24-78]
@@ -22185,8 +22820,10 @@
     (=daikanwa		. 18520)	; &M-18520;
     (=jef-china3	. #x57B6)	; &I-JC3-57B6;
     (<-vulgar
-     ((=jis-x0208@1978	  . #x4654)	; &M-18659; [38-52]
+     ((=ucs@jis/2004	  . #x701E)	; &M-18659;
+      (=jis-x0208@1978	  . #x4654)	; &M-18659; [38-52]
       (=ks-x1001	  . #x6F67)	; &I-K0-6F67; [79-71]
+      (=jis-x0213-1@2004  . #x4654)	; &I-JX3-4654; [38-52]
       (=daikanwa	  . 18659)	; &I-M-18659;
       ))
     (<-vulgar*sources
@@ -22207,13 +22844,15 @@
      ((=ucs@unicode	  . #x701E)	; &GT-23701;
       (=jis-x0208@1983	  . #x4654)	; &GT-23701; [38-52]
       (=jis-x0208@1990	  . #x4654)	; &I-J90-4654; [38-52]
-      (=jis-x0213-1	  . #x4654)	; &I-JX1-4654; [38-52]
+      (=jis-x0213-1@2000  . #x4654)	; &I-JX1-4654; [38-52]
       (=gt		  . 23701)	; &I-GT-23701;
       (=gt-pj-1		  . #x4654)	; &I-GT-23701; [38-52]
       (=jef-china3	  . #x70D8)	; &I-JC3-70D8;
-      (<-simplified@JP
-       ((=jis-x0208@1978    . #x4654)	; &M-18659; [38-52]
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x701E)	; &M-18659;
+	(=jis-x0208@1978    . #x4654)	; &M-18659; [38-52]
 	(=ks-x1001	    . #x6F67)	; &I-K0-6F67; [79-71]
+	(=jis-x0213-1@2004  . #x4654)	; &I-JX3-4654; [38-52]
 	(=daikanwa	    . 18659)	; &I-M-18659;
 	))
       )
@@ -22257,11 +22896,28 @@
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
+    (total-strokes	 . 18)
+    (=ucs		. #x24029)	; 𤀩
+    (->subsumptive
+     ((=ucs@iso		  . #x24029)	; &M-18522;
+      (=daikanwa	  . 18522)	; &M-18522;
+      )
+     ((=cns11643-4	  . #x5B52)	; &C4-5B52; [59-50]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x2402A)	; 𤀪
-    (=cns11643-5	. #x5B7B)	; &I-C5-5B7B; [59-91]
-    (=daikanwa		. 18523)	; &I-M-18523;
-    (=cbeta		. 04215)	; &I-CB04215;
+    (->subsumptive
+     ((=ucs@iso		  . #x2402A)	; &M-18523;
+      (=daikanwa	  . 18523)	; &M-18523;
+      )
+     ((=cbeta		  . 04215)	; &CB04215;
+      )
+     ((=cns11643-5	  . #x5B7B)	; &C5-5B7B; [59-91]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -22277,7 +22933,7 @@
     (=gt		. 23697)	; &I-GT-23697;
     (=gt-pj-1		. #x5F3D)	; &I-GT-23697; [63-29]
     (=daikanwa		. 18524)	; &I-M-18524;
-    (=shinjigen@rev	.  4506)	; 濬
+    (=shinjigen		.  4506)	; 濬
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -22348,6 +23004,56 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
+    (=ucs		. #x3D77)	; ãµ·
+    (->subsumptive
+     ((=daikanwa	  . 18528)	; &M-18528;
+      )
+     ((=ucs@unicode	  . #x3D77)	; &C4-565C;
+      (=cns11643-4	  . #x565C)	; &C4-565C; [54-60]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 18)
+    (=ucs		. #x24032)	; 𤀲
+    (->subsumptive
+     ((=daikanwa	  . 18529)	; &M-18529;
+      )
+     ((=cns11643-5	  . #x6238)	; &C5-6238; [66-24]
+      )
+     ((=ucs@iso		  . #x24032)	; &U-00024032;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x2402B)	; 𤀫
+    (->subsumptive
+     ((=daikanwa	  . 18530)	; &M-18530;
+      )
+     ((=ucs@iso		  . #x2402B)	; &C5-5B78;
+      (=cns11643-5	  . #x5B78)	; &C5-5B78; [59-88]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x2402C)	; 𤀬
+    (->subsumptive
+     ((=daikanwa	  . 18531)	; &M-18531;
+      )
+     ((=ucs@iso		  . #x2402C)	; &U-0002402C;
+      )
+     ((=cns11643-7	  . #x3870)	; &C7-3870; [24-80]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
     (=ucs		. #x6FEF)	; 濯
     (=big5		. #xC0DE)	; &I-B-C0DE;
     ))
@@ -22392,57 +23098,79 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x6FF0)	; æ¿°
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs@jis		. #x6FF0)	; &M-18533;
-    (=jis-x0212		. #x4925)	; &M-18533; [41-05]
-    (=jis-x0213-1	. #x773A)	; &I-JX1-773A; [87-26]
+    (=ucs		. #x6FF0)	; æ¿°
     (=big5		. #xC0E5)	; &I-B-C0E5;
-    (=daikanwa		. 18533)	; &I-M-18533;
-    (=jef-china3	. #x92A3)	; &I-JC3-92A3;
+    (->subsumptive
+     ((=ucs@jis		  . #x6FF0)	; &M-18533;
+      (=jis-x0212	  . #x4925)	; &M-18533; [41-05]
+      (=jis-x0213-1	  . #x773A)	; &I-JX1-773A; [87-26]
+      (=daikanwa	  . 18533)	; &I-M-18533;
+      (=jef-china3	  . #x92A3)	; &I-JC3-92A3;
+      )
+     ((=ucs@unicode	  . #x6FF0)	; &C1-7430;
+      (=cns11643-1	  . #x7430)	; &C1-7430; [84-16]
+      (=gb12345		  . #x4E2B)	; &C1-7430; [46-11]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	18533 0 1)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x6FF0)	; æ¿°
-    (=cns11643-1	. #x7430)	; &I-C1-7430; [84-16]
-    (=gb12345		. #x4E2B)	; æ¿° [46-11]
+    (=ucs		. #x2402D)	; 𤀭
+    (=cns11643-7	. #x3876)	; &I-C7-3876; [24-86]
+    (=daikanwa		. 18534)	; &I-M-18534;
     ))
 (define-char
-  '((=>ucs		. #x6FF1)	; 濱
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs@jis		. #x6FF1)	; &GT-23739;
-    (=jis-x0208		. #x5F40)	; &GT-23739; [63-32]
-    (=ks-x1001		. #x5E34)	; &I-K0-5E34; [62-20]
-    (=jis-x0213-1	. #x5F40)	; &I-JX1-5F40; [63-32]
-    (=big5		. #xC0D8)	; &I-B-C0D8;
-    (=gt		. 23739)	; &I-GT-23739;
-    (=gt-pj-1		. #x5F40)	; &I-GT-23739; [63-32]
-    (=daikanwa		. 18537)	; &I-M-18537;
-    (=shinjigen@rev	.  4235)	; &GT-23739;
+    (=ucs		. #x2402E)	; 𤀮
+    (->subsumptive
+     ((=daikanwa	  . 18535)	; &M-18535;
+      )
+     ((=ucs@iso		  . #x2402E)	; &C7-386F;
+      (=cns11643-7	  . #x386F)	; &C7-386F; [24-79]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	18537 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x6FF1)	; 濱
-    (=cns11643-1	. #x7423)	; &I-C1-7423; [84-03]
-    (=gb12345		. #x3175)	; 濱 [17-85]
+    (=ucs		. #x2402F)	; 𤀯
+    (=cns11643-7	. #x3879)	; &I-C7-3879; [24-89]
+    (=daikanwa		. 18536)	; &I-M-18536;
     ))
 (define-char
-  '((=>ucs		. #x6FF5)	; 濵
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs@jis		. #x6FF5)	; &M-18538;
-    (=jis-x0212		. #x4926)	; &M-18538; [41-06]
+    (=ucs		. #x6FF1)	; 濱
+    (=big5		. #xC0D8)	; &I-B-C0D8;
+    (->subsumptive
+     ((=ucs@jis		  . #x6FF1)	; &GT-23739;
+      (=jis-x0208	  . #x5F40)	; &GT-23739; [63-32]
+      (=ks-x1001	  . #x5E34)	; &I-K0-5E34; [62-20]
+      (=jis-x0213-1	  . #x5F40)	; &I-JX1-5F40; [63-32]
+      (=gt		  . 23739)	; &I-GT-23739;
+      (=gt-pj-1		  . #x5F40)	; &I-GT-23739; [63-32]
+      (=daikanwa	  . 18537)	; &I-M-18537;
+      (=shinjigen	  .  4235)	; &GT-23739;
+      )
+     ((=ucs@unicode	  . #x6FF1)	; &C1-7423;
+      (=cns11643-1	  . #x7423)	; &C1-7423; [84-03]
+      (=gb12345		  . #x3175)	; &C1-7423; [17-85]
+      ))
+    ))
+(define-char
+  '((=>ucs		. #x6FF5)	; 濵
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs@jis		. #x6FF5)	; &M-18538;
+    (=jis-x0212		. #x4926)	; &M-18538; [41-06]
     (=jis-x0213-1	. #x773B)	; &I-JX1-773B; [87-27]
     (=daikanwa		. 18538)	; &I-M-18538;
     (=jef-china3	. #x57B8)	; &I-JC3-57B8;
@@ -22459,61 +23187,192 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
+    (=ucs		. #x3D78)	; 㵸
+    (=cns11643-3	. #x553B)	; &I-C3-553B; [53-27]
+    (=daikanwa		. 18539)	; &I-M-18539;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x24030)	; 𤀰
+    (->subsumptive
+     ((=daikanwa	  . 18540)	; &M-18540;
+      )
+     ((=ucs@iso		  . #x24030)	; &C7-3874;
+      (=cns11643-7	  . #x3874)	; &C7-3874; [24-84]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
     (=ucs		. #x6FF2)	; 濲
-    (=cns11643-2	. #x5D44)	; &I-C2-5D44; [61-36]
     (=big5		. #xED58)	; &I-B-ED58;
-    (=daikanwa		. 18541)	; &I-M-18541;
+    (->subsumptive
+     ((=daikanwa	  . 18541)	; &M-18541;
+      )
+     ((=ucs@unicode	  . #x6FF2)	; &C2-5D44;
+      (=cns11643-2	  . #x5D44)	; &C2-5D44; [61-36]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (=ucs		. #x24031)	; 𤀱
     ))
 (define-char
-  '((=>ucs		. #x6FF6)	; 濶
+  '((<-denotational
+     ((=ucs		  . #x24031)	; 𤀱
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=daikanwa		. 18547)	; &M-18547;
+    (=daikanwa		. 18542)	; &M-18542;
     ))
 (define-char
-  '((morohashi-daikanwa	18547 0 0)
+  '((<-denotational
+     ((=ucs		  . #x24031)	; 𤀱
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x6FF6)	; 濶
-    (=jis-x0208		. #x6F69)	; &I-J90-6F69; [79-73]
-    (=cns11643-3	. #x5539)	; &I-C3-5539; [53-25]
-    (=jis-x0213-1	. #x6F69)	; &I-JX1-6F69; [79-73]
-    (=gt		. 23669)	; &I-GT-23669;
-    (=gt-pj-1		. #x6F69)	; &I-GT-23669; [79-73]
-    (=shinjigen@rev	.  8832)	; 濶
-    (=cbeta		. 04583)	; &I-CB04583;
+    (=cns11643-7	. #x3873)	; &C7-3873; [24-83]
     ))
 (define-char
-  '((=>ucs		. #x24034)	; 𤀴
+  '((<-denotational
+     ((=ucs		  . #x24031)	; 𤀱
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs@iso		. #x24031)	; &U-00024031;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (=ucs		. #x3D79)	; ãµ¹
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3D79)	; ãµ¹
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=daikanwa		. 18548)	; &M-18548;
+    (->subsumptive
+     ((=daikanwa	  . 18544)	; &M-18544;
+      )
+     ((=cns11643-4	  . #x5659)	; &C4-5659; [54-57]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	18548 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3D79)	; ãµ¹
+      ))
     (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs@unicode	. #x3D79)	; &UU+3D79;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x24034)	; 𤀴
-    (=cns11643-7	. #x387B)	; &I-C7-387B; [24-91]
+    (=ucs		. #x24033)	; 𤀳
+    (->subsumptive
+     ((=daikanwa	  . 18545)	; &M-18545;
+      )
+     ((=ucs@iso		  . #x24033)	; &U-00024033;
+      )
+     ((=cns11643-7	  . #x3875)	; &C7-3875; [24-85]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x24036)	; 𤀶
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=daikanwa		. 18549)	; &M-18549;
+    (=ucs		. #x24035)	; 𤀵
+    (->subsumptive
+     ((=daikanwa	  . 18546)	; &M-18546;
+      )
+     ((=ucs@iso		  . #x24035)	; &C5-5B7D;
+      (=cns11643-5	  . #x5B7D)	; &C5-5B7D; [59-93]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	18549 0 1)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x6FF6)	; 濶
+    (->subsumptive
+     ((=daikanwa	  . 18547)	; &M-18547;
+      (<-vulgar
+       ((=daikanwa	    . 41429)	; &M-41429;
+	))
+      (<-vulgar*sources
+       zhengzitong daikanwa)
+      )
+     ((=ucs@unicode	  . #x6FF6)	; &GT-23669;
+      (=jis-x0208	  . #x6F69)	; &GT-23669; [79-73]
+      (=cns11643-3	  . #x5539)	; &I-C3-5539; [53-25]
+      (=jis-x0213-1	  . #x6F69)	; &I-JX1-6F69; [79-73]
+      (=gt		  . 23669)	; &I-GT-23669;
+      (=gt-pj-1		  . #x6F69)	; &I-GT-23669; [79-73]
+      (=shinjigen	  .  8832)	; &GT-23669;
+      (=cbeta		  . 04583)	; &I-CB04583;
+      (<-vulgar
+       ((=ucs@unicode	    . #x95CA)	; &GT-55664;
+	(=jis-x0208	    . #x6F68)	; &GT-55664; [79-72]
+	(=ks-x1001	    . #x7C44)	; &I-K0-7C44; [92-36]
+	(=cns11643-1	    . #x757A)	; &I-C1-757A; [85-90]
+	(=jis-x0213-1	    . #x6F68)	; &I-JX1-6F68; [79-72]
+	(=shinjigen	    .  8831)	; &GT-55664;
+	))
+      (<-vulgar*sources
+       shinjigen)
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs		. #x24034)	; 𤀴
+    (->subsumptive
+     ((=daikanwa	  . 18548)	; &M-18548;
+      )
+     ((=ucs@iso		  . #x24034)	; &U-00024034;
+      )
+     ((=cns11643-7	  . #x387B)	; &C7-387B; [24-91]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
     (=ucs		. #x24036)	; 𤀶
-    (=cns11643-7	. #x3877)	; &I-C7-3877; [24-87]
+    (->subsumptive
+     ((=daikanwa	  . 18549)	; &M-18549;
+      )
+     ((=ucs@iso		  . #x24036)	; &U-00024036;
+      )
+     ((=cns11643-7	  . #x3877)	; &C7-3877; [24-87]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (=ucs		. #x24037)	; 𤀷
+    (->subsumptive
+     ((ideographic-strokes . 14)
+      (total-strokes	   . 17)
+      (->subsumptive
+       ((=daikanwa	    . 18550)	; &M-18550;
+	)
+       ((=ucs@iso	    . #x24037)	; &U-00024037;
+	))
+      )
+     ((ideographic-strokes . 13)
+      (total-strokes	   . 16)
+      (=cns11643-5	  . #x5537)	; &C5-5537; [53-23]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
@@ -22524,34 +23383,56 @@
     (=daikanwa		. 18551)	; &I-M-18551;
     ))
 (define-char
-  '((=>ucs		. #x2404D)	; 𤁍
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=daikanwa		. 18552)	; &M-18552;
+    (=ucs		. #x2404D)	; 𤁍
+    (->subsumptive
+     ((=daikanwa	  . 18552)	; &M-18552;
+      )
+     ((=cns11643-7	  . #x3871)	; &C7-3871; [24-81]
+      )
+     ((=ucs@iso		  . #x2404D)	; &U-0002404D;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (=ucs		. #x3D7B)	; ãµ»
     ))
 (define-char
-  '((morohashi-daikanwa	18552 0 1)
+  '((<-denotational
+     ((=ucs		  . #x3D7B)	; ãµ»
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x2404D)	; 𤁍
-    (=cns11643-7	. #x3871)	; &I-C7-3871; [24-81]
+    (=daikanwa		. 18553)	; &M-18553;
     ))
 (define-char
-  '((=>ucs		. #x3D7B)	; ãµ»
+  '((<-denotational
+     ((=ucs		  . #x3D7B)	; ãµ»
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=daikanwa		. 18553)	; &M-18553;
+    (=cns11643-3	. #x5533)	; &C3-5533; [53-19]
     ))
 (define-char
-  '((morohashi-daikanwa	18553 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3D7B)	; ãµ»
+      ))
     (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs@unicode	. #x3D7B)	; &UU+3D7B;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x3D7B)	; ãµ»
-    (=cns11643-3	. #x5533)	; &I-C3-5533; [53-19]
+    (=ucs		. #x24049)	; 𤁉
+    (=cns11643-7	. #x3872)	; &I-C7-3872; [24-82]
+    (=daikanwa		. 18554)	; &I-M-18554;
     ))
 (define-char
   '((=>ucs		. #x2404C)	; 𤁌
@@ -22572,464 +23453,750 @@
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x3D68)	; 㵨
-    (=cns11643-4	. #x5656)	; &I-C4-5656; [54-54]
+    (=ucs		. #x6FF8)	; 濸
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
+    (=ucs		. #x6FF9)	; 濹
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6FF9)	; 濹
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x3D6F)	; 㵯
-    (=cns11643-3	. #x5532)	; &I-C3-5532; [53-18]
+    (=ucs@unicode	. #x6FF9)	; &JSP-4927;
+    (=jis-x0212		. #x4927)	; &JSP-4927; [41-07]
+    (<-simplified@JP/jis
+     ((=ucs@jis/2000	  . #x6FF9)	; &JX1-7739;
+      (=ucs@jis/2004	  . #x6FF9)	; &JX1-7739;
+      (=jis-x0213-1	  . #x7739)	; &JX1-7739; [87-25]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x3D70)	; ãµ°
-    (=cns11643-3	. #x5538)	; &I-C3-5538; [53-24]
+    (=ucs		. #x24039)	; 𤀹
+    (=cns11643-3	. #x553A)	; &I-C3-553A; [53-26]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x3D72)	; ãµ²
-    (=cns11643-4	. #x5660)	; &I-C4-5660; [54-64]
+    (=ucs		. #x2403E)	; 𤀾
+    (=cns11643-7	. #x3878)	; &I-C7-3878; [24-88]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x3D75)	; ãµµ
-    (=cns11643-3	. #x552E)	; &I-C3-552E; [53-14]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x3D7D)	; ãµ½
+    (=cns11643-4	. #x5B56)	; &I-C4-5B56; [59-54]
+    (=daikanwa		. 18556)	; &I-M-18556;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x3D77)	; ãµ·
-    (=cns11643-4	. #x565C)	; &I-C4-565C; [54-60]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x6FFA)	; 濺
+    (=jis-x0208		. #x5F45)	; &I-J90-5F45; [63-37]
+    (=cns11643-1	. #x765D)	; &I-C1-765D; [86-61]
+    (=jis-x0213-1	. #x5F45)	; &I-JX1-5F45; [63-37]
+    (=gb12345		. #x3D26)	; 濺 [29-06]
+    (=big5		. #xC271)	; &I-B-C271;
+    (=gt		. 23816)	; &I-GT-23816;
+    (=gt-pj-1		. #x5F45)	; &I-GT-23816; [63-37]
+    (=daikanwa		. 18557)	; &I-M-18557;
+    (=shinjigen		.  4515)	; 濺
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x3D78)	; 㵸
-    (=cns11643-3	. #x553B)	; &I-C3-553B; [53-27]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x24061)	; 𤁡
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24061)	; 𤁡
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=daikanwa		. 18558)	; &M-18558;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24061)	; 𤁡
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs@iso		. #x24061)	; &C5-623F;
+    (=cns11643-5	. #x623F)	; &C5-623F; [66-31]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x3D79)	; ãµ¹
-    (=cns11643-4	. #x5659)	; &I-C4-5659; [54-57]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x3D7E)	; ãµ¾
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3D7E)	; ãµ¾
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=daikanwa		. 18559)	; &M-18559;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3D7E)	; ãµ¾
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (->subsumptive
+     ((=ucs@unicode	  . #x3D7E)	; &UU+3D7E;
+      )
+     ((=cns11643-4	  . #x5B54)	; &C4-5B54; [59-52]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x3D7A)	; 㵺
-    (=cns11643-4	. #x565B)	; &I-C4-565B; [54-59]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x24062)	; 𤁢
+    (->subsumptive
+     ((=daikanwa	  . 18560)	; &M-18560;
+      )
+     ((=cns11643-5	  . #x6246)	; &C5-6246; [66-38]
+      )
+     ((=ucs@iso		  . #x24062)	; &U-00024062;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x6FF8)	; 濸
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x6FFB)	; æ¿»
+    (=cns11643-2	. #x6222)	; &I-C2-6222; [66-02]
+    (=big5		. #xEFF4)	; &I-B-EFF4;
+    (=daikanwa		. 18561)	; &I-M-18561;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (=ucs		. #x6FF9)	; 濹
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x3D7F)	; 㵿
+    (=cns11643-4	. #x5B5A)	; &I-C4-5B5A; [59-58]
+    (=daikanwa		. 18562)	; &I-M-18562;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x6FFC)	; 濼
+    (=big5		. #xEFF6)	; &I-B-EFF6;
+    (->subsumptive
+     ((=ucs@unicode	  . #x6FFC)	; &M-18563;
+      (=jis-x0212	  . #x4928)	; &M-18563; [41-08]
+      (=jis-x0213-2	  . #x6F48)	; &I-JX2-6F48; [79-40]
+      (=gb12345		  . #x6378)	; &M-18563; [67-88]
+      (=daikanwa	  . 18563)	; &I-M-18563;
+      (=jef-china3	  . #x8CC9)	; &I-JC3-8CC9;
+      )
+     ((=ucs@cns		  . #x6FFC)	; &C2-6224;
+      (=cns11643-2	  . #x6224)	; &C2-6224; [66-04]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x6FFD)	; 濽
+    (=jis-x0212		. #x4929)	; &I-JSP-4929; [41-09]
+    (=cns11643-3	. #x5828)	; &I-C3-5828; [56-08]
+    (=daikanwa		. 18564)	; &I-M-18564;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x6FFE)	; 濾
+    (=big5		. #xC26F)	; &I-B-C26F;
+    (->subsumptive
+     ((=ucs@unicode	  . #x6FFE)	; &GT-23868;
+      (=jis-x0208	  . #x5F49)	; &GT-23868; [63-41]
+      (=ks-x1001	  . #x556B)	; &I-K0-556B; [53-75]
+      (=jis-x0213-1	  . #x5F49)	; &I-JX1-5F49; [63-41]
+      (=gb12345		  . #x424B)	; &GT-23868; [34-43]
+      (=gt		  . 23868)	; &I-GT-23868;
+      (=gt-pj-1		  . #x5F49)	; &I-GT-23868; [63-41]
+      (=daikanwa	  . 18565)	; &I-M-18565;
+      (=shinjigen	  .  4520)	; &GT-23868;
+      )
+     ((=cns11643-1	  . #x765B)	; &C1-765B; [86-59]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x24063)	; 𤁣
+    (->subsumptive
+     ((=ucs@iso		  . #x24063)	; &M-18566;
+      (=daikanwa	  . 18566)	; &M-18566;
+      )
+     ((=cns11643-5	  . #x6245)	; &C5-6245; [66-37]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x24064)	; 𤁤
+    (->subsumptive
+     ((=ucs@iso		  . #x24064)	; &M-18567;
+      (=daikanwa	  . 18567)	; &M-18567;
+      )
+     ((=cns11643-4	  . #x5B5D)	; &C4-5B5D; [59-61]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x24065)	; 𤁥
+    (->subsumptive
+     ((=ucs@iso		  . #x24065)	; &M-18568;
+      (=daikanwa	  . 18568)	; &M-18568;
+      )
+     ((=cns11643-5	  . #x623D)	; &C5-623D; [66-29]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (=ucs		. #x6FFF)	; æ¿¿
+    (=big5		. #xEFF2)	; &I-B-EFF2;
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x6FF9)	; 濹
+     ((=ucs		  . #x6FFF)	; æ¿¿
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs@cns		. #x6FFF)	; &M-18569;
+    (=cns11643-2	. #x617E)	; &M-18569; [65-94]
+    (=daikanwa		. 18569)	; &I-M-18569;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6FFF)	; æ¿¿
       ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs@unicode	. #x6FF9)	; &JSP-4927;
-    (=jis-x0212		. #x4927)	; &JSP-4927; [41-07]
-    (<-simplified@JP
-     ((=ucs@jis/2000	  . #x6FF9)	; &JX1-7739;
-      (=jis-x0213-1	  . #x7739)	; &JX1-7739; [87-25]
+    (=ucs@unicode	. #x6FFF)	; &UU+6FFF;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x24066)	; 𤁦
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24066)	; 𤁦
       ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=daikanwa		. 18570)	; &M-18570;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24066)	; 𤁦
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs@iso		. #x24066)	; &C5-6239;
+    (=cns11643-5	. #x6239)	; &C5-6239; [66-25]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x23FDF)	; 𣿟
-    (=cns11643-5	. #x5B77)	; &I-C5-5B77; [59-87]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x7000)	; 瀀
+    (=big5		. #xEFF3)	; &I-B-EFF3;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7000)	; 瀀
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (->subsumptive
+     ((=daikanwa	  . 18571)	; &M-18571;
+      )
+     ((=ucs@cns		  . #x7000)	; &C2-6221;
+      (=cns11643-2	  . #x6221)	; &C2-6221; [66-01]
+      (mojikyo		  . 018571)	; &MCS-6000488B;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7000)	; 瀀
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs@unicode	. #x7000)	; &JX2-6F49;
+    (=jis-x0212		. #x492A)	; &JX2-6F49; [41-10]
+    (=jis-x0213-2	. #x6F49)	; &I-JX2-6F49; [79-41]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x24023)	; 𤀣
-    (=cns11643-5	. #x5B7C)	; &I-C5-5B7C; [59-92]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x24067)	; 𤁧
+    (=cns11643-5	. #x6242)	; &I-C5-6242; [66-34]
+    (=daikanwa		. 18572)	; &I-M-18572;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x24024)	; 𤀤
-    (=cns11643-4	. #x565A)	; &I-C4-565A; [54-58]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x7001)	; 瀁
+    (=big5		. #xEFEE)	; &I-B-EFEE;
+    (->subsumptive
+     ((=ucs@cns		  . #x7001)	; &GT-23856;
+      (=ucs@jis		  . #x7001)	; &GT-23856;
+      (=jis-x0208	  . #x5F47)	; &GT-23856; [63-39]
+      (=ks-x1001	  . #x6548)	; &I-K0-6548; [69-40]
+      (=cns11643-2	  . #x617A)	; &I-C2-617A; [65-90]
+      (=jis-x0213-1	  . #x5F47)	; &I-JX1-5F47; [63-39]
+      (=gt		  . 23856)	; &I-GT-23856;
+      (=gt-pj-1		  . #x5F47)	; &I-GT-23856; [63-39]
+      (=daikanwa	  . 18573)	; &I-M-18573;
+      )
+     ((=ucs@unicode	  . #x7001)	; &UU+7001;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x24026)	; 𤀦
-    (=cns11643-5	. #x5B7A)	; &I-C5-5B7A; [59-90]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x7002)	; 瀂
+    (=cns11643-3	. #x582A)	; &I-C3-582A; [56-10]
+    (=daikanwa		. 18574)	; &I-M-18574;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x24068)	; 𤁨
+    (=cns11643-7	. #x4040)	; &I-C7-4040; [32-32]
+    (=daikanwa		. 18575)	; &I-M-18575;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x7003)	; 瀃
+    (=cns11643-3	. #x5827)	; &I-C3-5827; [56-07]
+    (=daikanwa		. 18576)	; &I-M-18576;
+    (=cbeta		. 01580)	; &I-CB01580;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x24069)	; 𤁩
+    (=cns11643-7	. #x4046)	; &I-C7-4046; [32-38]
+    (=daikanwa		. 18577)	; &I-M-18577;
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x2406A)	; 𤁪
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2406A)	; 𤁪
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=daikanwa		. 18578)	; &M-18578;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2406A)	; 𤁪
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs@iso		. #x2406A)	; &C4-5B59;
+    (=cns11643-4	. #x5B59)	; &C4-5B59; [59-57]
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x2406B)	; 𤁫
+    (->subsumptive
+     ((=ucs@iso		  . #x2406B)	; &M-18579;
+      (=daikanwa	  . 18579)	; &M-18579;
+      )
+     ((=cns11643-5	  . #x624B)	; &C5-624B; [66-43]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x2406C)	; 𤁬
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2406C)	; 𤁬
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24029)	; 𤀩
-    (=cns11643-4	. #x5B52)	; &I-C4-5B52; [59-50]
+    (=daikanwa		. 18580)	; &M-18580;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x2402B)	; 𤀫
-    (=cns11643-5	. #x5B78)	; &I-C5-5B78; [59-88]
+  '((<-denotational
+     ((=ucs		  . #x2406C)	; 𤁬
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs@iso		. #x2406C)	; &C5-6244;
+    (=cns11643-5	. #x6244)	; &C5-6244; [66-36]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x2402C)	; 𤀬
-    (=cns11643-7	. #x3870)	; &I-C7-3870; [24-80]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x2406D)	; 𤁭
+    (=cns11643-7	. #x403C)	; &I-C7-403C; [32-28]
+    (=daikanwa		. 18581)	; &I-M-18581;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x2402D)	; 𤀭
-    (=cns11643-7	. #x3876)	; &I-C7-3876; [24-86]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x2406E)	; 𤁮
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x2402E)	; 𤀮
-    (=cns11643-7	. #x386F)	; &I-C7-386F; [24-79]
+  '((<-denotational
+     ((=ucs		  . #x2406E)	; 𤁮
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=cns11643-5	. #x6241)	; &M-18582; [66-33]
+    (=daikanwa		. 18582)	; &I-M-18582;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x2402F)	; 𤀯
-    (=cns11643-7	. #x3879)	; &I-C7-3879; [24-89]
+  '((<-denotational
+     ((=ucs		  . #x2406E)	; 𤁮
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs@iso		. #x2406E)	; &U-0002406E;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x24030)	; 𤀰
-    (=cns11643-7	. #x3874)	; &I-C7-3874; [24-84]
+    (=ucs		. #x7004)	; 瀄
+    (=big5		. #xE9F6)	; &I-B-E9F6;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x24031)	; 𤀱
-    (=cns11643-7	. #x3873)	; &I-C7-3873; [24-83]
+  '((<-denotational
+     ((=ucs		  . #x7004)	; 瀄
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=daikanwa		. 18583)	; &M-18583;
+    (mojikyo		. 018583)	; &MCS-60004897;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 18)
-    (=ucs		. #x24032)	; 𤀲
-    (=cns11643-5	. #x6238)	; &I-C5-6238; [66-24]
+  '((<-denotational
+     ((=ucs		  . #x7004)	; 瀄
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs@unicode	. #x7004)	; &C2-5823;
+    (=cns11643-2	. #x5823)	; &C2-5823; [56-03]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x24033)	; 𤀳
-    (=cns11643-7	. #x3875)	; &I-C7-3875; [24-85]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x2406F)	; 𤁯
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x24035)	; 𤀵
-    (=cns11643-5	. #x5B7D)	; &I-C5-5B7D; [59-93]
+  '((<-denotational
+     ((=ucs		  . #x2406F)	; 𤁯
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs@iso		. #x2406F)	; &M-18584;
+    (=daikanwa		. 18584)	; &M-18584;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x24039)	; 𤀹
-    (=cns11643-3	. #x553A)	; &I-C3-553A; [53-26]
+  '((<-denotational
+     ((=ucs		  . #x2406F)	; 𤁯
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=cns11643-5	. #x624A)	; &C5-624A; [66-42]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x2403E)	; 𤀾
-    (=cns11643-7	. #x3878)	; &I-C7-3878; [24-88]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x24070)	; 𤁰
+    (=cns11643-4	. #x5B58)	; &I-C4-5B58; [59-56]
+    (=daikanwa		. 18585)	; &I-M-18585;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x24049)	; 𤁉
-    (=cns11643-7	. #x3872)	; &I-C7-3872; [24-82]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x3D80)	; 㶀
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational
+     ((=ucs		  . #x3D80)	; 㶀
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x6FFA)	; 濺
-    (=jis-x0208		. #x5F45)	; &I-J90-5F45; [63-37]
-    (=cns11643-1	. #x765D)	; &I-C1-765D; [86-61]
-    (=jis-x0213-1	. #x5F45)	; &I-JX1-5F45; [63-37]
-    (=gb12345		. #x3D26)	; 濺 [29-06]
-    (=big5		. #xC271)	; &I-B-C271;
-    (=gt		. 23816)	; &I-GT-23816;
-    (=gt-pj-1		. #x5F45)	; &I-GT-23816; [63-37]
-    (=daikanwa		. 18557)	; &I-M-18557;
-    (=shinjigen@rev	.  4515)	; 濺
+    (=daikanwa		. 18586)	; &M-18586;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational
+     ((=ucs		  . #x3D80)	; 㶀
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x6FFB)	; æ¿»
-    (=cns11643-2	. #x6222)	; &I-C2-6222; [66-02]
-    (=big5		. #xEFF4)	; &I-B-EFF4;
-    (=daikanwa		. 18561)	; &I-M-18561;
+    (->subsumptive
+     ((=ucs@unicode	  . #x3D80)	; &UU+3D80;
+      )
+     ((=cns11643-4	  . #x5B57)	; &C4-5B57; [59-55]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x6FFC)	; 濼
+    (=ucs		. #x7005)	; 瀅
+    (=big5		. #xEFEF)	; &I-B-EFEF;
     (->subsumptive
-     ((=ucs@unicode	  . #x6FFC)	; &M-18563;
-      (=jis-x0212	  . #x4928)	; &M-18563; [41-08]
-      (=jis-x0213-2	  . #x6F48)	; &I-JX2-6F48; [79-40]
-      (=gb12345		  . #x6378)	; &M-18563; [67-88]
-      (=big5		  . #xEFF6)	; &I-B-EFF6;
-      (=daikanwa	  . 18563)	; &I-M-18563;
-      (=jef-china3	  . #x8CC9)	; &I-JC3-8CC9;
+     ((=ucs@unicode	  . #x7005)	; &M-18587;
+      (=ks-x1001	  . #x7B24)	; &M-18587; [91-04]
+      (=jis-x0212	  . #x492B)	; &I-JSP-492B; [41-11]
+      (=jis-x0213-1	  . #x773C)	; &I-JX1-773C; [87-28]
+      (=gb12345		  . #x645E)	; &M-18587; [68-62]
+      (=daikanwa	  . 18587)	; &I-M-18587;
+      (=jef-china3	  . #x57B9)	; &I-JC3-57B9;
       )
-     ((=ucs@cns		  . #x6FFC)	; &C2-6224;
-      (=cns11643-2	  . #x6224)	; &C2-6224; [66-04]
+     ((=ucs@cns		  . #x7005)	; &C2-617B;
+      (=cns11643-2	  . #x617B)	; &C2-617B; [65-91]
       ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x6FFD)	; 濽
-    (=jis-x0212		. #x4929)	; &I-JSP-4929; [41-09]
-    (=cns11643-3	. #x5828)	; &I-C3-5828; [56-08]
-    (=daikanwa		. 18564)	; &I-M-18564;
+    (=ucs		. #x3D81)	; 㶁
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational
+     ((=ucs		  . #x3D81)	; 㶁
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x6FFE)	; 濾
-    (=jis-x0208		. #x5F49)	; &I-J90-5F49; [63-41]
-    (=ks-x1001		. #x556B)	; &I-K0-556B; [53-75]
-    (=jis-x0213-1	. #x5F49)	; &I-JX1-5F49; [63-41]
-    (=gb12345		. #x424B)	; 濾 [34-43]
-    (=big5		. #xC26F)	; &I-B-C26F;
-    (=gt		. 23868)	; &I-GT-23868;
-    (=gt-pj-1		. #x5F49)	; &I-GT-23868; [63-41]
-    (=daikanwa		. 18565)	; &I-M-18565;
-    (=shinjigen@rev	.  4520)	; 濾
+    (=daikanwa		. 18588)	; &M-18588;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3D81)	; 㶁
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs@unicode	. #x3D81)	; &UU+3D81;
     ))
 (define-char
-  '((=>ucs		. #x6FFE)	; 濾
-    (morohashi-daikanwa	18565 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3D81)	; 㶁
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=cns11643-1	. #x765B)	; &C1-765B; [86-59]
+    (=cns11643-4	. #x5B60)	; &C4-5B60; [59-64]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (=ucs		. #x6FFF)	; æ¿¿
+    (=ucs		. #x24071)	; 𤁱
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x6FFF)	; æ¿¿
+     ((=ucs		  . #x24071)	; 𤁱
       ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs@cns		. #x6FFF)	; &M-18569;
-    (=cns11643-2	. #x617E)	; &M-18569; [65-94]
-    (=daikanwa		. 18569)	; &I-M-18569;
+    (->subsumptive
+     ((=daikanwa	  . 18589)	; &M-18589;
+      )
+     ((=cns11643-5	  . #x6243)	; &C5-6243; [66-35]
+      ))
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x6FFF)	; æ¿¿
+     ((=ucs		  . #x24071)	; 𤁱
       ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs@unicode	. #x6FFF)	; &B-EFF2;
-    (=big5		. #xEFF2)	; &B-EFF2;
+    (=ucs@iso		. #x24071)	; &U-00024071;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x7000)	; 瀀
+    (=ucs		. #x24072)	; 𤁲
     (->subsumptive
-     ((=daikanwa	  . 18571)	; &M-18571;
+     ((=daikanwa	  . 18590)	; &M-18590;
       )
-     ((=ucs@cns		  . #x7000)	; &C2-6221;
-      (=cns11643-2	  . #x6221)	; &C2-6221; [66-01]
-      (mojikyo		  . 018571)	; &MCS-6000488B;
+     ((=cns11643-7	  . #x4047)	; &C7-4047; [32-39]
       )
-     ((=ucs@unicode	  . #x7000)	; &JX2-6F49;
-      (=jis-x0212	  . #x492A)	; &JX2-6F49; [41-10]
-      (=jis-x0213-2	  . #x6F49)	; &I-JX2-6F49; [79-41]
-      (=big5		  . #xEFF3)	; &I-B-EFF3;
+     ((=ucs@iso		  . #x24072)	; &U-00024072;
       ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x7001)	; 瀁
-    (=big5		. #xEFEE)	; &I-B-EFEE;
-    (->subsumptive
-     ((=ucs@cns		  . #x7001)	; &GT-23856;
-      (=ucs@jis		  . #x7001)	; &GT-23856;
-      (=jis-x0208	  . #x5F47)	; &GT-23856; [63-39]
-      (=ks-x1001	  . #x6548)	; &I-K0-6548; [69-40]
-      (=cns11643-2	  . #x617A)	; &I-C2-617A; [65-90]
-      (=jis-x0213-1	  . #x5F47)	; &I-JX1-5F47; [63-39]
-      (=gt		  . 23856)	; &I-GT-23856;
-      (=gt-pj-1		  . #x5F47)	; &I-GT-23856; [63-39]
-      (=daikanwa	  . 18573)	; &I-M-18573;
-      )
-     ((=ucs@unicode	  . #x7001)	; &UU+7001;
-      ))
+    (=>jis-x0208@1997	. #x4642)	; &J97-4642; [38-34]
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational
+     ((=>jis-x0208@1997	  . #x4642)	; &J97-4642; [38-34]
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x7002)	; 瀂
-    (=cns11643-3	. #x582A)	; &I-C3-582A; [56-10]
-    (=daikanwa		. 18574)	; &I-M-18574;
+    (=ucs		. #x7006)	; 瀆
+    (=big5		. #xC270)	; &I-B-C270;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational
+     ((=ucs		  . #x7006)	; 瀆
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x7003)	; 瀃
-    (=cns11643-3	. #x5827)	; &I-C3-5827; [56-07]
-    (=daikanwa		. 18576)	; &I-M-18576;
-    (=cbeta		. 01580)	; &I-CB01580;
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (=ucs		. #x7004)	; 瀄
-    (=big5		. #xE9F6)	; &I-B-E9F6;
+    (=ucs@jis		. #x7006)	; &M-18591;
+    (=jis-x0208@1978	. #x4642)	; &M-18591; [38-34]
+    (=ks-x1001		. #x5439)	; &I-K0-5439; [52-25]
+    (=jis-x0212		. #x492C)	; &I-JSP-492C; [41-12]
+    (=jis-x0213-1	. #x773D)	; &I-JX1-773D; [87-29]
+    (=daikanwa		. 18591)	; &I-M-18591;
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x7004)	; 瀄
+     ((=ucs		  . #x7006)	; 瀆
       ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=daikanwa		. 18583)	; &M-18583;
-    (mojikyo		. 018583)	; &MCS-60004897;
+    (=ucs@unicode	. #x7006)	; &C1-765C;
+    (=cns11643-1	. #x765C)	; &C1-765C; [86-60]
+    (=gb12345		. #x6442)	; &C1-765C; [68-34]
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x7004)	; 瀄
+     ((=>jis-x0208@1997	  . #x4642)	; &J97-4642; [38-34]
       ))
     (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 13)
-    (total-strokes	 . 16)
-    (=ucs@unicode	. #x7004)	; &C2-5823;
-    (=cns11643-2	. #x5823)	; &C2-5823; [56-03]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x7005)	; 瀅
-    (->subsumptive
-     ((=ucs@unicode	  . #x7005)	; &M-18587;
-      (=ks-x1001	  . #x7B24)	; &M-18587; [91-04]
-      (=jis-x0212	  . #x492B)	; &I-JSP-492B; [41-11]
-      (=jis-x0213-1	  . #x773C)	; &I-JX1-773C; [87-28]
-      (=gb12345		  . #x645E)	; &M-18587; [68-62]
-      (=big5		  . #xEFEF)	; &I-B-EFEF;
-      (=daikanwa	  . 18587)	; &I-M-18587;
-      (=jef-china3	  . #x57B9)	; &I-JC3-57B9;
-      )
-     ((=ucs@cns		  . #x7005)	; &C2-617B;
-      (=cns11643-2	  . #x617B)	; &C2-617B; [65-91]
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=ucs		. #x6D9C)	; 涜
+    (=>jis-x0213-1	. #x4642)	; 涜 [38-34]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x6D9C)	; 涜
       ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=jef-china3	. #x70D7)	; &JC3-70D7;
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4642)	; &J97-4642; [38-34]
+     ((=ucs		  . #x6D9C)	; 涜
       ))
     (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x7006)	; 瀆
-    (=big5		. #xC270)	; &I-B-C270;
-    (->subsumptive
+    (ideographic-strokes . 7)
+    (total-strokes	 . 10)
+    (=ucs@unicode	. #x6D9C)	; &GT-22395;
+    (=jis-x0208@1983	. #x4642)	; &GT-22395; [38-34]
+    (=jis-x0208@1990	. #x4642)	; &I-J90-4642; [38-34]
+    (=jis-x0213-1	. #x4642)	; &I-JX1-4642; [38-34]
+    (=gt		. 22395)	; &I-GT-22395;
+    (=gt-pj-1		. #x4642)	; &I-GT-22395; [38-34]
+    (<-simplified@JP/jis
      ((=ucs@jis		  . #x7006)	; &M-18591;
       (=jis-x0208@1978	  . #x4642)	; &M-18591; [38-34]
       (=ks-x1001	  . #x5439)	; &I-K0-5439; [52-25]
       (=jis-x0212	  . #x492C)	; &I-JSP-492C; [41-12]
       (=jis-x0213-1	  . #x773D)	; &I-JX1-773D; [87-29]
       (=daikanwa	  . 18591)	; &I-M-18591;
-      )
-     ((=ucs@unicode	  . #x7006)	; &C1-765C;
-      (=cns11643-1	  . #x765C)	; &C1-765C; [86-60]
-      (=gb12345		  . #x6442)	; &C1-765C; [68-34]
       ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (=jis-x0208@1997	. #x4642)	; &J97-4642; [38-34]
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x24073)	; 𤁳
+    (->subsumptive
+     ((=daikanwa	  . 18592)	; &M-18592;
+      )
+     ((=ucs@iso		  . #x24073)	; &U-00024073;
+      )
+     ((=cns11643-5	  . #x623B)	; &C5-623B; [66-27]
+      ))
     ))
 (define-char
-  '((<-denotational
-     ((=jis-x0208@1997	  . #x4642)	; &J97-4642; [38-34]
-      ))
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 7)
-    (total-strokes	 . 10)
-    (=ucs		. #x6D9C)	; 涜
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs		. #x24074)	; 𤁴
     (->subsumptive
-     ((=ucs@unicode	  . #x6D9C)	; &GT-22395;
-      (=jis-x0208@1983	  . #x4642)	; &GT-22395; [38-34]
-      (=jis-x0208@1990	  . #x4642)	; &I-J90-4642; [38-34]
-      (=jis-x0213-1	  . #x4642)	; &I-JX1-4642; [38-34]
-      (=gt		  . 22395)	; &I-GT-22395;
-      (=gt-pj-1		  . #x4642)	; &I-GT-22395; [38-34]
-      (<-simplified@JP
-       ((=ucs@jis	    . #x7006)	; &M-18591;
-	(=jis-x0208@1978    . #x4642)	; &M-18591; [38-34]
-	(=ks-x1001	    . #x5439)	; &I-K0-5439; [52-25]
-	(=jis-x0212	    . #x492C)	; &I-JSP-492C; [41-12]
-	(=jis-x0213-1	    . #x773D)	; &I-JX1-773D; [87-29]
-	(=daikanwa	    . 18591)	; &I-M-18591;
-	))
+     ((=daikanwa	  . 18593)	; &M-18593;
+      )
+     ((=ucs@iso		  . #x24074)	; &U-00024074;
       )
-     ((=jef-china3	  . #x70D7)	; &JC3-70D7;
+     ((=cns11643-7	  . #x4041)	; &C7-4041; [32-33]
       ))
     ))
 (define-char
@@ -23106,7 +24273,7 @@
       (=gt		  . 23806)	; &I-GT-23806;
       (=gt-pj-1		  . #x5F43)	; &I-GT-23806; [63-35]
       (=daikanwa	  . 18596)	; &I-M-18596;
-      (=shinjigen@rev	  .  4513)	; &GT-23806;
+      (=shinjigen	  .  4513)	; &GT-23806;
       )
      ((=ucs@unicode	  . #x7009)	; &C1-7659;
       (=cns11643-1	  . #x7659)	; &C1-7659; [86-57]
@@ -23118,6 +24285,7 @@
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (=ucs		. #x700A)	; 瀊
+    (=big5		. #xEFF8)	; &I-B-EFF8;
     (->subsumptive
      ((=ucs@jis		  . #x700A)	; &M-18597;
       (=jis-x0213-2	  . #x6F4B)	; &M-18597; [79-43]
@@ -23125,68 +24293,81 @@
       )
      ((=ucs@unicode	  . #x700A)	; &C2-6226;
       (=cns11643-2	  . #x6226)	; &C2-6226; [66-06]
-      (=big5		  . #xEFF8)	; &I-B-EFF8;
       ))
     ))
 (define-char
-  '((=>ucs		. #x700B)	; 瀋
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs@jis		. #x700B)	; &GT-23812;
-    (=jis-x0208		. #x5F44)	; &GT-23812; [63-36]
-    (=ks-x1001		. #x6423)	; &I-K0-6423; [68-03]
-    (=jis-x0213-1	. #x5F44)	; &I-JX1-5F44; [63-36]
-    (=big5		. #xC26E)	; &I-B-C26E;
-    (=gt		. 23812)	; &I-GT-23812;
-    (=gt-pj-1		. #x5F44)	; &I-GT-23812; [63-36]
-    (=daikanwa		. 18600)	; &I-M-18600;
-    (=shinjigen@rev	.  4514)	; &GT-23812;
+    (=ucs		. #x24075)	; 𤁵
+    (->subsumptive
+     ((=daikanwa	  . 18598)	; &M-18598;
+      )
+     ((=ucs@iso		  . #x24075)	; &C5-6240;
+      (=cns11643-5	  . #x6240)	; &C5-6240; [66-32]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	18600 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x700B)	; 瀋
-    (=cns11643-1	. #x765A)	; &I-C1-765A; [86-58]
-    (=gb12345		. #x6449)	; 瀋 [68-41]
+    (=ucs		. #x24076)	; 𤁶
+    (=cns11643-7	. #x4048)	; &I-C7-4048; [32-40]
+    (=daikanwa		. 18599)	; &I-M-18599;
     ))
 (define-char
-  '((=>ucs		. #x700C)	; 瀌
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=big5		. #xEFEC)	; &M-18601;
-    (=daikanwa		. 18601)	; &I-M-18601;
+    (=ucs		. #x700B)	; 瀋
+    (=big5		. #xC26E)	; &I-B-C26E;
+    (->subsumptive
+     ((=ucs@jis		  . #x700B)	; &GT-23812;
+      (=jis-x0208	  . #x5F44)	; &GT-23812; [63-36]
+      (=ks-x1001	  . #x6423)	; &I-K0-6423; [68-03]
+      (=jis-x0213-1	  . #x5F44)	; &I-JX1-5F44; [63-36]
+      (=gt		  . 23812)	; &I-GT-23812;
+      (=gt-pj-1		  . #x5F44)	; &I-GT-23812; [63-36]
+      (=daikanwa	  . 18600)	; &I-M-18600;
+      (=shinjigen	  .  4514)	; &GT-23812;
+      )
+     ((=ucs@unicode	  . #x700B)	; &UU+700B;
+      (=gb12345		  . #x6449)	; &UU+700B; [68-41]
+      )
+     ((=cns11643-1	  . #x765A)	; &C1-765A; [86-58]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	18601 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (=ucs		. #x700C)	; 瀌
-    (=iso-ir165		. #x7D35)	; &I-EGB-7D35; [93-21]
-    (=cns11643-2	. #x6178)	; &I-C2-6178; [65-88]
-    ))
-(define-char
-  '((=>ucs		. #x700D)	; 瀍
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs@jis		. #x700D)	; &M-18602;
-    (=jis-x0212		. #x492E)	; &M-18602; [41-14]
-    (=big5		. #xEFED)	; &I-B-EFED;
-    (=daikanwa		. 18602)	; &I-M-18602;
+    (=big5		. #xEFEC)	; &I-B-EFEC;
+    (->subsumptive
+     ((=daikanwa	  . 18601)	; &M-18601;
+      )
+     ((=ucs@unicode	  . #x700C)	; &EGB-7D35;
+      (=iso-ir165	  . #x7D35)	; &EGB-7D35; [93-21]
+      )
+     ((=cns11643-2	  . #x6178)	; &C2-6178; [65-88]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	18602 0 0)
-    (ideographic-radical . 85)	; ⽔
+  '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (=ucs		. #x700D)	; 瀍
-    (=iso-ir165		. #x7D34)	; &I-EGB-7D34; [93-20]
-    (=cns11643-2	. #x6179)	; &I-C2-6179; [65-89]
+    (=big5		. #xEFED)	; &I-B-EFED;
+    (->subsumptive
+     ((=ucs@jis		  . #x700D)	; &M-18602;
+      (=jis-x0212	  . #x492E)	; &M-18602; [41-14]
+      (=daikanwa	  . 18602)	; &I-M-18602;
+      )
+     ((=cns11643-2	  . #x6179)	; &C2-6179; [65-89]
+      )
+     ((=ucs@unicode	  . #x700D)	; &EGB-7D34;
+      (=iso-ir165	  . #x7D34)	; &EGB-7D34; [93-20]
+      ))
     ))
 (define-char
   '((=>ucs		. #x24077)	; 𤁷
@@ -23213,486 +24394,470 @@
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (=ucs		. #x700E)	; 瀎
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x700E)	; 瀎
-      ))
-    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs@cns		. #x700E)	; &M-18606;
-    (=cns11643-2	. #x617D)	; &M-18606; [65-93]
-    (=daikanwa		. 18606)	; &I-M-18606;
-    (mojikyo		. 018606)	; &MCS-600048AE;
+    (=ucs		. #x24078)	; 𤁸
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x700E)	; 瀎
+     ((=ucs		  . #x24078)	; 𤁸
       ))
     (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=big5		. #xEFF1)	; &B-EFF1;
-    (->subsumptive
-     ((=ucs@unicode	  . #x700E)	; &UU+700E;
-      ))
-    ))
-(define-char
-  '((=>ucs		. #x700F)	; 瀏
-    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=daikanwa		. 18607)	; &M-18607;
-    (mojikyo		. 018607)	; &MCS-600048AF;
+    (=daikanwa		. 18604)	; &M-18604;
     ))
 (define-char
-  '((morohashi-daikanwa	18607 0 0)
+  '((<-denotational
+     ((=ucs		  . #x24078)	; 𤁸
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x700F)	; 瀏
-    (=jis-x0208		. #x5F48)	; &I-J90-5F48; [63-40]
-    (=ks-x1001		. #x5737)	; &I-K0-5737; [55-23]
-    (=cns11643-1	. #x765F)	; &I-C1-765F; [86-63]
-    (=jis-x0213-1	. #x5F48)	; &I-JX1-5F48; [63-40]
-    (=gb12345		. #x642F)	; 瀏 [68-15]
-    (=big5		. #xC273)	; &I-B-C273;
-    (=gt		. 23861)	; &I-GT-23861;
-    (=gt-pj-1		. #x5F48)	; &I-GT-23861; [63-40]
-    (=shinjigen@rev	.  4519)	; 瀏
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x7010)	; 瀐
-    (=cns11643-3	. #x5829)	; &I-C3-5829; [56-09]
-    (=daikanwa		. 18608)	; &I-M-18608;
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x7011)	; 瀑
-    (=jis-x0208		. #x5F46)	; &I-J90-5F46; [63-38]
-    (=gb2312		. #x4659)	; &I-G0-4659; [38-57]
-    (=ks-x1001		. #x786E)	; &I-K0-786E; [88-78]
-    (=cns11643-1	. #x765E)	; &I-C1-765E; [86-62]
-    (=jis-x0213-1	. #x5F46)	; &I-JX1-5F46; [63-38]
-    (=big5		. #xC272)	; &I-B-C272;
-    (=gt		. 23841)	; &I-GT-23841;
-    (=gt-pj-1		. #x5F46)	; &I-GT-23841; [63-38]
-    (=daikanwa		. 18609)	; &I-M-18609;
-    (=shinjigen@rev	.  4517)	; 瀑
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x7012)	; 瀒
-    (=cns11643-4	. #x5B5E)	; &I-C4-5B5E; [59-62]
-    (=daikanwa		. 18610)	; &I-M-18610;
+    (=ucs@iso		. #x24078)	; &C4-5B5F;
+    (=cns11643-4	. #x5B5F)	; &C4-5B5F; [59-63]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x7014)	; 瀔
-    (=iso-ir165		. #x7D33)	; &I-EGB-7D33; [93-19]
-    (=cns11643-2	. #x617C)	; &I-C2-617C; [65-92]
-    (=big5		. #xEFF0)	; &I-B-EFF0;
-    (=daikanwa		. 18615)	; &I-M-18615;
+    (=ucs		. #x24079)	; 𤁹
+    (->subsumptive
+     ((=daikanwa	  . 18605)	; &M-18605;
+      )
+     ((=ucs@iso		  . #x24079)	; &C4-5B55;
+      (=cns11643-4	  . #x5B55)	; &C4-5B55; [59-53]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x7013)	; 瀓
-    (=cns11643-3	. #x582B)	; &I-C3-582B; [56-11]
-    (=daikanwa		. 18617)	; &I-M-18617;
-    ))
-(define-char
-  '((=>ucs		. #x6FF7)	; æ¿·
-    (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=big5		. #xEFF7)	; &M-18628;
-    (=daikanwa		. 18628)	; &I-M-18628;
+    (=ucs		. #x700E)	; 瀎
+    (=big5		. #xEFF1)	; &I-B-EFF1;
     ))
 (define-char
-  '((morohashi-daikanwa	18628 0 0)
+  '((<-denotational
+     ((=ucs		  . #x700E)	; 瀎
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x6FF7)	; æ¿·
-    (=cns11643-2	. #x6225)	; &I-C2-6225; [66-05]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x240A5)	; 𤂥
-    (=cns11643-7	. #x4043)	; &I-C7-4043; [32-35]
-    (=daikanwa		. 49231)	; &I-M-49231;
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x3D7D)	; ãµ½
-    (=cns11643-4	. #x5B56)	; &I-C4-5B56; [59-54]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x3D7E)	; ãµ¾
-    (=cns11643-4	. #x5B54)	; &I-C4-5B54; [59-52]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x3D7F)	; 㵿
-    (=cns11643-4	. #x5B5A)	; &I-C4-5B5A; [59-58]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x3D80)	; 㶀
-    (=cns11643-4	. #x5B57)	; &I-C4-5B57; [59-55]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x3D81)	; 㶁
-    (=cns11643-4	. #x5B60)	; &I-C4-5B60; [59-64]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x3D86)	; 㶆
-    (=cns11643-4	. #x5B5B)	; &I-C4-5B5B; [59-59]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x6F9B)	; 澛
-    (=iso-ir165		. #x2E60)	; &I-EGB-2E60; [14-64]
+    (=ucs@cns		. #x700E)	; &M-18606;
+    (=cns11643-2	. #x617D)	; &M-18606; [65-93]
+    (=daikanwa		. 18606)	; &I-M-18606;
+    (mojikyo		. 018606)	; &MCS-600048AE;
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x6FF9)	; 濹
+     ((=ucs		  . #x700E)	; 瀎
       ))
     (ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs@jis/2000	. #x6FF9)	; &JX1-7739;
-    (=jis-x0213-1	. #x7739)	; &JX1-7739; [87-25]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x24061)	; 𤁡
-    (=cns11643-5	. #x623F)	; &I-C5-623F; [66-31]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x24062)	; 𤁢
-    (=cns11643-5	. #x6246)	; &I-C5-6246; [66-38]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x24063)	; 𤁣
-    (=cns11643-5	. #x6245)	; &I-C5-6245; [66-37]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x24064)	; 𤁤
-    (=cns11643-4	. #x5B5D)	; &I-C4-5B5D; [59-61]
-    ))
-(define-char
-  '((ideographic-radical . 85)	; ⽔
-    (ideographic-strokes . 15)
-    (total-strokes	 . 18)
-    (=ucs		. #x24065)	; 𤁥
-    (=cns11643-5	. #x623D)	; &I-C5-623D; [66-29]
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs@unicode	. #x700E)	; &UU+700E;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((=>ucs		. #x700F)	; 瀏
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24066)	; 𤁦
-    (=cns11643-5	. #x6239)	; &I-C5-6239; [66-25]
+    (=daikanwa		. 18607)	; &M-18607;
+    (mojikyo		. 018607)	; &MCS-600048AF;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((morohashi-daikanwa	18607 0 0)
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24067)	; 𤁧
-    (=cns11643-5	. #x6242)	; &I-C5-6242; [66-34]
+    (=ucs		. #x700F)	; 瀏
+    (=jis-x0208		. #x5F48)	; &I-J90-5F48; [63-40]
+    (=ks-x1001		. #x5737)	; &I-K0-5737; [55-23]
+    (=cns11643-1	. #x765F)	; &I-C1-765F; [86-63]
+    (=jis-x0213-1	. #x5F48)	; &I-JX1-5F48; [63-40]
+    (=gb12345		. #x642F)	; 瀏 [68-15]
+    (=big5		. #xC273)	; &I-B-C273;
+    (=gt		. 23861)	; &I-GT-23861;
+    (=gt-pj-1		. #x5F48)	; &I-GT-23861; [63-40]
+    (=shinjigen@rev	.  4519)	; 瀏
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24068)	; 𤁨
-    (=cns11643-7	. #x4040)	; &I-C7-4040; [32-32]
+    (=ucs		. #x7010)	; 瀐
+    (=cns11643-3	. #x5829)	; &I-C3-5829; [56-09]
+    (=daikanwa		. 18608)	; &I-M-18608;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24069)	; 𤁩
-    (=cns11643-7	. #x4046)	; &I-C7-4046; [32-38]
+    (=ucs		. #x7011)	; 瀑
+    (=jis-x0208		. #x5F46)	; &I-J90-5F46; [63-38]
+    (=gb2312		. #x4659)	; &I-G0-4659; [38-57]
+    (=ks-x1001		. #x786E)	; &I-K0-786E; [88-78]
+    (=cns11643-1	. #x765E)	; &I-C1-765E; [86-62]
+    (=jis-x0213-1	. #x5F46)	; &I-JX1-5F46; [63-38]
+    (=big5		. #xC272)	; &I-B-C272;
+    (=gt		. 23841)	; &I-GT-23841;
+    (=gt-pj-1		. #x5F46)	; &I-GT-23841; [63-38]
+    (=daikanwa		. 18609)	; &I-M-18609;
+    (=shinjigen		.  4517)	; 瀑
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x2406A)	; 𤁪
-    (=cns11643-4	. #x5B59)	; &I-C4-5B59; [59-57]
+    (=ucs		. #x7012)	; 瀒
+    (->subsumptive
+     ((=ucs@unicode	  . #x7012)	; &M-18610;
+      (=daikanwa	  . 18610)	; &M-18610;
+      )
+     ((=cns11643-4	  . #x5B5E)	; &C4-5B5E; [59-62]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x2406B)	; 𤁫
-    (=cns11643-5	. #x624B)	; &I-C5-624B; [66-43]
+    (=ucs		. #x2407A)	; 𤁺
+    (=cns11643-7	. #x4045)	; &I-C7-4045; [32-37]
+    (=daikanwa		. 18611)	; &I-M-18611;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x2406C)	; 𤁬
-    (=cns11643-5	. #x6244)	; &I-C5-6244; [66-36]
+    (=ucs		. #x2407B)	; 𤁻
+    (->subsumptive
+     ((=daikanwa	  . 18612)	; &M-18612;
+      )
+     ((=ucs@iso		  . #x2407B)	; &C7-4044;
+      (=cns11643-7	  . #x4044)	; &C7-4044; [32-36]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x2406D)	; 𤁭
-    (=cns11643-7	. #x403C)	; &I-C7-403C; [32-28]
+    (=ucs		. #x2407C)	; 𤁼
+    (->subsumptive
+     ((=daikanwa	  . 18613)	; &M-18613;
+      )
+     ((=ucs@iso		  . #x2407C)	; &U-0002407C;
+      )
+     ((=cns11643-7	  . #x403E)	; &C7-403E; [32-30]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x2406E)	; 𤁮
-    (=cns11643-5	. #x6241)	; &I-C5-6241; [66-33]
+    (=ucs		. #x2407D)	; 𤁽
+    (->subsumptive
+     ((=ucs@iso		  . #x2407D)	; &M-18614;
+      (=daikanwa	  . 18614)	; &M-18614;
+      )
+     ((=cns11643-5	  . #x623A)	; &C5-623A; [66-26]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x2406F)	; 𤁯
-    (=cns11643-5	. #x624A)	; &I-C5-624A; [66-42]
+    (=ucs		. #x7014)	; 瀔
+    (=big5		. #xEFF0)	; &I-B-EFF0;
+    (->subsumptive
+     ((=daikanwa	  . 18615)	; &M-18615;
+      )
+     ((=ucs@unicode	  . #x7014)	; &C2-617C;
+      (=iso-ir165	  . #x7D33)	; &C2-617C; [93-19]
+      (=cns11643-2	  . #x617C)	; &I-C2-617C; [65-92]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24070)	; 𤁰
-    (=cns11643-4	. #x5B58)	; &I-C4-5B58; [59-56]
+    (=ucs		. #x2407E)	; 𤁾
+    (->subsumptive
+     ((=ucs@iso		  . #x2407E)	; &M-18616;
+      (=daikanwa	  . 18616)	; &M-18616;
+      )
+     ((=cns11643-4	  . #x5B53)	; &C4-5B53; [59-51]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24071)	; 𤁱
-    (=cns11643-5	. #x6243)	; &I-C5-6243; [66-35]
+    (=ucs		. #x7013)	; 瀓
+    (->subsumptive
+     ((=daikanwa	  . 18617)	; &M-18617;
+      )
+     ((=ucs@unicode	  . #x7013)	; &C3-582B;
+      (=cns11643-3	  . #x582B)	; &C3-582B; [56-11]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24072)	; 𤁲
-    (=cns11643-7	. #x4047)	; &I-C7-4047; [32-39]
+    (=ucs		. #x2407F)	; 𤁿
+    (->subsumptive
+     ((=ucs@iso		  . #x2407F)	; &M-18618;
+      (=daikanwa	  . 18618)	; &M-18618;
+      )
+     ((=cns11643-5	  . #x623C)	; &C5-623C; [66-28]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24073)	; 𤁳
-    (=cns11643-5	. #x623B)	; &I-C5-623B; [66-27]
+    (=ucs		. #x24080)	; 𤂀
+    (->subsumptive
+     ((=daikanwa	  . 18619)	; &M-18619;
+      )
+     ((=ucs@iso		  . #x24080)	; &U-00024080;
+      )
+     ((=cns11643-5	  . #x623E)	; &C5-623E; [66-30]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24074)	; 𤁴
-    (=cns11643-7	. #x4041)	; &I-C7-4041; [32-33]
+    (=ucs		. #x24081)	; 𤂁
+    (->subsumptive
+     ((=daikanwa	  . 18620)	; &M-18620;
+      )
+     ((=ucs@iso		  . #x24081)	; &C5-6249;
+      (=cns11643-5	  . #x6249)	; &C5-6249; [66-41]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24075)	; 𤁵
-    (=cns11643-5	. #x6240)	; &I-C5-6240; [66-32]
+    (=ucs		. #x24082)	; 𤂂
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational
+     ((=ucs		  . #x24082)	; 𤂂
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24076)	; 𤁶
-    (=cns11643-7	. #x4048)	; &I-C7-4048; [32-40]
+    (=daikanwa		. 18621)	; &M-18621;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational
+     ((=ucs		  . #x24082)	; 𤂂
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24078)	; 𤁸
-    (=cns11643-4	. #x5B5F)	; &I-C4-5B5F; [59-63]
+    (->subsumptive
+     ((=cns11643-5	  . #x624C)	; &C5-624C; [66-44]
+      )
+     ((=ucs@iso		  . #x24082)	; &U-00024082;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24079)	; 𤁹
-    (=cns11643-4	. #x5B55)	; &I-C4-5B55; [59-53]
+    (=ucs		. #x24083)	; 𤂃
+    (->subsumptive
+     ((=daikanwa	  . 18622)	; &M-18622;
+      )
+     ((=ucs@iso		  . #x24083)	; &U-00024083;
+      )
+     ((=cns11643-5	  . #x6247)	; &C5-6247; [66-39]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x2407A)	; 𤁺
-    (=cns11643-7	. #x4045)	; &I-C7-4045; [32-37]
+    (=ucs		. #x24084)	; 𤂄
+    (->subsumptive
+     ((=daikanwa	  . 18623)	; &M-18623;
+      )
+     ((=ucs@iso		  . #x24084)	; &U-00024084;
+      )
+     ((=cns11643-7	  . #x403F)	; &C7-403F; [32-31]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x2407B)	; 𤁻
-    (=cns11643-7	. #x4044)	; &I-C7-4044; [32-36]
+    (=ucs		. #x24085)	; 𤂅
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational
+     ((=ucs		  . #x24085)	; 𤂅
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x2407C)	; 𤁼
-    (=cns11643-7	. #x403E)	; &I-C7-403E; [32-30]
+    (=daikanwa		. 18624)	; &M-18624;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational
+     ((=ucs		  . #x24085)	; 𤂅
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x2407D)	; 𤁽
-    (=cns11643-5	. #x623A)	; &I-C5-623A; [66-26]
+    (->subsumptive
+     ((=ucs@iso		  . #x24085)	; &U-00024085;
+      )
+     ((=cns11643-4	  . #x5B5C)	; &C4-5B5C; [59-60]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x2407E)	; 𤁾
-    (=cns11643-4	. #x5B53)	; &I-C4-5B53; [59-51]
+    (=ucs		. #x24086)	; 𤂆
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational
+     ((=ucs		  . #x24086)	; 𤂆
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x2407F)	; 𤁿
-    (=cns11643-5	. #x623C)	; &I-C5-623C; [66-28]
+    (=daikanwa		. 18625)	; &M-18625;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational
+     ((=ucs		  . #x24086)	; 𤂆
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24080)	; 𤂀
-    (=cns11643-5	. #x623E)	; &I-C5-623E; [66-30]
+    (->subsumptive
+     ((=cns11643-7	  . #x4042)	; &C7-4042; [32-34]
+      )
+     ((=ucs@iso		  . #x24086)	; &U-00024086;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24081)	; 𤂁
-    (=cns11643-5	. #x6249)	; &I-C5-6249; [66-41]
+    (=ucs		. #x240B2)	; 𤂲
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational
+     ((=ucs		  . #x240B2)	; 𤂲
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24082)	; 𤂂
-    (=cns11643-5	. #x624C)	; &I-C5-624C; [66-44]
+    (=daikanwa		. 18627)	; &M-18627;
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational
+     ((=ucs		  . #x240B2)	; 𤂲
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24083)	; 𤂃
-    (=cns11643-5	. #x6247)	; &I-C5-6247; [66-39]
+    (=ucs@iso		. #x240B2)	; &C5-6248;
+    (=cns11643-5	. #x6248)	; &C5-6248; [66-40]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24084)	; 𤂄
-    (=cns11643-7	. #x403F)	; &I-C7-403F; [32-31]
+    (=ucs		. #x6FF7)	; æ¿·
+    (=big5		. #xEFF7)	; &I-B-EFF7;
+    (->subsumptive
+     ((=daikanwa	  . 18628)	; &M-18628;
+      )
+     ((=ucs@unicode	  . #x6FF7)	; &C2-6225;
+      (=cns11643-2	  . #x6225)	; &C2-6225; [66-05]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24085)	; 𤂅
-    (=cns11643-4	. #x5B5C)	; &I-C4-5B5C; [59-60]
+    (=ucs		. #x240A6)	; 𤂦
+    (->subsumptive
+     ((=daikanwa	  . 18631)	; &M-18631;
+      )
+     ((=ucs@iso		  . #x240A6)	; &C7-403B;
+      (=cns11643-7	  . #x403B)	; &C7-403B; [32-27]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x24086)	; 𤂆
-    (=cns11643-7	. #x4042)	; &I-C7-4042; [32-34]
+    (=ucs		. #x240A2)	; 𤂢
+    (->subsumptive
+     ((=ucs@iso		  . #x240A2)	; &M-18632;
+      (=daikanwa	  . 18632)	; &M-18632;
+      )
+     ((=cns11643-7	  . #x403D)	; &C7-403D; [32-29]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x2408A)	; 𤂊
-    (=cns11643-5	. #x624D)	; &I-C5-624D; [66-45]
+    (=ucs		. #x240A3)	; 𤂣
+    (->subsumptive
+     ((=daikanwa	  . 18633)	; &M-18633;
+      )
+     ((=ucs@iso		  . #x240A3)	; &U-000240A3;
+      )
+     ((=cns11643-7	  . #x4039)	; &C7-4039; [32-25]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x240A2)	; 𤂢
-    (=cns11643-7	. #x403D)	; &I-C7-403D; [32-29]
+    (=ucs		. #x240A5)	; 𤂥
+    (=cns11643-7	. #x4043)	; &I-C7-4043; [32-35]
+    (=daikanwa		. 49231)	; &I-M-49231;
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x240A3)	; 𤂣
-    (=cns11643-7	. #x4039)	; &I-C7-4039; [32-25]
+    (=ucs		. #x6F9B)	; 澛
+    (=iso-ir165		. #x2E60)	; &I-EGB-2E60; [14-64]
     ))
 (define-char
-  '((ideographic-radical . 85)	; ⽔
+  '((<-denotational
+     ((=ucs		  . #x6FF9)	; 濹
+      ))
+    (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x240A6)	; 𤂦
-    (=cns11643-7	. #x403B)	; &I-C7-403B; [32-27]
+    (=ucs@jis/2000	. #x6FF9)	; &JX1-7739;
+    (=ucs@jis/2004	. #x6FF9)	; &JX1-7739;
+    (=jis-x0213-1	. #x7739)	; &JX1-7739; [87-25]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
-    (=ucs		. #x240B2)	; 𤂲
-    (=cns11643-5	. #x6248)	; &I-C5-6248; [66-40]
+    (=ucs		. #x2408A)	; 𤂊
+    (=cns11643-5	. #x624D)	; &I-C5-624D; [66-45]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (=ucs		. #x7015)	; 瀕
+    (=>jis-x0208	. #x494E)	; 瀕 [41-46]
+    (=>jis-x0213-1	. #x494E)	; 瀕 [41-46]
     ))
 (define-char
   '((<-denotational
@@ -23701,10 +24866,12 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
+    (=big5		. #xC378)	; &B-C378;
     (->subsumptive
-     ((=jis-x0208@1978	  . #x494E)	; &M-18636; [41-46]
+     ((=ucs@jis/2004	  . #x7015)	; &M-18636;
+      (=jis-x0208@1978	  . #x494E)	; &M-18636; [41-46]
       (=ks-x1001	  . #x5E35)	; &I-K0-5E35; [62-21]
-      (=big5		  . #xC378)	; &I-B-C378;
+      (=jis-x0213-1@2004  . #x494E)	; &I-JX3-494E; [41-46]
       (=daikanwa	  . 18636)	; &I-M-18636;
       )
      ((=ucs@unicode	  . #x7015)	; &C1-7845;
@@ -23719,16 +24886,19 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 17)
     (total-strokes	 . 20)
-    (=ucs@jis		. #x7015)	; &GT-23988;
+    (=ucs@jis/1990	. #x7015)	; &GT-23988;
+    (=ucs@jis/2000	. #x7015)	; &GT-23988;
     (=jis-x0208@1983	. #x494E)	; &GT-23988; [41-46]
     (=jis-x0208@1990	. #x494E)	; &I-J90-494E; [41-46]
-    (=jis-x0213-1	. #x494E)	; &I-JX1-494E; [41-46]
+    (=jis-x0213-1@2000	. #x494E)	; &I-JX1-494E; [41-46]
     (=gt		. 23988)	; &I-GT-23988;
     (=gt-pj-1		. #x494E)	; &I-GT-23988; [41-46]
     (=jef-china3	. #x70DB)	; &I-JC3-70DB;
-    (<-simplified@JP
-     ((=jis-x0208@1978	  . #x494E)	; &M-18636; [41-46]
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x7015)	; &M-18636;
+      (=jis-x0208@1978	  . #x494E)	; &M-18636; [41-46]
       (=ks-x1001	  . #x5E35)	; &I-K0-5E35; [62-21]
+      (=jis-x0213-1@2004  . #x494E)	; &I-JX3-494E; [41-46]
       (=daikanwa	  . 18636)	; &I-M-18636;
       ))
     ))
@@ -23770,32 +24940,52 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (=ucs		. #x7018)	; 瀘
-    (=jis-x0208		. #x5F4E)	; &I-J90-5F4E; [63-46]
-    (=ks-x1001		. #x5652)	; &I-K0-5652; [54-50]
-    (=jis-x0213-1	. #x5F4E)	; &I-JX1-5F4E; [63-46]
-    (=gb12345		. #x6372)	; 瀘 [67-82]
     (=big5		. #xC379)	; &I-B-C379;
-    (=gt		. 23936)	; &I-GT-23936;
-    (=gt-pj-1		. #x5F4E)	; &I-GT-23936; [63-46]
-    (=daikanwa		. 18646)	; &I-M-18646;
-    (=shinjigen@rev	.  4529)	; 瀘
+    (->subsumptive
+     ((=ucs@unicode	  . #x7018)	; &GT-23936;
+      (=jis-x0208	  . #x5F4E)	; &GT-23936; [63-46]
+      (=ks-x1001	  . #x5652)	; &I-K0-5652; [54-50]
+      (=jis-x0213-1	  . #x5F4E)	; &I-JX1-5F4E; [63-46]
+      (=gb12345		  . #x6372)	; &GT-23936; [67-82]
+      (=gt		  . 23936)	; &I-GT-23936;
+      (=gt-pj-1		  . #x5F4E)	; &I-GT-23936; [63-46]
+      (=daikanwa	  . 18646)	; &I-M-18646;
+      (=shinjigen	  .  4529)	; &GT-23936;
+      )
+     ((=cns11643-1	  . #x7846)	; &C1-7846; [88-38]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 85)	; ⽔
+    (=ucs		. #x3D86)	; 㶆
     ))
 (define-char
-  '((=>ucs		. #x7018)	; 瀘
-    (morohashi-daikanwa	18646 0 0)
+  '((<-denotational
+     ((=ucs		  . #x3D86)	; 㶆
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
-    (=cns11643-1	. #x7846)	; &C1-7846; [88-38]
+    (=daikanwa		. 18647)	; &M-18647;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3D86)	; 㶆
+      ))
+    (ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=ucs@unicode	. #x3D86)	; &C4-5B5B;
+    (=cns11643-4	. #x5B5B)	; &C4-5B5B; [59-59]
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (=ucs		. #x7019)	; 瀙
+    (=big5		. #xF25C)	; &I-B-F25C;
     (->subsumptive
-     ((=big5		  . #xF25C)	; &B-F25C;
-      (->subsumptive
+     ((->subsumptive
        ((=daikanwa	    . 18649)	; &M-18649;
 	)
        ((=ucs@cns	    . #x7019)	; &C2-6567;
@@ -23914,7 +25104,7 @@
     (=gt		. 23935)	; &I-GT-23935;
     (=gt-pj-1		. #x5F4D)	; &I-GT-23935; [63-45]
     (=daikanwa		. 18658)	; &I-M-18658;
-    (=shinjigen@rev	.  4528)	; 瀝
+    (=shinjigen		.  4528)	; 瀝
     ))
 (define-char
   '((<-denotational
@@ -23924,8 +25114,10 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (->subsumptive
-     ((=jis-x0208@1978	  . #x4654)	; &M-18659; [38-52]
+     ((=ucs@jis/2004	  . #x701E)	; &M-18659;
+      (=jis-x0208@1978	  . #x4654)	; &M-18659; [38-52]
       (=ks-x1001	  . #x6F67)	; &I-K0-6F67; [79-71]
+      (=jis-x0213-1@2004  . #x4654)	; &I-JX3-4654; [38-52]
       (=daikanwa	  . 18659)	; &I-M-18659;
       (=cbeta		  . 01336)	; &I-CB01336;
       )
@@ -24059,19 +25251,25 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (=ucs		. #x7024)	; 瀤
+    (=big5		. #xF266)	; &I-B-F266;
     (->subsumptive
-     ((=big5		  . #xF266)	; &B-F266;
-      (->subsumptive
-       ((=daikanwa	    . 18668)	; &M-18668;
-	(mojikyo	    . 018668)	; &MCS-600048EC;
-	))
+     ((=daikanwa	  . 18668)	; &M-18668;
+      (mojikyo		  . 018668)	; &MCS-600048EC;
       )
      ((=ucs@unicode	  . #x7024)	; &C2-6571;
       (=cns11643-2	  . #x6571)	; &C2-6571; [69-81]
       ))
     ))
 (define-char
-  '((=>ucs		. #x7025)	; 瀥
+  '((ideographic-radical . 85)	; ⽔
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (=ucs		. #x7025)	; 瀥
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7025)	; 瀥
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
@@ -24079,16 +25277,23 @@
     (mojikyo		. 018669)	; &MCS-600048ED;
     ))
 (define-char
-  '((morohashi-daikanwa	18669 0 2)
+  '((<-denotational
+     ((=ucs		  . #x7025)	; 瀥
+      ))
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
-    (=ucs		. #x7025)	; 瀥
-    (=cns11643-3	. #x5A54)	; &I-C3-5A54; [58-52]
+    (->subsumptive
+     ((=ucs@unicode	  . #x7025)	; &UU+7025;
+      )
+     ((=cns11643-3	  . #x5A54)	; &C3-5A54; [58-52]
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (=ucs		. #x7026)	; 瀦
+    (=>jis-x0208	. #x4375)	; 瀦 [35-85]
+    (=>jis-x0213-1	. #x4375)	; 瀦 [35-85]
     (=big5		. #xEFF5)	; &I-B-EFF5;
     ))
 (define-char
@@ -24098,7 +25303,9 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
+    (=ucs@jis/2004	. #x7026)	; &M-18670;
     (=jis-x0208@1978	. #x4375)	; &M-18670; [35-85]
+    (=jis-x0213-1@2004	. #x4375)	; &I-JX3-4375; [35-85]
     (=daikanwa		. 18670)	; &I-M-18670;
     (mojikyo		. 018670)	; &MCS-600048EE;
     ))
@@ -24113,13 +25320,15 @@
     (=jis-x0208@1983	. #x4375)	; &GT-23825; [35-85]
     (=jis-x0208@1990	. #x4375)	; &I-J90-4375; [35-85]
     (=cns11643-2	. #x6223)	; &I-C2-6223; [66-03]
-    (=jis-x0213-1	. #x4375)	; &I-JX1-4375; [35-85]
+    (=jis-x0213-1@2000	. #x4375)	; &I-JX1-4375; [35-85]
     (=gt		. 23825)	; &I-GT-23825;
     (=gt-pj-1		. #x4375)	; &I-GT-23825; [35-85]
     (=jef-china3	. #x70D5)	; &I-JC3-70D5;
     (mojikyo		. 054231)	; &MCS-6000D3D7;
     (<-simplified@JP/jis
-     ((=jis-x0208@1978	  . #x4375)	; &M-18670; [35-85]
+     ((=ucs@jis/2004	  . #x7026)	; &M-18670;
+      (=jis-x0208@1978	  . #x4375)	; &M-18670; [35-85]
+      (=jis-x0213-1@2004  . #x4375)	; &I-JX3-4375; [35-85]
       (=daikanwa	  . 18670)	; &I-M-18670;
       ))
     ))
@@ -24128,27 +25337,26 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (=ucs		. #x7027)	; 瀧
+    (=big5		. #xF25D)	; &I-B-F25D;
     (->subsumptive
-     ((=big5		  . #xF25D)	; &B-F25D;
-      (->subsumptive
-       ((=ucs@jis	    . #x7027)	; &GT-23937;
-	(=jis-x0208	    . #x426D)	; &GT-23937; [34-77]
-	(=ks-x1001	    . #x5669)	; &I-K0-5669; [54-73]
-	(=jis-x0213-1	    . #x426D)	; &I-JX1-426D; [34-77]
-	(=gt		    . 23937)	; &I-GT-23937;
-	(=gt-pj-1	    . #x426D)	; &I-GT-23937; [34-77]
-	(=daikanwa	    . 18671)	; &I-M-18671;
-	(=shinjigen@rev	    .  4411)	; &GT-23937;
-	(mojikyo	    . 018671)	; &MCS-600048EF;
-	)
-       ((=ucs@unicode	    . #x7027)	; &UU+7027;
-	(=gb12345	    . #x6371)	; &UU+7027; [67-81]
-	))
+     ((=ucs@jis		  . #x7027)	; &GT-23937;
+      (=jis-x0208	  . #x426D)	; &GT-23937; [34-77]
+      (=ks-x1001	  . #x5669)	; &I-K0-5669; [54-73]
+      (=jis-x0213-1	  . #x426D)	; &I-JX1-426D; [34-77]
+      (=gt		  . 23937)	; &I-GT-23937;
+      (=gt-pj-1		  . #x426D)	; &I-GT-23937; [34-77]
+      (=daikanwa	  . 18671)	; &I-M-18671;
+      (mojikyo		  . 018671)	; &MCS-600048EF;
+      )
+     ((=ucs@unicode	  . #x7027)	; &UU+7027;
+      (=gb12345		  . #x6371)	; &UU+7027; [67-81]
       )
      ((=ucs@cns		  . #x7027)	; &C2-6568;
       (=cns11643-2	  . #x6568)	; &C2-6568; [69-72]
       )
-     ((=jef-china3	  . #x57BB)	; &JC3-57BB;
+     ((=shinjigen@1ed	  .  4409)	; &JC3-57BB;
+      (=shinjigen@rev	  .  4411)	; &JC3-57BB;
+      (=jef-china3	  . #x57BB)	; &JC3-57BB;
       ))
     ))
 (define-char
@@ -24156,6 +25364,7 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 19)
     (=ucs		. #x7028)	; 瀨
+    (=big5		. #xC375)	; &I-B-C375;
     ))
 (define-char
   '((<-denotational
@@ -24168,7 +25377,6 @@
     (=ks-x1001		. #x566E)	; &M-18672; [54-78]
     (=cns11643-1	. #x7842)	; &I-C1-7842; [88-34]
     (=jis-x0213-1	. #x773E)	; &I-JX1-773E; [87-30]
-    (=big5		. #xC375)	; &I-B-C375;
     (=daikanwa		. 18672)	; &I-M-18672;
     (=jef-china3	. #x57BC)	; &I-JC3-57BC;
     (mojikyo		. 018672)	; &MCS-600048F0;
@@ -25676,6 +26884,8 @@
 (define-char
   '((ideographic-radical . 85)	; ⽔
     (=ucs		. #x7058)	; 灘
+    (=>jis-x0208	. #x4667)	; 灘 [38-71]
+    (=>jis-x0213-1	. #x4667)	; 灘 [38-71]
     ))
 (define-char
   '((<-denotational
@@ -25686,8 +26896,10 @@
     (total-strokes	 . 22)
     (=big5		. #xC579)	; &B-C579;
     (->subsumptive
-     ((=jis-x0208@1978	  . #x4667)	; &M-18784; [38-71]
+     ((=ucs@jis/2004	  . #x7058)	; &M-18784;
+      (=jis-x0208@1978	  . #x4667)	; &M-18784; [38-71]
       (=ks-x1001	  . #x7728)	; &I-K0-7728; [87-08]
+      (=jis-x0213-1@2004  . #x4667)	; &I-JX3-4667; [38-71]
       (=daikanwa	  . 18784)	; &I-M-18784;
       )
      ((=ucs@unicode	  . #x7058)	; &C1-7B65;
@@ -25702,13 +26914,21 @@
     (ideographic-radical . 85)	; ⽔
     (ideographic-strokes . 18)
     (total-strokes	 . 21)
-    (=ucs@jis		. #x7058)	; &GT-24031;
+    (=ucs@jis/1990	. #x7058)	; &GT-24031;
+    (=ucs@jis/2000	. #x7058)	; &GT-24031;
     (=jis-x0208@1983	. #x4667)	; &GT-24031; [38-71]
     (=jis-x0208@1990	. #x4667)	; &I-J90-4667; [38-71]
-    (=jis-x0213-1	. #x4667)	; &I-JX1-4667; [38-71]
+    (=jis-x0213-1@2000	. #x4667)	; &I-JX1-4667; [38-71]
     (=gt		. 24031)	; &I-GT-24031;
     (=gt-pj-1		. #x4667)	; &I-GT-24031; [38-71]
     (=jef-china3	. #x70D9)	; &I-JC3-70D9;
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x7058)	; &M-18784;
+      (=jis-x0208@1978	  . #x4667)	; &M-18784; [38-71]
+      (=ks-x1001	  . #x7728)	; &I-K0-7728; [87-08]
+      (=jis-x0213-1@2004  . #x4667)	; &I-JX3-4667; [38-71]
+      (=daikanwa	  . 18784)	; &I-M-18784;
+      ))
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔
diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el
index ddfb7d2..1269a88 100644
--- a/lisp/utf-2000/Ideograph-R086-Fire.el
+++ b/lisp/utf-2000/Ideograph-R086-Fire.el
@@ -415,10 +415,10 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x7074)	; 灴
+    (=big5		. #xCB5E)	; &I-B-CB5E;
     (->subsumptive
      ((=ucs@unicode	  . #x7074)	; &M-18867;
-      (=big5		  . #xCB5E)	; &M-18867;
-      (=daikanwa	  . 18867)	; &I-M-18867;
+      (=daikanwa	  . 18867)	; &M-18867;
       )
      ((=ucs@cns		  . #x7074)	; &C2-245E;
       (=cns11643-2	  . #x245E)	; &C2-245E; [04-62]
@@ -429,30 +429,59 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x7075)	; 灵
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7075)	; 灵
+      ))
+    (ideographic-radical . 86)	; ⽕
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
     (->subsumptive
      ((=ucs@jis		  . #x7075)	; &M-18868;
       (=jis-x0212	  . #x4946)	; &M-18868; [41-38]
-      (=cns11643-3	  . #x2662)	; &I-C3-2662; [06-66]
       (=jis-x0213-1	  . #x7744)	; &I-JX1-7744; [87-36]
       (=daikanwa	  . 18868)	; &I-M-18868;
       )
-     ((=ucs@unicode	  . #x7075)	; &G0-4169;
-      (=gb2312		  . #x4169)	; &G0-4169; [33-73]
+     ((=cns11643-3	  . #x2662)	; &C3-2662; [06-66]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7075)	; 灵
       ))
+    (ideographic-radical . 86)	; ⽕
+    (ideographic-strokes . 3)
+    (total-strokes	 . 7)
+    (=ucs@unicode	. #x7075)	; &G0-4169;
+    (=gb2312		. #x4169)	; &G0-4169; [33-73]
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x7076)	; 灶
+    (=big5		. #xA85F)	; &I-B-A85F;
     (->subsumptive
      ((=ucs@unicode	  . #x7076)	; &M-18869;
       (=gb2312		  . #x546E)	; &M-18869; [52-78]
       (=jis-x0212	  . #x4947)	; &I-JSP-4947; [41-39]
       (=jis-x0213-2	  . #x6F5A)	; &I-JX2-6F5A; [79-58]
-      (=big5		  . #xA85F)	; &I-B-A85F;
       (=daikanwa	  . 18869)	; &I-M-18869;
+      (=shinjigen	  .  5728)	; &M-18869;
       (=jef-china3	  . #x57D7)	; &I-JC3-57D7;
+      (<-vulgar
+       ((=ucs@jis/1990	    . #x7AC8)	; &M-25703;
+	(=ucs@jis/2000	    . #x7AC8)	; &M-25703;
+	(=jis-x0208@1978    . #x3376)	; &M-25703; [19-86]
+	(=jis-x0208@1983    . #x635E)	; &I-J83-635E; [67-62]
+	(=jis-x0208@1990    . #x635E)	; &I-J90-635E; [67-62]
+	(=jis-x0213-1@2000  . #x635E)	; &I-JX1-635E; [67-62]
+	(=daikanwa	    . 25703)	; &I-M-25703;
+	(=shinjigen	    .  5727)	; &M-25703;
+	))
+      (<-vulgar*sources
+       shinjigen)
       )
      ((=cns11643-1	  . #x4B22)	; &C1-4B22; [43-02]
       ))
@@ -488,17 +517,24 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x7078)	; 灸
+    (=>jis-x0208	. #x3564)	; 灸 [21-68]
+    (=>jis-x0213-1	. #x3564)	; 灸 [21-68]
+    (=big5		. #xA862)	; &I-B-A862;
     (->subsumptive
-     ((=ucs@jis		  . #x7078)	; &GT-24174;
-      (=jis-x0208	  . #x3564)	; &GT-24174; [21-68]
-      (=ks-x1001	  . #x4F36)	; &I-K0-4F36; [47-22]
-      (=jis-x0213-1	  . #x3564)	; &I-JX1-3564; [21-68]
-      (=big5		  . #xA862)	; &I-B-A862;
+     ((=ucs@jis/2004	  . #x7078)	; &GT-24174;
+      (=ks-x1001	  . #x4F36)	; &GT-24174; [47-22]
+      (=jis-x0213-1@2004  . #x3564)	; &I-JX3-3564; [21-68]
       (=gt		  . 24174)	; &I-GT-24174;
       (=gt-pj-1		  . #x3564)	; &I-GT-24174; [21-68]
       (=daikanwa	  . 18872)	; &I-M-18872;
+      (=shinjigen@1ed	  .  4555)	; &GT-24174;
       (=shinjigen@rev	  .  4556)	; &GT-24174;
       )
+     ((=ucs@jis/1990	  . #x7078)	; &J90-3564;
+      (=ucs@jis/2000	  . #x7078)	; &J90-3564;
+      (=jis-x0208	  . #x3564)	; &J90-3564; [21-68]
+      (=jis-x0213-1@2000  . #x3564)	; &I-JX1-3564; [21-68]
+      )
      ((=ucs@unicode	  . #x7078)	; &G0-3E44;
       (=gb2312		  . #x3E44)	; &G0-3E44; [30-36]
       )
@@ -616,8 +652,9 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=ucs		. #x707C)	; 灼
+    (=>jis-x0208	. #x3C5E)	; 灼 [28-62]
+    (=>jis-x0213-1	. #x3C5E)	; 灼 [28-62]
     (=big5		. #xA860)	; &I-B-A860;
-    (=jis-x0208@1997	. #x3C5E)	; 灼 [28-62]
     ))
 (define-char
   '((<-denotational
@@ -626,8 +663,10 @@
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=ucs@jis/2004	. #x707C)	; &GT-24181;
     (=jis-x0208@1978	. #x3C5E)	; &GT-24181; [28-62]
     (=ks-x1001		. #x6D47)	; &I-K0-6D47; [77-39]
+    (=jis-x0213-1@2004	. #x3C5E)	; &I-JX3-3C5E; [28-62]
     (=gt		. 24181)	; &I-GT-24181;
     (=gt-k		. 02568)	; &I-GT-K02568;
     (=gt-pj-4		. #x5A44)	; &I-GT-24181; [58-36]
@@ -645,11 +684,18 @@
       (=gb2312		  . #x5746)	; &GT-24182; [55-38]
       (=jis-x0208@1983	  . #x3C5E)	; &I-J83-3C5E; [28-62]
       (=jis-x0208@1990	  . #x3C5E)	; &I-J90-3C5E; [28-62]
-      (=jis-x0213-1	  . #x3C5E)	; &I-JX1-3C5E; [28-62]
+      (=jis-x0213-1@2000  . #x3C5E)	; &I-JX1-3C5E; [28-62]
       (=gt		  . 24182)	; &I-GT-24182;
       (=gt-k		  . 02569)	; &I-GT-K02569;
       (=gt-pj-1		  . #x3C5E)	; &I-GT-24182; [28-62]
       (=jef-china3	  . #x58AA)	; &I-JC3-58AA;
+      (<-simplified@JP/extra/design
+       ((=ucs@jis/2004	    . #x707C)	; &GT-24181;
+	(=jis-x0208@1978    . #x3C5E)	; &GT-24181; [28-62]
+	(=ks-x1001	    . #x6D47)	; &I-K0-6D47; [77-39]
+	(=jis-x0213-1@2004  . #x3C5E)	; &I-JX3-3C5E; [28-62]
+	(=daikanwa	    . 18878)	; &I-M-18878;
+	))
       )
      ((=cns11643-1	  . #x4B23)	; &C1-4B23; [43-03]
       ))
@@ -2493,6 +2539,12 @@
     (=ucs@iso		. #x241C7)	; &U-000241C7;
     ))
 (define-char
+  '((ideographic-radical@simplified . 86)	; ⽕
+    (ideographic-radical@traditional . 87)	; ⽖
+    (=ucs@big5		. #x70BA)	; &B-ACB0;
+    (=big5		. #xACB0)	; &B-ACB0;
+    ))
+(define-char
   '((<-denotational
      ((=ucs@big5	  . #x70BA)	; &B-ACB0;
       (=big5		  . #xACB0)	; &B-ACB0;
@@ -2520,12 +2572,6 @@
       ))
     ))
 (define-char
-  '((ideographic-radical@simplified . 86)	; ⽕
-    (ideographic-radical@traditional . 87)	; ⽖
-    (=ucs@big5		. #x70BA)	; &B-ACB0;
-    (=big5		. #xACB0)	; &B-ACB0;
-    ))
-(define-char
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 5)
     (total-strokes	 . 9)
@@ -4559,8 +4605,14 @@
       ))
     ))
 (define-char
+  '((ideographic-radical@jis/a . 86)	; ⽕
+    (ideographic-radical@jis/b . 203)	; ⿊
+    (ideographic-strokes@jis/b . 0)
+    (=>jis-x0208@1997	. #x3975)	; &J97-3975; [25-85]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3975)	; &J97-3975; [25-85]
+     ((=>jis-x0208@1997	  . #x3975)	; &J97-3975; [25-85]
       ))
     (ideographic-radical@ucs . 203)	; ⿊
     (ideographic-strokes@ucs . 0)
@@ -5426,20 +5478,24 @@
     (=hanziku-6		. #xCA59)	; &I-HZK06-CA59;
     ))
 (define-char
+  '((ideographic-radical . 86)	; ⽕
+    (=>jis-x0208@1997	. #x316B)	; &J97-316B; [17-75]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x316B)	; &J97-316B; [17-75]
+     ((=>jis-x0208@1997	  . #x316B)	; &J97-316B; [17-75]
       ))
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
     (=ucs		. #x7130)	; 焰
+    (=big5		. #xB54B)	; &I-B-B54B;
     (->subsumptive
      ((=ucs@jis		  . #x7130)	; &M-19141;
       (=jis-x0208@1978	  . #x316B)	; &M-19141; [17-75]
       (=ks-x1001	  . #x667B)	; &I-K0-667B; [70-91]
       (=jis-x0212	  . #x496F)	; &I-JSP-496F; [41-79]
       (=jis-x0213-1	  . #x7751)	; &I-JX1-7751; [87-49]
-      (=big5		  . #xB54B)	; &I-B-B54B;
       (=daikanwa	  . 19141)	; &I-M-19141;
       )
      ((=ucs@unicode	  . #x7130)	; &G0-5166;
@@ -5449,12 +5505,8 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 86)	; ⽕
-    (=jis-x0208@1997	. #x316B)	; &J97-316B; [17-75]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x316B)	; &J97-316B; [17-75]
+     ((=>jis-x0208@1997	  . #x316B)	; &J97-316B; [17-75]
       ))
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 7)
@@ -5470,7 +5522,7 @@
       (=gt		  . 24380)	; &I-GT-24380;
       (=gt-pj-1		  . #x316B)	; &I-GT-24380; [17-75]
       (=jef-china3	  . #x70E0)	; &I-JC3-70E0;
-      (<-simplified@JP
+      (<-simplified@JP/jis
        ((=ucs@jis	    . #x7130)	; &M-19141;
 	(=jis-x0208@1978    . #x316B)	; &M-19141; [17-75]
 	(=ks-x1001	    . #x667B)	; &I-K0-667B; [70-91]
@@ -5881,8 +5933,8 @@
 (define-char
   '((ideographic-radical . 86)	; ⽕
     (=ucs		. #x716E)	; 煮
+    (=>jis-x0208@1997	. #x3C51)	; 煮 [28-49]
     (=big5		. #xB54E)	; &I-B-B54E;
-    (=jis-x0208@1997	. #x3C51)	; 煮 [28-49]
     ))
 (define-char
   '((<-denotational
@@ -6256,6 +6308,8 @@
 (define-char
   '((ideographic-radical . 86)	; ⽕
     (=ucs		. #x7149)	; 煉
+    (=>jis-x0208	. #x4E7B)	; 煉 [46-91]
+    (=>jis-x0213-1	. #x4E7B)	; 煉 [46-91]
     ))
 (define-char
   '((<-denotational
@@ -6264,12 +6318,13 @@
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=big5		. #xB7D2)	; &B-B7D2;
     (->subsumptive
      ((=ucs@unicode	  . #x7149)	; &M-19178;
       (=jis-x0208@1978	  . #x4E7B)	; &M-19178; [46-91]
       (=ks-x1001	  . #x5621)	; &I-K0-5621; [54-01]
+      (=jis-x0213-1@2004  . #x4E7B)	; &I-JX3-4E7B; [46-91]
       (=gb12345		  . #x4136)	; &M-19178; [33-22]
-      (=big5		  . #xB7D2)	; &I-B-B7D2;
       (=daikanwa	  . 19178)	; &I-M-19178;
       )
      ((=cns11643-1	  . #x6478)	; &C1-6478; [68-88]
@@ -6282,13 +6337,21 @@
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 8)
     (total-strokes	 . 12)
-    (=ucs@jis		. #x7149)	; &GT-24542;
+    (=ucs@jis/1990	. #x7149)	; &GT-24542;
+    (=ucs@jis/2000	. #x7149)	; &GT-24542;
     (=jis-x0208@1983	. #x4E7B)	; &GT-24542; [46-91]
     (=jis-x0208@1990	. #x4E7B)	; &I-J90-4E7B; [46-91]
-    (=jis-x0213-1	. #x4E7B)	; &I-JX1-4E7B; [46-91]
+    (=jis-x0213-1@2000	. #x4E7B)	; &I-JX1-4E7B; [46-91]
     (=gt		. 24542)	; &I-GT-24542;
     (=gt-pj-1		. #x4E7B)	; &I-GT-24542; [46-91]
     (=jef-china3	. #x58AD)	; &I-JC3-58AD;
+    (<-simplified@JP/jis
+     ((=ucs@unicode	  . #x7149)	; &M-19178;
+      (=jis-x0208@1978	  . #x4E7B)	; &M-19178; [46-91]
+      (=ks-x1001	  . #x5621)	; &I-K0-5621; [54-01]
+      (=jis-x0213-1@2004  . #x4E7B)	; &I-JX3-4E7B; [46-91]
+      (=daikanwa	  . 19178)	; &I-M-19178;
+      ))
     ))
 (define-char
   '((=>ucs		. #x714A)	; 煊
@@ -6392,8 +6455,10 @@
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=ucs@jis/2004	. #x714E)	; &M-19184;
     (=jis-x0208@1978	. #x4079)	; &M-19184; [32-89]
     (=ks-x1001		. #x6F21)	; &I-K0-6F21; [79-01]
+    (=jis-x0213-1@2004	. #x4079)	; &I-JX3-4079; [32-89]
     (=daikanwa		. 19184)	; &I-M-19184;
     ))
 (define-char
@@ -6403,20 +6468,22 @@
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=big5		. #xB7CE)	; &B-B7CE;
     (->subsumptive
      ((=ucs@unicode	  . #x714E)	; &GT-24620;
       (=gb2312		  . #x3C65)	; &GT-24620; [28-69]
       (=jis-x0208@1983	  . #x4079)	; &I-J83-4079; [32-89]
       (=jis-x0208@1990	  . #x4079)	; &I-J90-4079; [32-89]
-      (=jis-x0213-1	  . #x4079)	; &I-JX1-4079; [32-89]
-      (=big5		  . #xB7CE)	; &I-B-B7CE;
+      (=jis-x0213-1@2000  . #x4079)	; &I-JX1-4079; [32-89]
       (=gt		  . 24620)	; &I-GT-24620;
       (=gt-k		  . 10233)	; &I-GT-K10233;
       (=gt-pj-1		  . #x4079)	; &I-GT-24620; [32-89]
       (=jef-china3	  . #x58AB)	; &I-JC3-58AB;
-      (<-simplified@JP/misc
-       ((=jis-x0208@1978    . #x4079)	; &M-19184; [32-89]
+      (<-simplified@JP/extra/design
+       ((=ucs@jis/2004	    . #x714E)	; &M-19184;
+	(=jis-x0208@1978    . #x4079)	; &M-19184; [32-89]
 	(=ks-x1001	    . #x6F21)	; &I-K0-6F21; [79-01]
+	(=jis-x0213-1@2004  . #x4079)	; &I-JX3-4079; [32-89]
 	(=daikanwa	    . 19184)	; &I-M-19184;
 	))
       )
@@ -8088,6 +8155,8 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x717D)	; 煽
+    (=>jis-x0208	. #x407A)	; 煽 [32-90]
+    (=>jis-x0213-1	. #x407A)	; 煽 [32-90]
     (=big5		. #xBAB4)	; &I-B-BAB4;
     ))
 (define-char
@@ -8097,7 +8166,9 @@
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=ucs@jis/2004	. #x717D)	; &M-19272;
     (=ks-x1001		. #x6043)	; &M-19272; [64-35]
+    (=jis-x0213-1@2004	. #x407A)	; &I-JX3-407A; [32-90]
     (=daikanwa		. 19272)	; &I-M-19272;
     ))
 (define-char
@@ -8126,15 +8197,18 @@
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=ucs@jis		. #x717D)	; &GT-24721;
+    (=ucs@jis/1990	. #x717D)	; &GT-24721;
+    (=ucs@jis/2000	. #x717D)	; &GT-24721;
     (=jis-x0208@1983	. #x407A)	; &GT-24721; [32-90]
     (=jis-x0208@1990	. #x407A)	; &I-J90-407A; [32-90]
-    (=jis-x0213-1	. #x407A)	; &I-JX1-407A; [32-90]
+    (=jis-x0213-1@2000	. #x407A)	; &I-JX1-407A; [32-90]
     (=gt		. 24721)	; &I-GT-24721;
     (=gt-pj-1		. #x407A)	; &I-GT-24721; [32-90]
     (=jef-china3	. #x58AC)	; &I-JC3-58AC;
-    (<-simplified@JP/misc
-     ((=ks-x1001	  . #x6043)	; &M-19272; [64-35]
+    (<-simplified@JP/extra/design
+     ((=ucs@jis/2004	  . #x717D)	; &M-19272;
+      (=ks-x1001	  . #x6043)	; &M-19272; [64-35]
+      (=jis-x0213-1@2004  . #x407A)	; &I-JX3-407A; [32-90]
       (=daikanwa	  . 19272)	; &I-M-19272;
       ))
     ))
@@ -9252,6 +9326,14 @@
   '((ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x706B)	; 火
+      )
+     ((=ucs		  . #x9022)	; 逢
+      ))
     (=ucs		. #x71A2)	; 熢
     ))
 (define-char
@@ -9272,14 +9354,10 @@
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
 	(=ucs		    . #x2FF0)	; â¿°
 	)
-       ((=ucs@unicode	    . #x706B)	; &GT-24152;
-	(=jis-x0208	    . #x3250)	; &GT-24152; [18-48]
-	(=gb2312	    . #x3B70)	; &I-G0-3B70; [27-80]
-	(=ks-x1001	    . #x7B7D)	; &I-K0-7B7D; [91-93]
-	(=jis-x0213-1	    . #x3250)	; &I-JX1-3250; [18-48]
-	(=daikanwa	    . 18850)	; &I-M-18850;
+       ((=gt-k		    . 00405)	; &GT-K00405;
 	)
-       ((=ks-x1001	    . #x5C71)	; &M-38901; [60-81]
+       ((=ucs@jis/2004	    . #x9022)	; &M-38901;
+	(=ks-x1001	    . #x5C71)	; &M-38901; [60-81]
 	(=jis-x0213-1@2004  . #x3029)	; &I-JX3-3029; [16-09]
 	(=daikanwa	    . 38901)	; &I-M-38901;
 	))
@@ -9315,12 +9393,7 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@unicode	  . #x706B)	; &GT-24152;
-      (=jis-x0208	  . #x3250)	; &GT-24152; [18-48]
-      (=gb2312		  . #x3B70)	; &I-G0-3B70; [27-80]
-      (=ks-x1001	  . #x7B7D)	; &I-K0-7B7D; [91-93]
-      (=jis-x0213-1	  . #x3250)	; &I-JX1-3250; [18-48]
-      (=daikanwa	  . 18850)	; &I-M-18850;
+     ((=gt-k		  . 00405)	; &GT-K00405;
       )
      ((=ucs@unicode	  . #x9022)	; &GT-52042;
       (=jis-x0208@1978/-4pr . #x3029)	; &GT-52042; [16-09]
@@ -11326,8 +11399,15 @@
     (=ucs@unicode	. #x71D6)	; &UU+71D6;
     ))
 (define-char
+  '((ideographic-radical . 86)	; ⽕
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (=>jis-x0208	. #x5F73)	; &J97-5F73; [63-83]
+    (=>jis-x0213-1	. #x5F73)	; &J97-5F73; [63-83]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5F73)	; &J97-5F73; [63-83]
+     ((=>jis-x0208	  . #x5F73)	; &J97-5F73; [63-83]
       ))
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 12)
@@ -11349,14 +11429,8 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 86)	; ⽕
-    (ideographic-strokes . 12)
-    (total-strokes	 . 16)
-    (=jis-x0208@1997	. #x5F73)	; &J97-5F73; [63-83]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x5F73)	; &J97-5F73; [63-83]
+     ((=>jis-x0208	  . #x5F73)	; &J97-5F73; [63-83]
       ))
     (ideographic-radical . 86)	; ⽕
     (ideographic-strokes . 12)
@@ -12813,6 +12887,14 @@
     ))
 (define-char
   '((ideographic-radical . 86)	; ⽕
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x706B)	; 火
+      )
+     ((=ucs		  . #x84EC)	; 蓬
+      ))
     (=ucs		. #x2446B)	; 𤑫
     ))
 (define-char
@@ -12826,17 +12908,12 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@unicode	  . #x706B)	; &GT-24152;
-      (=jis-x0208	  . #x3250)	; &GT-24152; [18-48]
-      (=gb2312		  . #x3B70)	; &I-G0-3B70; [27-80]
-      (=ks-x1001	  . #x7B7D)	; &I-K0-7B7D; [91-93]
-      (=jis-x0213-1	  . #x3250)	; &I-JX1-3250; [18-48]
-      (=daikanwa	  . 18850)	; &I-M-18850;
+     ((=gt-k		  . 00405)	; &GT-K00405;
       )
      ((=ucs@unicode	  . #x84EC)	; &GT-41746;
       (=gb2312		  . #x456E)	; &GT-41746; [37-78]
       (=jis-x0208@1983	  . #x4B29)	; &I-J83-4B29; [43-09]
-      (=jis-x0213-1	  . #x4B29)	; &I-JX1-4B29; [43-09]
+      (=jis-x0213-1@2000  . #x4B29)	; &I-JX1-4B29; [43-09]
       ))
     (=ucs@iso		. #x2446B)	; &U-0002446B;
     ))
@@ -13429,7 +13506,7 @@
     (ideographic-radical@cns . 130)	; ⾁
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (<=>gt		. 38767)	; &aGT-38767;
+    (=>>gt		. 38767)	; &G-GT-38767;
     (->subsumptive
      ((ideographic-radical . 130)	; ⾁
       (=gt		  . 38767)	; &GT-38767;
@@ -13449,7 +13526,7 @@
     (ideographic-radical@cns . 130)	; ⾁
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (<=>gt		. 38769)	; &aGT-38769;
+    (=>>gt		. 38769)	; &G-GT-38769;
     (->subsumptive
      ((ideographic-radical . 86)	; ⽕
       (=ucs@iso		  . #x24443)	; &GT-38769;
@@ -13471,10 +13548,12 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x706B)	; 火
+     ((=gt-k		  . 00405)	; &GT-K00405;
       )
-     ((=jis-x0208@1978	  . #x4B29)	; &J78-4B29; [43-09]
+     ((=ucs@jis/2004	  . #x84EC)	; &JX3-4B29;
+      (=jis-x0208@1978	  . #x4B29)	; &JX3-4B29; [43-09]
       (=ks-x1001	  . #x5C6F)	; &I-K0-5C6F; [60-79]
+      (=jis-x0213-1@2004  . #x4B29)	; &I-JX3-4B29; [43-09]
       ))
     (=cbeta		. 02412)	; &CB02412;
     ))
diff --git a/lisp/utf-2000/Ideograph-R087-Claw.el b/lisp/utf-2000/Ideograph-R087-Claw.el
index e776281..03cc0bb 100644
--- a/lisp/utf-2000/Ideograph-R087-Claw.el
+++ b/lisp/utf-2000/Ideograph-R087-Claw.el
@@ -787,6 +787,12 @@
     (=cns11643-6	. #x4158)	; &I-C6-4158; [33-56]
     ))
 (define-char
+  '((ideographic-radical@simplified . 86)	; ⽕
+    (ideographic-radical@traditional . 87)	; ⽖
+    (=ucs@big5		. #x70BA)	; &B-ACB0;
+    (=big5		. #xACB0)	; &B-ACB0;
+    ))
+(define-char
   '((<-denotational
      ((=ucs@big5	  . #x70BA)	; &B-ACB0;
       (=big5		  . #xACB0)	; &B-ACB0;
@@ -815,12 +821,6 @@
     (=shinjigen		.  4703)	; &GT-25270;
     ))
 (define-char
-  '((ideographic-radical@simplified . 86)	; ⽕
-    (ideographic-radical@traditional . 87)	; ⽖
-    (=ucs@big5		. #x70BA)	; &B-ACB0;
-    (=big5		. #xACB0)	; &B-ACB0;
-    ))
-(define-char
   '((<-denotational
      ((=ucs		  . #x7232)	; 爲
       ))
diff --git a/lisp/utf-2000/Ideograph-R088-Father.el b/lisp/utf-2000/Ideograph-R088-Father.el
index f8ac9c5..867ade5 100644
--- a/lisp/utf-2000/Ideograph-R088-Father.el
+++ b/lisp/utf-2000/Ideograph-R088-Father.el
@@ -133,6 +133,18 @@
     (=ucs		. #x24553)	; 𤕓
     (->subsumptive
      ((=daikanwa	  . 19729)	; &M-19729;
+      (=shinjigen	  .  4712)	; &M-19729;
+      (<-ancient
+       ((=ucs@jis/1990	    . #x723A)	; &GT-25352;
+	(=ucs@jis/2000	    . #x723A)	; &GT-25352;
+	(=jis-x0208	    . #x4C6C)	; &GT-25352; [44-76]
+	(=ks-x1001	    . #x652C)	; &I-K0-652C; [69-12]
+	(=jis-x0213-1@2000  . #x4C6C)	; &I-JX1-4C6C; [44-76]
+	(=daikanwa	    . 19734)	; &I-M-19734;
+	(=shinjigen	    .  4711)	; &GT-25352;
+	))
+      (<-ancient*sources
+       zihui-bu daikanwa shinjigen)
       )
      ((=ucs@iso		  . #x24553)	; &C6-4159;
       (=cns11643-6	  . #x4159)	; &C6-4159; [33-57]
@@ -178,32 +190,47 @@
 (define-char
   '((ideographic-radical . 88)	; ⽗
     (=ucs		. #x3E19)	; 㸙
-    (->subsumptive
-     ((ideographic-strokes . 9)
-      (total-strokes	   . 13)
-      (=daikanwa	  . 19733)	; &M-19733;
-      )
-     ((ideographic-strokes . 8)
-      (total-strokes	   . 12)
-      (=ucs@unicode	  . #x3E19)	; &C4-386B;
-      (=cns11643-4	  . #x386B)	; &C4-386B; [24-75]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3E19)	; 㸙
+      ))
+    (ideographic-radical . 88)	; ⽗
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=daikanwa		. 19733)	; &M-19733;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x3E19)	; 㸙
       ))
+    (ideographic-radical . 88)	; ⽗
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=ucs@unicode	. #x3E19)	; &C4-386B;
+    (=cns11643-4	. #x386B)	; &C4-386B; [24-75]
     ))
 (define-char
   '((ideographic-radical . 88)	; ⽗
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x723A)	; 爺
+    (=>jis-x0208	. #x4C6C)	; 爺 [44-76]
+    (=>jis-x0213-1	. #x4C6C)	; 爺 [44-76]
     (=big5		. #xB7DD)	; &I-B-B7DD;
     (->subsumptive
-     ((=ucs@jis		  . #x723A)	; &GT-25352;
+     ((=ucs@jis/1990	  . #x723A)	; &GT-25352;
+      (=ucs@jis/2000	  . #x723A)	; &GT-25352;
       (=jis-x0208	  . #x4C6C)	; &GT-25352; [44-76]
       (=ks-x1001	  . #x652C)	; &I-K0-652C; [69-12]
-      (=jis-x0213-1	  . #x4C6C)	; &I-JX1-4C6C; [44-76]
+      (=jis-x0213-1@2000  . #x4C6C)	; &I-JX1-4C6C; [44-76]
       (=gt		  . 25352)	; &I-GT-25352;
       (=gt-pj-1		  . #x4C6C)	; &I-GT-25352; [44-76]
       (=daikanwa	  . 19734)	; &I-M-19734;
-      (=shinjigen@rev	  .  4711)	; &GT-25352;
+      (=shinjigen	  .  4711)	; &GT-25352;
+      )
+     ((=ucs@jis/2004	  . #x723A)	; &JX3-4C6C;
+      (=jis-x0213-1@2004  . #x4C6C)	; &JX3-4C6C; [44-76]
       )
      ((=cns11643-1	  . #x6525)	; &C1-6525; [69-05]
       )
diff --git a/lisp/utf-2000/Ideograph-R089-Double-X.el b/lisp/utf-2000/Ideograph-R089-Double-X.el
index f41a059..1b2e24c 100644
--- a/lisp/utf-2000/Ideograph-R089-Double-X.el
+++ b/lisp/utf-2000/Ideograph-R089-Double-X.el
@@ -184,60 +184,38 @@
     (=gt-k		. 11127)	; &I-GT-K11127;
     (=gt-pj-1		. #x3C24)	; &I-GT-25366; [28-04]
     (=daikanwa		. 19750)	; &I-M-19750;
-    (=shinjigen@rev	.  4714)	; 爾
+    (=shinjigen		.  4714)	; 爾
     ))
 (define-char
-  '((=>ucs		. #x723E)	; 爾
-    (morohashi-daikanwa	19750 0 9)
+  '((<-denotational
+     ((=ucs		  . #x723E)	; 爾
+      ))
     (ideographic-radical . 89)	; ⽘
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=jef-china3	. #x41A4)	; &JC3-41A4;
     ))
 (define-char
-  '((ideographic-	(:radical	9 ; ⼈
-			 :strokes	12
-			 :sources	(ucs))
-			(:radical	89 ; ⽘
-			 :strokes	10
-			 :sources	(morohashi-daikanwa cns-11643)))
+  '((ideographic-radical@ucs . 9)	; ⼈
+    (ideographic-strokes@ucs . 12)
+    (ideographic-radical@cns . 89)	; ⽘
+    (ideographic-strokes@cns . 10)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (ideographic-strokes@cns*sources
+     daikanwa)
     (total-strokes	 . 14)
     (hanyu-dazidian	1 216 4)
-    (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW")
-      (=ucs		  . #x2FF3)	; ⿳
-      )
-     ((=big5-cdp	  . #x8AFC)	; &CDP-8AFC;
-      )
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-	(=ucs		    . #x2FF0)	; â¿°
-	)
-       ((=ucs		    . #x723B)	; 爻
-	)
-       ((=ucs		    . #x723B)	; 爻
-	))
-      )
-     ((=ucs		  . #x5140)	; 兀
-      ))
     (=ucs		. #x2039B)	; 𠎛
     (=cns11643-6	. #x5E57)	; &I-C6-5E57; [62-55]
     (=daikanwa		. 19751)	; &I-M-19751;
     (=hanziku-1		. #xD2C7)	; &I-HZK01-D2C7;
-    ))
-(define-char
-  '((ideographic-radical . 89)	; ⽘
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x2458F)	; 𤖏
-    (=cns11643-6	. #x5E58)	; &I-C6-5E58; [62-56]
-    ))
-(define-char
-  '((ideographic-radical . 89)	; ⽘
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs		. #x24590)	; 𤖐
-    (=cns11643-6	. #x5E59)	; &I-C6-5E59; [62-57]
+    (<-same
+     ((=ucs		  . #x24564)	; 𤕤
+      (=daikanwa	  . 19748)	; &I-M-19748;
+      ))
+    (<-same*sources
+     ermuzi daikanwa)
     ))
 (define-char
   '((=>ucs		. #x24567)	; 𤕧
diff --git a/lisp/utf-2000/Ideograph-R090-Half-Tree-Trunk.el b/lisp/utf-2000/Ideograph-R090-Half-Tree-Trunk.el
index 68fadd7..c23cf6b 100644
--- a/lisp/utf-2000/Ideograph-R090-Half-Tree-Trunk.el
+++ b/lisp/utf-2000/Ideograph-R090-Half-Tree-Trunk.el
@@ -630,6 +630,32 @@
     ))
 (define-char
   '((ideographic-radical . 90)	; ⽙
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x2458F)	; 𤖏
+    (->subsumptive
+     ((=daikanwa	  . 19793)	; &M-19793;
+      )
+     ((=ucs@iso		  . #x2458F)	; &U-0002458F;
+      )
+     ((=cns11643-6	  . #x5E58)	; &C6-5E58; [62-56]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 90)	; ⽙
+    (ideographic-strokes . 10)
+    (total-strokes	 . 14)
+    (=ucs		. #x24590)	; 𤖐
+    (->subsumptive
+     ((=daikanwa	  . 19794)	; &M-19794;
+      )
+     ((=ucs@iso		  . #x24590)	; &U-00024590;
+      )
+     ((=cns11643-6	  . #x5E59)	; &C6-5E59; [62-57]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 90)	; ⽙
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=ucs		. #x24593)	; 𤖓
diff --git a/lisp/utf-2000/Ideograph-R091-Slice.el b/lisp/utf-2000/Ideograph-R091-Slice.el
index 3267abd..1591992 100644
--- a/lisp/utf-2000/Ideograph-R091-Slice.el
+++ b/lisp/utf-2000/Ideograph-R091-Slice.el
@@ -802,29 +802,49 @@
 (define-char
   '((ideographic-radical . 91)	; ⽚
     (=ucs		. #x724C)	; 牌
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x724C)	; 牌
+      ))
+    (ideographic-radical . 91)	; ⽚
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=big5		. #xB550)	; &B-B550;
     (->subsumptive
-     ((ideographic-strokes . 8)
-      (total-strokes	   . 12)
-      (=ucs@unicode	  . #x724C)	; &M-19854;
+     ((=ucs@unicode	  . #x724C)	; &M-19854;
       (=jis-x0208@1978	  . #x4757)	; &M-19854; [39-55]
       (=gb2312		  . #x4546)	; &I-G0-4546; [37-38]
       (=ks-x1001	  . #x782B)	; &I-K0-782B; [88-11]
-      (=big5		  . #xB550)	; &I-B-B550;
+      (=jis-x0213-1@2004  . #x4757)	; &I-JX3-4757; [39-55]
       (=daikanwa	  . 19854)	; &I-M-19854;
-      (=shinjigen@rev	  .  4725)	; &M-19854;
-      )
-     ((ideographic-strokes . 8)
-      (total-strokes	   . 12)
-      (=cns11643-1	  . #x6056)	; &C1-6056; [64-54]
+      (=shinjigen	  .  4725)	; &M-19854;
       )
-     ((ideographic-strokes . 9)
-      (total-strokes	   . 13)
-      (=ucs@jis		  . #x724C)	; &GT-25508;
-      (=jis-x0208@1983	  . #x4757)	; &GT-25508; [39-55]
-      (=jis-x0208@1990	  . #x4757)	; &I-J90-4757; [39-55]
-      (=jis-x0213-1	  . #x4757)	; &I-JX1-4757; [39-55]
-      (=gt		  . 25508)	; &I-GT-25508;
-      (=gt-pj-1		  . #x4757)	; &I-GT-25508; [39-55]
+     ((=cns11643-1	  . #x6056)	; &C1-6056; [64-54]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x724C)	; 牌
+      ))
+    (ideographic-radical . 91)	; ⽚
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=ucs@jis/1990	. #x724C)	; &GT-25508;
+    (=ucs@jis/2000	. #x724C)	; &GT-25508;
+    (=jis-x0208@1983	. #x4757)	; &GT-25508; [39-55]
+    (=jis-x0208@1990	. #x4757)	; &I-J90-4757; [39-55]
+    (=jis-x0213-1@2000	. #x4757)	; &I-JX1-4757; [39-55]
+    (=gt		. 25508)	; &I-GT-25508;
+    (=gt-pj-1		. #x4757)	; &I-GT-25508; [39-55]
+    (=jef-china3	. #x58BF)	; &I-JC3-58BF;
+    (<-simplified@JP/extra/design
+     ((=ucs@unicode	  . #x724C)	; &M-19854;
+      (=jis-x0208@1978	  . #x4757)	; &M-19854; [39-55]
+      (=gb2312		  . #x4546)	; &I-G0-4546; [37-38]
+      (=ks-x1001	  . #x782B)	; &I-K0-782B; [88-11]
+      (=jis-x0213-1@2004  . #x4757)	; &I-JX3-4757; [39-55]
+      (=daikanwa	  . 19854)	; &I-M-19854;
       ))
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R092-Fang.el b/lisp/utf-2000/Ideograph-R092-Fang.el
index ed3bae4..8c2ae29 100644
--- a/lisp/utf-2000/Ideograph-R092-Fang.el
+++ b/lisp/utf-2000/Ideograph-R092-Fang.el
@@ -3,8 +3,9 @@
   '((ideographic-radical . 92)	; ⽛
     (ideographic-strokes . 0)
     (=ucs		. #x7259)	; 牙
+    (=>jis-x0208	. #x3267)	; 牙 [18-71]
+    (=>jis-x0213-1	. #x3267)	; 牙 [18-71]
     (=big5		. #xA4FA)	; &I-B-A4FA;
-    (=jis-x0208@1997	. #x3267)	; 牙 [18-71]
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R093-Cow.el b/lisp/utf-2000/Ideograph-R093-Cow.el
index 1a5c670..4adb02d 100644
--- a/lisp/utf-2000/Ideograph-R093-Cow.el
+++ b/lisp/utf-2000/Ideograph-R093-Cow.el
@@ -1139,21 +1139,27 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
     (=ucs		. #x727D)	; 牽
+    (=>jis-x0208	. #x3823)	; 牽 [24-03]
+    (=>jis-x0213-1	. #x3823)	; 牽 [24-03]
     (=big5		. #xB26F)	; &I-B-B26F;
     (->subsumptive
-     ((=ucs@jis		  . #x727D)	; &GT-25686;
-      (=jis-x0208	  . #x3823)	; &GT-25686; [24-03]
-      (=ks-x1001	  . #x4C32)	; &I-K0-4C32; [44-18]
-      (=jis-x0213-1	  . #x3823)	; &I-JX1-3823; [24-03]
+     ((=ucs@jis/2004	  . #x727D)	; &GT-25686;
+      (=ks-x1001	  . #x4C32)	; &GT-25686; [44-18]
+      (=jis-x0213-1@2004  . #x3823)	; &I-JX3-3823; [24-03]
       (=gt		  . 25686)	; &I-GT-25686;
       (=gt-k		  . 07756)	; &I-GT-K07756;
       (=gt-pj-1		  . #x3823)	; &I-GT-25686; [24-03]
       (=daikanwa	  . 20025)	; &I-M-20025;
-      (=shinjigen@rev	  .  4745)	; &GT-25686;
+      (=shinjigen	  .  4745)	; &GT-25686;
       )
      ((=ucs@unicode	  . #x727D)	; &C1-5B74;
       (=cns11643-1	  . #x5B74)	; &C1-5B74; [59-84]
       (=gb12345		  . #x4723)	; &C1-5B74; [39-03]
+      )
+     ((=ucs@jis/1990	  . #x727D)	; &J90-3823;
+      (=ucs@jis/2000	  . #x727D)	; &J90-3823;
+      (=jis-x0208	  . #x3823)	; &J90-3823; [24-03]
+      (=jis-x0213-1@2000  . #x3823)	; &I-JX1-3823; [24-03]
       ))
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R094-Dog.el b/lisp/utf-2000/Ideograph-R094-Dog.el
index 7ae1293..9e52d42 100644
--- a/lisp/utf-2000/Ideograph-R094-Dog.el
+++ b/lisp/utf-2000/Ideograph-R094-Dog.el
@@ -1622,36 +1622,33 @@
     (=daikanwa		. 20364)	; &I-M-20364;
     ))
 (define-char
-  '((=>ucs		. #x72E1)	; 狡
-    (ideographic-radical . 94)	; ⽝
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (=ucs@jis		. #x72E1)	; &GT-26098;
-    (=jis-x0208		. #x6044)	; &GT-26098; [64-36]
-    (=ks-x1001		. #x4E6A)	; &I-K0-4E6A; [46-74]
-    (=jis-x0213-1	. #x6044)	; &I-JX1-6044; [64-36]
-    (=big5		. #xACBE)	; &I-B-ACBE;
-    (=gt		. 26098)	; &I-GT-26098;
-    (=gt-pj-1		. #x6044)	; &I-GT-26098; [64-36]
-    (=daikanwa		. 20365)	; &I-M-20365;
-    (=shinjigen@rev	.  4779)	; &GT-26098;
-    ))
-(define-char
-  '((=>ucs		. #x72E1)	; 狡
-    (morohashi-daikanwa	20365 0 0)
-    (ideographic-radical . 94)	; ⽝
-    (ideographic-strokes . 6)
-    (total-strokes	 . 9)
-    (mojikyo		. 020365)	; &MCS-60004F8D;
-    ))
-(define-char
-  '((morohashi-daikanwa	20365 0 1)
-    (ideographic-radical . 94)	; ⽝
+  '((ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x72E1)	; 狡
-    (=gb2312		. #x3D46)	; &I-G0-3D46; [29-38]
-    (=cns11643-1	. #x5241)	; &I-C1-5241; [50-33]
+    (=>jis-x0208	. #x6044)	; 狡 [64-36]
+    (=>jis-x0213-1	. #x6044)	; 狡 [64-36]
+    (=big5		. #xACBE)	; &I-B-ACBE;
+    (->subsumptive
+     ((=ucs@jis/1990	  . #x72E1)	; &GT-26098;
+      (=ucs@jis/2000	  . #x72E1)	; &GT-26098;
+      (=jis-x0208	  . #x6044)	; &GT-26098; [64-36]
+      (=ks-x1001	  . #x4E6A)	; &I-K0-4E6A; [46-74]
+      (=jis-x0213-1@2000  . #x6044)	; &I-JX1-6044; [64-36]
+      (=gt		  . 26098)	; &I-GT-26098;
+      (=gt-pj-1		  . #x6044)	; &I-GT-26098; [64-36]
+      (=daikanwa	  . 20365)	; &I-M-20365;
+      (=shinjigen	  .  4779)	; &GT-26098;
+      )
+     ((mojikyo		  . 020365)	; &MCS-60004F8D;
+      )
+     ((=ucs@jis/2004	  . #x72E1)	; &JX3-6044;
+      (=jis-x0213-1@2004  . #x6044)	; &JX3-6044; [64-36]
+      )
+     ((=ucs@unicode	  . #x72E1)	; &C1-5241;
+      (=gb2312		  . #x3D46)	; &C1-5241; [29-38]
+      (=cns11643-1	  . #x5241)	; &I-C1-5241; [50-33]
+      ))
     ))
 (define-char
   '((ideographic-radical . 94)	; ⽝
@@ -4306,9 +4303,14 @@
     (ideographic-radical . 94)	; ⽝
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
-    (=jis-x0208@1978	. #x4D32)	; &M-20558; [45-18]
-    (=ks-x1001		. #x6B23)	; &I-K0-6B23; [75-03]
-    (=daikanwa		. 20558)	; &I-M-20558;
+    (->subsumptive
+     ((=jis-x0208@1978	  . #x4D32)	; &M-20558; [45-18]
+      (=ks-x1001	  . #x6B23)	; &I-K0-6B23; [75-03]
+      (=daikanwa	  . 20558)	; &I-M-20558;
+      )
+     ((=ucs@jis/2004	  . #x7337)	; &JX3-4D32;
+      (=jis-x0213-1@2004  . #x4D32)	; &JX3-4D32; [45-18]
+      ))
     ))
 (define-char
   '((<-denotational
@@ -4320,10 +4322,11 @@
     (->subsumptive
      ((=cns11643-1	  . #x6527)	; &C1-6527; [69-07]
       )
-     ((=ucs@jis		  . #x7337)	; &J90-4D32;
+     ((=ucs@jis/1990	  . #x7337)	; &J90-4D32;
+      (=ucs@jis/2000	  . #x7337)	; &J90-4D32;
       (=jis-x0208@1983	  . #x4D32)	; &J90-4D32; [45-18]
       (=jis-x0208@1990	  . #x4D32)	; &I-J90-4D32; [45-18]
-      (=jis-x0213-1	  . #x4D32)	; &I-JX1-4D32; [45-18]
+      (=jis-x0213-1@2000  . #x4D32)	; &I-JX1-4D32; [45-18]
       )
      ((=ucs@unicode	  . #x7337)	; &GT-26390;
       (=gb2312		  . #x6960)	; &GT-26390; [73-64]
diff --git a/lisp/utf-2000/Ideograph-R096-Jade.el b/lisp/utf-2000/Ideograph-R096-Jade.el
index 10ae92b..6f03627 100644
--- a/lisp/utf-2000/Ideograph-R096-Jade.el
+++ b/lisp/utf-2000/Ideograph-R096-Jade.el
@@ -1841,8 +1841,9 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x73E5)	; 珥
+    (=>jis-x0208	. #x6062)	; 珥 [64-66]
+    (=>jis-x0213-1	. #x6062)	; 珥 [64-66]
     (=big5		. #xD2AD)	; &I-B-D2AD;
-    (=jis-x0208@1997	. #x6062)	; 珥 [64-66]
     (->subsumptive
      ((=jis-x0208@1978	  . #x6062)	; &GT-26818; [64-66]
       (=jis-x0208@1983	  . #x6062)	; &I-J83-6062; [64-66]
diff --git a/lisp/utf-2000/Ideograph-R098-Tile.el b/lisp/utf-2000/Ideograph-R098-Tile.el
index 0f678e4..8511297 100644
--- a/lisp/utf-2000/Ideograph-R098-Tile.el
+++ b/lisp/utf-2000/Ideograph-R098-Tile.el
@@ -1919,12 +1919,30 @@
     (ideographic-radical . 98)	; ⽡
     (ideographic-strokes . 12)
     (=big5		. #xED70)	; &B-ED70;
+    ))
+(define-char
+  '((<-denotational
+     ((=big5		  . #xED70)	; &B-ED70;
+      ))
+    (ideographic-radical . 98)	; ⽡
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
     (->subsumptive
-     ((total-strokes	   . 17)
-      (=jis-x0208@1978	  . #x3979)	; &M-21602; [25-89]
+     ((=jis-x0208@1978	  . #x3979)	; &M-21602; [25-89]
       (=ks-x1001	  . #x7177)	; &I-K0-7177; [81-87]
       (=daikanwa	  . 21602)	; &I-M-21602;
       )
+     ((=ucs@jis/2004	  . #x7511)	; &JX3-3979;
+      (=jis-x0213-1@2004  . #x3979)	; &JX3-3979; [25-89]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=big5		  . #xED70)	; &B-ED70;
+      ))
+    (ideographic-radical . 98)	; ⽡
+    (ideographic-strokes . 12)
+    (->subsumptive
      ((total-strokes	   . 17)
       (=ucs@cns		  . #x7511)	; &C2-5D5C;
       (=cns11643-2	  . #x5D5C)	; &C2-5D5C; [61-60]
@@ -1941,10 +1959,11 @@
     (ideographic-radical . 98)	; ⽡
     (ideographic-strokes . 11)
     (total-strokes	 . 16)
-    (=ucs@jis		. #x7511)	; &GT-27722;
+    (=ucs@jis/1990	. #x7511)	; &GT-27722;
+    (=ucs@jis/2000	. #x7511)	; &GT-27722;
     (=jis-x0208@1983	. #x3979)	; &GT-27722; [25-89]
     (=jis-x0208@1990	. #x3979)	; &I-J90-3979; [25-89]
-    (=jis-x0213-1	. #x3979)	; &I-JX1-3979; [25-89]
+    (=jis-x0213-1@2000	. #x3979)	; &I-JX1-3979; [25-89]
     (=gt		. 27722)	; &I-GT-27722;
     (=gt-pj-1		. #x3979)	; &I-GT-27722; [25-89]
     (=jef-china3	. #x5AB6)	; &I-JC3-5AB6;
@@ -2157,17 +2176,24 @@
     (=big5		. #xC27C)	; &I-B-C27C;
     (->subsumptive
      ((total-strokes	   . 18)
-      (=ucs@jis		  . #x7515)	; &GT-27757;
-      (=jis-x0208@1983	  . #x6131)	; &GT-27757; [65-17]
-      (=ks-x1001	  . #x6838)	; &I-K0-6838; [72-24]
-      (=jis-x0208@1990	  . #x6131)	; &I-J90-6131; [65-17]
-      (=jis-x0213-1	  . #x6131)	; &I-JX1-6131; [65-17]
+      (=daikanwa	  . 21617)	; &M-21617;
+      )
+     ((total-strokes	   . 18)
+      (=ucs@jis/2004	  . #x7515)	; &GT-27757;
+      (=ks-x1001	  . #x6838)	; &GT-27757; [72-24]
+      (=jis-x0213-1@2004  . #x6131)	; &I-JX3-6131; [65-17]
       (=gt		  . 27757)	; &I-GT-27757;
       (=gt-pj-1		  . #x6131)	; &I-GT-27757; [65-17]
-      (=daikanwa	  . 21617)	; &I-M-21617;
       (=shinjigen	  .  5002)	; &GT-27757;
       )
      ((total-strokes	   . 18)
+      (=ucs@jis/1990	  . #x7515)	; &J90-6131;
+      (=ucs@jis/2000	  . #x7515)	; &J90-6131;
+      (=jis-x0208@1983	  . #x6131)	; &J90-6131; [65-17]
+      (=jis-x0208@1990	  . #x6131)	; &I-J90-6131; [65-17]
+      (=jis-x0213-1@2000  . #x6131)	; &I-JX1-6131; [65-17]
+      )
+     ((total-strokes	   . 18)
       (=cns11643-1	  . #x7668)	; &C1-7668; [86-72]
       )
      ((total-strokes	   . 17)
diff --git a/lisp/utf-2000/Ideograph-R100-Life.el b/lisp/utf-2000/Ideograph-R100-Life.el
index 48064ed..34424e9 100644
--- a/lisp/utf-2000/Ideograph-R100-Life.el
+++ b/lisp/utf-2000/Ideograph-R100-Life.el
@@ -188,8 +188,15 @@
     (=daikanwa		. 21683)	; &I-M-21683;
     ))
 (define-char
+  '((ideographic-radical . 100)	; â½£
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
+    (=>jis-x0208	. #x3B3A)	; &J97-3B3A; [27-26]
+    (=>jis-x0213-1	. #x3B3A)	; &J97-3B3A; [27-26]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3B3A)	; &J97-3B3A; [27-26]
+     ((=>jis-x0208	  . #x3B3A)	; &J97-3B3A; [27-26]
       ))
     (ideographic-radical . 100)	; â½£
     (ideographic-strokes . 6)
@@ -206,14 +213,8 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 100)	; â½£
-    (ideographic-strokes . 6)
-    (total-strokes	 . 11)
-    (=jis-x0208@1997	. #x3B3A)	; &J97-3B3A; [27-26]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3B3A)	; &J97-3B3A; [27-26]
+     ((=>jis-x0208	  . #x3B3A)	; &J97-3B3A; [27-26]
       ))
     (ideographic-radical . 100)	; â½£
     (ideographic-strokes . 6)
@@ -229,6 +230,14 @@
       (=gt-k		  . 07770)	; &I-GT-K07770;
       (=gt-pj-1		  . #x3B3A)	; &I-GT-27847; [27-26]
       (mojikyo		  . 050288)	; &MCS-6000C470;
+      (<-same
+       ((=daikanwa	    . 21684)	; &M-21684;
+	))
+      (<-same*sources
+       daikanwa)
+      (<-simplified@JP/misc
+       ((=daikanwa	    . 21684)	; &M-21684;
+	))
       )
      ((=ucs@unicode	  . #x7523)	; &C3-3745;
       (=cns11643-3	  . #x3745)	; &C3-3745; [23-37]
@@ -314,21 +323,25 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
     (=ucs		. #x7526)	; 甦
+    (=>jis-x0208	. #x6134)	; 甦 [65-20]
+    (=>jis-x0213-1	. #x6134)	; 甦 [65-20]
     (=big5		. #xB564)	; &I-B-B564;
     (->subsumptive
-     ((=ucs@jis		  . #x7526)	; &GT-27855;
+     ((=ucs@jis/1990	  . #x7526)	; &GT-27855;
+      (=ucs@jis/2000	  . #x7526)	; &GT-27855;
       (=jis-x0208	  . #x6134)	; &GT-27855; [65-20]
       (=ks-x1001	  . #x6141)	; &I-K0-6141; [65-33]
-      (=jis-x0213-1	  . #x6134)	; &I-JX1-6134; [65-20]
+      (=jis-x0213-1@2000  . #x6134)	; &I-JX1-6134; [65-20]
       (=gt		  . 27855)	; &I-GT-27855;
       (=gt-pj-1		  . #x6134)	; &I-GT-27855; [65-20]
       (=daikanwa	  . 21691)	; &I-M-21691;
-      (=shinjigen@rev	  .  5012)	; &GT-27855;
+      (=shinjigen	  .  5012)	; &GT-27855;
       )
      ((=cns11643-1	  . #x606A)	; &C1-606A; [64-74]
       )
-     ((=ucs@unicode	  . #x7526)	; &EGB-2C75;
-      (=iso-ir165	  . #x2C75)	; &EGB-2C75; [12-85]
+     ((=ucs@unicode	  . #x7526)	; &JX3-6134;
+      (=iso-ir165	  . #x2C75)	; &JX3-6134; [12-85]
+      (=jis-x0213-1@2004  . #x6134)	; &I-JX3-6134; [65-20]
       ))
     ))
 (define-char
@@ -405,6 +418,16 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
     (=daikanwa		. 21697)	; &M-21697;
+    (<-same
+     ((=ucs@jis/1990	  . #x7526)	; &GT-27855;
+      (=ucs@jis/2000	  . #x7526)	; &GT-27855;
+      (=jis-x0208	  . #x6134)	; &GT-27855; [65-20]
+      (=ks-x1001	  . #x6141)	; &I-K0-6141; [65-33]
+      (=jis-x0213-1@2000  . #x6134)	; &I-JX1-6134; [65-20]
+      (=daikanwa	  . 21691)	; &I-M-21691;
+      ))
+    (<-same*sources
+     zihui daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -414,6 +437,18 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
     (=ucs@iso		. #x24BF3)	; &U-00024BF3;
+    (=shinjigen		.  5013)	; &U-00024BF3;
+    (<-formed
+     ((=ucs@jis/1990	  . #x7526)	; &GT-27855;
+      (=ucs@jis/2000	  . #x7526)	; &GT-27855;
+      (=jis-x0208	  . #x6134)	; &GT-27855; [65-20]
+      (=ks-x1001	  . #x6141)	; &I-K0-6141; [65-33]
+      (=jis-x0213-1@2000  . #x6134)	; &I-JX1-6134; [65-20]
+      (=daikanwa	  . 21691)	; &I-M-21691;
+      (=shinjigen	  .  5012)	; &GT-27855;
+      ))
+    (<-formed*sources
+     shinjigen)
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R102-Field.el b/lisp/utf-2000/Ideograph-R102-Field.el
index ce6144f..e0b6cf4 100644
--- a/lisp/utf-2000/Ideograph-R102-Field.el
+++ b/lisp/utf-2000/Ideograph-R102-Field.el
@@ -450,11 +450,19 @@
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
+    (=ucs		. #x22341)	; 𢍁
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x22341)	; 𢍁
+      ))
+    (ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
-    (=ucs		. #x22341)	; 𢍁
-    (=cns11643-4	. #x2741)	; &I-C4-2741; [07-33]
+    (=ucs@iso		. #x22341)	; &M-21752;
+    (=cns11643-4	. #x2741)	; &M-21752; [07-33]
     (=daikanwa		. 21752)	; &I-M-21752;
+    (=hanziku-7		. #xB4EB)	; &I-HZK07-B4EB;
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
@@ -579,6 +587,18 @@
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
+    (=ucs		. #x3F58)	; 㽘
+    (->subsumptive
+     ((=daikanwa	  . 21762)	; &M-21762;
+      )
+     ((=ucs@unicode	  . #x3F58)	; &C4-2A41;
+      (=cns11643-4	  . #x2A41)	; &C4-2A41; [10-33]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
     (=ucs		. #x7546)	; 畆
     (->subsumptive
      ((=ucs@jis		  . #x7546)	; &GT-27975;
@@ -627,6 +647,31 @@
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
+    (hanyu-dazidian	4 2535 5)
+    (=ucs		. #x24C29)	; 𤰩
+    (=cns11643-4	. #x2A42)	; &I-C4-2A42; [10-34]
+    (=daikanwa		. 21765)	; &I-M-21765;
+    (=hanziku-7		. #xB5EB)	; &I-HZK07-B5EB;
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=ucs		. #x24C2A)	; 𤰪
+    (->subsumptive
+     ((=ucs@iso		  . #x24C2A)	; &M-21766;
+      (=daikanwa	  . 21766)	; &M-21766;
+      )
+     ((=cns11643-5	  . #x2A4D)	; &C5-2A4D; [10-45]
+      )
+     ((hanyu-dazidian	  4 2534 4)
+      (=hanziku-7	  . #xB5CA)	; &HZK07-B5CA;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
     (=ucs		. #x7548)	; 畈
     (=big5		. #xCFDB)	; &I-B-CFDB;
     (->subsumptive
@@ -658,6 +703,64 @@
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
+    (hanyu-dazidian	4 2535 3)
+    (=ucs		. #x24C2B)	; 𤰫
+    (=cns11643-6	. #x3274)	; &I-C6-3274; [18-84]
+    (=daikanwa		. 21769)	; &I-M-21769;
+    (=hanziku-7		. #xB5E9)	; &I-HZK07-B5E9;
+    (<-ancient
+     ((=ucs@unicode	  . #x90A6)	; &GT-52932;
+      (=jis-x0208	  . #x4B2E)	; &GT-52932; [43-14]
+      (=gb2312		  . #x306E)	; &I-G0-306E; [16-78]
+      (=ks-x1001	  . #x5B40)	; &I-K0-5B40; [59-32]
+      (=jis-x0213-1	  . #x4B2E)	; &I-JX1-4B2E; [43-14]
+      (=daikanwa	  . 39310)	; &I-M-39310;
+      ))
+    (<-ancient*sources
+     zhengzitong daikanwa)
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=ucs		. #x24C2C)	; 𤰬
+    (->subsumptive
+     ((=daikanwa	  . 21770)	; &M-21770;
+      )
+     ((hanyu-dazidian	  4 2533 1)
+      (=ucs@iso		  . #x24C2C)	; &HZK07-B5A7;
+      (=cns11643-5	  . #x2A4C)	; &HZK07-B5A7; [10-44]
+      (=hanziku-7	  . #xB5A7)	; &I-HZK07-B5A7;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (hanyu-dazidian	4 2531 15)
+    (=ucs		. #x24C2D)	; 𤰭
+    (=cns11643-6	. #x3273)	; &I-C6-3273; [18-83]
+    (=daikanwa		. 21771)	; &I-M-21771;
+    (=hanziku-7		. #xB553)	; &I-HZK07-B553;
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (hanyu-dazidian	4 2535 1)
+    (=ucs		. #x24C2E)	; 𤰮
+    (->subsumptive
+     ((=ucs@iso		  . #x24C2E)	; &M-21772;
+      (=daikanwa	  . 21772)	; &M-21772;
+      (=hanziku-7	  . #xB5E7)	; &I-HZK07-B5E7;
+      )
+     ((=cns11643-5	  . #x2A4B)	; &C5-2A4B; [10-43]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
     (=ucs		. #x754A)	; 畊
     (=jis-x0208		. #x6139)	; &I-J90-6139; [65-25]
     (=cns11643-3	. #x2E28)	; &I-C3-2E28; [14-08]
@@ -665,7 +768,14 @@
     (=gt		. 27957)	; &I-GT-27957;
     (=gt-pj-1		. #x6139)	; &I-GT-27957; [65-25]
     (=daikanwa		. 21773)	; &I-M-21773;
-    (=shinjigen@rev	.  6358)	; 畊
+    (=shinjigen		.  6358)	; 畊
+    (<-formed
+     ((=cns11643-1	  . #x5755)	; &GT-37380; [55-53]
+      (=daikanwa	  . 28907)	; &I-M-28907;
+      (=shinjigen	  .  6357)	; &GT-37380;
+      ))
+    (<-formed*sources
+     shinjigen)
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
@@ -755,6 +865,111 @@
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
+    (=ucs		. #x24C2F)	; 𤰯
+    (->subsumptive
+     ((=daikanwa	  . 21779)	; &M-21779;
+      )
+     ((=cns11643-6	  . #x3276)	; &C6-3276; [18-86]
+      )
+     ((hanyu-dazidian	  4 2534 5)
+      (=ucs@iso		  . #x24C2F)	; &HZK07-B5CB;
+      (=hanziku-7	  . #xB5CB)	; &HZK07-B5CB;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (hanyu-dazidian	3 2033 2)
+    (=ucs		. #x24C30)	; 𤰰
+    (=cns11643-6	. #x327A)	; &I-C6-327A; [18-90]
+    (=daikanwa		. 21780)	; &I-M-21780;
+    (=hanziku-5		. #xF8A3)	; &I-HZK05-F8A3;
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=ucs		. #x24C31)	; 𤰱
+    (->subsumptive
+     ((=cns11643-6	  . #x3277)	; &M-21782; [18-87]
+      (=daikanwa	  . 21782)	; &I-M-21782;
+      )
+     ((=ucs@iso		  . #x24C31)	; &U-00024C31;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=ucs		. #x24C33)	; 𤰳
+    (->subsumptive
+     ((=daikanwa	  . 21783)	; &M-21783;
+      )
+     ((hanyu-dazidian	  4 2531 10)
+      (=hanziku-7	  . #xB54E)	; &HZK07-B54E;
+      )
+     ((=ucs@iso		  . #x24C33)	; &C5-2A4E;
+      (=cns11643-5	  . #x2A4E)	; &C5-2A4E; [10-46]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=ucs		. #x24C34)	; 𤰴
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24C34)	; 𤰴
+      ))
+    (ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (hanyu-dazidian	4 2531 6)
+    (=ucs@iso		. #x24C34)	; &M-21784;
+    (=daikanwa		. 21784)	; &M-21784;
+    (=hanziku-7		. #xB54A)	; &I-HZK07-B54A;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x24C34)	; 𤰴
+      ))
+    (ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=cns11643-6	. #x3278)	; &C6-3278; [18-88]
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=ucs		. #x24C35)	; 𤰵
+    (->subsumptive
+     ((=cns11643-6	  . #x3275)	; &M-21785; [18-85]
+      (=daikanwa	  . 21785)	; &I-M-21785;
+      )
+     ((hanyu-dazidian	  4 2532 2)
+      (=ucs@iso		  . #x24C35)	; &HZK07-B566;
+      (=hanziku-7	  . #xB566)	; &HZK07-B566;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=ucs		. #x3F59)	; 㽙
+    (->subsumptive
+     ((=ucs@unicode	  . #x3F59)	; &M-21786;
+      (=daikanwa	  . 21786)	; &M-21786;
+      )
+     ((=cns11643-3	  . #x2E29)	; &C3-2E29; [14-09]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
     (=ucs		. #x7550)	; 畐
     (=jis-x0212		. #x4D35)	; &I-JSP-4D35; [45-21]
     (=cns11643-3	. #x2E26)	; &I-C3-2E26; [14-06]
@@ -804,6 +1019,14 @@
     (=cns11643-5	. #x2A4F)	; &I-C5-2A4F; [10-47]
     ))
 (define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
+    (=ucs		. #x3F5A)	; 㽚
+    (=cns11643-4	. #x2A43)	; &I-C4-2A43; [10-35]
+    (=daikanwa		. 21790)	; &I-M-21790;
+    ))
+(define-char
   '((=>ucs		. #x20B47)	; 𠭇
     (ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 4)
@@ -830,167 +1053,55 @@
     (=gt		. 27970)	; &I-GT-27970;
     (=gt-pj-1		. #x482A)	; &I-GT-27970; [40-10]
     (=daikanwa		. 21797)	; &I-M-21797;
-    (=shinjigen@rev	.  5038)	; 畑
+    (=shinjigen		.  5038)	; 畑
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
     (=ucs		. #x7552)	; 畒
-    (=jis-x0212		. #x4D36)	; &I-JSP-4D36; [45-22]
-    (=jis-x0213-2	. #x713C)	; &I-JX2-713C; [81-28]
-    (=daikanwa		. 49331)	; &I-M-49331;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (=daikanwa		. 49332)	; &M-49332;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (=ucs		. #x3F58)	; 㽘
-    (=cns11643-4	. #x2A41)	; &I-C4-2A41; [10-33]
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (=ucs		. #x3F59)	; 㽙
-    (=cns11643-3	. #x2E29)	; &I-C3-2E29; [14-09]
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (=ucs		. #x3F5A)	; 㽚
-    (=cns11643-4	. #x2A43)	; &I-C4-2A43; [10-35]
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (hanyu-dazidian	4 2535 5)
-    (=ucs		. #x24C29)	; 𤰩
-    (=cns11643-4	. #x2A42)	; &I-C4-2A42; [10-34]
-    (=hanziku-7		. #xB5EB)	; &I-HZK07-B5EB;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (hanyu-dazidian	4 2534 4)
-    (=ucs		. #x24C2A)	; 𤰪
-    (=cns11643-5	. #x2A4D)	; &I-C5-2A4D; [10-45]
-    (=hanziku-7		. #xB5CA)	; &I-HZK07-B5CA;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (hanyu-dazidian	4 2535 3)
-    (=ucs		. #x24C2B)	; 𤰫
-    (=cns11643-6	. #x3274)	; &I-C6-3274; [18-84]
-    (=hanziku-7		. #xB5E9)	; &I-HZK07-B5E9;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (hanyu-dazidian	4 2533 1)
-    (=ucs		. #x24C2C)	; 𤰬
-    (=cns11643-5	. #x2A4C)	; &I-C5-2A4C; [10-44]
-    (=hanziku-7		. #xB5A7)	; &I-HZK07-B5A7;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (hanyu-dazidian	4 2531 15)
-    (=ucs		. #x24C2D)	; 𤰭
-    (=cns11643-6	. #x3273)	; &I-C6-3273; [18-83]
-    (=hanziku-7		. #xB553)	; &I-HZK07-B553;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (hanyu-dazidian	4 2535 1)
-    (=ucs		. #x24C2E)	; 𤰮
-    (=cns11643-5	. #x2A4B)	; &I-C5-2A4B; [10-43]
-    (=hanziku-7		. #xB5E7)	; &I-HZK07-B5E7;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (hanyu-dazidian	4 2534 5)
-    (=ucs		. #x24C2F)	; 𤰯
-    (=cns11643-6	. #x3276)	; &I-C6-3276; [18-86]
-    (=hanziku-7		. #xB5CB)	; &I-HZK07-B5CB;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (hanyu-dazidian	3 2033 2)
-    (=ucs		. #x24C30)	; 𤰰
-    (=cns11643-6	. #x327A)	; &I-C6-327A; [18-90]
-    (=hanziku-5		. #xF8A3)	; &I-HZK05-F8A3;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (=ucs		. #x24C31)	; 𤰱
-    (=cns11643-6	. #x3277)	; &I-C6-3277; [18-87]
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (=ucs		. #x24C33)	; 𤰳
-    (=cns11643-5	. #x2A4E)	; &I-C5-2A4E; [10-46]
+    (->subsumptive
+     ((=ucs@jis		  . #x7552)	; &M-49331;
+      (=jis-x0212	  . #x4D36)	; &M-49331; [45-22]
+      (=jis-x0213-2	  . #x713C)	; &I-JX2-713C; [81-28]
+      (=daikanwa	  . 49331)	; &I-M-49331;
+      )
+     ((=ucs@unicode	  . #x7552)	; &UU+7552;
+      ))
     ))
 (define-char
-  '((=>ucs		. #x24C33)	; 𤰳
+  '((<-denotational
+     ((=ucs		  . #x22341)	; 𢍁
+      ))
     (ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (hanyu-dazidian	4 2531 10)
-    (=hanziku-7		. #xB54E)	; &HZK07-B54E;
+    (=daikanwa		. 49332)	; &M-49332;
+    (<-original
+     ((=ucs@iso		  . #x22341)	; &M-21752;
+      (=cns11643-4	  . #x2741)	; &M-21752; [07-33]
+      (=daikanwa	  . 21752)	; &I-M-21752;
+      ))
+    (<-original*sources
+     daikanwa)
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (hanyu-dazidian	4 2531 6)
-    (=ucs		. #x24C34)	; 𤰴
-    (=hanziku-7		. #xB54A)	; &I-HZK07-B54A;
-    ))
-(define-char
-  '((=>ucs		. #x24C34)	; 𤰴
-    (ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (=cns11643-6	. #x3278)	; &C6-3278; [18-88]
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (hanyu-dazidian	4 2536 2)
+    (=ucs		. #x24C4C)	; 𤱌
+    (=cns11643-5	. #x2E6A)	; &I-C5-2E6A; [14-74]
+    (=daikanwa		. 21799)	; &I-M-21799;
+    (=hanziku-7		. #xB649)	; &I-HZK07-B649;
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (hanyu-dazidian	4 2532 2)
-    (=ucs		. #x24C35)	; 𤰵
-    (=hanziku-7		. #xB566)	; &I-HZK07-B566;
-    ))
-(define-char
-  '((=>ucs		. #x24C35)	; 𤰵
-    (ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
-    (=cns11643-6	. #x3275)	; &C6-3275; [18-85]
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (=ucs		. #x3F5B)	; 㽛
+    (=cns11643-4	. #x2E2F)	; &I-C4-2E2F; [14-15]
+    (=daikanwa		. 21800)	; &I-M-21800;
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
@@ -1038,6 +1149,26 @@
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
+    (hanyu-dazidian	4 2539 5)
+    (=ucs		. #x24C4D)	; 𤱍
+    (=cns11643-4	. #x2E2E)	; &I-C4-2E2E; [14-14]
+    (=daikanwa		. 21803)	; &I-M-21803;
+    (=hanziku-7		. #xB6CE)	; &I-HZK07-B6CE;
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (hanyu-dazidian	4 2539 8)
+    (=ucs		. #x24C4E)	; 𤱎
+    (=cns11643-5	. #x2E6B)	; &I-C5-2E6B; [14-75]
+    (=daikanwa		. 21804)	; &I-M-21804;
+    (=hanziku-7		. #xB6D1)	; &I-HZK07-B6D1;
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
     (=ucs		. #x7556)	; 畖
     (=daikanwa		. 21805)	; &I-M-21805;
     ))
@@ -1159,6 +1290,24 @@
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
+    (hanyu-dazidian	4 2539 2)
+    (=ucs		. #x24C50)	; 𤱐
+    (=cns11643-6	. #x3960)	; &I-C6-3960; [25-64]
+    (=daikanwa		. 21812)	; &I-M-21812;
+    (=hanziku-7		. #xB6CB)	; &I-HZK07-B6CB;
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (=ucs		. #x3F5C)	; 㽜
+    (=cns11643-4	. #x2E31)	; &I-C4-2E31; [14-17]
+    (=daikanwa		. 21813)	; &I-M-21813;
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
     (=ucs		. #x755C)	; 畜
     (=big5		. #xAF62)	; &I-B-AF62;
     (->subsumptive
@@ -1410,56 +1559,6 @@
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
-    (=ucs		. #x3F5B)	; 㽛
-    (=cns11643-4	. #x2E2F)	; &I-C4-2E2F; [14-15]
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (=ucs		. #x3F5C)	; 㽜
-    (=cns11643-4	. #x2E31)	; &I-C4-2E31; [14-17]
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (hanyu-dazidian	4 2536 2)
-    (=ucs		. #x24C4C)	; 𤱌
-    (=cns11643-5	. #x2E6A)	; &I-C5-2E6A; [14-74]
-    (=hanziku-7		. #xB649)	; &I-HZK07-B649;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (hanyu-dazidian	4 2539 5)
-    (=ucs		. #x24C4D)	; 𤱍
-    (=cns11643-4	. #x2E2E)	; &I-C4-2E2E; [14-14]
-    (=hanziku-7		. #xB6CE)	; &I-HZK07-B6CE;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (hanyu-dazidian	4 2539 8)
-    (=ucs		. #x24C4E)	; 𤱎
-    (=cns11643-5	. #x2E6B)	; &I-C5-2E6B; [14-75]
-    (=hanziku-7		. #xB6D1)	; &I-HZK07-B6D1;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (hanyu-dazidian	4 2539 2)
-    (=ucs		. #x24C50)	; 𤱐
-    (=cns11643-6	. #x3960)	; &I-C6-3960; [25-64]
-    (=hanziku-7		. #xB6CB)	; &I-HZK07-B6CB;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
     (=ucs		. #x24C55)	; 𤱕
     (=cns11643-6	. #x395F)	; &I-C6-395F; [25-63]
     ))
@@ -1472,17 +1571,41 @@
      ((=ucs@jis		  . #x7561)	; &M-21828;
       (=jis-x0212	  . #x4D3A)	; &M-21828; [45-26]
       (=daikanwa	  . 21828)	; &I-M-21828;
+      (<-formed
+       ((=ucs@jis	    . #x5793)	; &GT-06323;
+	(=jis-x0208	    . #x5436)	; &GT-06323; [52-22]
+	(=ks-x1001	    . #x7A27)	; &I-K0-7A27; [90-07]
+	(=jis-x0213-1	    . #x5436)	; &I-JX1-5436; [52-22]
+	(=daikanwa	    . 05040)	; &I-M-05040;
+	))
+      (<-formed*sources
+       jiyun)
+      (<-same
+       ((=ucs@jis	    . #x5793)	; &GT-06323;
+	(=jis-x0208	    . #x5436)	; &GT-06323; [52-22]
+	(=ks-x1001	    . #x7A27)	; &I-K0-7A27; [90-07]
+	(=jis-x0213-1	    . #x5436)	; &I-JX1-5436; [52-22]
+	(=daikanwa	    . 05040)	; &I-M-05040;
+	))
+      (<-same*sources
+       jiyun daikanwa)
       )
      ((=cns11643-3	  . #x3746)	; &C3-3746; [23-38]
       )
      ((=ucs@unicode	  . #x7561)	; &UU+7561;
       )
-     ((=shinjigen@1ed	  .  1385)	; &SJG1-1385;
+     ((=shinjigen	  .  1385)	; &SJG2-1385;
+      (<-formed
+       ((=shinjigen	    .  1384)	; &SJG2-1384;
+	))
+      (<-formed*sources
+       shinjigen)
       ))
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
     (=ucs		. #x7562)	; 畢
+    (=big5		. #xB2A6)	; &I-B-B2A6;
     ))
 (define-char
   '((<-denotational
@@ -1498,13 +1621,12 @@
       (=gt-k		  . 07861)	; &I-GT-K07861;
       (=gt-pj-1		  . #x492D)	; &I-GT-28043; [41-13]
       (=daikanwa	  . 21829)	; &GT-28043;
+      (=shinjigen	  .  5058)	; &GT-28043;
       )
      ((=ucs@jis		  . #x7562)	; &J90-492D;
       (=jis-x0208	  . #x492D)	; &J90-492D; [41-13]
       (=ks-x1001	  . #x7934)	; &I-K0-7934; [89-20]
       (=jis-x0213-1	  . #x492D)	; &I-JX1-492D; [41-13]
-      (=big5		  . #xB2A6)	; &I-B-B2A6;
-      (=shinjigen@rev	  .  5058)	; &J90-492D;
       ))
     ))
 (define-char
@@ -1520,6 +1642,43 @@
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
+    (hanyu-dazidian	4 2541 2)
+    (=ucs		. #x24C65)	; 𤱥
+    (=cns11643-4	. #x333E)	; &I-C4-333E; [19-30]
+    (=daikanwa		. 21830)	; &I-M-21830;
+    (=hanziku-7		. #xB74C)	; &I-HZK07-B74C;
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
+    (hanyu-dazidian	4 2542 4)
+    (=ucs		. #x24C66)	; 𤱦
+    (->subsumptive
+     ((=daikanwa	  . 21831)	; &M-21831;
+      )
+     ((=ucs@iso		  . #x24C66)	; &HZK07-B76E;
+      (=hanziku-7	  . #xB76E)	; &HZK07-B76E;
+      )
+     ((=cns11643-6	  . #x4228)	; &C6-4228; [34-08]
+      ))
+    ))
+(define-char
+  '((=>ucs		. #x24C67)	; 𤱧
+    (ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
+    (hanyu-dazidian	4 2542 6)
+    (=daikanwa		. 21833)	; &M-21833;
+    (=hanziku-7		. #xB770)	; &I-HZK07-B770;
+    (<-unknown
+     ((=ucs		  . #x24C67)	; 𤱧
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
     (=ucs		. #x7563)	; 畣
     (=cns11643-2	. #x3740)	; &I-C2-3740; [23-32]
     (=big5		. #xD67B)	; &I-B-D67B;
@@ -1530,21 +1689,42 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ucs		. #x7564)	; 畤
-    (->subsumptive
-     ((=ucs@unicode	  . #x7564)	; &GT-28033;
-      (=jis-x0208	  . #x613F)	; &GT-28033; [65-31]
-      (=iso-ir165	  . #x7D50)	; &I-EGB-7D50; [93-48]
-      (=jis-x0213-1	  . #x613F)	; &I-JX1-613F; [65-31]
-      (=big5		  . #xD67A)	; &I-B-D67A;
-      (=gt		  . 28033)	; &I-GT-28033;
-      (=gt-k		  . 07957)	; &I-GT-K07957;
-      (=gt-pj-1		  . #x613F)	; &I-GT-28033; [65-31]
-      (=daikanwa	  . 21837)	; &I-M-21837;
-      (=shinjigen@rev	  .  5057)	; &GT-28033;
-      )
-     ((=ucs@cns		  . #x7564)	; &C2-373F;
-      (=cns11643-2	  . #x373F)	; &C2-373F; [23-31]
+    (=big5		. #xD67A)	; &I-B-D67A;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7564)	; 畤
       ))
+    (ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
+    (=ucs@unicode	. #x7564)	; &GT-28033;
+    (=jis-x0208		. #x613F)	; &GT-28033; [65-31]
+    (=iso-ir165		. #x7D50)	; &I-EGB-7D50; [93-48]
+    (=jis-x0213-1	. #x613F)	; &I-JX1-613F; [65-31]
+    (=gt		. 28033)	; &I-GT-28033;
+    (=gt-k		. 07957)	; &I-GT-K07957;
+    (=gt-pj-1		. #x613F)	; &I-GT-28033; [65-31]
+    (=daikanwa		. 21837)	; &I-M-21837;
+    (=shinjigen		.  5057)	; &GT-28033;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7564)	; 畤
+      ))
+    (ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
+    (=ucs@cns		. #x7564)	; &C2-373F;
+    (=cns11643-2	. #x373F)	; &C2-373F; [23-31]
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
+    (=ucs		. #x3F5D)	; 㽝
+    (=cns11643-5	. #x3364)	; &I-C5-3364; [19-68]
+    (=daikanwa		. 21838)	; &I-M-21838;
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
@@ -1561,7 +1741,7 @@
     (=gt-k		. 07895)	; &I-GT-K07895;
     (=gt-pj-1		. #x4E2C)	; &I-GT-28048; [46-12]
     (=daikanwa		. 21839)	; &I-M-21839;
-    (=shinjigen@rev	.  5060)	; 略
+    (=shinjigen		.  5060)	; 略
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
@@ -1575,7 +1755,14 @@
     (=gt-k		. 07958)	; &I-GT-K07958;
     (=gt-pj-1		. #x6140)	; &I-GT-28049; [65-32]
     (=daikanwa		. 21840)	; &I-M-21840;
-    (=shinjigen@rev	.  5061)	; 畧
+    (=shinjigen		.  5061)	; 畧
+    (<-vulgar
+     ((=ucs		  . #x7565)	; 略
+      (=jis-x0208	  . #x4E2C)	; &I-J90-4E2C; [46-12]
+      (=shinjigen	  .  5060)	; 略
+      ))
+    (<-vulgar*sources
+     shinjigen)
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
@@ -1591,17 +1778,23 @@
     (=gt		. 28027)	; &I-GT-28027;
     (=gt-pj-1		. #x374D)	; &I-GT-28027; [23-45]
     (=daikanwa		. 21842)	; &I-M-21842;
-    (=shinjigen@rev	.  5056)	; 畦
+    (=shinjigen		.  5056)	; 畦
+    ))
+(define-char
+  '((ideographic-radical . 102)	; â½¥
+    (=ucs		. #x7570)	; 異
+    (=>jis-x0208	. #x305B)	; 異 [16-59]
+    (=>jis-x0213-1	. #x305B)	; 異 [16-59]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x305B)	; &J97-305B; [16-59]
+     ((=ucs		  . #x7570)	; 異
       ))
     (ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (=ucs		. #x7570)	; 異
-    (=jis-x0208		. #x305B)	; &I-J90-305B; [16-59]
+    (=ucs@unicode	. #x7570)	; &GT-28020;
+    (=jis-x0208		. #x305B)	; &GT-28020; [16-59]
     (=ks-x1001		. #x6C36)	; &I-K0-6C36; [76-22]
     (=cns11643-1	. #x5C2C)	; &I-C1-5C2C; [60-12]
     (=jis-x0213-1	. #x305B)	; &I-JX1-305B; [16-59]
@@ -1610,11 +1803,16 @@
     (=gt-k		. 07717)	; &I-GT-K07717;
     (=gt-pj-1		. #x305B)	; &I-GT-28020; [16-59]
     (=daikanwa		. 21854)	; &I-M-21854;
-    (=shinjigen@rev	.  5054)	; 異
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (=jis-x0208@1997	. #x305B)	; &J97-305B; [16-59]
+    (=shinjigen		.  5054)	; &GT-28020;
+    (<-simplified@JP/misc
+     ((=ucs		  . #x2F938)	; 異
+      ))
+    (<-wrong
+     ((=ucs		  . #x2F938)	; 異
+      (=daikanwa	  . 21866)	; &I-M-21866;
+      ))
+    (<-wrong*sources
+     pianhai daikanwa)
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
@@ -1632,58 +1830,38 @@
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (=ucs		. #x3F5D)	; 㽝
-    (=cns11643-5	. #x3364)	; &I-C5-3364; [19-68]
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 6)
-    (total-strokes	 . 11)
     (=ucs		. #x3F5E)	; 㽞
     (=cns11643-3	. #x3748)	; &I-C3-3748; [23-40]
+    (=daikanwa		. 21856)	; &I-M-21856;
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ucs		. #x7569)	; 畩
-    (=jis-x0208		. #x613E)	; &I-J90-613E; [65-30]
-    (=jis-x0213-1	. #x613E)	; &I-JX1-613E; [65-30]
-    (=gt		. 28028)	; &I-GT-28028;
-    (=gt-pj-1		. #x613E)	; &I-GT-28028; [65-30]
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 6)
-    (total-strokes	 . 11)
-    (hanyu-dazidian	4 2541 2)
-    (=ucs		. #x24C65)	; 𤱥
-    (=cns11643-4	. #x333E)	; &I-C4-333E; [19-30]
-    (=hanziku-7		. #xB74C)	; &I-HZK07-B74C;
-    ))
-(define-char
-  '((ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 6)
-    (total-strokes	 . 11)
-    (hanyu-dazidian	4 2542 4)
-    (=ucs		. #x24C66)	; 𤱦
-    (=cns11643-6	. #x4228)	; &I-C6-4228; [34-08]
-    (=hanziku-7		. #xB76E)	; &I-HZK07-B76E;
+    (->subsumptive
+     ((=ucs@jis		  . #x7569)	; &GT-28028;
+      (=jis-x0208	  . #x613E)	; &GT-28028; [65-30]
+      (=jis-x0213-1	  . #x613E)	; &I-JX1-613E; [65-30]
+      (=gt		  . 28028)	; &I-GT-28028;
+      (=gt-pj-1		  . #x613E)	; &I-GT-28028; [65-30]
+      )
+     ((=ucs@unicode	  . #x7569)	; &UU+7569;
+      ))
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
-    (hanyu-dazidian	4 2542 6)
     (=ucs		. #x24C67)	; 𤱧
-    (=hanziku-7		. #xB770)	; &I-HZK07-B770;
-    ))
-(define-char
-  '((=>ucs		. #x24C67)	; 𤱧
-    (ideographic-radical . 102)	; â½¥
-    (ideographic-strokes . 6)
-    (total-strokes	 . 11)
-    (=cns11643-5	. #x3363)	; &C5-3363; [19-67]
+    (<-unknown
+     ((=daikanwa	  . 21833)	; &M-21833;
+      ))
+    (->subsumptive
+     ((=ucs@iso		  . #x24C67)	; &U-00024C67;
+      )
+     ((=cns11643-5	  . #x3363)	; &C5-3363; [19-67]
+      ))
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
@@ -1943,7 +2121,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x305B)	; &J97-305B; [16-59]
+     ((=ucs		  . #x7570)	; 異
       ))
     (=>ucs*		. #x7570)	; 異
     (ideographic-radical . 102)	; â½¥
@@ -2072,6 +2250,15 @@
     (total-strokes	 . 12)
     (=ucs		. #x24C83)	; 𤲃
     (=cns11643-6	. #x4B57)	; &I-C6-4B57; [43-55]
+    (=shinjigen		.  5059)	; 𤲃
+    (<-original
+     ((=ucs@unicode	  . #x7562)	; &GT-28043;
+      (=gb12345		  . #x314F)	; &GT-28043; [17-47]
+      (=daikanwa	  . 21829)	; &GT-28043;
+      (=shinjigen	  .  5058)	; &GT-28043;
+      ))
+    (<-original*sources
+     shinjigen)
     ))
 (define-char
   '((ideographic-radical . 102)	; â½¥
diff --git a/lisp/utf-2000/Ideograph-R104-Sickness.el b/lisp/utf-2000/Ideograph-R104-Sickness.el
index be9c0a3..a302d63 100644
--- a/lisp/utf-2000/Ideograph-R104-Sickness.el
+++ b/lisp/utf-2000/Ideograph-R104-Sickness.el
@@ -1008,141 +1008,123 @@
     (=ucs		. #x75B7)	; 疷
     ))
 (define-char
-  '((=>ucs		. #x75B8)	; 疸
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (=ucs@jis		. #x75B8)	; &GT-28370;
-    (=jis-x0208		. #x6155)	; &GT-28370; [65-53]
-    (=ks-x1001		. #x5338)	; &I-K0-5338; [51-24]
-    (=jis-x0213-1	. #x6155)	; &I-JX1-6155; [65-53]
-    (=big5		. #xAF6E)	; &I-B-AF6E;
-    (=gt		. 28370)	; &I-GT-28370;
-    (=gt-pj-1		. #x6155)	; &I-GT-28370; [65-53]
-    (=daikanwa		. 22094)	; &I-M-22094;
-    (=shinjigen@rev	.  5107)	; &GT-28370;
-    ))
-(define-char
-  '((morohashi-daikanwa	22094 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (=ucs		. #x75B8)	; 疸
-    (=gb2312		. #x7063)	; &I-G0-7063; [80-67]
-    (=cns11643-1	. #x5671)	; &I-C1-5671; [54-81]
-    ))
-(define-char
-  '((=>ucs		. #x75B9)	; 疹
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (=ucs@jis		. #x75B9)	; &GT-28357;
-    (=jis-x0208		. #x3F3E)	; &GT-28357; [31-30]
-    (=ks-x1001		. #x7256)	; &I-K0-7256; [82-54]
-    (=jis-x0213-1	. #x3F3E)	; &I-JX1-3F3E; [31-30]
-    (=big5		. #xAF6C)	; &I-B-AF6C;
-    (=gt		. 28357)	; &I-GT-28357;
-    (=gt-pj-1		. #x3F3E)	; &I-GT-28357; [31-30]
-    (=daikanwa		. 22097)	; &I-M-22097;
-    (=shinjigen@rev	.  5105)	; &GT-28357;
+    (=big5		. #xAF6E)	; &I-B-AF6E;
+    (->subsumptive
+     ((=ucs@jis		  . #x75B8)	; &GT-28370;
+      (=jis-x0208	  . #x6155)	; &GT-28370; [65-53]
+      (=ks-x1001	  . #x5338)	; &I-K0-5338; [51-24]
+      (=jis-x0213-1	  . #x6155)	; &I-JX1-6155; [65-53]
+      (=gt		  . 28370)	; &I-GT-28370;
+      (=gt-pj-1		  . #x6155)	; &I-GT-28370; [65-53]
+      (=daikanwa	  . 22094)	; &I-M-22094;
+      (=shinjigen	  .  5107)	; &GT-28370;
+      )
+     ((=ucs@unicode	  . #x75B8)	; &C1-5671;
+      (=gb2312		  . #x7063)	; &C1-5671; [80-67]
+      (=cns11643-1	  . #x5671)	; &I-C1-5671; [54-81]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22097 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (=ucs		. #x75B9)	; 疹
-    (=gb2312		. #x556E)	; &I-G0-556E; [53-78]
-    (=cns11643-1	. #x566F)	; &I-C1-566F; [54-79]
-    ))
-(define-char
-  '((=>ucs		. #x75BA)	; 疺
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (=ucs@jis		. #x75BA)	; &M-22102;
-    (=jis-x0212		. #x4D4E)	; &M-22102; [45-46]
-    (=big5		. #xD2CA)	; &I-B-D2CA;
-    (=daikanwa		. 22102)	; &I-M-22102;
-    (=jef-china3	. #x5AE0)	; &I-JC3-5AE0;
+    (=big5		. #xAF6C)	; &I-B-AF6C;
+    (->subsumptive
+     ((=ucs@jis		  . #x75B9)	; &GT-28357;
+      (=jis-x0208	  . #x3F3E)	; &GT-28357; [31-30]
+      (=ks-x1001	  . #x7256)	; &I-K0-7256; [82-54]
+      (=jis-x0213-1	  . #x3F3E)	; &I-JX1-3F3E; [31-30]
+      (=gt		  . 28357)	; &I-GT-28357;
+      (=gt-pj-1		  . #x3F3E)	; &I-GT-28357; [31-30]
+      (=daikanwa	  . 22097)	; &I-M-22097;
+      (=shinjigen	  .  5105)	; &GT-28357;
+      )
+     ((=ucs@unicode	  . #x75B9)	; &C1-566F;
+      (=gb2312		  . #x556E)	; &C1-566F; [53-78]
+      (=cns11643-1	  . #x566F)	; &I-C1-566F; [54-79]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22102 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (=ucs		. #x75BA)	; 疺
-    (=cns11643-2	. #x312D)	; &I-C2-312D; [17-13]
-    ))
-(define-char
-  '((=>ucs		. #x75BB)	; 疻
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (=big5		. #xD2C5)	; &M-22103;
-    (=daikanwa		. 22103)	; &I-M-22103;
+    (=big5		. #xD2CA)	; &I-B-D2CA;
+    (->subsumptive
+     ((=ucs@jis		  . #x75BA)	; &M-22102;
+      (=jis-x0212	  . #x4D4E)	; &M-22102; [45-46]
+      (=daikanwa	  . 22102)	; &I-M-22102;
+      (=jef-china3	  . #x5AE0)	; &I-JC3-5AE0;
+      )
+     ((=ucs@unicode	  . #x75BA)	; &C2-312D;
+      (=cns11643-2	  . #x312D)	; &C2-312D; [17-13]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22103 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (=ucs		. #x75BB)	; 疻
-    (=cns11643-2	. #x3128)	; &I-C2-3128; [17-08]
-    ))
-(define-char
-  '((=>ucs		. #x75BC)	; 疼
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (=ks-x1001		. #x5459)	; &M-22105; [52-57]
-    (=big5		. #xAF6B)	; &I-B-AF6B;
-    (=daikanwa		. 22105)	; &I-M-22105;
-    ))
-(define-char
-  '((=>ucs		. #x75BC)	; 疼
-    (morohashi-daikanwa	22105 0 0)
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (=ucs@jis		. #x75BC)	; &GT-28375;
-    (=jis-x0208		. #x6156)	; &GT-28375; [65-54]
-    (=jis-x0213-1	. #x6156)	; &I-JX1-6156; [65-54]
-    (=gt		. 28375)	; &I-GT-28375;
-    (=gt-pj-1		. #x6156)	; &I-GT-28375; [65-54]
+    (=big5		. #xD2C5)	; &I-B-D2C5;
+    (->subsumptive
+     ((=daikanwa	  . 22103)	; &M-22103;
+      )
+     ((=ucs@unicode	  . #x75BB)	; &C2-3128;
+      (=cns11643-2	  . #x3128)	; &C2-3128; [17-08]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22105 0 1)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (=ucs		. #x75BC)	; 疼
-    (=gb2312		. #x4C5B)	; &I-G0-4C5B; [44-59]
-    (=cns11643-1	. #x566E)	; &I-C1-566E; [54-78]
-    ))
-(define-char
-  '((=>ucs		. #x75BD)	; 疽
-    (ideographic-radical . 104)	; ⽧
-    (ideographic-strokes . 5)
-    (total-strokes	 . 10)
-    (=ucs@jis		. #x75BD)	; &GT-28354;
-    (=jis-x0208		. #x6154)	; &GT-28354; [65-52]
-    (=ks-x1001		. #x6E45)	; &I-K0-6E45; [78-37]
-    (=jis-x0213-1	. #x6154)	; &I-JX1-6154; [65-52]
-    (=big5		. #xAF6A)	; &I-B-AF6A;
-    (=gt		. 28354)	; &I-GT-28354;
-    (=gt-pj-1		. #x6154)	; &I-GT-28354; [65-52]
-    (=daikanwa		. 22106)	; &I-M-22106;
-    (=shinjigen@rev	.  5103)	; &GT-28354;
+    (=>jis-x0208	. #x6156)	; 疼 [65-54]
+    (=>jis-x0213-1	. #x6156)	; 疼 [65-54]
+    (=big5		. #xAF6B)	; &I-B-AF6B;
+    (->subsumptive
+     ((=ucs@jis/2004	  . #x75BC)	; &M-22105;
+      (=ks-x1001	  . #x5459)	; &M-22105; [52-57]
+      (=jis-x0213-1@2004  . #x6156)	; &I-JX3-6156; [65-54]
+      (=daikanwa	  . 22105)	; &I-M-22105;
+      )
+     ((=ucs@jis/1990	  . #x75BC)	; &GT-28375;
+      (=ucs@jis/2000	  . #x75BC)	; &GT-28375;
+      (=jis-x0208	  . #x6156)	; &GT-28375; [65-54]
+      (=jis-x0213-1@2000  . #x6156)	; &I-JX1-6156; [65-54]
+      (=gt		  . 28375)	; &I-GT-28375;
+      (=gt-pj-1		  . #x6156)	; &I-GT-28375; [65-54]
+      )
+     ((=ucs@unicode	  . #x75BC)	; &G0-4C5B;
+      (=gb2312		  . #x4C5B)	; &G0-4C5B; [44-59]
+      )
+     ((=cns11643-1	  . #x566E)	; &C1-566E; [54-78]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	22106 0 0)
-    (ideographic-radical . 104)	; ⽧
+  '((ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (=ucs		. #x75BD)	; 疽
-    (=gb2312		. #x3E52)	; &I-G0-3E52; [30-50]
-    (=cns11643-1	. #x566D)	; &I-C1-566D; [54-77]
+    (=big5		. #xAF6A)	; &I-B-AF6A;
+    (->subsumptive
+     ((=ucs@jis		  . #x75BD)	; &GT-28354;
+      (=jis-x0208	  . #x6154)	; &GT-28354; [65-52]
+      (=ks-x1001	  . #x6E45)	; &I-K0-6E45; [78-37]
+      (=jis-x0213-1	  . #x6154)	; &I-JX1-6154; [65-52]
+      (=gt		  . 28354)	; &I-GT-28354;
+      (=gt-pj-1		  . #x6154)	; &I-GT-28354; [65-52]
+      (=daikanwa	  . 22106)	; &I-M-22106;
+      (=shinjigen	  .  5103)	; &GT-28354;
+      )
+     ((=ucs@unicode	  . #x75BD)	; &C1-566D;
+      (=gb2312		  . #x3E52)	; &C1-566D; [30-50]
+      (=cns11643-1	  . #x566D)	; &I-C1-566D; [54-77]
+      ))
     ))
 (define-char
   '((ideographic-radical . 104)	; ⽧
@@ -5387,8 +5369,13 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 104)	; ⽧
+    (=>jis-x0208	. #x4169)	; &J97-4169; [33-73]
+    (=>jis-x0213-1	. #x4169)	; &J97-4169; [33-73]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4169)	; &J97-4169; [33-73]
+     ((=>jis-x0208	  . #x4169)	; &J97-4169; [33-73]
       ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 10)
@@ -5408,12 +5395,8 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 104)	; ⽧
-    (=jis-x0208@1997	. #x4169)	; &J97-4169; [33-73]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4169)	; &J97-4169; [33-73]
+     ((=>jis-x0208	  . #x4169)	; &J97-4169; [33-73]
       ))
     (ideographic-radical . 104)	; ⽧
     (ideographic-strokes . 7)
@@ -5427,7 +5410,7 @@
       (=gt		  . 28480)	; &I-GT-28480;
       (=gt-pj-1		  . #x4169)	; &I-GT-28480; [33-73]
       (=jef-china3	  . #x5AF5)	; &I-JC3-5AF5;
-      (<-simplified@JP
+      (<-simplified@JP/jis
        ((=ucs@jis	    . #x7626)	; &M-22415;
 	(=jis-x0208@1978    . #x4169)	; &M-22415; [33-73]
 	(=ks-x1001	    . #x6231)	; &I-K0-6231; [66-17]
diff --git a/lisp/utf-2000/Ideograph-R109-Eye.el b/lisp/utf-2000/Ideograph-R109-Eye.el
index 8a95d6d..01fe9ce 100644
--- a/lisp/utf-2000/Ideograph-R109-Eye.el
+++ b/lisp/utf-2000/Ideograph-R109-Eye.el
@@ -2846,12 +2846,14 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 11)
     (=ucs		. #x773A)	; 眺
-    (=jis-x0208@1997	. #x442F)	; 眺 [36-15]
+    (=>jis-x0208	. #x442F)	; 眺 [36-15]
+    (=>jis-x0213-1	. #x442F)	; 眺 [36-15]
+    (=big5		. #xB2B7)	; &I-B-B2B7;
     (->subsumptive
      ((=jis-x0208@1978	  . #x442F)	; &M-23314; [36-15]
       (=jis-x0208@1983	  . #x442F)	; &I-J83-442F; [36-15]
       (=daikanwa	  . 23314)	; &I-M-23314;
-      (=shinjigen@rev	  .  5307)	; &M-23314;
+      (=shinjigen	  .  5307)	; &M-23314;
       )
      ((=ucs@unicode	  . #x773A)	; &GT-29853;
       (=gb2312		  . #x4C77)	; &GT-29853; [44-87]
@@ -2859,7 +2861,6 @@
       (=jis-x0208@1990	  . #x442F)	; &I-J90-442F; [36-15]
       (=cns11643-1	  . #x5C3C)	; &I-C1-5C3C; [60-28]
       (=jis-x0213-1	  . #x442F)	; &I-JX1-442F; [36-15]
-      (=big5		  . #xB2B7)	; &I-B-B2B7;
       (=gt		  . 29853)	; &I-GT-29853;
       (=gt-pj-1		  . #x442F)	; &I-GT-29853; [36-15]
       ))
@@ -7596,6 +7597,14 @@
     (total-strokes	 . 16)
     (=ucs		. #x77A5)	; 瞥
     (=big5		. #xBF68)	; &I-B-BF68;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x77A5)	; 瞥
+      ))
+    (ideographic-radical . 109)	; ⽬
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
     (->subsumptive
      ((=jis-x0208@1978	  . #x4A4D)	; &GT-30345; [42-45]
       (=ks-x1001	  . #x5C2D)	; &I-K0-5C2D; [60-13]
@@ -7603,15 +7612,39 @@
       (=gt-pj-5		  . #x4621)	; &I-GT-30345; [38-01]
       (=daikanwa	  . 23672)	; &I-M-23672;
       )
+     ((=ucs@jis/2004	  . #x77A5)	; &JX3-4A4D;
+      (=jis-x0213-1@2004  . #x4A4D)	; &JX3-4A4D; [42-45]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x77A5)	; 瞥
+      ))
+    (ideographic-radical . 109)	; ⽬
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (->subsumptive
      ((=ucs@unicode	  . #x77A5)	; &GT-30346;
       (=gb2312		  . #x4633)	; &GT-30346; [38-19]
-      (=jis-x0208@1983	  . #x4A4D)	; &I-J83-4A4D; [42-45]
-      (=jis-x0208@1990	  . #x4A4D)	; &I-J90-4A4D; [42-45]
       (=cns11643-1	  . #x7152)	; &I-C1-7152; [81-50]
-      (=jis-x0213-1	  . #x4A4D)	; &I-JX1-4A4D; [42-45]
       (=gt		  . 30346)	; &I-GT-30346;
       (=gt-pj-1		  . #x4A4D)	; &I-GT-30346; [42-45]
+      )
+     ((=ucs@jis/1990	  . #x77A5)	; &J90-4A4D;
+      (=ucs@jis/2000	  . #x77A5)	; &J90-4A4D;
+      (=jis-x0208@1983	  . #x4A4D)	; &J90-4A4D; [42-45]
+      (=jis-x0208@1990	  . #x4A4D)	; &I-J90-4A4D; [42-45]
+      (=jis-x0213-1@2000  . #x4A4D)	; &I-JX1-4A4D; [42-45]
       (=jef-china3	  . #x5BE3)	; &I-JC3-5BE3;
+      (<-simplified@JP/jis/1978
+       ((=jis-x0208@1978    . #x4A4D)	; &GT-30345; [42-45]
+	(=ks-x1001	    . #x5C2D)	; &I-K0-5C2D; [60-13]
+	(=daikanwa	    . 23672)	; &I-M-23672;
+	))
+      (<-simplified@JP/jis/2004
+       ((=ucs@jis/2004	    . #x77A5)	; &JX3-4A4D;
+	(=jis-x0213-1@2004  . #x4A4D)	; &JX3-4A4D; [42-45]
+	))
       ))
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R112-Stone.el b/lisp/utf-2000/Ideograph-R112-Stone.el
index 225f7d9..91a6e76 100644
--- a/lisp/utf-2000/Ideograph-R112-Stone.el
+++ b/lisp/utf-2000/Ideograph-R112-Stone.el
@@ -516,6 +516,14 @@
   '((ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
+    (=ucs		. #x409B)	; 䂛
+    (=cns11643-3	. #x2E38)	; &I-C3-2E38; [14-24]
+    (=daikanwa		. 24058)	; &I-M-24058;
+    ))
+(define-char
+  '((ideographic-radical . 112)	; ⽯
+    (ideographic-strokes . 4)
+    (total-strokes	 . 9)
     (=ucs		. #x780A)	; 砊
     (->subsumptive
      ((=daikanwa	  . 24059)	; &M-24059;
@@ -702,10 +710,15 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 112)	; ⽯
+    (=ucs@big5		. #x7814)	; &J97-3826;
+    (=>jis-x0208@1997	. #x3826)	; &J97-3826; [24-06]
+    (=big5		. #xACE3)	; &J97-3826;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x7814)	; &B-ACE3;
-      (=big5		  . #xACE3)	; &B-ACE3;
-      (=jis-x0208@1997	  . #x3826)	; &B-ACE3; [24-06]
+     ((=ucs@big5	  . #x7814)	; &J97-3826;
+      (=>jis-x0208@1997	  . #x3826)	; &J97-3826; [24-06]
       ))
     (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 4)
@@ -736,12 +749,6 @@
      daikanwa)
     ))
 (define-char
-  '((ideographic-radical . 112)	; ⽯
-    (=ucs@big5		. #x7814)	; &B-ACE3;
-    (=big5		. #xACE3)	; &B-ACE3;
-    (=jis-x0208@1997	. #x3826)	; &B-ACE3; [24-06]
-    ))
-(define-char
   '((morohashi-daikanwa	24080 1)
     (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 4)
@@ -765,13 +772,6 @@
   '((ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
-    (=ucs		. #x409B)	; 䂛
-    (=cns11643-3	. #x2E38)	; &I-C3-2E38; [14-24]
-    ))
-(define-char
-  '((ideographic-radical . 112)	; ⽯
-    (ideographic-strokes . 4)
-    (total-strokes	 . 9)
     (=ucs		. #x7816)	; 砖
     (=gb2312		. #x5729)	; &I-G0-5729; [55-09]
     ))
@@ -2083,9 +2083,8 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x7814)	; &B-ACE3;
-      (=big5		  . #xACE3)	; &B-ACE3;
-      (=jis-x0208@1997	  . #x3826)	; &B-ACE3; [24-06]
+     ((=ucs@big5	  . #x7814)	; &J97-3826;
+      (=>jis-x0208@1997	  . #x3826)	; &J97-3826; [24-06]
       ))
     (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 6)
@@ -6365,16 +6364,6 @@
   '((<-denotational
      ((=ucs		  . #x40E3)	; 䃣
       ))
-    (=>ucs*		. #x40E3)	; 䃣
-    (ideographic-radical . 112)	; ⽯
-    (ideographic-strokes . 12)
-    (total-strokes	 . 17)
-    (=ucs		. #x2F951)	; 䃣
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x2F951)	; 䃣
-      ))
     (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
@@ -6391,13 +6380,15 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x2F951)	; 䃣
+     ((=ucs		  . #x40E3)	; 䃣
       ))
+    (=>ucs*		. #x40E3)	; 䃣
     (ideographic-radical . 112)	; ⽯
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=ucs@iso		. #x2F951)	; &C7-396D;
-    (=cns11643-7	. #x396D)	; &C7-396D; [25-77]
+    (=ucs		. #x2F951)	; 䃣
+    (=ucs@unicode	. #x40E3)	; 䃣
+    (=cns11643-7	. #x396D)	; &I-C7-396D; [25-77]
     ))
 (define-char
   '((ideographic-radical . 112)	; ⽯
diff --git a/lisp/utf-2000/Ideograph-R113-Spirit.el b/lisp/utf-2000/Ideograph-R113-Spirit.el
index 0656a89..43cd72f 100644
--- a/lisp/utf-2000/Ideograph-R113-Spirit.el
+++ b/lisp/utf-2000/Ideograph-R113-Spirit.el
@@ -103,8 +103,19 @@
     (ideographic-strokes . 1)
     (total-strokes	 . 6)
     (=daikanwa		. 24626)	; &M-24626;
+    (=shinjigen		.  5507)	; &M-24626;
     (=jef-china3	. #x70E5)	; &I-JC3-70E5;
     (mojikyo		. 024626)	; &MCS-60006032;
+    (<-ancient
+     ((=ucs@jis		  . #x79AE)	; &GT-32019;
+      (=jis-x0208	  . #x6339)	; &GT-32019; [67-25]
+      (=ks-x1001	  . #x5649)	; &I-K0-5649; [54-41]
+      (=jis-x0213-1	  . #x6339)	; &I-JX1-6339; [67-25]
+      (=daikanwa	  . 24844)	; &I-M-24844;
+      (=shinjigen	  .  5506)	; &GT-32019;
+      ))
+    (<-ancient*sources
+     jiyun daikanwa shinjigen)
     ))
 (define-char
   '((<-denotational
@@ -347,8 +358,10 @@
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
+    (=ucs@jis/2004	. #x7941)	; &GT-31515;
     (=jis-x0208@1978	. #x3737)	; &GT-31515; [23-23]
     (=ks-x1001		. #x5135)	; &I-K0-5135; [49-21]
+    (=jis-x0213-1@2004	. #x3737)	; &I-JX3-3737; [23-23]
     (=gt		. 31515)	; &I-GT-31515;
     (=gt-k		. 04982)	; &I-GT-K04982;
     (=gt-pj-5		. #x5027)	; &I-GT-31515; [48-07]
@@ -362,13 +375,21 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
     (->subsumptive
-     ((=ucs@jis		  . #x7941)	; &GT-31498;
+     ((=ucs@jis/1990	  . #x7941)	; &GT-31498;
+      (=ucs@jis/2000	  . #x7941)	; &GT-31498;
       (=jis-x0208@1983	  . #x3737)	; &GT-31498; [23-23]
       (=jis-x0208@1990	  . #x3737)	; &I-J90-3737; [23-23]
-      (=jis-x0213-1	  . #x3737)	; &I-JX1-3737; [23-23]
+      (=jis-x0213-1@2000  . #x3737)	; &I-JX1-3737; [23-23]
       (=gt		  . 31498)	; &I-GT-31498;
       (=gt-k		  . 02532)	; &I-GT-K02532;
       (=gt-pj-1		  . #x3737)	; &I-GT-31498; [23-23]
+      (<-simplified@JP/extra
+       ((=ucs@jis/2004	    . #x7941)	; &GT-31515;
+	(=jis-x0208@1978    . #x3737)	; &GT-31515; [23-23]
+	(=ks-x1001	    . #x5135)	; &I-K0-5135; [49-21]
+	(=jis-x0213-1@2004  . #x3737)	; &I-JX3-3737; [23-23]
+	(=daikanwa	    . 24634)	; &I-M-24634;
+	))
       )
      ((=ucs@unicode	  . #x7941)	; &C1-4F25;
       (=gb2312		  . #x466E)	; &C1-4F25; [38-78]
@@ -382,9 +403,9 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
     (=ucs		. #x7942)	; 祂
+    (=big5		. #xCDA2)	; &I-B-CDA2;
     (->subsumptive
-     ((=ucs@unicode	  . #x7942)	; &B-CDA2;
-      (=big5		  . #xCDA2)	; &B-CDA2;
+     ((=ucs@unicode	  . #x7942)	; &UU+7942;
       )
      ((=cns11643-2	  . #x2842)	; &C2-2842; [08-34]
       ))
@@ -401,7 +422,11 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
     (=ucs		. #x2560D)	; 𥘍
-    (=cns11643-6	. #x2D48)	; &I-C6-2D48; [13-40]
+    (->subsumptive
+     ((=cns11643-6	  . #x2D48)	; &C6-2D48; [13-40]
+      )
+     ((=ucs@iso		  . #x2560D)	; &U-0002560D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
@@ -410,7 +435,18 @@
     (=ucs		. #x2560F)	; 𥘏
     ))
 (define-char
-  '((=>ucs		. #x2560F)	; 𥘏
+  '((<-denotational
+     ((=ucs		  . #x2560F)	; 𥘏
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 3)
+    (total-strokes	 . 8)
+    (=ucs@iso		. #x2560F)	; &U-0002560F;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2560F)	; 𥘏
+      ))
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 3)
     (total-strokes	 . 8)
@@ -614,8 +650,10 @@
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
+    (=ucs@jis/2004	. #x7947)	; &M-24639;
     (=jis-x0208@1978	. #x3540)	; &M-24639; [21-32]
     (=ks-x1001		. #x5136)	; &I-K0-5136; [49-22]
+    (=jis-x0213-1@2004	. #x3540)	; &I-JX3-3540; [21-32]
     (=daikanwa		. 24639)	; &I-M-24639;
     ))
 (define-char
@@ -626,13 +664,21 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
     (->subsumptive
-     ((=ucs@jis		  . #x7947)	; &GT-31519;
+     ((=ucs@jis/1990	  . #x7947)	; &GT-31519;
+      (=ucs@jis/2000	  . #x7947)	; &GT-31519;
       (=jis-x0208@1983	  . #x3540)	; &GT-31519; [21-32]
       (=jis-x0208@1990	  . #x3540)	; &I-J90-3540; [21-32]
-      (=jis-x0213-1	  . #x3540)	; &I-JX1-3540; [21-32]
+      (=jis-x0213-1@2000  . #x3540)	; &I-JX1-3540; [21-32]
       (=gt		  . 31519)	; &I-GT-31519;
       (=gt-pj-1		  . #x3540)	; &I-GT-31519; [21-32]
       (=jef-china3	  . #x5CCF)	; &I-JC3-5CCF;
+      (<-simplified@JP/extra
+       ((=ucs@jis/2004	    . #x7947)	; &M-24639;
+	(=jis-x0208@1978    . #x3540)	; &M-24639; [21-32]
+	(=ks-x1001	    . #x5136)	; &I-K0-5136; [49-22]
+	(=jis-x0213-1@2004  . #x3540)	; &I-JX3-3540; [21-32]
+	(=daikanwa	    . 24639)	; &I-M-24639;
+	))
       )
      ((=ucs@unicode	  . #x7947)	; &C1-526C;
       (=iso-ir165	  . #x7D38)	; &C1-526C; [93-24]
@@ -1758,19 +1804,28 @@
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (=ucs		. #x795F)	; 祟
+    (=>jis-x0208	. #x632E)	; 祟 [67-14]
+    (=>jis-x0213-1	. #x632E)	; 祟 [67-14]
+    (=big5		. #xAFA9)	; &I-B-AFA9;
     (->subsumptive
      ((=cns11643-1	  . #x572C)	; &M-24674; [55-12]
       (=daikanwa	  . 24674)	; &I-M-24674;
       )
      ((=ucs@unicode	  . #x795F)	; &GT-31635;
-      (=jis-x0208	  . #x632E)	; &GT-31635; [67-14]
-      (=gb2312		  . #x4B6E)	; &I-G0-4B6E; [43-78]
-      (=jis-x0213-1	  . #x632E)	; &I-JX1-632E; [67-14]
-      (=big5		  . #xAFA9)	; &I-B-AFA9;
+      (=gb2312		  . #x4B6E)	; &GT-31635; [43-78]
       (=gt		  . 31635)	; &I-GT-31635;
       (=gt-k		  . 06618)	; &I-GT-K06618;
       (=gt-pj-1		  . #x632E)	; &I-GT-31635; [67-14]
-      (=shinjigen@rev	  .  5531)	; &GT-31635;
+      (=shinjigen	  .  5531)	; &GT-31635;
+      (->subsumptive
+       ((=ucs@jis/1990	    . #x795F)	; &J90-632E;
+	(=ucs@jis/2000	    . #x795F)	; &J90-632E;
+	(=jis-x0208	    . #x632E)	; &J90-632E; [67-14]
+	(=jis-x0213-1@2000  . #x632E)	; &I-JX1-632E; [67-14]
+	)
+       ((=ucs@jis/2004	    . #x795F)	; &JX3-632E;
+	(=jis-x0213-1@2004  . #x632E)	; &JX3-632E; [67-14]
+	))
       ))
     ))
 (define-char
@@ -1794,7 +1849,7 @@
     (=gt		. 31623)	; &I-GT-31623;
     (=gt-pj-1		. #x632C)	; &I-GT-31623; [67-12]
     (=daikanwa		. 24676)	; &I-M-24676;
-    (=shinjigen@rev	.  5525)	; &GT-31623;
+    (=shinjigen		.  5525)	; &GT-31623;
     ))
 (define-char
   '((<-denotational
@@ -3691,6 +3746,36 @@
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
+    (=ucs		. #x256A6)	; 𥚦
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256A6)	; 𥚦
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (=daikanwa		. 24759)	; &M-24759;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256A6)	; 𥚦
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (->subsumptive
+     ((hanyu-dazidian	  4 2403 19)
+      (=ucs@iso		  . #x256A6)	; &HZK06-F0DF;
+      (=hanziku-6	  . #xF0DF)	; &HZK06-F0DF;
+      )
+     ((=cns11643-5	  . #x4823)	; &C5-4823; [40-03]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
     (=ucs		. #x798A)	; 禊
     (=big5		. #xE2F9)	; &I-B-E2F9;
     ))
@@ -3751,10 +3836,75 @@
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
+    (=ucs@unicode	. #x798B)	; &UU+798B;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x798B)	; 禋
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (=cns11643-2	. #x4C42)	; &C2-4C42; [44-34]
+    ))
+(define-char
+  '((ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (=ucs		. #x256A7)	; 𥚧
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256A7)	; 𥚧
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (hanyu-dazidian	4 2403 2)
+    (=daikanwa		. 24762)	; &M-24762;
+    (=hanziku-6		. #xF0CE)	; &I-HZK06-F0CE;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256A7)	; 𥚧
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (=ucs@iso		. #x256A7)	; &C6-5F5F;
+    (=cns11643-6	. #x5F5F)	; &C6-5F5F; [63-63]
+    ))
+(define-char
+  '((ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (=ucs		. #x256A8)	; 𥚨
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256A8)	; 𥚨
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (->subsumptive
+     ((=daikanwa	  . 24763)	; &M-24763;
+      )
+     ((hanyu-dazidian	  4 2403 4)
+      (=hanziku-6	  . #xF0D0)	; &HZK06-F0D0;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256A8)	; 𥚨
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
     (->subsumptive
-     ((=cns11643-2	  . #x4C42)	; &C2-4C42; [44-34]
+     ((=ucs@iso		  . #x256A8)	; &U-000256A8;
       )
-     ((=ucs@unicode	  . #x798B)	; &UU+798B;
+     ((=cns11643-6	  . #x5F60)	; &C6-5F60; [63-64]
       ))
     ))
 (define-char
@@ -3914,6 +4064,7 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
     (=ucs		. #x798F)	; 福
+    (=>jis-x0208@1997	. #x4A21)	; 福 [42-01]
     (=big5		. #xBAD6)	; &I-B-BAD6;
     ))
 (define-char
@@ -3930,12 +4081,14 @@
     (=ks-x1001		. #x5C58)	; &I-K0-5C58; [60-56]
     (=jis-x0213-1	. #x7941)	; &I-JX1-7941; [89-33]
     (=daikanwa		. 24768)	; &I-M-24768;
-    (=shinjigen@1ed	.  5573)	; 福
+    (=shinjigen		.  5573)	; 福
     (=jef-china3	. #x5CE4)	; &I-JC3-5CE4;
     (mojikyo		. 024768)	; &MCS-600060C0;
     (<-formed
-     ((=jis-x0208@1978	  . #x492F)	; &M-38973; [41-15]
+     ((=ucs@jis/2004	  . #x903C)	; &M-38973;
+      (=jis-x0208@1978	  . #x492F)	; &M-38973; [41-15]
       (=ks-x1001	  . #x793A)	; &I-K0-793A; [89-26]
+      (=jis-x0213-1@2004  . #x492F)	; &I-JX3-492F; [41-15]
       (=daikanwa	  . 38973)	; &I-M-38973;
       ))
     ))
@@ -3946,6 +4099,9 @@
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
+    (=>>jis-x0208	. #x4A21)	; &G-GT-31825; [42-01]
+    (=>jis-x0213-1	. #x4A21)	; &G-GT-31825; [42-01]
+    (=>>gt		. 31825)	; &G-GT-31825;
     (->subsumptive
      ((morohashi-daikanwa	24768 1)
       (=ucs@jis		  . #x798F)	; &GT-31825;
@@ -3953,7 +4109,7 @@
       (=jis-x0213-1	  . #x4A21)	; &I-JX1-4A21; [42-01]
       (=gt		  . 31825)	; &I-GT-31825;
       (=gt-pj-1		  . #x4A21)	; &I-GT-31825; [42-01]
-      (=shinjigen@1ed	  .  5572)	; &GT-31825;
+      (=shinjigen	  .  5572)	; &GT-31825;
       (mojikyo		  . 050315)	; &MCS-6000C48B;
       (<-simplified@JP/Jouyou
        ((name		    . "CJK COMPATIBILITY IDEOGRAPH-FA1B")
@@ -4111,6 +4267,36 @@
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
+    (=ucs		. #x256A9)	; 𥚩
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256A9)	; 𥚩
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (=daikanwa		. 24774)	; &M-24774;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256A9)	; 𥚩
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (->subsumptive
+     ((hanyu-dazidian	  4 2403 26)
+      (=ucs@iso		  . #x256A9)	; &HZK06-F0E6;
+      (=hanziku-6	  . #xF0E6)	; &HZK06-F0E6;
+      )
+     ((=cns11643-4	  . #x4556)	; &C4-4556; [37-54]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
     (=ucs		. #x7995)	; 禕
     (=big5		. #xE2FC)	; &I-B-E2FC;
     ))
@@ -4232,6 +4418,46 @@
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
+    (=ucs		. #x256AA)	; 𥚪
+    (->subsumptive
+     ((=daikanwa	  . 24779)	; &M-24779;
+      )
+     ((=ucs@iso		  . #x256AA)	; &C6-5F63;
+      (=cns11643-6	  . #x5F63)	; &C6-5F63; [63-67]
+      )
+     ((hanyu-dazidian	  1 389 12)
+      (=hanziku-1	  . #xF5F8)	; &HZK01-F5F8;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (=ucs		. #x4115)	; 䄕
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4115)	; 䄕
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (=daikanwa		. 24780)	; &M-24780;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4115)	; 䄕
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x4115)	; &C3-4849;
+    (=cns11643-3	. #x4849)	; &C3-4849; [40-41]
+    ))
+(define-char
+  '((ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
     (=ucs		. #x256AB)	; 𥚫
     ))
 (define-char
@@ -4289,6 +4515,14 @@
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
+    (=ucs		. #x22FC6)	; 𢿆
+    (=cns11643-5	. #x4825)	; &I-C5-4825; [40-05]
+    (=daikanwa		. 24783)	; &I-M-24783;
+    ))
+(define-char
+  '((ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 14)
     (=ucs		. #x256C1)	; 𥛁
     (->subsumptive
      ((=cns11643-6	  . #x5F62)	; &M-24784; [63-66]
@@ -4300,6 +4534,26 @@
       ))
     ))
 (define-char
+  '((ideographic-radical@ucs . 43)	; ⼪
+    (ideographic-strokes@ucs . 10)
+    (ideographic-radical@cns . 113)	; â½°
+    (ideographic-strokes@cns . 9)
+    (ideographic-radical@cns*sources
+     daikanwa cns11643)
+    (ideographic-strokes@cns*sources
+     daikanwa)
+    (total-strokes	 . 14)
+    (=ucs		. #x21C07)	; 𡰇
+    (->subsumptive
+     ((=ucs@iso		  . #x21C07)	; &M-24785;
+      (=daikanwa	  . 24785)	; &M-24785;
+      )
+     ((ideographic-radical . 113)	; â½°
+      (ideographic-strokes . 9)
+      (=cns11643-5	  . #x4826)	; &C5-4826; [40-06]
+      ))
+    ))
+(define-char
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
@@ -4356,12 +4610,14 @@
     (=jis-x0213-1	. #x4135)	; &I-JX1-4135; [33-21]
     (=gt		. 31813)	; &I-GT-31813;
     (=gt-pj-1		. #x4135)	; &I-GT-31813; [33-21]
+    (=shinjigen		.  5566)	; &GT-31813;
     (<-simplified@JP/Jouyou
      ((=ucs@jis		  . #x79AA)	; &GT-31989;
       (=jis-x0208	  . #x6338)	; &GT-31989; [67-24]
       (=ks-x1001	  . #x6049)	; &I-K0-6049; [64-41]
       (=jis-x0213-1	  . #x6338)	; &I-JX1-6338; [67-24]
       (=daikanwa	  . 24835)	; &I-M-24835;
+      (=shinjigen	  .  5567)	; &GT-31989;
       ))
     (<-simplified@JP/Jouyou*sources
      daikanwa JP/Jouyou)
@@ -4370,100 +4626,10 @@
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 9)
     (total-strokes	 . 14)
-    (=ucs		. #x4115)	; 䄕
-    (=cns11643-3	. #x4849)	; &I-C3-4849; [40-41]
-    ))
-(define-char
-  '((ideographic-radical . 113)	; â½°
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
     (=ucs		. #x7999)	; 禙
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (=ucs		. #x21C07)	; 𡰇
-    (=cns11643-5	. #x4826)	; &I-C5-4826; [40-06]
-    ))
-(define-char
-  '((ideographic-radical . 113)	; â½°
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (=ucs		. #x22FC6)	; 𢿆
-    (=cns11643-5	. #x4825)	; &I-C5-4825; [40-05]
-    ))
-(define-char
-  '((ideographic-radical . 113)	; â½°
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (hanyu-dazidian	4 2403 19)
-    (=ucs		. #x256A6)	; 𥚦
-    (=cns11643-5	. #x4823)	; &I-C5-4823; [40-03]
-    (=hanziku-6		. #xF0DF)	; &I-HZK06-F0DF;
-    ))
-(define-char
-  '((ideographic-radical . 113)	; â½°
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (=ucs		. #x256A7)	; 𥚧
-    (=cns11643-6	. #x5F5F)	; &I-C6-5F5F; [63-63]
-    ))
-(define-char
-  '((=>ucs		. #x256A7)	; 𥚧
-    (ideographic-radical . 113)	; â½°
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (hanyu-dazidian	4 2403 2)
-    (=hanziku-6		. #xF0CE)	; &HZK06-F0CE;
-    ))
-(define-char
-  '((ideographic-radical . 113)	; â½°
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (=ucs		. #x256A8)	; 𥚨
-    ))
-(define-char
-  '((=>ucs		. #x256A8)	; 𥚨
-    (ideographic-radical . 113)	; â½°
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (=cns11643-6	. #x5F60)	; &C6-5F60; [63-64]
-    ))
-(define-char
-  '((=>ucs		. #x256A8)	; 𥚨
-    (ideographic-radical . 113)	; â½°
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (hanyu-dazidian	4 2403 4)
-    (=hanziku-6		. #xF0D0)	; &HZK06-F0D0;
-    ))
-(define-char
-  '((ideographic-radical . 113)	; â½°
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (hanyu-dazidian	4 2403 26)
-    (=ucs		. #x256A9)	; 𥚩
-    (=hanziku-6		. #xF0E6)	; &I-HZK06-F0E6;
-    ))
-(define-char
-  '((=>ucs		. #x256A9)	; 𥚩
-    (ideographic-radical . 113)	; â½°
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (=cns11643-4	. #x4556)	; &C4-4556; [37-54]
-    ))
-(define-char
-  '((ideographic-radical . 113)	; â½°
-    (ideographic-strokes . 9)
-    (total-strokes	 . 14)
-    (hanyu-dazidian	1 389 12)
-    (=ucs		. #x256AA)	; 𥚪
-    (=cns11643-6	. #x5F63)	; &I-C6-5F63; [63-67]
-    (=hanziku-1		. #xF5F8)	; &I-HZK01-F5F8;
-    ))
-(define-char
-  '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
     (=ucs		. #x799A)	; 禚
@@ -5339,317 +5505,586 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
     (=ucs		. #x256EE)	; 𥛮
-    (->subsumptive
-     ((hanyu-dazidian	  4 2408 4)
-      (=daikanwa	  . 24825)	; &M-24825;
-      (=hanziku-6	  . #xF1D3)	; &I-HZK06-F1D3;
-      )
-     ((=ucs@iso		  . #x256EE)	; &C4-5743;
-      (=cns11643-4	  . #x5743)	; &C4-5743; [55-35]
-      ))
     ))
 (define-char
-  '((ideographic-radical . 113)	; â½°
+  '((<-denotational
+     ((=ucs		  . #x256EE)	; 𥛮
+      ))
+    (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=ucs		. #x411F)	; 䄟
-    (->subsumptive
-     ((->subsumptive
-       ((=daikanwa	    . 24827)	; &M-24827;
-	)
-       ((=cns11643-4	    . #x5742)	; &C4-5742; [55-34]
-	))
-      )
-     ((=ucs@unicode	  . #x411F)	; &UU+411F;
-      ))
+    (hanyu-dazidian	4 2408 4)
+    (=daikanwa		. 24825)	; &M-24825;
+    (=hanziku-6		. #xF1D3)	; &I-HZK06-F1D3;
     ))
 (define-char
-  '((ideographic-radical . 113)	; â½°
+  '((<-denotational
+     ((=ucs		  . #x256EE)	; 𥛮
+      ))
+    (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=ucs		. #x79A7)	; 禧
     (->subsumptive
-     ((=ucs@jis		  . #x79A7)	; &GT-31977;
-      (=jis-x0208	  . #x6336)	; &GT-31977; [67-22]
-      (=ks-x1001	  . #x7D7B)	; &I-K0-7D7B; [93-91]
-      (=jis-x0213-1	  . #x6336)	; &I-JX1-6336; [67-22]
-      (=gt		  . 31977)	; &I-GT-31977;
-      (=gt-pj-1		  . #x6336)	; &I-GT-31977; [67-22]
-      (=daikanwa	  . 24828)	; &I-M-24828;
-      (=shinjigen@rev	  .  5577)	; &GT-31977;
+     ((=ucs@iso		  . #x256EE)	; &U-000256EE;
       )
-     ((=ucs@unicode	  . #x79A7)	; &C1-7452;
-      (=gb2312		  . #x6C7B)	; &C1-7452; [76-91]
-      (=cns11643-1	  . #x7452)	; &I-C1-7452; [84-50]
-      (=big5		  . #xC148)	; &I-B-C148;
+     ((=cns11643-4	  . #x5743)	; &C4-5743; [55-35]
       ))
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=ucs		. #x256FB)	; 𥛻
+    (=ucs		. #x256EF)	; 𥛯
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256EF)	; 𥛯
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
     (->subsumptive
-     ((hanyu-dazidian	  4 2407 22)
-      (=daikanwa	  . 24831)	; &M-24831;
-      (=hanziku-6	  . #xF1C5)	; &I-HZK06-F1C5;
+     ((=daikanwa	  . 24826)	; &M-24826;
       )
-     ((=ucs@iso		  . #x256FB)	; &C7-3971;
-      (=cns11643-7	  . #x3971)	; &C7-3971; [25-81]
+     ((hanyu-dazidian	  4 2408 7)
+      (=hanziku-6	  . #xF1D6)	; &HZK06-F1D6;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x256EF)	; 𥛯
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs@iso		. #x256EF)	; &C5-5C5A;
+    (=cns11643-5	. #x5C5A)	; &C5-5C5A; [60-58]
+    ))
+(define-char
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=ucs		. #x79A8)	; 禨
+    (=ucs		. #x411F)	; 䄟
     (->subsumptive
-     ((=ucs@jis		  . #x79A8)	; &M-24832;
-      (=jis-x0212	  . #x506C)	; &M-24832; [48-76]
-      (=daikanwa	  . 24832)	; &I-M-24832;
-      (=jef-china3	  . #x5CEA)	; &I-JC3-5CEA;
-      )
-     ((=cns11643-2	  . #x5D7B)	; &C2-5D7B; [61-91]
+     ((->subsumptive
+       ((=daikanwa	    . 24827)	; &M-24827;
+	)
+       ((=cns11643-4	    . #x5742)	; &C4-5742; [55-34]
+	))
       )
-     ((=ucs@unicode	  . #x79A8)	; &B-EDB0;
-      (=big5		  . #xEDB0)	; &B-EDB0;
+     ((=ucs@unicode	  . #x411F)	; &UU+411F;
       ))
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
-    (=ucs		. #x79A9)	; 禩
-    (->subsumptive
-     ((ideographic-strokes . 12)
-      (total-strokes	   . 17)
-      (=daikanwa	  . 24833)	; &M-24833;
-      )
-     ((ideographic-strokes . 11)
-      (total-strokes	   . 16)
-      (=ucs@jis		  . #x79A9)	; &JX2-726C;
-      (=jis-x0212	  . #x506D)	; &JX2-726C; [48-77]
-      (=jis-x0213-2	  . #x726C)	; &I-JX2-726C; [82-76]
-      (=jef-china3	  . #x9FDB)	; &I-JC3-9FDB;
-      )
-     ((ideographic-strokes . 11)
-      (total-strokes	   . 16)
-      (=ucs@unicode	  . #x79A9)	; &C3-5227;
-      (=cns11643-3	  . #x5227)	; &C3-5227; [50-07]
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs		. #x79A7)	; 禧
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79A7)	; 禧
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs@jis		. #x79A7)	; &GT-31977;
+    (=jis-x0208		. #x6336)	; &GT-31977; [67-22]
+    (=ks-x1001		. #x7D7B)	; &I-K0-7D7B; [93-91]
+    (=jis-x0213-1	. #x6336)	; &I-JX1-6336; [67-22]
+    (=gt		. 31977)	; &I-GT-31977;
+    (=gt-pj-1		. #x6336)	; &I-GT-31977; [67-22]
+    (=daikanwa		. 24828)	; &I-M-24828;
+    (=shinjigen		.  5577)	; &GT-31977;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79A7)	; 禧
       ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs@unicode	. #x79A7)	; &C1-7452;
+    (=gb2312		. #x6C7B)	; &C1-7452; [76-91]
+    (=cns11643-1	. #x7452)	; &I-C1-7452; [84-50]
+    (=big5		. #xC148)	; &I-B-C148;
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=ucs		. #x79AA)	; 禪
-    (->subsumptive
-     ((=ucs@jis		  . #x79AA)	; &GT-31989;
-      (=jis-x0208	  . #x6338)	; &GT-31989; [67-24]
-      (=ks-x1001	  . #x6049)	; &I-K0-6049; [64-41]
-      (=jis-x0213-1	  . #x6338)	; &I-JX1-6338; [67-24]
-      (=gt		  . 31989)	; &I-GT-31989;
-      (=gt-pj-1		  . #x6338)	; &I-GT-31989; [67-24]
-      (=daikanwa	  . 24835)	; &I-M-24835;
-      (=shinjigen@rev	  .  5567)	; &GT-31989;
-      )
-     ((=ucs@unicode	  . #x79AA)	; &C1-7453;
-      (=cns11643-1	  . #x7453)	; &C1-7453; [84-51]
-      (=gb12345		  . #x6C78)	; &C1-7453; [76-88]
-      (=big5		  . #xC149)	; &I-B-C149;
+    (=ucs		. #x256F0)	; 𥛰
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256F0)	; 𥛰
       ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (hanyu-dazidian	4 2407 26)
+    (=daikanwa		. 24829)	; &M-24829;
+    (=hanziku-6		. #xF1C9)	; &I-HZK06-F1C9;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256F0)	; 𥛰
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs@iso		. #x256F0)	; &C7-3973;
+    (=cns11643-7	. #x3973)	; &C7-3973; [25-83]
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=ucs		. #x79AB)	; 禫
+    (=ucs		. #x256F1)	; 𥛱
     (->subsumptive
-     ((=ucs@jis		  . #x79AB)	; &M-24836;
-      (=jis-x0212	  . #x506E)	; &M-24836; [48-78]
-      (=daikanwa	  . 24836)	; &I-M-24836;
+     ((=cns11643-4	  . #x5744)	; &M-24830; [55-36]
+      (=daikanwa	  . 24830)	; &I-M-24830;
       )
-     ((=ucs@unicode	  . #x79AB)	; &C2-5D7A;
-      (=cns11643-2	  . #x5D7A)	; &C2-5D7A; [61-90]
-      (=big5		  . #xEDAF)	; &I-B-EDAF;
+     ((hanyu-dazidian	  4 2407 23)
+      (=ucs@iso		  . #x256F1)	; &HZK06-F1C6;
+      (=hanziku-6	  . #xF1C6)	; &HZK06-F1C6;
       ))
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
-    (=ucs		. #x256F4)	; 𥛴
-    (->subsumptive
-     ((ideographic-strokes . 12)
-      (total-strokes	   . 16)
-      (=ucs@iso		  . #x256F4)	; &M-24838;
-      (=cns11643-7	  . #x305E)	; &M-24838; [16-62]
-      (=daikanwa	  . 24838)	; &I-M-24838;
-      )
-     ((ideographic-strokes . 11)
-      (total-strokes	   . 15)
-      (hanyu-dazidian	  4 2552 2)
-      (=hanziku-7	  . #xB972)	; &HZK07-B972;
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs		. #x256FB)	; 𥛻
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256FB)	; 𥛻
       ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (hanyu-dazidian	4 2407 22)
+    (=daikanwa		. 24831)	; &M-24831;
+    (=hanziku-6		. #xF1C5)	; &I-HZK06-F1C5;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256FB)	; 𥛻
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs@iso		. #x256FB)	; &C7-3971;
+    (=cns11643-7	. #x3971)	; &C7-3971; [25-81]
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
-    (=ucs		. #x256FC)	; 𥛼
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs		. #x79A8)	; 禨
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79A8)	; 禨
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs@jis		. #x79A8)	; &M-24832;
+    (=jis-x0212		. #x506C)	; &M-24832; [48-76]
+    (=daikanwa		. 24832)	; &I-M-24832;
+    (=jef-china3	. #x5CEA)	; &I-JC3-5CEA;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79A8)	; 禨
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=big5		. #xEDB0)	; &B-EDB0;
     (->subsumptive
-     ((ideographic-strokes . 12)
-      (total-strokes	   . 17)
-      (hanyu-dazidian	  4 2407 24)
-      (=daikanwa	  . 24839)	; &M-24839;
-      (=hanziku-6	  . #xF1C7)	; &I-HZK06-F1C7;
+     ((=cns11643-2	  . #x5D7B)	; &C2-5D7B; [61-91]
       )
-     ((ideographic-strokes . 12)
-      (total-strokes	   . 17)
-      (=ucs@iso		  . #x256FC)	; &C7-3975;
-      (=cns11643-7	  . #x3975)	; &C7-3975; [25-85]
+     ((=ucs@unicode	  . #x79A8)	; &UU+79A8;
       ))
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
+    (=ucs		. #x79A9)	; 禩
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79A9)	; 禩
+      ))
+    (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=ucs		. #x256FD)	; 𥛽
-    (->subsumptive
-     ((hanyu-dazidian	  4 2407 25)
-      (=daikanwa	  . 49402)	; &M-49402;
-      (=hanziku-6	  . #xF1C8)	; &I-HZK06-F1C8;
-      )
-     ((=ucs@iso		  . #x256FD)	; &C7-3972;
-      (=cns11643-7	  . #x3972)	; &C7-3972; [25-82]
+    (=daikanwa		. 24833)	; &M-24833;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79A9)	; 禩
       ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
+    (=ucs@jis		. #x79A9)	; &JX2-726C;
+    (=jis-x0212		. #x506D)	; &JX2-726C; [48-77]
+    (=jis-x0213-2	. #x726C)	; &I-JX2-726C; [82-76]
+    (=jef-china3	. #x9FDB)	; &I-JC3-9FDB;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79A9)	; 禩
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 11)
+    (total-strokes	 . 16)
+    (=ucs@unicode	. #x79A9)	; &C3-5227;
+    (=cns11643-3	. #x5227)	; &C3-5227; [50-07]
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=ucs		. #x256FF)	; 𥛿
+    (=ucs		. #x256F2)	; 𥛲
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256F2)	; 𥛲
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
     (->subsumptive
-     ((hanyu-dazidian	  4 2408 6)
-      (=daikanwa	  . 49403)	; &M-49403;
-      (=hanziku-6	  . #xF1D5)	; &I-HZK06-F1D5;
+     ((=daikanwa	  . 24834)	; &M-24834;
       )
-     ((=ucs@iso		  . #x256FF)	; &C7-3970;
-      (=cns11643-7	  . #x3970)	; &C7-3970; [25-80]
+     ((hanyu-dazidian	  4 2408 2)
+      (=hanziku-6	  . #xF1D1)	; &HZK06-F1D1;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x256F2)	; 𥛲
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs@iso		. #x256F2)	; &C7-3976;
+    (=cns11643-7	. #x3976)	; &C7-3976; [25-86]
+    ))
+(define-char
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=ucs		. #x256EF)	; 𥛯
-    (=cns11643-5	. #x5C5A)	; &I-C5-5C5A; [60-58]
+    (=ucs		. #x79AA)	; 禪
     ))
 (define-char
-  '((=>ucs		. #x256EF)	; 𥛯
+  '((<-denotational
+     ((=ucs		  . #x79AA)	; 禪
+      ))
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (hanyu-dazidian	4 2408 7)
-    (=hanziku-6		. #xF1D6)	; &HZK06-F1D6;
+    (=ucs@jis		. #x79AA)	; &GT-31989;
+    (=jis-x0208		. #x6338)	; &GT-31989; [67-24]
+    (=ks-x1001		. #x6049)	; &I-K0-6049; [64-41]
+    (=jis-x0213-1	. #x6338)	; &I-JX1-6338; [67-24]
+    (=gt		. 31989)	; &I-GT-31989;
+    (=gt-pj-1		. #x6338)	; &I-GT-31989; [67-24]
+    (=daikanwa		. 24835)	; &I-M-24835;
+    (=shinjigen		.  5567)	; &GT-31989;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79AA)	; 禪
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs@unicode	. #x79AA)	; &C1-7453;
+    (=cns11643-1	. #x7453)	; &C1-7453; [84-51]
+    (=gb12345		. #x6C78)	; &C1-7453; [76-88]
+    (=big5		. #xC149)	; &I-B-C149;
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=ucs		. #x256F0)	; 𥛰
-    (=cns11643-7	. #x3973)	; &I-C7-3973; [25-83]
+    (=ucs		. #x79AB)	; 禫
     ))
 (define-char
-  '((=>ucs		. #x256F0)	; 𥛰
+  '((<-denotational
+     ((=ucs		  . #x79AB)	; 禫
+      ))
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (hanyu-dazidian	4 2407 26)
-    (=hanziku-6		. #xF1C9)	; &HZK06-F1C9;
+    (=ucs@jis		. #x79AB)	; &M-24836;
+    (=jis-x0212		. #x506E)	; &M-24836; [48-78]
+    (=daikanwa		. 24836)	; &I-M-24836;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79AB)	; 禫
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs@unicode	. #x79AB)	; &C2-5D7A;
+    (=cns11643-2	. #x5D7A)	; &C2-5D7A; [61-90]
+    (=big5		. #xEDAF)	; &I-B-EDAF;
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (hanyu-dazidian	4 2407 23)
-    (=ucs		. #x256F1)	; 𥛱
-    (=hanziku-6		. #xF1C6)	; &I-HZK06-F1C6;
+    (=ucs		. #x256F3)	; 𥛳
     ))
 (define-char
-  '((=>ucs		. #x256F1)	; 𥛱
+  '((<-denotational
+     ((=ucs		  . #x256F3)	; 𥛳
+      ))
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=cns11643-4	. #x5744)	; &C4-5744; [55-36]
+    (hanyu-dazidian	4 2407 27)
+    (=daikanwa		. 24837)	; &M-24837;
+    (=hanziku-6		. #xF1CA)	; &I-HZK06-F1CA;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256F3)	; 𥛳
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (->subsumptive
+     ((=ucs@iso		  . #x256F3)	; &U-000256F3;
+      )
+     ((=cns11643-7	  . #x3974)	; &C7-3974; [25-84]
+      ))
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
+    (=ucs		. #x256F4)	; 𥛴
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256F4)	; 𥛴
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (->subsumptive
+     ((=daikanwa	  . 24838)	; &M-24838;
+      )
+     ((=ucs@iso		  . #x256F4)	; &C7-305E;
+      (=cns11643-7	  . #x305E)	; &C7-305E; [16-62]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256F4)	; 𥛴
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (hanyu-dazidian	4 2552 2)
+    (=hanziku-7		. #xB972)	; &HZK07-B972;
+    ))
+(define-char
+  '((ideographic-radical . 113)	; â½°
+    (=ucs		. #x256FC)	; 𥛼
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256FC)	; 𥛼
+      ))
+    (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=ucs		. #x256F2)	; 𥛲
-    (=cns11643-7	. #x3976)	; &I-C7-3976; [25-86]
+    (hanyu-dazidian	4 2407 24)
+    (=daikanwa		. 24839)	; &M-24839;
+    (=hanziku-6		. #xF1C7)	; &I-HZK06-F1C7;
     ))
 (define-char
-  '((=>ucs		. #x256F2)	; 𥛲
+  '((<-denotational
+     ((=ucs		  . #x256FC)	; 𥛼
+      ))
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (hanyu-dazidian	4 2408 2)
-    (=hanziku-6		. #xF1D1)	; &HZK06-F1D1;
+    (=ucs@iso		. #x256FC)	; &C7-3975;
+    (=cns11643-7	. #x3975)	; &C7-3975; [25-85]
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (=ucs		. #x256F3)	; 𥛳
-    (=cns11643-7	. #x3974)	; &I-C7-3974; [25-84]
+    (=ucs		. #x256FD)	; 𥛽
     ))
 (define-char
-  '((=>ucs		. #x256F3)	; 𥛳
+  '((<-denotational
+     ((=ucs		  . #x256FD)	; 𥛽
+      ))
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 12)
     (total-strokes	 . 17)
-    (hanyu-dazidian	4 2407 27)
-    (=hanziku-6		. #xF1CA)	; &HZK06-F1CA;
+    (hanyu-dazidian	4 2407 25)
+    (=daikanwa		. 49402)	; &M-49402;
+    (=hanziku-6		. #xF1C8)	; &I-HZK06-F1C8;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256FD)	; 𥛽
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs@iso		. #x256FD)	; &C7-3972;
+    (=cns11643-7	. #x3972)	; &C7-3972; [25-82]
+    ))
+(define-char
+  '((ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs		. #x256FF)	; 𥛿
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256FF)	; 𥛿
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (hanyu-dazidian	4 2408 6)
+    (=daikanwa		. 49403)	; &M-49403;
+    (=hanziku-6		. #xF1D5)	; &I-HZK06-F1D5;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x256FF)	; 𥛿
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs@iso		. #x256FF)	; &C7-3970;
+    (=cns11643-7	. #x3970)	; &C7-3970; [25-80]
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
-    (=ucs		. #x79AC)	; 禬
+    (=ucs		. #x25703)	; 𥜃
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25703)	; 𥜃
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
     (->subsumptive
-     ((=daikanwa	  . 24841)	; &M-24841;
+     ((=daikanwa	  . 24840)	; &M-24840;
       )
-     ((=ucs@unicode	  . #x79AC)	; &C2-624B;
-      (=cns11643-2	  . #x624B)	; &C2-624B; [66-43]
-      (=big5		  . #xF05F)	; &I-B-F05F;
+     ((hanyu-dazidian	  4 2409 9)
+      (=hanziku-6	  . #xF1F8)	; &HZK06-F1F8;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x25703)	; 𥜃
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=ucs@iso		. #x25703)	; &C4-5C34;
+    (=cns11643-4	. #x5C34)	; &C4-5C34; [60-20]
+    ))
+(define-char
+  '((ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=ucs		. #x79AC)	; 禬
+    (=big5		. #xF05F)	; &I-B-F05F;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79AC)	; 禬
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=daikanwa		. 24841)	; &M-24841;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79AC)	; 禬
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=ucs@unicode	. #x79AC)	; &C2-624B;
+    (=cns11643-2	. #x624B)	; &C2-624B; [66-43]
+    ))
+(define-char
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
     (=ucs		. #x4120)	; 䄠
-    (->subsumptive
-     ((=daikanwa	  . 24842)	; &M-24842;
-      )
-     ((cns-radical?	  . 112)
-      (=ucs@unicode	  . #x4120)	; &C3-5846;
-      (=cns11643-3	  . #x5846)	; &C3-5846; [56-38]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4120)	; 䄠
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=daikanwa		. 24842)	; &M-24842;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4120)	; 䄠
       ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=ucs@unicode	. #x4120)	; &C3-5846;
+    (=cns11643-3	. #x5846)	; &C3-5846; [56-38]
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
     (=ucs		. #x79AD)	; 禭
-    (->subsumptive
-     ((ideographic-strokes . 13)
-      (total-strokes	   . 18)
-      (=daikanwa	  . 24843)	; &M-24843;
-      )
-     ((ideographic-strokes . 13)
-      (total-strokes	   . 18)
-      (=cns11643-2	  . #x624A)	; &C2-624A; [66-42]
-      (=big5		  . #xF05E)	; &I-B-F05E;
-      )
-     ((ideographic-strokes . 12)
-      (total-strokes	   . 17)
-      (=ucs@unicode	  . #x79AD)	; &UU+79AD;
+    (=big5		. #xF05E)	; &I-B-F05E;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79AD)	; 禭
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=daikanwa		. 24843)	; &M-24843;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79AD)	; 禭
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=cns11643-2	. #x624A)	; &C2-624A; [66-42]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79AD)	; 禭
       ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 12)
+    (total-strokes	 . 17)
+    (=ucs@unicode	. #x79AD)	; &UU+79AD;
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
@@ -5672,7 +6107,7 @@
     (=gt		. 32019)	; &I-GT-32019;
     (=gt-pj-1		. #x6339)	; &I-GT-32019; [67-25]
     (=daikanwa		. 24844)	; &I-M-24844;
-    (=shinjigen@rev	.  5506)	; &GT-32019;
+    (=shinjigen		.  5506)	; &GT-32019;
     ))
 (define-char
   '((<-denotational
@@ -5693,16 +6128,61 @@
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
+    (=ucs		. #x4121)	; 䄡
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4121)	; 䄡
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=daikanwa		. 24845)	; &M-24845;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4121)	; 䄡
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=ucs@unicode	. #x4121)	; &UU+4121;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4121)	; 䄡
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=cns11643-3	. #x5847)	; &C3-5847; [56-39]
+    ))
+(define-char
+  '((ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
     (=ucs		. #x79AF)	; 禯
-    (->subsumptive
-     ((=ucs@jis		  . #x79AF)	; &M-24846;
-      (=jis-x0212	  . #x506F)	; &M-24846; [48-79]
-      (=daikanwa	  . 24846)	; &I-M-24846;
-      )
-     ((cns-radical	 . 112)	; ⽯
-      (=ucs@unicode	  . #x79AF)	; &C3-5845;
-      (=cns11643-3	  . #x5845)	; &C3-5845; [56-37]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79AF)	; 禯
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=ucs@jis		. #x79AF)	; &M-24846;
+    (=jis-x0212		. #x506F)	; &M-24846; [48-79]
+    (=daikanwa		. 24846)	; &I-M-24846;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79AF)	; 禯
       ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=ucs@unicode	. #x79AF)	; &C3-5845;
+    (=cns11643-3	. #x5845)	; &C3-5845; [56-37]
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
@@ -5725,70 +6205,96 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
     (=ucs		. #x25705)	; 𥜅
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25705)	; 𥜅
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
     (->subsumptive
-     ((hanyu-dazidian	  4 2409 5)
-      (=daikanwa	  . 24848)	; &M-24848;
-      (=hanziku-6	  . #xF1F4)	; &I-HZK06-F1F4;
+     ((=daikanwa	  . 24848)	; &M-24848;
       )
-     ((->subsumptive
-       ((=ucs@iso	    . #x25705)	; &U-00025705;
-	)
-       ((=cns11643-7	    . #x412C)	; &C7-412C; [33-12]
-	))
+     ((hanyu-dazidian	  4 2409 5)
+      (=hanziku-6	  . #xF1F4)	; &HZK06-F1F4;
       ))
     ))
 (define-char
-  '((ideographic-radical . 113)	; â½°
+  '((<-denotational
+     ((=ucs		  . #x25705)	; 𥜅
+      ))
+    (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
-    (=ucs		. #x25711)	; 𥜑
     (->subsumptive
-     ((hanyu-dazidian	  4 2409 3)
-      (=daikanwa	  . 24849)	; &M-24849;
-      (=hanziku-6	  . #xF1F2)	; &I-HZK06-F1F2;
+     ((=ucs@iso		  . #x25705)	; &U-00025705;
       )
-     ((=ucs@iso		  . #x25711)	; &C4-5C33;
-      (=cns11643-4	  . #x5C33)	; &C4-5C33; [60-19]
+     ((=cns11643-7	  . #x412C)	; &C7-412C; [33-12]
       ))
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
-    (=ucs		. #x2570F)	; 𥜏
-    (->subsumptive
-     ((=daikanwa	  . 24850)	; &M-24850;
-      (mojikyo		  . 024850)	; &MCS-60006112;
-      )
-     ((hanyu-dazidian	  4 2409 6)
-      (=hanziku-6	  . #xF1F5)	; &HZK06-F1F5;
-      )
-     ((=ucs@iso		  . #x2570F)	; &C7-412B;
-      (=cns11643-7	  . #x412B)	; &C7-412B; [33-11]
+    (=ucs		. #x25711)	; 𥜑
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25711)	; 𥜑
       ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (hanyu-dazidian	4 2409 3)
+    (=daikanwa		. 24849)	; &M-24849;
+    (=hanziku-6		. #xF1F2)	; &I-HZK06-F1F2;
     ))
 (define-char
-  '((ideographic-radical . 113)	; â½°
+  '((<-denotational
+     ((=ucs		  . #x25711)	; 𥜑
+      ))
+    (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
-    (cns-radical?	. 112)
-    (=ucs		. #x4121)	; 䄡
-    (=cns11643-3	. #x5847)	; &I-C3-5847; [56-39]
+    (=ucs@iso		. #x25711)	; &C4-5C33;
+    (=cns11643-4	. #x5C33)	; &C4-5C33; [60-19]
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
-    (=ucs		. #x25703)	; 𥜃
-    (=cns11643-4	. #x5C34)	; &I-C4-5C34; [60-20]
+    (=ucs		. #x2570F)	; 𥜏
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2570F)	; 𥜏
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=daikanwa		. 24850)	; &M-24850;
+    (mojikyo		. 024850)	; &MCS-60006112;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2570F)	; 𥜏
+      ))
+    (ideographic-radical . 113)	; â½°
+    (ideographic-strokes . 13)
+    (total-strokes	 . 18)
+    (=ucs@iso		. #x2570F)	; &C7-412B;
+    (=cns11643-7	. #x412B)	; &C7-412B; [33-11]
     ))
 (define-char
-  '((=>ucs		. #x25703)	; 𥜃
+  '((<-denotational
+     ((=ucs		  . #x2570F)	; 𥜏
+      ))
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 13)
     (total-strokes	 . 18)
-    (hanyu-dazidian	4 2409 9)
-    (=hanziku-6		. #xF1F8)	; &HZK06-F1F8;
+    (hanyu-dazidian	4 2409 6)
+    (=hanziku-6		. #xF1F5)	; &HZK06-F1F5;
     ))
 (define-char
   '((ideographic-radical . 113)	; â½°
@@ -5803,7 +6309,9 @@
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
+    (=ucs@jis/2004	. #x79B0)	; &M-24851;
     (=jis-x0208@1978	. #x4729)	; &M-24851; [39-09]
+    (=jis-x0213-1@2004	. #x4729)	; &I-JX3-4729; [39-09]
     (=daikanwa		. 24851)	; &I-M-24851;
     ))
 (define-char
@@ -5814,12 +6322,19 @@
     (ideographic-strokes . 14)
     (total-strokes	 . 19)
     (->subsumptive
-     ((=ucs@jis		  . #x79B0)	; &GT-32014;
+     ((=ucs@jis/1990	  . #x79B0)	; &GT-32014;
+      (=ucs@jis/2000	  . #x79B0)	; &GT-32014;
       (=jis-x0208@1983	  . #x4729)	; &GT-32014; [39-09]
       (=jis-x0208@1990	  . #x4729)	; &I-J90-4729; [39-09]
-      (=jis-x0213-1	  . #x4729)	; &I-JX1-4729; [39-09]
+      (=jis-x0213-1@2000  . #x4729)	; &I-JX1-4729; [39-09]
       (=gt		  . 32014)	; &I-GT-32014;
       (=gt-pj-1		  . #x4729)	; &I-GT-32014; [39-09]
+      (<-simplified@JP/extra
+       ((=ucs@jis/2004	    . #x79B0)	; &M-24851;
+	(=jis-x0208@1978    . #x4729)	; &M-24851; [39-09]
+	(=jis-x0213-1@2004  . #x4729)	; &I-JX3-4729; [39-09]
+	(=daikanwa	    . 24851)	; &I-M-24851;
+	))
       )
      ((=ucs@unicode	  . #x79B0)	; &C2-662F;
       (=cns11643-2	  . #x662F)	; &C2-662F; [70-15]
@@ -5829,8 +6344,12 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 113)	; â½°
+    (=>jis-x0208@1997	. #x4578)	; &J97-4578; [37-88]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4578)	; &J97-4578; [37-88]
+     ((=>jis-x0208@1997	  . #x4578)	; &J97-4578; [37-88]
       ))
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 14)
@@ -5851,12 +6370,8 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 113)	; â½°
-    (=jis-x0208@1997	. #x4578)	; &J97-4578; [37-88]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4578)	; &J97-4578; [37-88]
+     ((=>jis-x0208@1997	  . #x4578)	; &J97-4578; [37-88]
       ))
     (ideographic-radical . 113)	; â½°
     (ideographic-strokes . 7)
@@ -5869,7 +6384,7 @@
       (=jis-x0213-1	  . #x4578)	; &I-JX1-4578; [37-88]
       (=gt		  . 31697)	; &I-GT-31697;
       (=gt-pj-1		  . #x4578)	; &I-GT-31697; [37-88]
-      (<-simplified@JP
+      (<-simplified@JP/extra
        ((=ucs@jis	    . #x79B1)	; &M-24852;
 	(=jis-x0208@1978    . #x4578)	; &M-24852; [37-88]
 	(=ks-x1001	    . #x542A)	; &I-K0-542A; [52-10]
diff --git a/lisp/utf-2000/Ideograph-R115-Grain.el b/lisp/utf-2000/Ideograph-R115-Grain.el
index 776683c..69d8b2d 100644
--- a/lisp/utf-2000/Ideograph-R115-Grain.el
+++ b/lisp/utf-2000/Ideograph-R115-Grain.el
@@ -165,6 +165,20 @@
     (=gb2312		. #x3851)	; &I-G0-3851; [24-49]
     (=cns11643-3	. #x2A3F)	; &I-C3-2A3F; [10-31]
     (=daikanwa		. 24925)	; &I-M-24925;
+    (=shinjigen		.  5620)	; 秆
+    (<-formed
+     ((=ucs		  . #x7A08)	; 稈
+      (=jis-x0208	  . #x6343)	; &I-J90-6343; [67-35]
+      (=shinjigen	  .  5619)	; 稈
+      ))
+    (<-formed*sources
+     shinjigen)
+    (<-same
+     ((=ucs		  . #x7A08)	; 稈
+      (=daikanwa	  . 25074)	; &I-M-25074;
+      ))
+    (<-same*sources
+     zhengzitong daikanwa)
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
@@ -470,7 +484,7 @@
       (=gt		  . 32192)	; &I-GT-32192;
       (=gt-pj-1		  . #x633E)	; &I-GT-32192; [67-30]
       (=daikanwa	  . 24958)	; &I-M-24958;
-      (=shinjigen@rev	  .  5600)	; &GT-32192;
+      (=shinjigen	  .  5600)	; &GT-32192;
       )
      ((=cns11643-2	  . #x2C5B)	; &C2-2C5B; [12-59]
       ))
@@ -859,28 +873,50 @@
     (=gt		. 32241)	; &I-GT-32241;
     (=gt-pj-1		. #x6342)	; &I-GT-32241; [67-34]
     (=daikanwa		. 24992)	; &I-M-24992;
-    (=shinjigen@rev	.  5616)	; 秣
+    (=shinjigen		.  5616)	; 秣
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
     (=ucs		. #x79E4)	; 秤
-    (->subsumptive
-     ((=jis-x0208@1978	  . #x4769)	; &M-24993; [39-73]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79E4)	; 秤
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (=ucs@jis/2004	. #x79E4)	; &M-24993;
+    (=jis-x0208@1978	. #x4769)	; &M-24993; [39-73]
+    (=ks-x1001		. #x765F)	; &I-K0-765F; [86-63]
+    (=jis-x0213-1@2004	. #x4769)	; &I-JX3-4769; [39-73]
+    (=daikanwa		. 24993)	; &I-M-24993;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x79E4)	; 秤
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
+    (=ucs@unicode	. #x79E4)	; &GT-32226;
+    (=gb2312		. #x3353)	; &GT-32226; [19-51]
+    (=jis-x0208@1983	. #x4769)	; &I-J83-4769; [39-73]
+    (=jis-x0208@1990	. #x4769)	; &I-J90-4769; [39-73]
+    (=cns11643-1	. #x5732)	; &I-C1-5732; [55-18]
+    (=jis-x0213-1@2000	. #x4769)	; &I-JX1-4769; [39-73]
+    (=big5		. #xAFAF)	; &I-B-AFAF;
+    (=gt		. 32226)	; &I-GT-32226;
+    (=gt-pj-1		. #x4769)	; &I-GT-32226; [39-73]
+    (=jef-china3	. #x5DC6)	; &I-JC3-5DC6;
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x79E4)	; &M-24993;
+      (=jis-x0208@1978	  . #x4769)	; &M-24993; [39-73]
       (=ks-x1001	  . #x765F)	; &I-K0-765F; [86-63]
+      (=jis-x0213-1@2004  . #x4769)	; &I-JX3-4769; [39-73]
       (=daikanwa	  . 24993)	; &I-M-24993;
-      )
-     ((=ucs@unicode	  . #x79E4)	; &GT-32226;
-      (=gb2312		  . #x3353)	; &GT-32226; [19-51]
-      (=jis-x0208@1983	  . #x4769)	; &I-J83-4769; [39-73]
-      (=jis-x0208@1990	  . #x4769)	; &I-J90-4769; [39-73]
-      (=cns11643-1	  . #x5732)	; &I-C1-5732; [55-18]
-      (=jis-x0213-1	  . #x4769)	; &I-JX1-4769; [39-73]
-      (=big5		  . #xAFAF)	; &I-B-AFAF;
-      (=gt		  . 32226)	; &I-GT-32226;
-      (=gt-pj-1		  . #x4769)	; &I-GT-32226; [39-73]
-      (=jef-china3	  . #x5DC6)	; &I-JC3-5DC6;
       ))
     ))
 (define-char
@@ -1824,46 +1860,86 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
     (=ucs		. #x414E)	; 䅎
-    (=cns11643-3	. #x3D67)	; &I-C3-3D67; [29-71]
-    (=daikanwa		. 25067)	; &I-M-25067;
+    (->subsumptive
+     ((=ucs@unicode	  . #x414E)	; &M-25067;
+      (=daikanwa	  . 25067)	; &M-25067;
+      )
+     ((=cns11643-3	  . #x3D67)	; &C3-3D67; [29-71]
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
     (=ucs		. #x7A03)	; 稃
-    (->subsumptive
-     ((=ucs@jis		  . #x7A03)	; &M-25068;
-      (=jis-x0212	  . #x512B)	; &M-25068; [49-11]
-      (=jis-x0213-1	  . #x794C)	; &I-JX1-794C; [89-44]
-      (=daikanwa	  . 25068)	; &I-M-25068;
-      (=jef-china3	  . #x5DA8)	; &I-JC3-5DA8;
-      )
-     ((=ucs@unicode	  . #x7A03)	; &C2-3E5C;
-      (=gb2312		  . #x6F7B)	; &C2-3E5C; [79-91]
-      (=cns11643-2	  . #x3E5C)	; &I-C2-3E5C; [30-60]
-      (=big5		  . #xDAD8)	; &I-B-DAD8;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7A03)	; 稃
       ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
+    (=ucs@jis		. #x7A03)	; &M-25068;
+    (=jis-x0212		. #x512B)	; &M-25068; [49-11]
+    (=jis-x0213-1	. #x794C)	; &I-JX1-794C; [89-44]
+    (=daikanwa		. 25068)	; &I-M-25068;
+    (=jef-china3	. #x5DA8)	; &I-JC3-5DA8;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7A03)	; 稃
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
+    (=ucs@unicode	. #x7A03)	; &C2-3E5C;
+    (=gb2312		. #x6F7B)	; &C2-3E5C; [79-91]
+    (=cns11643-2	. #x3E5C)	; &I-C2-3E5C; [30-60]
+    (=big5		. #xDAD8)	; &I-B-DAD8;
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
     (=ucs		. #x7A04)	; 稄
+    (=big5		. #xDADA)	; &I-B-DADA;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7A04)	; 稄
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
     (->subsumptive
      ((=daikanwa	  . 25069)	; &M-25069;
       )
      ((=cns11643-2	  . #x3E5E)	; &C2-3E5E; [30-62]
-      )
-     ((=big5		  . #xDADA)	; &B-DADA;
-      )
-     ((=ucs@unicode	  . #x7A04)	; &UU+7A04;
       ))
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x7A05)	; &B-B57C;
-      (=big5		  . #xB57C)	; &B-B57C;
+     ((=ucs		  . #x7A04)	; 稄
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
+    (=ucs@unicode	. #x7A04)	; &UU+7A04;
+    ))
+(define-char
+  '((ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
+    (=ucs@big5		. #x7A05)	; &J97-4047;
+    (=>jis-x0208	. #x4047)	; &J97-4047; [32-39]
+    (=>jis-x0213-1	. #x4047)	; &J97-4047; [32-39]
+    (=big5		. #xB57C)	; &J97-4047;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs@big5	  . #x7A05)	; &J97-4047;
+      (=>jis-x0208	  . #x4047)	; &J97-4047; [32-39]
       ))
     (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 7)
@@ -1880,16 +1956,9 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 115)	; â½²
-    (ideographic-strokes . 7)
-    (total-strokes	 . 12)
-    (=ucs@big5		. #x7A05)	; &B-B57C;
-    (=big5		. #xB57C)	; &B-B57C;
-    ))
-(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x7A05)	; &B-B57C;
-      (=big5		  . #xB57C)	; &B-B57C;
+     ((=ucs@big5	  . #x7A05)	; &J97-4047;
+      (=>jis-x0208	  . #x4047)	; &J97-4047; [32-39]
       ))
     (morohashi-daikanwa	25070 1)
     (ideographic-radical . 115)	; â½²
@@ -1903,21 +1972,40 @@
     (=gt		. 32336)	; &I-GT-32336;
     (=gt-pj-1		. #x4047)	; &I-GT-32336; [32-39]
     (mojikyo		. 050319)	; &MCS-6000C48F;
+    (<-same
+     ((=ks-x1001	  . #x612A)	; &M-25070; [65-10]
+      (=daikanwa	  . 25070)	; &I-M-25070;
+      ))
+    (<-same*sources
+     daikanwa)
+    (<-simplified@JP/misc
+     ((=ks-x1001	  . #x612A)	; &M-25070; [65-10]
+      (=daikanwa	  . 25070)	; &I-M-25070;
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
     (=ucs		. #x7A06)	; 稆
-    (->subsumptive
-     ((ideographic-strokes . 7)
-      (total-strokes	   . 12)
-      (=cns11643-6	  . #x4C43)	; &M-25071; [44-35]
-      (=daikanwa	  . 25071)	; &I-M-25071;
-      )
-     ((ideographic-strokes . 6)
-      (total-strokes	   . 11)
-      (=ucs@unicode	  . #x7A06)	; &G0-6F79;
-      (=gb2312		  . #x6F79)	; &G0-6F79; [79-89]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7A06)	; 稆
       ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 7)
+    (total-strokes	 . 12)
+    (=cns11643-6	. #x4C43)	; &M-25071; [44-35]
+    (=daikanwa		. 25071)	; &I-M-25071;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7A06)	; 稆
+      ))
+    (ideographic-radical . 115)	; â½²
+    (ideographic-strokes . 6)
+    (total-strokes	 . 11)
+    (=ucs@unicode	. #x7A06)	; &G0-6F79;
+    (=gb2312		. #x6F79)	; &G0-6F79; [79-89]
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
@@ -1938,9 +2026,14 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
     (=ucs		. #x7A07)	; 稇
-    (=jis-x0212		. #x512C)	; &I-JSP-512C; [49-12]
-    (=cns11643-3	. #x3D66)	; &I-C3-3D66; [29-70]
-    (=daikanwa		. 25073)	; &I-M-25073;
+    (->subsumptive
+     ((=ucs@jis		  . #x7A07)	; &M-25073;
+      (=jis-x0212	  . #x512C)	; &M-25073; [49-12]
+      (=daikanwa	  . 25073)	; &I-M-25073;
+      )
+     ((=ucs@unicode	  . #x7A07)	; &C3-3D66;
+      (=cns11643-3	  . #x3D66)	; &C3-3D66; [29-70]
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
@@ -1955,16 +2048,21 @@
     (=gt		. 32312)	; &I-GT-32312;
     (=gt-pj-1		. #x6343)	; &I-GT-32312; [67-35]
     (=daikanwa		. 25074)	; &I-M-25074;
-    (=shinjigen@rev	.  5619)	; 稈
+    (=shinjigen		.  5619)	; 稈
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
     (ideographic-strokes . 7)
     (total-strokes	 . 12)
     (=ucs		. #x7A09)	; 稉
-    (=jis-x0212		. #x512D)	; &I-JSP-512D; [49-13]
-    (=cns11643-3	. #x3D69)	; &I-C3-3D69; [29-73]
-    (=daikanwa		. 25075)	; &I-M-25075;
+    (->subsumptive
+     ((=ucs@jis		  . #x7A09)	; &M-25075;
+      (=jis-x0212	  . #x512D)	; &M-25075; [49-13]
+      (=daikanwa	  . 25075)	; &I-M-25075;
+      )
+     ((=ucs@unicode	  . #x7A09)	; &C3-3D69;
+      (=cns11643-3	  . #x3D69)	; &C3-3D69; [29-73]
+      ))
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
@@ -2294,19 +2392,30 @@
       (=gb2312		  . #x305E)	; &I-G0-305E; [16-62]
       (=ks-x1001	  . #x782D)	; &I-K0-782D; [88-13]
       (=cns11643-2	  . #x4561)	; &I-C2-4561; [37-65]
+      (=jis-x0213-1@2004  . #x4923)	; &I-JX3-4923; [41-03]
       (=big5		  . #xDEFB)	; &I-B-DEFB;
       (=daikanwa	  . 25113)	; &I-M-25113;
       )
      ((ideographic-strokes . 9)
       (total-strokes	   . 14)
-      (=ucs@jis		  . #x7A17)	; &GT-32477;
+      (=ucs@jis/1990	  . #x7A17)	; &GT-32477;
+      (=ucs@jis/2000	  . #x7A17)	; &GT-32477;
       (=jis-x0208@1983	  . #x4923)	; &GT-32477; [41-03]
       (=jis-x0208@1990	  . #x4923)	; &I-J90-4923; [41-03]
-      (=jis-x0213-1	  . #x4923)	; &I-JX1-4923; [41-03]
+      (=jis-x0213-1@2000  . #x4923)	; &I-JX1-4923; [41-03]
       (=gt		  . 32477)	; &I-GT-32477;
       (=gt-k		  . 11165)	; &I-GT-K11165;
       (=gt-pj-1		  . #x4923)	; &I-GT-32477; [41-03]
       (=jef-china3	  . #x5DC7)	; &I-JC3-5DC7;
+      (<-simplified@JP/extra/design
+       ((=ucs@unicode	    . #x7A17)	; &M-25113;
+	(=jis-x0208@1978    . #x4923)	; &M-25113; [41-03]
+	(=gb2312	    . #x305E)	; &I-G0-305E; [16-62]
+	(=ks-x1001	    . #x782D)	; &I-K0-782D; [88-13]
+	(=cns11643-2	    . #x4561)	; &I-C2-4561; [37-65]
+	(=jis-x0213-1@2004  . #x4923)	; &I-JX3-4923; [41-03]
+	(=daikanwa	    . 25113)	; &I-M-25113;
+	))
       ))
     ))
 (define-char
@@ -3475,10 +3584,11 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
     (=ucs		. #x7A37)	; 稷
+    (=big5		. #xBD5E)	; &I-B-BD5E;
     ))
 (define-char
   '((<-denotational
-     ((=big5		  . #xBD5E)	; &B-BD5E;
+     ((=ucs		  . #x7A37)	; 稷
       ))
     (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 10)
@@ -3496,21 +3606,12 @@
     (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 10)
     (total-strokes	 . 15)
-    (=big5		. #xBD5E)	; &B-BD5E;
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x7A37)	; 稷
-      ))
-    (ideographic-radical . 115)	; â½²
-    (ideographic-strokes . 10)
-    (total-strokes	 . 15)
     (=ucs@unicode	. #x7A37)	; &G0-7022;
     (=gb2312		. #x7022)	; &G0-7022; [80-02]
     ))
 (define-char
   '((<-denotational
-     ((=big5		  . #xBD5E)	; &B-BD5E;
+     ((=ucs		  . #x7A37)	; 稷
       ))
     (ideographic-radical . 115)	; â½²
     (ideographic-strokes . 10)
@@ -3521,7 +3622,7 @@
     (=jis-x0213-1	. #x634D)	; &I-JX1-634D; [67-45]
     (=gt		. 32523)	; &I-GT-32523;
     (=gt-pj-1		. #x634D)	; &I-GT-32523; [67-45]
-    (=shinjigen@rev	.  5654)	; &GT-32523;
+    (=shinjigen		.  5654)	; &GT-32523;
     ))
 (define-char
   '((ideographic-radical . 115)	; â½²
diff --git a/lisp/utf-2000/Ideograph-R116-Cave.el b/lisp/utf-2000/Ideograph-R116-Cave.el
index a4bd5be..eade7cc 100644
--- a/lisp/utf-2000/Ideograph-R116-Cave.el
+++ b/lisp/utf-2000/Ideograph-R116-Cave.el
@@ -380,24 +380,34 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 9)
     (=ucs		. #x7A7F)	; ç©¿
+    (=>jis-x0208	. #x407C)	; ç©¿ [32-92]
+    (=>jis-x0213-1	. #x407C)	; ç©¿ [32-92]
     (=big5		. #xACEF)	; &I-B-ACEF;
     (->subsumptive
-     ((=daikanwa	  . 25436)	; &M-25436;
-      )
-     ((mojikyo		  . 025436)	; &MCS-6000635C;
-      )
-     ((=cns11643-1	  . #x5272)	; &C1-5272; [50-82]
+     ((=>>jis-x0213-1@2004 . #x407C)	; &G-JX3-407C; [32-92]
+      (->subsumptive
+       ((=daikanwa	    . 25436)	; &M-25436;
+	)
+       ((mojikyo	    . 025436)	; &MCS-6000635C;
+	)
+       ((=ucs@jis/2004	    . #x7A7F)	; &JX3-407C;
+	(=jis-x0213-1@2004  . #x407C)	; &JX3-407C; [32-92]
+	)
+       ((=cns11643-1	    . #x5272)	; &C1-5272; [50-82]
+	))
       )
      ((=ucs@unicode	  . #x7A7F)	; &G0-3429;
       (=gb2312		  . #x3429)	; &G0-3429; [20-09]
       )
-     ((=ucs@jis		  . #x7A7F)	; &GT-32858;
+     ((=ucs@jis/1990	  . #x7A7F)	; &GT-32858;
+      (=ucs@jis/2000	  . #x7A7F)	; &GT-32858;
       (=jis-x0208	  . #x407C)	; &GT-32858; [32-92]
-      (=ks-x1001	  . #x743E)	; &I-K0-743E; [84-30]
-      (=jis-x0213-1	  . #x407C)	; &I-JX1-407C; [32-92]
+      (=jis-x0213-1@2000  . #x407C)	; &I-JX1-407C; [32-92]
       (=gt		  . 32858)	; &I-GT-32858;
       (=gt-k		  . 06486)	; &I-GT-K06486;
       (=gt-pj-1		  . #x407C)	; &I-GT-32858; [32-92]
+      )
+     ((=ks-x1001	  . #x743E)	; &K0-743E; [84-30]
       (=jef-china3	  . #x5DD7)	; &I-JC3-5DD7;
       ))
     ))
@@ -3925,7 +3935,12 @@
     (ideographic-strokes . 15)
     (total-strokes	 . 20)
     (=ucs		. #x25A36)	; 𥨶
-    (=cns11643-7	. #x4E67)	; &I-C7-4E67; [46-71]
+    (->subsumptive
+     ((=daikanwa	  . 25701)	; &M-25701;
+      )
+     ((=ucs@iso		  . #x25A36)	; &C7-4E67;
+      (=cns11643-7	  . #x4E67)	; &C7-4E67; [46-71]
+      ))
     ))
 (define-char
   '((ideographic-radical . 116)	; â½³
@@ -3933,6 +3948,8 @@
     (total-strokes	 . 20)
     (=ucs		. #x25A37)	; 𥨷
     (->subsumptive
+     ((=daikanwa	  . 25702)	; &M-25702;
+      )
      ((=ucs@iso		  . #x25A37)	; &U-00025A37;
       )
      ((=cns11643-7	  . #x4E65)	; &C7-4E65; [46-69]
@@ -3944,18 +3961,22 @@
     (total-strokes	 . 21)
     (=ucs		. #x7AC8)	; 竈
     (->subsumptive
-     ((=ucs@jis		  . #x7AC8)	; &GT-33163;
-      (=jis-x0208@1978	  . #x3376)	; &GT-33163; [19-86]
+     ((=ucs@jis/1990	  . #x7AC8)	; &M-25703;
+      (=ucs@jis/2000	  . #x7AC8)	; &M-25703;
+      (=jis-x0208@1978	  . #x3376)	; &M-25703; [19-86]
       (=jis-x0208@1983	  . #x635E)	; &I-J83-635E; [67-62]
       (=jis-x0208@1990	  . #x635E)	; &I-J90-635E; [67-62]
-      (=jis-x0213-1	  . #x635E)	; &I-JX1-635E; [67-62]
-      (=gt		  . 33163)	; &I-GT-33163;
-      (=gt-pj-1		  . #x635E)	; &I-GT-33163; [67-62]
+      (=jis-x0213-1@2000  . #x635E)	; &I-JX1-635E; [67-62]
       (=daikanwa	  . 25703)	; &I-M-25703;
-      (=shinjigen@rev	  .  5727)	; &GT-33163;
+      (=shinjigen	  .  5727)	; &M-25703;
       )
      ((=cns11643-3	  . #x5E49)	; &C3-5E49; [62-41]
       )
+     ((=ucs@jis/2004	  . #x7AC8)	; &GT-33163;
+      (=jis-x0213-1@2004  . #x635E)	; &GT-33163; [67-62]
+      (=gt		  . 33163)	; &I-GT-33163;
+      (=gt-pj-1		  . #x635E)	; &I-GT-33163; [67-62]
+      )
      ((=ucs@unicode	  . #x7AC8)	; &UU+7AC8;
       (=gb12345		  . #x546E)	; &UU+7AC8; [52-78]
       ))
diff --git a/lisp/utf-2000/Ideograph-R118-Bamboo.el b/lisp/utf-2000/Ideograph-R118-Bamboo.el
index 52ba278..423b570 100644
--- a/lisp/utf-2000/Ideograph-R118-Bamboo.el
+++ b/lisp/utf-2000/Ideograph-R118-Bamboo.el
@@ -259,34 +259,62 @@
     (=gt		. 33412)	; &I-GT-33412;
     (=gt-pj-1		. #x6376)	; &I-GT-33412; [67-86]
     (=daikanwa		. 25865)	; &I-M-25865;
-    (=shinjigen@rev	.  5755)	; 笆
+    (=shinjigen		.  5755)	; 笆
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
     (=ucs		. #x7B07)	; 笇
-    (=jis-x0212		. #x5173)	; &I-JSP-5173; [49-83]
-    (=jis-x0213-2	. #x733F)	; &I-JX2-733F; [83-31]
-    (=daikanwa		. 25868)	; &I-M-25868;
+    (->subsumptive
+     ((=ucs@jis		  . #x7B07)	; &M-25868;
+      (=jis-x0212	  . #x5173)	; &M-25868; [49-83]
+      (=jis-x0213-2	  . #x733F)	; &I-JX2-733F; [83-31]
+      (=daikanwa	  . 25868)	; &I-M-25868;
+      )
+     ((=ucs@unicode	  . #x7B07)	; &UU+7B07;
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
     (=ucs		. #x7B08)	; 笈
-    (->subsumptive
-     ((=cns11643-2	  . #x3166)	; &M-25869; [17-70]
+    (=>jis-x0208	. #x3568)	; 笈 [21-72]
+    (=>jis-x0213-1	. #x3568)	; 笈 [21-72]
+    (=big5		. #xD344)	; &I-B-D344;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7B08)	; 笈
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 4)
+    (total-strokes	 . 10)
+    (=ucs@jis/2004	. #x7B08)	; &M-25869;
+    (=cns11643-2	. #x3166)	; &M-25869; [17-70]
+    (=jis-x0213-1@2004	. #x3568)	; &I-JX3-3568; [21-72]
+    (=daikanwa		. 25869)	; &I-M-25869;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7B08)	; 笈
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 4)
+    (total-strokes	 . 10)
+    (=ucs@unicode	. #x7B08)	; &GT-33356;
+    (=jis-x0208		. #x3568)	; &GT-33356; [21-72]
+    (=gb2312		. #x7345)	; &I-G0-7345; [83-37]
+    (=jis-x0213-1@2000	. #x3568)	; &I-JX1-3568; [21-72]
+    (=gt		. 33356)	; &I-GT-33356;
+    (=gt-pj-1		. #x3568)	; &I-GT-33356; [21-72]
+    (=jef-china3	. #x5DEA)	; &I-JC3-5DEA;
+    (<-simplified@JP/extra/design
+     ((=ucs@jis/2004	  . #x7B08)	; &M-25869;
+      (=cns11643-2	  . #x3166)	; &M-25869; [17-70]
+      (=jis-x0213-1@2004  . #x3568)	; &I-JX3-3568; [21-72]
       (=daikanwa	  . 25869)	; &I-M-25869;
-      )
-     ((=ucs@unicode	  . #x7B08)	; &GT-33356;
-      (=jis-x0208	  . #x3568)	; &GT-33356; [21-72]
-      (=gb2312		  . #x7345)	; &I-G0-7345; [83-37]
-      (=jis-x0213-1	  . #x3568)	; &I-JX1-3568; [21-72]
-      (=big5		  . #xD344)	; &I-B-D344;
-      (=gt		  . 33356)	; &I-GT-33356;
-      (=gt-pj-1		  . #x3568)	; &I-GT-33356; [21-72]
-      (=jef-china3	  . #x5DEA)	; &I-JC3-5DEA;
       ))
     ))
 (define-char
@@ -294,13 +322,26 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
     (=ucs		. #x7B09)	; 笉
-    (->subsumptive
-     ((=cns11643-2	  . #x3169)	; &M-25870; [17-73]
-      (=daikanwa	  . 25870)	; &I-M-25870;
-      )
-     ((=ucs@unicode	  . #x7B09)	; &B-D347;
-      (=big5		  . #xD347)	; &B-D347;
+    (=big5		. #xD347)	; &I-B-D347;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7B09)	; 笉
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 4)
+    (total-strokes	 . 10)
+    (=cns11643-2	. #x3169)	; &M-25870; [17-73]
+    (=daikanwa		. 25870)	; &I-M-25870;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7B09)	; 笉
       ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 4)
+    (total-strokes	 . 10)
+    (=ucs@unicode	. #x7B09)	; &UU+7B09;
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -315,7 +356,7 @@
     (=gt		. 33406)	; &I-GT-33406;
     (=gt-pj-1		. #x6375)	; &I-GT-33406; [67-85]
     (=daikanwa		. 25872)	; &I-M-25872;
-    (=shinjigen@rev	.  5754)	; 笊
+    (=shinjigen		.  5754)	; 笊
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -2437,7 +2478,15 @@
     (=jis-x0213-1	. #x7960)	; &I-JX1-7960; [89-64]
     (=big5		. #xDF48)	; &I-B-DF48;
     (=daikanwa		. 26069)	; &I-M-26069;
+    (=shinjigen		.  5822)	; ç­­
     (=jef-china3	. #x5DFC)	; &I-JC3-5DFC;
+    (<-original
+     ((=ucs		  . #x7B97)	; 算
+      (=jis-x0208	  . #x3B3B)	; &I-J90-3B3B; [27-27]
+      (=shinjigen	  .  5821)	; 算
+      ))
+    (<-original*sources
+     shinjigen)
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -2454,7 +2503,7 @@
     (=gt-k		. 10333)	; &I-GT-K10333;
     (=gt-pj-1		. #x642E)	; &I-GT-33606; [68-14]
     (=daikanwa		. 26070)	; &I-M-26070;
-    (=shinjigen@rev	.  5803)	; ç­®
+    (=shinjigen		.  5803)	; ç­®
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -2541,27 +2590,33 @@
     (=gt		. 33571)	; &I-GT-33571;
     (=gt-pj-1		. #x6429)	; &I-GT-33571; [68-09]
     (=daikanwa		. 26079)	; &I-M-26079;
-    (=shinjigen@rev	.  5801)	; ç­´
+    (=shinjigen		.  5801)	; ç­´
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (=ucs		. #x7B75)	; ç­µ
+    (=>jis-x0208	. #x6427)	; ç­µ [68-07]
+    (=>jis-x0213-1	. #x6427)	; ç­µ [68-07]
+    (=big5		. #xBAE1)	; &I-B-BAE1;
     (->subsumptive
      ((ideographic-strokes . 7)
       (total-strokes	   . 13)
       (->subsumptive
-       ((=ucs@jis	    . #x7B75)	; &GT-33560;
+       ((=ucs@jis/1990	    . #x7B75)	; &GT-33560;
+	(=ucs@jis/2000	    . #x7B75)	; &GT-33560;
 	(=jis-x0208	    . #x6427)	; &GT-33560; [68-07]
 	(=ks-x1001	    . #x665D)	; &I-K0-665D; [70-61]
-	(=jis-x0213-1	    . #x6427)	; &I-JX1-6427; [68-07]
+	(=jis-x0213-1@2000  . #x6427)	; &I-JX1-6427; [68-07]
 	(=gt		    . 33560)	; &I-GT-33560;
 	(=gt-pj-1	    . #x6427)	; &I-GT-33560; [68-07]
 	(=daikanwa	    . 26080)	; &I-M-26080;
-	(=shinjigen@rev	    .  5799)	; &GT-33560;
+	(=shinjigen	    .  5799)	; &GT-33560;
+	)
+       ((=ucs@jis/2004	    . #x7B75)	; &JX3-6427;
+	(=jis-x0213-1@2004  . #x6427)	; &JX3-6427; [68-07]
 	)
        ((=ucs@unicode	    . #x7B75)	; &G0-735B;
 	(=gb2312	    . #x735B)	; &G0-735B; [83-59]
-	(=big5		    . #xBAE1)	; &I-B-BAE1;
 	))
       )
      ((ideographic-strokes . 8)
@@ -2571,27 +2626,66 @@
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
+    (=ucs		. #x25B6B)	; 𥭫
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25B6B)	; 𥭫
+      ))
+    (ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
-    (=ucs		. #x7B76)	; ç­¶
     (->subsumptive
-     ((=big5		  . #xDF52)	; &M-26099;
-      (=daikanwa	  . 26099)	; &I-M-26099;
+     ((=daikanwa	  . 26091)	; &M-26091;
       )
-     ((=ucs@unicode	  . #x7B76)	; &C2-4577;
-      (=cns11643-2	  . #x4577)	; &C2-4577; [37-87]
+     ((=ucs@iso		  . #x25B6B)	; &U-00025B6B;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25B6B)	; 𥭫
       ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=cns11643-6	. #x5F7B)	; &C6-5F7B; [63-91]
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 7)
+    (total-strokes	 . 13)
+    (=ucs		. #x7B76)	; ç­¶
+    (=big5		. #xDF52)	; &I-B-DF52;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7B76)	; ç­¶
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 7)
+    (total-strokes	 . 13)
+    (=daikanwa		. 26099)	; &M-26099;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7B76)	; ç­¶
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 7)
+    (total-strokes	 . 13)
+    (=ucs@unicode	. #x7B76)	; &C2-4577;
+    (=cns11643-2	. #x4577)	; &C2-4577; [37-87]
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
     (=ucs		. #x7B77)	; ç­·
+    (=big5		. #xB85F)	; &I-B-B85F;
     (->subsumptive
      ((=ucs@unicode	  . #x7B77)	; &M-26100;
       (=gb2312		  . #x3F6A)	; &M-26100; [31-74]
       (=jis-x0212	  . #x5233)	; &I-JSP-5233; [50-19]
-      (=big5		  . #xB85F)	; &I-B-B85F;
       (=daikanwa	  . 26100)	; &I-M-26100;
       (=jef-china3	  . #x80D7)	; &I-JC3-80D7;
       )
@@ -3068,6 +3162,34 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
+    (=ucs		. #x25B8D)	; 𥮍
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25B8D)	; 𥮍
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=daikanwa		. 26108)	; &M-26108;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25B8D)	; 𥮍
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (->subsumptive
+     ((=ucs@iso		  . #x25B8D)	; &U-00025B8D;
+      )
+     ((=cns11643-5	  . #x4845)	; &C5-4845; [40-37]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
     (=ucs		. #x7B84)	; 箄
     (=jis-x0212		. #x5234)	; &I-JSP-5234; [50-20]
     (=cns11643-1	. #x6A31)	; &I-C1-6A31; [74-17]
@@ -3096,7 +3218,17 @@
       (=gt		  . 33742)	; &I-GT-33742;
       (=gt-pj-1		  . #x4A4F)	; &I-GT-33742; [42-47]
       (=daikanwa	  . 26114)	; &I-M-26114;
-      (=shinjigen@rev	  .  5855)	; &GT-33742;
+      (=shinjigen	  .  5855)	; &GT-33742;
+      (<-vulgar
+       ((=ucs@unicode	    . #x7BE6)	; &GT-33993;
+	(=jis-x0208	    . #x6444)	; &GT-33993; [68-36]
+	(=gb2312	    . #x7377)	; &I-G0-7377; [83-87]
+	(=jis-x0213-1	    . #x6444)	; &I-JX1-6444; [68-36]
+	(=daikanwa	    . 26356)	; &I-M-26356;
+	(=shinjigen	    .  5854)	; &GT-33993;
+	))
+      (<-vulgar*sources
+       zihui daikanwa shinjigen)
       )
      ((=cns11643-3	  . #x4860)	; &C3-4860; [40-64]
       ))
@@ -3105,6 +3237,31 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
+    (=ucs		. #x25B90)	; 𥮐
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25B90)	; 𥮐
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=daikanwa		. 26115)	; &M-26115;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25B90)	; 𥮐
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs@iso		. #x25B90)	; &C5-4843;
+    (=cns11643-5	. #x4843)	; &C5-4843; [40-35]
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
     (=ucs		. #x7B87)	; 箇
     (=jis-x0208		. #x3255)	; &I-J90-3255; [18-53]
     (=ks-x1001		. #x4B4D)	; &I-K0-4B4D; [43-45]
@@ -3115,7 +3272,15 @@
     (=gt		. 33652)	; &I-GT-33652;
     (=gt-pj-1		. #x3255)	; &I-GT-33652; [18-53]
     (=daikanwa		. 26116)	; &I-M-26116;
-    (=shinjigen@rev	.  5811)	; 箇
+    (=shinjigen		.  5811)	; 箇
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs		. #x4203)	; 䈃
+    (=cns11643-4	. #x4565)	; &I-C4-4565; [37-69]
+    (=daikanwa		. 26117)	; &I-M-26117;
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -3130,6 +3295,19 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
+    (=ucs		. #x4204)	; 䈄
+    (->subsumptive
+     ((=daikanwa	  . 26119)	; &M-26119;
+      )
+     ((=ucs@unicode	  . #x4204)	; &UU+4204;
+      )
+     ((=cns11643-3	  . #x485B)	; &C3-485B; [40-59]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
     (=ucs		. #x7B89)	; 箉
     ))
 (define-char
@@ -3139,13 +3317,10 @@
     (ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (->subsumptive
-     ((=ucs@jis		  . #x7B89)	; &M-26120;
-      (=jis-x0212	  . #x5235)	; &M-26120; [50-21]
-      (=daikanwa	  . 26120)	; &I-M-26120;
-      )
-     ((=cns11643-4	  . #x456B)	; &C4-456B; [37-75]
-      ))
+    (=ucs@jis		. #x7B89)	; &M-26120;
+    (=jis-x0212		. #x5235)	; &M-26120; [50-21]
+    (=daikanwa		. 26120)	; &I-M-26120;
+    (=hanziku-8		. #xBD47)	; &I-HZK08-BD47;
     ))
 (define-char
   '((<-denotational
@@ -3157,6 +3332,15 @@
     (=ucs@unicode	. #x7B89)	; &UU+7B89;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x7B89)	; 箉
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=cns11643-4	. #x456B)	; &C4-456B; [37-75]
+    ))
+(define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
@@ -3397,7 +3581,7 @@
     (=gt-k		. 11230)	; &I-GT-K11230;
     (=gt-pj-1		. #x6437)	; &I-GT-33716; [68-23]
     (=daikanwa		. 26133)	; &I-M-26133;
-    (=shinjigen@rev	.  5828)	; &GT-33716;
+    (=shinjigen		.  5828)	; &GT-33716;
     ))
 (define-char
   '((<-denotational
@@ -3414,6 +3598,18 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
+    (=ucs		. #x25B94)	; 𥮔
+    (->subsumptive
+     ((=ucs@iso		  . #x25B94)	; &M-26134;
+      (=daikanwa	  . 26134)	; &M-26134;
+      )
+     ((=cns11643-6	  . #x5F7D)	; &C6-5F7D; [63-93]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
     (=ucs		. #x7B90)	; 箐
     (=big5		. #xE352)	; &I-B-E352;
     ))
@@ -3475,6 +3671,18 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
+    (=ucs		. #x25B95)	; 𥮕
+    (->subsumptive
+     ((=daikanwa	  . 26138)	; &M-26138;
+      )
+     ((=ucs@iso		  . #x25B95)	; &C5-483C;
+      (=cns11643-5	  . #x483C)	; &C5-483C; [40-28]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
     (=ucs		. #x7B92)	; 箒
     ))
 (define-char
@@ -3536,6 +3744,31 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
+    (=ucs		. #x25B96)	; 𥮖
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25B96)	; 𥮖
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=daikanwa		. 26141)	; &M-26141;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25B96)	; 𥮖
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs@iso		. #x25B96)	; &C5-483B;
+    (=cns11643-5	. #x483B)	; &C5-483B; [40-27]
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
     (=ucs		. #x7B94)	; 箔
     (=jis-x0208		. #x4773)	; &I-J90-4773; [39-83]
     (=gb2312		. #x322D)	; &I-G0-322D; [18-13]
@@ -3546,7 +3779,7 @@
     (=gt		. 33734)	; &I-GT-33734;
     (=gt-pj-1		. #x4773)	; &I-GT-33734; [39-83]
     (=daikanwa		. 26142)	; &I-M-26142;
-    (=shinjigen@rev	.  5830)	; 箔
+    (=shinjigen		.  5830)	; 箔
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -3563,7 +3796,20 @@
     (=gt-k		. 11181)	; &I-GT-K11181;
     (=gt-pj-1		. #x4C27)	; &I-GT-33660; [44-07]
     (=daikanwa		. 26143)	; &I-M-26143;
-    (=shinjigen@rev	.  5814)	; 箕
+    (=shinjigen		.  5814)	; 箕
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs		. #x25B97)	; 𥮗
+    (->subsumptive
+     ((=daikanwa	  . 26144)	; &M-26144;
+      )
+     ((=ucs@iso		  . #x25B97)	; &U-00025B97;
+      )
+     ((=cns11643-5	  . #x4842)	; &C5-4842; [40-34]
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -3591,21 +3837,25 @@
     (=gt-k		. 11125)	; &I-GT-K11125;
     (=gt-pj-1		. #x3B3B)	; &I-GT-33688; [27-27]
     (=daikanwa		. 26146)	; &I-M-26146;
-    (=shinjigen@rev	.  5821)	; 算
+    (=shinjigen		.  5821)	; 算
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=ucs		. #x7B98)	; 箘
-    (=jis-x0208		. #x6430)	; &I-J90-6430; [68-16]
-    (=cns11643-2	. #x4C60)	; &I-C2-4C60; [44-64]
-    (=jis-x0213-1	. #x6430)	; &I-JX1-6430; [68-16]
-    (=big5		. #xE359)	; &I-B-E359;
-    (=gt		. 33665)	; &I-GT-33665;
-    (=gt-pj-1		. #x6430)	; &I-GT-33665; [68-16]
-    (=daikanwa		. 26147)	; &I-M-26147;
-    (=shinjigen@rev	.  5815)	; 箘
+    (->subsumptive
+     ((=ucs@unicode	  . #x7B98)	; &GT-33665;
+      (=jis-x0208	  . #x6430)	; &GT-33665; [68-16]
+      (=cns11643-2	  . #x4C60)	; &I-C2-4C60; [44-64]
+      (=jis-x0213-1	  . #x6430)	; &I-JX1-6430; [68-16]
+      (=big5		  . #xE359)	; &I-B-E359;
+      (=gt		  . 33665)	; &I-GT-33665;
+      (=gt-pj-1		  . #x6430)	; &I-GT-33665; [68-16]
+      (=daikanwa	  . 26147)	; &I-M-26147;
+      )
+     ((=shinjigen	  .  5815)	; &SJG2-5815;
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -3740,25 +3990,75 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (=ucs		. #x7B9F)	; 箟
-    (=jis-x0208		. #x6431)	; &I-J90-6431; [68-17]
-    (=jis-x0213-1	. #x6431)	; &I-JX1-6431; [68-17]
-    (=gt		. 33666)	; &I-GT-33666;
-    (=gt-pj-1		. #x6431)	; &I-GT-33666; [68-17]
-    (=daikanwa		. 26157)	; &I-M-26157;
-    (=shinjigen@rev	.  5817)	; 箟
+    (=ucs		. #x25B99)	; 𥮙
+    (->subsumptive
+     ((=daikanwa	  . 26155)	; &M-26155;
+      )
+     ((=ucs@iso		  . #x25B99)	; &U-00025B99;
+      )
+     ((=cns11643-6	  . #x6028)	; &C6-6028; [64-08]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x7B9F)	; 箟
-    (morohashi-daikanwa	26157 0 0)
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs		. #x25B9A)	; 𥮚
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25B9A)	; 𥮚
+      ))
     (ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (=cns11643-3	. #x485D)	; &C3-485D; [40-61]
+    (=cns11643-5	. #x4840)	; &M-26156; [40-32]
+    (=daikanwa		. 26156)	; &I-M-26156;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25B9A)	; 𥮚
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs@iso		. #x25B9A)	; &U-00025B9A;
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs		. #x7B9F)	; 箟
+    (->subsumptive
+     ((=ucs@unicode	  . #x7B9F)	; &GT-33666;
+      (=jis-x0208	  . #x6431)	; &GT-33666; [68-17]
+      (=jis-x0213-1	  . #x6431)	; &I-JX1-6431; [68-17]
+      (=gt		  . 33666)	; &I-GT-33666;
+      (=gt-pj-1		  . #x6431)	; &I-GT-33666; [68-17]
+      (=daikanwa	  . 26157)	; &I-M-26157;
+      (=shinjigen	  .  5817)	; &GT-33666;
+      (<-ancient
+       ((=ucs@unicode	    . #x7B98)	; &GT-33665;
+	(=jis-x0208	    . #x6430)	; &GT-33665; [68-16]
+	(=cns11643-2	    . #x4C60)	; &I-C2-4C60; [44-64]
+	(=jis-x0213-1	    . #x6430)	; &I-JX1-6430; [68-16]
+	(=daikanwa	    . 26147)	; &I-M-26147;
+	))
+      (<-ancient*sources
+       jiyun daikanwa)
+      (<-formed
+       ((=shinjigen	    .  5815)	; &SJG2-5815;
+	))
+      (<-formed*sources
+       shinjigen)
+      )
+     ((=cns11643-3	  . #x485D)	; &C3-485D; [40-61]
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (=ucs		. #x7BA0)	; ç® 
+    (=big5		. #xBD69)	; &I-B-BD69;
     ))
 (define-char
   '((<-denotational
@@ -3769,7 +4069,6 @@
     (total-strokes	 . 14)
     (=ucs@unicode	. #x7BA0)	; &M-26158;
     (=jis-x0212		. #x523C)	; &M-26158; [50-28]
-    (=big5		. #xBD69)	; &I-B-BD69;
     (=daikanwa		. 26158)	; &I-M-26158;
     (mojikyo		. 026158)	; &MCS-6000662E;
     ))
@@ -3787,6 +4086,31 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
+    (=ucs		. #x25B9B)	; 𥮛
+    (->subsumptive
+     ((=daikanwa	  . 26159)	; &M-26159;
+      )
+     ((=cns11643-6	  . #x6026)	; &C6-6026; [64-06]
+      )
+     ((=ucs@iso		  . #x25B9B)	; &U-00025B9B;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs		. #x25B9C)	; 𥮜
+    (->subsumptive
+     ((=cns11643-5	  . #x4838)	; &M-26160; [40-24]
+      (=daikanwa	  . 26160)	; &I-M-26160;
+      )
+     ((=ucs@iso		  . #x25B9C)	; &U-00025B9C;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
     (=ucs		. #x420A)	; 䈊
     ))
 (define-char
@@ -3858,6 +4182,26 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
+    (=ucs		. #x25B9E)	; 𥮞
+    (=cns11643-6	. #x6025)	; &I-C6-6025; [64-05]
+    (=daikanwa		. 26166)	; &I-M-26166;
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs		. #x420B)	; 䈋
+    (->subsumptive
+     ((=ucs@unicode	  . #x420B)	; &M-26167;
+      (=daikanwa	  . 26167)	; &M-26167;
+      )
+     ((=cns11643-4	  . #x456D)	; &C4-456D; [37-77]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
     (=ucs		. #x7BA4)	; 箤
     (=big5		. #xE35C)	; &I-B-E35C;
     (->subsumptive
@@ -3887,39 +4231,50 @@
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (=ucs		. #x25BA3)	; 𥮣
-    (=daikanwa		. 26173)	; &I-M-26173;
+    (=ucs		. #x25BA2)	; 𥮢
+    (->subsumptive
+     ((=daikanwa	  . 26172)	; &M-26172;
+      )
+     ((=ucs@iso		  . #x25BA2)	; &C5-483A;
+      (=cns11643-5	  . #x483A)	; &C5-483A; [40-26]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x25BA3)	; 𥮣
-    (morohashi-daikanwa	26173 0 1)
-    (ideographic-radical . 118)	; â½µ
+  '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (=cns11643-5	. #x4841)	; &C5-4841; [40-33]
+    (=ucs		. #x25BA3)	; 𥮣
+    (->subsumptive
+     ((=ucs@iso		  . #x25BA3)	; &M-26173;
+      (=daikanwa	  . 26173)	; &M-26173;
+      )
+     ((=cns11643-5	  . #x4841)	; &C5-4841; [40-33]
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=ucs		. #x25BA4)	; 𥮤
-    (=cns11643-5	. #x4837)	; &I-C5-4837; [40-23]
-    (=daikanwa		. 26174)	; &I-M-26174;
-    ))
-(define-char
-  '((=>ucs		. #x420D)	; 䈍
-    (ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=daikanwa		. 26175)	; &M-26175;
+    (->subsumptive
+     ((=ucs@iso		  . #x25BA4)	; &M-26174;
+      (=daikanwa	  . 26174)	; &M-26174;
+      )
+     ((=cns11643-5	  . #x4837)	; &C5-4837; [40-23]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	26175 0 1)
-    (ideographic-radical . 118)	; â½µ
+  '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=ucs		. #x420D)	; 䈍
-    (=cns11643-5	. #x4836)	; &I-C5-4836; [40-22]
+    (->subsumptive
+     ((=daikanwa	  . 26175)	; &M-26175;
+      )
+     ((=cns11643-5	  . #x4836)	; &C5-4836; [40-22]
+      )
+     ((=ucs@unicode	  . #x420D)	; &UU+420D;
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -4078,179 +4433,81 @@
     (ideographic-radical@cns . 118)	; â½µ
     (ideographic-strokes@cns . 8)
     (total-strokes	 . 14)
-    (=ucs		. #x5284)	; 劄
-    (=cns11643-2	. #x4C61)	; &I-C2-4C61; [44-65]
-    (=jis-x0213-2	. #x233D)	; &I-JX2-233D; [03-29]
-    (=big5		. #xE35A)	; &I-B-E35A;
-    (=jef-china3	. #x5EC1)	; &I-JC3-5EC1;
-    (mojikyo		. 054893)	; &MCS-6000D66D;
-    (<-same
-     ((=ucs		  . #x7B9A)	; 箚
-      (=daikanwa	  . 26149)	; &I-M-26149;
-      ))
-    (<-same*sources
-     guangyun kangxi daikanwa)
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x4203)	; 䈃
-    (=cns11643-4	. #x4565)	; &I-C4-4565; [37-69]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x4204)	; 䈄
-    (=cns11643-3	. #x485B)	; &I-C3-485B; [40-59]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x420B)	; 䈋
-    (=cns11643-4	. #x456D)	; &I-C4-456D; [37-77]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x7BA6)	; 箦
-    (=gb2312		. #x7365)	; &I-G0-7365; [83-69]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x7BA7)	; 箧
-    (=gb2312		. #x7366)	; &I-G0-7366; [83-70]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x7BA8)	; 箨
-    (=gb2312		. #x736A)	; &I-G0-736A; [83-74]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x7BA9)	; 箩
-    (=gb2312		. #x4261)	; &I-G0-4261; [34-65]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x7BAB)	; 箫
-    (=gb2312		. #x736F)	; &I-G0-736F; [83-79]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x25B6B)	; 𥭫
-    (=cns11643-6	. #x5F7B)	; &I-C6-5F7B; [63-91]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x25B8D)	; 𥮍
-    (=cns11643-5	. #x4845)	; &I-C5-4845; [40-37]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x25B8F)	; 𥮏
-    (=cns11643-4	. #x456C)	; &I-C4-456C; [37-76]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x25B90)	; 𥮐
-    (=cns11643-5	. #x4843)	; &I-C5-4843; [40-35]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x25B92)	; 𥮒
-    (=cns11643-4	. #x4567)	; &I-C4-4567; [37-71]
-    ))
-(define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x25B93)	; 𥮓
-    (=cns11643-6	. #x5F7C)	; &I-C6-5F7C; [63-92]
+    (=ucs		. #x5284)	; 劄
+    (=cns11643-2	. #x4C61)	; &I-C2-4C61; [44-65]
+    (=jis-x0213-2	. #x233D)	; &I-JX2-233D; [03-29]
+    (=big5		. #xE35A)	; &I-B-E35A;
+    (=jef-china3	. #x5EC1)	; &I-JC3-5EC1;
+    (mojikyo		. 054893)	; &MCS-6000D66D;
+    (<-same
+     ((=ucs		  . #x7B9A)	; 箚
+      (=daikanwa	  . 26149)	; &I-M-26149;
+      ))
+    (<-same*sources
+     guangyun kangxi daikanwa)
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (=ucs		. #x25B94)	; 𥮔
-    (=cns11643-6	. #x5F7D)	; &I-C6-5F7D; [63-93]
+    (=ucs		. #x7BA6)	; 箦
+    (=gb2312		. #x7365)	; &I-G0-7365; [83-69]
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (=ucs		. #x25B95)	; 𥮕
-    (=cns11643-5	. #x483C)	; &I-C5-483C; [40-28]
+    (=ucs		. #x7BA7)	; 箧
+    (=gb2312		. #x7366)	; &I-G0-7366; [83-70]
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (=ucs		. #x25B96)	; 𥮖
-    (=cns11643-5	. #x483B)	; &I-C5-483B; [40-27]
+    (=ucs		. #x7BA8)	; 箨
+    (=gb2312		. #x736A)	; &I-G0-736A; [83-74]
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (=ucs		. #x25B97)	; 𥮗
-    (=cns11643-5	. #x4842)	; &I-C5-4842; [40-34]
+    (=ucs		. #x7BA9)	; 箩
+    (=gb2312		. #x4261)	; &I-G0-4261; [34-65]
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (=ucs		. #x25B98)	; 𥮘
-    (=cns11643-4	. #x456F)	; &I-C4-456F; [37-79]
+    (=ucs		. #x7BAB)	; 箫
+    (=gb2312		. #x736F)	; &I-G0-736F; [83-79]
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (=ucs		. #x25B99)	; 𥮙
-    (=cns11643-6	. #x6028)	; &I-C6-6028; [64-08]
+    (=ucs		. #x25B8F)	; 𥮏
+    (=cns11643-4	. #x456C)	; &I-C4-456C; [37-76]
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (=ucs		. #x25B9A)	; 𥮚
-    (=cns11643-5	. #x4840)	; &I-C5-4840; [40-32]
+    (=ucs		. #x25B92)	; 𥮒
+    (=cns11643-4	. #x4567)	; &I-C4-4567; [37-71]
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (=ucs		. #x25B9B)	; 𥮛
-    (=cns11643-6	. #x6026)	; &I-C6-6026; [64-06]
+    (=ucs		. #x25B93)	; 𥮓
+    (=cns11643-6	. #x5F7C)	; &I-C6-5F7C; [63-92]
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (=ucs		. #x25B9C)	; 𥮜
-    (=cns11643-5	. #x4838)	; &I-C5-4838; [40-24]
+    (=ucs		. #x25B98)	; 𥮘
+    (=cns11643-4	. #x456F)	; &I-C4-456F; [37-79]
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -4261,60 +4518,74 @@
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x25B9E)	; 𥮞
-    (=cns11643-6	. #x6025)	; &I-C6-6025; [64-05]
+    (=ucs		. #x7BAC)	; 箬
+    (=big5		. #xE6D9)	; &I-B-E6D9;
     ))
 (define-char
-  '((ideographic-radical . 118)	; â½µ
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x25BA2)	; 𥮢
-    (=cns11643-5	. #x483A)	; &I-C5-483A; [40-26]
+  '((<-denotational
+     ((=ucs		  . #x7BAC)	; 箬
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=cns11643-2	. #x5261)	; &M-26192; [50-65]
+    (=daikanwa		. 26192)	; &I-M-26192;
+    (=jef-china3	. #x8DBE)	; &I-JC3-8DBE;
     ))
 (define-char
-  '((ideographic-radical . 118)	; â½µ
+  '((<-denotational
+     ((=ucs		  . #x7BAC)	; 箬
+      ))
+    (ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (=ucs		. #x25BEE)	; 𥯮
-    (=cns11643-5	. #x4848)	; &I-C5-4848; [40-40]
+    (=ucs@unicode	. #x7BAC)	; &JSP-523E;
+    (=gb2312		. #x7368)	; &JSP-523E; [83-72]
+    (=jis-x0212		. #x523E)	; &I-JSP-523E; [50-30]
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
-    (=ucs		. #x7BAC)	; 箬
-    (->subsumptive
-     ((ideographic-strokes . 9)
-      (total-strokes	   . 15)
-      (=cns11643-2	  . #x5261)	; &M-26192; [50-65]
-      (=daikanwa	  . 26192)	; &I-M-26192;
-      )
-     ((ideographic-strokes . 8)
-      (total-strokes	   . 14)
-      (=ucs@unicode	  . #x7BAC)	; &JSP-523E;
-      (=gb2312		  . #x7368)	; &JSP-523E; [83-72]
-      (=jis-x0212	  . #x523E)	; &I-JSP-523E; [50-30]
-      (=big5		  . #xE6D9)	; &I-B-E6D9;
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=ucs		. #x7BAD)	; ç®­
+    (=>jis-x0208	. #x407D)	; ç®­ [32-93]
+    (=>jis-x0213-1	. #x407D)	; ç®­ [32-93]
+    (=big5		. #xBD62)	; &I-B-BD62;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BAD)	; ç®­
       ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=ucs@jis/2004	. #x7BAD)	; &M-26193;
+    (=jis-x0213-1@2004	. #x407D)	; &M-26193; [32-93]
+    (=daikanwa		. 26193)	; &I-M-26193;
     ))
 (define-char
-  '((ideographic-radical . 118)	; â½µ
+  '((<-denotational
+     ((=ucs		  . #x7BAD)	; ç®­
+      ))
+    (ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
-    (=ucs		. #x7BAD)	; ç®­
+    (=>>jis-x0213-1@2000 . #x407D)	; &G-JX1-407D; [32-93]
     (->subsumptive
-     ((=daikanwa	  . 26193)	; &M-26193;
-      )
      ((=ucs@unicode	  . #x7BAD)	; &GT-33833;
       (=jis-x0208	  . #x407D)	; &GT-33833; [32-93]
       (=gb2312		  . #x3C7D)	; &I-G0-3C7D; [28-93]
       (=ks-x1001	  . #x6F29)	; &I-K0-6F29; [79-09]
-      (=jis-x0213-1	  . #x407D)	; &I-JX1-407D; [32-93]
-      (=big5		  . #xBD62)	; &I-B-BD62;
+      (=jis-x0213-1@2000  . #x407D)	; &I-JX1-407D; [32-93]
       (=gt		  . 33833)	; &I-GT-33833;
       (=gt-k		  . 11916)	; &I-GT-K11916;
       (=gt-pj-1		  . #x407D)	; &I-GT-33833; [32-93]
       (=jef-china3	  . #x5DEB)	; &I-JC3-5DEB;
+      (<-simplified@JP/extra/design
+       ((=ucs@jis/2004	    . #x7BAD)	; &M-26193;
+	(=jis-x0213-1@2004  . #x407D)	; &M-26193; [32-93]
+	(=daikanwa	    . 26193)	; &I-M-26193;
+	))
       )
      ((=cns11643-1	  . #x6E2D)	; &C1-6E2D; [78-13]
       ))
@@ -4324,8 +4595,13 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x25BD1)	; 𥯑
-    (=cns11643-5	. #x4F3A)	; &I-C5-4F3A; [47-26]
-    (=daikanwa		. 26194)	; &I-M-26194;
+    (->subsumptive
+     ((=daikanwa	  . 26194)	; &M-26194;
+      )
+     ((=cns11643-5	  . #x4F3A)	; &C5-4F3A; [47-26]
+      )
+     ((=ucs@iso		  . #x25BD1)	; &U-00025BD1;
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -4523,26 +4799,44 @@
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (=ucs		. #x7BB8)	; 箸
-    (->subsumptive
-     ((ideographic-strokes . 9)
-      (total-strokes	   . 15)
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BB8)	; 箸
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=ucs@jis/2004	. #x7BB8)	; &M-26224;
+    (=jis-x0208@1978	. #x4824)	; &M-26224; [40-04]
+    (=ks-x1001		. #x6E46)	; &I-K0-6E46; [78-38]
+    (=jis-x0213-1@2004	. #x4824)	; &I-JX3-4824; [40-04]
+    (=daikanwa		. 26224)	; &I-M-26224;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BB8)	; 箸
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x7BB8)	; &GT-33724;
+    (=gb2312		. #x7367)	; &GT-33724; [83-71]
+    (=jis-x0208@1983	. #x4824)	; &I-J83-4824; [40-04]
+    (=jis-x0208@1990	. #x4824)	; &I-J90-4824; [40-04]
+    (=cns11643-1	. #x6A2F)	; &I-C1-6A2F; [74-15]
+    (=jis-x0213-1@2000	. #x4824)	; &I-JX1-4824; [40-04]
+    (=big5		. #xBAE6)	; &I-B-BAE6;
+    (=gt		. 33724)	; &I-GT-33724;
+    (=gt-k		. 11163)	; &I-GT-K11163;
+    (=gt-pj-1		. #x4824)	; &I-GT-33724; [40-04]
+    (=jef-china3	. #x5EC3)	; &I-JC3-5EC3;
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x7BB8)	; &M-26224;
       (=jis-x0208@1978	  . #x4824)	; &M-26224; [40-04]
       (=ks-x1001	  . #x6E46)	; &I-K0-6E46; [78-38]
+      (=jis-x0213-1@2004  . #x4824)	; &I-JX3-4824; [40-04]
       (=daikanwa	  . 26224)	; &I-M-26224;
-      )
-     ((ideographic-strokes . 8)
-      (total-strokes	   . 14)
-      (=ucs@unicode	  . #x7BB8)	; &GT-33724;
-      (=gb2312		  . #x7367)	; &GT-33724; [83-71]
-      (=jis-x0208@1983	  . #x4824)	; &I-J83-4824; [40-04]
-      (=jis-x0208@1990	  . #x4824)	; &I-J90-4824; [40-04]
-      (=cns11643-1	  . #x6A2F)	; &I-C1-6A2F; [74-15]
-      (=jis-x0213-1	  . #x4824)	; &I-JX1-4824; [40-04]
-      (=big5		  . #xBAE6)	; &I-B-BAE6;
-      (=gt		  . 33724)	; &I-GT-33724;
-      (=gt-k		  . 11163)	; &I-GT-K11163;
-      (=gt-pj-1		  . #x4824)	; &I-GT-33724; [40-04]
-      (=jef-china3	  . #x5EC3)	; &I-JC3-5EC3;
       ))
     ))
 (define-char
@@ -4551,21 +4845,39 @@
     (total-strokes	 . 15)
     (=ucs		. #x7BB9)	; 箹
     (=big5		. #xE6DC)	; &I-B-E6DC;
-    (->subsumptive
-     ((=daikanwa	  . 26226)	; &M-26226;
-      )
-     ((=ucs@unicode	  . #x7BB9)	; &C2-5264;
-      (=cns11643-2	  . #x5264)	; &C2-5264; [50-68]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BB9)	; 箹
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=daikanwa		. 26226)	; &M-26226;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BB9)	; 箹
       ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=ucs@unicode	. #x7BB9)	; &C2-5264;
+    (=cns11643-2	. #x5264)	; &C2-5264; [50-68]
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x7BBA)	; 箺
-    (=jis-x0212		. #x5244)	; &I-JSP-5244; [50-36]
-    (=cns11643-4	. #x4B73)	; &I-C4-4B73; [43-83]
-    (=daikanwa		. 26227)	; &I-M-26227;
+    (->subsumptive
+     ((=ucs@jis		  . #x7BBA)	; &M-26227;
+      (=jis-x0212	  . #x5244)	; &M-26227; [50-36]
+      (=daikanwa	  . 26227)	; &I-M-26227;
+      )
+     ((=ucs@unicode	  . #x7BBA)	; &C4-4B73;
+      (=cns11643-4	  . #x4B73)	; &C4-4B73; [43-83]
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
@@ -4691,40 +5003,78 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x7BC6)	; 篆
-    (=jis-x0208		. #x643F)	; &I-J90-643F; [68-31]
-    (=gb2312		. #x572D)	; &I-G0-572D; [55-13]
-    (=ks-x1001		. #x6F2A)	; &I-K0-6F2A; [79-10]
-    (=cns11643-1	. #x6E31)	; &I-C1-6E31; [78-17]
-    (=jis-x0213-1	. #x643F)	; &I-JX1-643F; [68-31]
     (=big5		. #xBD66)	; &I-B-BD66;
-    (=gt		. 33851)	; &I-GT-33851;
-    (=gt-k		. 11996)	; &I-GT-K11996;
-    (=gt-pj-1		. #x643F)	; &I-GT-33851; [68-31]
-    (=daikanwa		. 26256)	; &I-M-26256;
-    (=shinjigen@rev	.  5841)	; 篆
+    (->subsumptive
+     ((=ucs@jis		  . #x7BC6)	; &GT-33851;
+      (=jis-x0208	  . #x643F)	; &GT-33851; [68-31]
+      (=ks-x1001	  . #x6F2A)	; &I-K0-6F2A; [79-10]
+      (=jis-x0213-1	  . #x643F)	; &I-JX1-643F; [68-31]
+      (=gt		  . 33851)	; &I-GT-33851;
+      (=gt-k		  . 11996)	; &I-GT-K11996;
+      (=gt-pj-1		  . #x643F)	; &I-GT-33851; [68-31]
+      (=daikanwa	  . 26256)	; &I-M-26256;
+      (=shinjigen	  .  5841)	; &GT-33851;
+      )
+     ((=ucs@unicode	  . #x7BC6)	; &G0-572D;
+      (=gb2312		  . #x572D)	; &G0-572D; [55-13]
+      )
+     ((=cns11643-1	  . #x6E31)	; &C1-6E31; [78-17]
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x7BC7)	; 篇
-    (->subsumptive
-     ((=ks-x1001	  . #x7839)	; &GT-33869; [88-25]
+    (=>jis-x0208	. #x4A53)	; 篇 [42-51]
+    (=>jis-x0213-1	. #x4A53)	; 篇 [42-51]
+    (=big5		. #xBD67)	; &I-B-BD67;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BC7)	; 篇
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=ucs@jis/2004	. #x7BC7)	; &GT-33869;
+    (=ks-x1001		. #x7839)	; &GT-33869; [88-25]
+    (=cns11643-1	. #x6E32)	; &I-C1-6E32; [78-18]
+    (=jis-x0213-1@2004	. #x4A53)	; &I-JX3-4A53; [42-51]
+    (=gt		. 33869)	; &I-GT-33869;
+    (=gt-pj-5		. #x5F60)	; &I-GT-33869; [63-64]
+    (=daikanwa		. 26257)	; &I-M-26257;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BC7)	; 篇
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=ucs@unicode	. #x7BC7)	; &G0-462A;
+    (=gb2312		. #x462A)	; &G0-462A; [38-10]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BC7)	; 篇
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=ucs@jis/1990	. #x7BC7)	; &GT-33870;
+    (=ucs@jis/2000	. #x7BC7)	; &GT-33870;
+    (=jis-x0208		. #x4A53)	; &GT-33870; [42-51]
+    (=jis-x0213-1@2000	. #x4A53)	; &I-JX1-4A53; [42-51]
+    (=gt		. 33870)	; &I-GT-33870;
+    (=gt-pj-1		. #x4A53)	; &I-GT-33870; [42-51]
+    (=jef-china3	. #x5EC4)	; &I-JC3-5EC4;
+    (<-simplified@JP/extra/design
+     ((=ucs@jis/2004	  . #x7BC7)	; &GT-33869;
+      (=ks-x1001	  . #x7839)	; &GT-33869; [88-25]
       (=cns11643-1	  . #x6E32)	; &I-C1-6E32; [78-18]
-      (=big5		  . #xBD67)	; &I-B-BD67;
-      (=gt		  . 33869)	; &I-GT-33869;
-      (=gt-pj-5		  . #x5F60)	; &I-GT-33869; [63-64]
+      (=jis-x0213-1@2004  . #x4A53)	; &I-JX3-4A53; [42-51]
       (=daikanwa	  . 26257)	; &I-M-26257;
-      )
-     ((=ucs@jis		  . #x7BC7)	; &GT-33870;
-      (=jis-x0208	  . #x4A53)	; &GT-33870; [42-51]
-      (=jis-x0213-1	  . #x4A53)	; &I-JX1-4A53; [42-51]
-      (=gt		  . 33870)	; &I-GT-33870;
-      (=gt-pj-1		  . #x4A53)	; &I-GT-33870; [42-51]
-      (=jef-china3	  . #x5EC4)	; &I-JC3-5EC4;
-      )
-     ((=ucs@unicode	  . #x7BC7)	; &G0-462A;
-      (=gb2312		  . #x462A)	; &G0-462A; [38-10]
       ))
     ))
 (define-char
@@ -4749,30 +5099,58 @@
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
+    (=ucs		. #x25BEE)	; 𥯮
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25BEE)	; 𥯮
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=daikanwa		. 26269)	; &M-26269;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x25BEE)	; 𥯮
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs@iso		. #x25BEE)	; &C5-4848;
+    (=cns11643-5	. #x4848)	; &C5-4848; [40-40]
+    ))
+(define-char
+  '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x7BCB)	; 篋
-    (=jis-x0208		. #x643A)	; &I-J90-643A; [68-26]
-    (=cns11643-2	. #x525F)	; &I-C2-525F; [50-63]
-    (=jis-x0213-1	. #x643A)	; &I-JX1-643A; [68-26]
-    (=gb12345		. #x7366)	; 篋 [83-70]
     (=big5		. #xE6D7)	; &I-B-E6D7;
-    (=gt		. 33781)	; &I-GT-33781;
-    (=gt-pj-1		. #x643A)	; &I-GT-33781; [68-26]
-    (=daikanwa		. 26271)	; &I-M-26271;
-    (=shinjigen@rev	.  5832)	; 篋
+    (->subsumptive
+     ((=ucs@jis		  . #x7BCB)	; &GT-33781;
+      (=jis-x0208	  . #x643A)	; &GT-33781; [68-26]
+      (=cns11643-2	  . #x525F)	; &I-C2-525F; [50-63]
+      (=jis-x0213-1	  . #x643A)	; &I-JX1-643A; [68-26]
+      (=gt		  . 33781)	; &I-GT-33781;
+      (=gt-pj-1		  . #x643A)	; &I-GT-33781; [68-26]
+      (=daikanwa	  . 26271)	; &I-M-26271;
+      (=shinjigen	  .  5832)	; &GT-33781;
+      )
+     ((=ucs@unicode	  . #x7BCB)	; &UU+7BCB;
+      (=gb12345		  . #x7366)	; &UU+7BCB; [83-70]
+      ))
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
     (=ucs		. #x7BCC)	; 篌
+    (=big5		. #xBD6A)	; &I-B-BD6A;
     (->subsumptive
      ((=ucs@unicode	  . #x7BCC)	; &GT-33793;
       (=jis-x0208	  . #x643C)	; &GT-33793; [68-28]
       (=gb2312		  . #x7373)	; &I-G0-7373; [83-83]
       (=jis-x0213-1	  . #x643C)	; &I-JX1-643C; [68-28]
-      (=big5		  . #xBD6A)	; &I-B-BD6A;
       (=gt		  . 33793)	; &I-GT-33793;
       (=gt-pj-1		  . #x643C)	; &I-GT-33793; [68-28]
       (=daikanwa	  . 26272)	; &I-M-26272;
@@ -5745,19 +6123,41 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
     (=ucs		. #x7BDD)	; 篝
-    (->subsumptive
-     ((=gt		  . 33916)	; &GT-33916;
-      (=gt-pj-5		  . #x6123)	; &GT-33916; [65-03]
+    (=>jis-x0208	. #x6440)	; 篝 [68-32]
+    (=>jis-x0213-1	. #x6440)	; 篝 [68-32]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BDD)	; 篝
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 10)
+    (total-strokes	 . 16)
+    (=ucs@jis/2004	. #x7BDD)	; &GT-33916;
+    (=jis-x0213-1@2004	. #x6440)	; &GT-33916; [68-32]
+    (=gt		. 33916)	; &I-GT-33916;
+    (=gt-pj-5		. #x6123)	; &I-GT-33916; [65-03]
+    (=daikanwa		. 26320)	; &I-M-26320;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BDD)	; 篝
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 10)
+    (total-strokes	 . 16)
+    (=ucs@unicode	. #x7BDD)	; &GT-33917;
+    (=jis-x0208		. #x6440)	; &GT-33917; [68-32]
+    (=gb2312		. #x7374)	; &I-G0-7374; [83-84]
+    (=cns11643-2	. #x5926)	; &I-C2-5926; [57-06]
+    (=jis-x0213-1@2000	. #x6440)	; &I-JX1-6440; [68-32]
+    (=big5		. #xEABA)	; &I-B-EABA;
+    (=gt		. 33917)	; &I-GT-33917;
+    (=gt-pj-1		. #x6440)	; &I-GT-33917; [68-32]
+    (<-simplified@JP/extra/design
+     ((=ucs@jis/2004	  . #x7BDD)	; &GT-33916;
+      (=jis-x0213-1@2004  . #x6440)	; &GT-33916; [68-32]
       (=daikanwa	  . 26320)	; &I-M-26320;
-      )
-     ((=ucs@unicode	  . #x7BDD)	; &GT-33917;
-      (=jis-x0208	  . #x6440)	; &GT-33917; [68-32]
-      (=gb2312		  . #x7374)	; &I-G0-7374; [83-84]
-      (=cns11643-2	  . #x5926)	; &I-C2-5926; [57-06]
-      (=jis-x0213-1	  . #x6440)	; &I-JX1-6440; [68-32]
-      (=big5		  . #xEABA)	; &I-B-EABA;
-      (=gt		  . 33917)	; &I-GT-33917;
-      (=gt-pj-1		  . #x6440)	; &I-GT-33917; [68-32]
       ))
     ))
 (define-char
@@ -5765,24 +6165,52 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
     (=ucs		. #x7BDE)	; 篞
-    (->subsumptive
-     ((=ucs@unicode	  . #x7BDE)	; &M-26321;
-      (=big5		  . #xEAB7)	; &M-26321;
-      (=daikanwa	  . 26321)	; &I-M-26321;
-      )
-     ((=cns11643-2	  . #x5923)	; &C2-5923; [57-03]
+    (=big5		. #xEAB7)	; &I-B-EAB7;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BDE)	; 篞
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 10)
+    (total-strokes	 . 16)
+    (=ucs@unicode	. #x7BDE)	; &M-26321;
+    (=daikanwa		. 26321)	; &M-26321;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BDE)	; 篞
       ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 10)
+    (total-strokes	 . 16)
+    (=cns11643-2	. #x5923)	; &C2-5923; [57-03]
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
     (=ucs		. #x7BDF)	; 篟
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BDF)	; 篟
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 10)
+    (total-strokes	 . 16)
+    (=daikanwa		. 26326)	; &M-26326;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7BDF)	; 篟
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 10)
+    (total-strokes	 . 16)
+    (=big5		. #xEAC6)	; &B-EAC6;
     (->subsumptive
-     ((=daikanwa	  . 26326)	; &M-26326;
-      )
-     ((=ucs@unicode	  . #x7BDF)	; &B-EAC6;
-      (=big5		  . #xEAC6)	; &B-EAC6;
+     ((=ucs@unicode	  . #x7BDF)	; &UU+7BDF;
       )
      ((=cns11643-2	  . #x5932)	; &C2-5932; [57-18]
       ))
@@ -5790,6 +6218,7 @@
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (=ucs		. #x7BE0)	; 篠
+    (=big5		. #xC151)	; &I-B-C151;
     (->subsumptive
      ((ideographic-strokes . 10)
       (total-strokes	   . 16)
@@ -5797,7 +6226,6 @@
       (=jis-x0208	  . #x3C44)	; &GT-34058; [28-36]
       (=ks-x1001	  . #x6146)	; &I-K0-6146; [65-38]
       (=jis-x0213-1	  . #x3C44)	; &I-JX1-3C44; [28-36]
-      (=big5		  . #xC151)	; &I-B-C151;
       (=gt		  . 34058)	; &I-GT-34058;
       (=gt-pj-1		  . #x3C44)	; &I-GT-34058; [28-36]
       (=daikanwa	  . 26328)	; &I-M-26328;
@@ -5857,19 +6285,19 @@
     (=gt		. 33984)	; &I-GT-33984;
     (=gt-pj-1		. #x4646)	; &I-GT-33984; [38-38]
     (=daikanwa		. 26344)	; &I-M-26344;
-    (=shinjigen@rev	.  9362)	; 篤
+    (=shinjigen		.  9362)	; 篤
     ))
 (define-char
   '((ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
     (=ucs		. #x7BE5)	; 篥
+    (=big5		. #xEABC)	; &I-B-EABC;
     (->subsumptive
      ((=ucs@unicode	  . #x7BE5)	; &GT-34005;
       (=jis-x0208	  . #x6445)	; &GT-34005; [68-37]
       (=gb2312		  . #x7376)	; &I-G0-7376; [83-86]
       (=jis-x0213-1	  . #x6445)	; &I-JX1-6445; [68-37]
-      (=big5		  . #xEABC)	; &I-B-EABC;
       (=gt		  . 34005)	; &I-GT-34005;
       (=gt-pj-1		  . #x6445)	; &I-GT-34005; [68-37]
       (=daikanwa	  . 26352)	; &I-M-26352;
@@ -5882,16 +6310,16 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
     (=ucs		. #x7BE6)	; 篦
+    (=big5		. #xBF7B)	; &I-B-BF7B;
     (->subsumptive
      ((=ucs@unicode	  . #x7BE6)	; &GT-33993;
       (=jis-x0208	  . #x6444)	; &GT-33993; [68-36]
       (=gb2312		  . #x7377)	; &I-G0-7377; [83-87]
       (=jis-x0213-1	  . #x6444)	; &I-JX1-6444; [68-36]
-      (=big5		  . #xBF7B)	; &I-B-BF7B;
       (=gt		  . 33993)	; &I-GT-33993;
       (=gt-pj-1		  . #x6444)	; &I-GT-33993; [68-36]
       (=daikanwa	  . 26356)	; &I-M-26356;
-      (=shinjigen@rev	  .  5854)	; &GT-33993;
+      (=shinjigen	  .  5854)	; &GT-33993;
       )
      ((=cns11643-1	  . #x7165)	; &C1-7165; [81-69]
       ))
@@ -7846,8 +8274,12 @@
     (=daikanwa		. 26508)	; &I-M-26508;
     ))
 (define-char
+  '((ideographic-radical . 118)	; â½µ
+    (=>jis-x0208@1997	. #x433D)	; &J97-433D; [35-29]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x433D)	; &J97-433D; [35-29]
+     ((=>jis-x0208@1997	  . #x433D)	; &J97-433D; [35-29]
       ))
     (ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 12)
@@ -7862,12 +8294,8 @@
     (=daikanwa		. 26509)	; &I-M-26509;
     ))
 (define-char
-  '((ideographic-radical . 118)	; â½µ
-    (=jis-x0208@1997	. #x433D)	; &J97-433D; [35-29]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x433D)	; &J97-433D; [35-29]
+     ((=>jis-x0208@1997	  . #x433D)	; &J97-433D; [35-29]
       ))
     (ideographic-radical . 118)	; â½µ
     (=ucs		. #x7BAA)	; 箪
@@ -9232,19 +9660,45 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 19)
     (=ucs		. #x7C3E)	; ç°¾
+    (=>jis-x0208	. #x4E7C)	; ç°¾ [46-92]
+    (=>jis-x0213-1	. #x4E7C)	; ç°¾ [46-92]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7C3E)	; ç°¾
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 13)
+    (total-strokes	 . 19)
     (->subsumptive
      ((=daikanwa	  . 26616)	; &M-26616;
       )
-     ((=gt		  . 34334)	; &GT-34334;
-      (=gt-pj-5		  . #x6342)	; &GT-34334; [67-34]
-      )
-     ((=ucs@jis		  . #x7C3E)	; &GT-34335;
+     ((=ucs@jis/2004	  . #x7C3E)	; &GT-34334;
+      (=jis-x0213-1@2004  . #x4E7C)	; &GT-34334; [46-92]
+      (=gt		  . 34334)	; &I-GT-34334;
+      (=gt-pj-5		  . #x6342)	; &I-GT-34334; [67-34]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7C3E)	; ç°¾
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 13)
+    (total-strokes	 . 19)
+    (->subsumptive
+     ((=ucs@jis/1990	  . #x7C3E)	; &GT-34335;
+      (=ucs@jis/2000	  . #x7C3E)	; &GT-34335;
       (=jis-x0208	  . #x4E7C)	; &GT-34335; [46-92]
       (=ks-x1001	  . #x5633)	; &I-K0-5633; [54-19]
-      (=jis-x0213-1	  . #x4E7C)	; &I-JX1-4E7C; [46-92]
+      (=jis-x0213-1@2000  . #x4E7C)	; &I-JX1-4E7C; [46-92]
       (=gt		  . 34335)	; &I-GT-34335;
       (=gt-pj-1		  . #x4E7C)	; &I-GT-34335; [46-92]
       (=jef-china3	  . #x5EC5)	; &I-JC3-5EC5;
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x7C3E)	; &GT-34334;
+	(=jis-x0213-1@2004  . #x4E7C)	; &GT-34334; [46-92]
+	))
       )
      ((=ucs@unicode	  . #x7C3E)	; &C1-7859;
       (=cns11643-1	  . #x7859)	; &C1-7859; [88-57]
@@ -9257,10 +9711,27 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 19)
     (=ucs		. #x4260)	; 䉠
-    (=cns11643-3	. #x5A6D)	; &I-C3-5A6D; [58-77]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4260)	; 䉠
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 13)
+    (total-strokes	 . 19)
+    (=cns11643-3	. #x5A6D)	; &M-26617; [58-77]
     (=daikanwa		. 26617)	; &I-M-26617;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x4260)	; 䉠
+      ))
+    (ideographic-radical . 118)	; â½µ
+    (ideographic-strokes . 13)
+    (total-strokes	 . 19)
+    (=ucs@unicode	. #x4260)	; &UU+4260;
+    ))
+(define-char
   '((=>ucs		. #x25D29)	; 𥴩
     (ideographic-radical . 118)	; â½µ
     (ideographic-strokes . 13)
diff --git a/lisp/utf-2000/Ideograph-R119-Rice.el b/lisp/utf-2000/Ideograph-R119-Rice.el
index 34e85b2..9775c2b 100644
--- a/lisp/utf-2000/Ideograph-R119-Rice.el
+++ b/lisp/utf-2000/Ideograph-R119-Rice.el
@@ -239,21 +239,43 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 9)
     (=ucs		. #x7C7E)	; ç±¾
-    (=daikanwa		. 26853)	; &I-M-26853;
-    (=jef-china3	. #x5EC9)	; &I-JC3-5EC9;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7C7E)	; ç±¾
+      ))
+    (ideographic-radical . 119)	; ⽶
+    (ideographic-strokes . 3)
+    (total-strokes	 . 9)
     (->subsumptive
+     ((=daikanwa	  . 26853)	; &M-26853;
+      )
+     ((=ucs@unicode	  . #x7C7E)	; &JC3-5EC9;
+      (=jef-china3	  . #x5EC9)	; &JC3-5EC9;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7C7E)	; ç±¾
+      ))
+    (ideographic-radical . 119)	; ⽶
+    (ideographic-strokes . 3)
+    (total-strokes	 . 9)
+    (=ucs@jis/1990	. #x7C7E)	; &GT-34621;
+    (=ucs@jis/2000	. #x7C7E)	; &GT-34621;
+    (=jis-x0208@1983	. #x4C62)	; &GT-34621; [44-66]
+    (=jis-x0208@1990	. #x4C62)	; &I-J90-4C62; [44-66]
+    (=jis-x0213-1@2000	. #x4C62)	; &I-JX1-4C62; [44-66]
+    (=gt		. 34621)	; &I-GT-34621;
+    (=gt-pj-1		. #x4C62)	; &I-GT-34621; [44-66]
+    (=jef-china3	. #x5EDD)	; &I-JC3-5EDD;
+    (<-simplified@JP/jis/1978
      ((=jis-x0208@1978	  . #x4C62)	; &GT-34620; [44-66]
-      (=gt		  . 34620)	; &I-GT-34620;
-      (=gt-pj-5		  . #x6622)	; &I-GT-34620; [70-02]
       (=daikanwa	  . 26857)	; &I-M-26857;
-      )
-     ((=ucs@jis		  . #x7C7E)	; &GT-34621;
-      (=jis-x0208@1983	  . #x4C62)	; &GT-34621; [44-66]
-      (=jis-x0208@1990	  . #x4C62)	; &I-J90-4C62; [44-66]
-      (=jis-x0213-1	  . #x4C62)	; &I-JX1-4C62; [44-66]
-      (=gt		  . 34621)	; &I-GT-34621;
-      (=gt-pj-1		  . #x4C62)	; &I-GT-34621; [44-66]
-      (=jef-china3	  . #x5EDD)	; &I-JC3-5EDD;
+      ))
+    (<-simplified@JP/jis/2004
+     ((=ucs@jis/2004	  . #x7C7E)	; &JX3-4C62;
+      (=jis-x0213-1@2004  . #x4C62)	; &JX3-4C62; [44-66]
       ))
     ))
 (define-char
@@ -279,6 +301,23 @@
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x7C7E)	; ç±¾
+      ))
+    (ideographic-radical . 119)	; ⽶
+    (ideographic-strokes . 3)
+    (total-strokes	 . 9)
+    (->subsumptive
+     ((=jis-x0208@1978	  . #x4C62)	; &GT-34620; [44-66]
+      (=gt		  . 34620)	; &I-GT-34620;
+      (=gt-pj-5		  . #x6622)	; &I-GT-34620; [70-02]
+      (=daikanwa	  . 26857)	; &I-M-26857;
+      )
+     ((=ucs@jis/2004	  . #x7C7E)	; &JX3-4C62;
+      (=jis-x0213-1@2004  . #x4C62)	; &JX3-4C62; [44-66]
+      ))
+    ))
+(define-char
   '((ideographic-radical . 119)	; ⽶
     (ideographic-strokes . 3)
     (total-strokes	 . 9)
@@ -290,7 +329,7 @@
     (=gt		. 34605)	; &I-GT-34605;
     (=gt-pj-1		. #x364E)	; &I-GT-34605; [22-46]
     (=daikanwa		. 26858)	; &I-M-26858;
-    (=shinjigen@rev	.  5899)	; 粁
+    (=shinjigen		.  5899)	; 粁
     ))
 (define-char
   '((ideographic-radical . 119)	; ⽶
@@ -309,12 +348,23 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 9)
     (=ucs		. #x7C82)	; 粂
-    (=jis-x0208		. #x3729)	; &I-J90-3729; [23-09]
-    (=jis-x0213-1	. #x3729)	; &I-JX1-3729; [23-09]
-    (=gt		. 34606)	; &I-GT-34606;
-    (=gt-pj-1		. #x3729)	; &I-GT-34606; [23-09]
-    (=daikanwa		. 26860)	; &I-M-26860;
-    (=shinjigen@rev	.  5900)	; 粂
+    (=>jis-x0208	. #x3729)	; 粂 [23-09]
+    (=>jis-x0213-1	. #x3729)	; 粂 [23-09]
+    (->subsumptive
+     ((=ucs@jis/1990	  . #x7C82)	; &M-26860;
+      (=ucs@jis/2000	  . #x7C82)	; &M-26860;
+      (=jis-x0208	  . #x3729)	; &M-26860; [23-09]
+      (=jis-x0213-1@2000  . #x3729)	; &I-JX1-3729; [23-09]
+      (=daikanwa	  . 26860)	; &I-M-26860;
+      (=shinjigen	  .  5900)	; &M-26860;
+      )
+     ((=ucs@jis/2004	  . #x7C82)	; &GT-34606;
+      (=jis-x0213-1@2004  . #x3729)	; &GT-34606; [23-09]
+      (=gt		  . 34606)	; &I-GT-34606;
+      (=gt-pj-1		  . #x3729)	; &I-GT-34606; [23-09]
+      )
+     ((=ucs@unicode	  . #x7C82)	; &UU+7C82;
+      ))
     ))
 (define-char
   '((ideographic-radical . 119)	; ⽶
@@ -329,7 +379,18 @@
       (=gt		  . 34637)	; &I-GT-34637;
       (=gt-pj-1		  . #x6463)	; &I-GT-34637; [68-67]
       (=daikanwa	  . 26861)	; &I-M-26861;
-      (=shinjigen@rev	  .  5601)	; &GT-34637;
+      (=shinjigen	  .  5601)	; &GT-34637;
+      (<-vulgar
+       ((=ucs@unicode	    . #x79D5)	; &GT-32192;
+	(=jis-x0208	    . #x633E)	; &GT-32192; [67-30]
+	(=gb2312	    . #x6F75)	; &I-G0-6F75; [79-85]
+	(=ks-x1001	    . #x5D79)	; &I-K0-5D79; [61-89]
+	(=jis-x0213-1	    . #x633E)	; &I-JX1-633E; [67-30]
+	(=daikanwa	    . 24958)	; &I-M-24958;
+	(=shinjigen	    .  5600)	; &GT-32192;
+	))
+      (<-vulgar*sources
+       shinjigen)
       )
      ((=cns11643-3	  . #x3331)	; &C3-3331; [19-17]
       ))
@@ -339,10 +400,10 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
     (=ucs		. #x7C8A)	; 粊
+    (=big5		. #xD34B)	; &I-B-D34B;
     (->subsumptive
      ((=ucs@unicode	  . #x7C8A)	; &M-26862;
-      (=big5		  . #xD34B)	; &M-26862;
-      (=daikanwa	  . 26862)	; &I-M-26862;
+      (=daikanwa	  . 26862)	; &M-26862;
       )
      ((=cns11643-2	  . #x316D)	; &C2-316D; [17-77]
       ))
diff --git a/lisp/utf-2000/Ideograph-R120-Silk.el b/lisp/utf-2000/Ideograph-R120-Silk.el
index 265fc5f..3c6f256 100644
--- a/lisp/utf-2000/Ideograph-R120-Silk.el
+++ b/lisp/utf-2000/Ideograph-R120-Silk.el
@@ -5920,6 +5920,21 @@
   '((ideographic-radical . 120)	; â½·
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
+    (=ucs		. #x2604B)	; 𦁋
+    (->subsumptive
+     ((=daikanwa	  . 27553)	; &M-27553;
+      )
+     ((hanyu-dazidian	  5 3419 1)
+      (=cns11643-6	  . #x603F)	; &HZK09-C3D7; [64-31]
+      (=hanziku-9	  . #xC3D7)	; &I-HZK09-C3D7;
+      )
+     ((=ucs@iso		  . #x2604B)	; &U-0002604B;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 120)	; â½·
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
     (=ucs		. #x7DA5)	; 綥
     (->subsumptive
      ((=daikanwa	  . 27554)	; &M-27554;
@@ -6016,15 +6031,45 @@
   '((ideographic-radical . 120)	; â½·
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
+    (=ucs		. #x2604C)	; 𦁌
+    (->subsumptive
+     ((=daikanwa	  . 27561)	; &M-27561;
+      )
+     ((hanyu-dazidian	  5 3417 6)
+      (=hanziku-9	  . #xC37A)	; &HZK09-C37A;
+      )
+     ((=ucs@iso		  . #x2604C)	; &C6-603E;
+      (=cns11643-6	  . #x603E)	; &C6-603E; [64-30]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 120)	; â½·
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
     (=ucs		. #x7DAA)	; 綪
     (=big5		. #xE366)	; &I-B-E366;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7DAA)	; 綪
+      ))
+    (ideographic-radical . 120)	; â½·
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
+    (=ucs@jis		. #x7DAA)	; &M-27562;
+    (=jis-x0212		. #x5424)	; &M-27562; [52-04]
+    (=jis-x0213-2	. #x7445)	; &I-JX2-7445; [84-37]
+    (=daikanwa		. 27562)	; &I-M-27562;
+    (=jef-china3	. #x9BF8)	; &I-JC3-9BF8;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7DAA)	; 綪
+      ))
+    (ideographic-radical . 120)	; â½·
+    (ideographic-strokes . 8)
+    (total-strokes	 . 14)
     (->subsumptive
-     ((=ucs@jis		  . #x7DAA)	; &M-27562;
-      (=jis-x0212	  . #x5424)	; &M-27562; [52-04]
-      (=jis-x0213-2	  . #x7445)	; &I-JX2-7445; [84-37]
-      (=daikanwa	  . 27562)	; &I-M-27562;
-      (=jef-china3	  . #x9BF8)	; &I-JC3-9BF8;
-      )
      ((=ucs@unicode	  . #x7DAA)	; &UU+7DAA;
       )
      ((=cns11643-2	  . #x4C6D)	; &C2-4C6D; [44-77]
@@ -7121,8 +7166,12 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 120)	; â½·
+    (=>jis-x0208@1997	. #x3D6F)	; &J97-3D6F; [29-79]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3D6F)	; &J97-3D6F; [29-79]
+     ((=>jis-x0208@1997	  . #x3D6F)	; &J97-3D6F; [29-79]
       ))
     (ideographic-radical . 120)	; â½·
     (ideographic-strokes . 8)
@@ -7136,7 +7185,7 @@
       (=gt		  . 35509)	; &I-GT-35509;
       (=gt-pj-1		  . #x3D6F)	; &I-GT-35509; [29-79]
       (=daikanwa	  . 27632)	; &I-M-27632;
-      (=shinjigen@rev	  .  6085)	; &GT-35509;
+      (=shinjigen	  .  6085)	; &GT-35509;
       (<-simplified@JP/Jouyou
        ((=ucs@jis	    . #x7DD6)	; &M-27633;
 	(=ks-x1001	    . #x5F7D)	; &M-27633; [63-93]
@@ -7151,10 +7200,6 @@
     ))
 (define-char
   '((ideographic-radical . 120)	; â½·
-    (=jis-x0208@1997	. #x3D6F)	; &J97-3D6F; [29-79]
-    ))
-(define-char
-  '((ideographic-radical . 120)	; â½·
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
     (=ucs		. #x26074)	; 𦁴
@@ -7400,28 +7445,6 @@
   '((ideographic-radical . 120)	; â½·
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
-    (hanyu-dazidian	5 3419 1)
-    (=ucs		. #x2604B)	; 𦁋
-    (=cns11643-6	. #x603F)	; &I-C6-603F; [64-31]
-    (=hanziku-9		. #xC3D7)	; &I-HZK09-C3D7;
-    ))
-(define-char
-  '((ideographic-radical . 120)	; â½·
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
-    (=ucs		. #x2604C)	; 𦁌
-    (->subsumptive
-     ((=ucs@iso		  . #x2604C)	; &C6-603E;
-      (=cns11643-6	  . #x603E)	; &C6-603E; [64-30]
-      )
-     ((hanyu-dazidian	  5 3417 6)
-      (=hanziku-9	  . #xC37A)	; &HZK09-C37A;
-      ))
-    ))
-(define-char
-  '((ideographic-radical . 120)	; â½·
-    (ideographic-strokes . 8)
-    (total-strokes	 . 14)
     (=ucs		. #x2605F)	; 𦁟
     (->subsumptive
      ((hanyu-dazidian	  5 3416 5)
@@ -7453,8 +7476,21 @@
     (=hanziku-9		. #xC1B9)	; &HZK09-C1B9;
     ))
 (define-char
+  '((ideographic-radical . 120)	; â½·
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (=ucs		. #x26096)	; 𦂖
+    (->subsumptive
+     ((morohashi-daikanwa	27632 1)
+      (hanyu-dazidian	  5 3428 6)
+      (=hanziku-9	  . #xC5C2)	; &HZK09-C5C2;
+      )
+     ((=ucs@iso		  . #x26096)	; &U-00026096;
+      ))
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3D6F)	; &J97-3D6F; [29-79]
+     ((=>jis-x0208@1997	  . #x3D6F)	; &J97-3D6F; [29-79]
       ))
     (ideographic-radical . 120)	; â½·
     (ideographic-strokes . 9)
@@ -15882,12 +15918,6 @@
     ))
 (define-char
   '((ideographic-radical . 120)	; â½·
-    (hanyu-dazidian	5 3428 6)
-    (=ucs		. #x26096)	; 𦂖
-    (=hanziku-9		. #xC5C2)	; &I-HZK09-C5C2;
-    ))
-(define-char
-  '((ideographic-radical . 120)	; â½·
     (hanyu-dazidian	5 3423 10)
     (=ucs		. #x260B2)	; 𦂲
     (=hanziku-9		. #xC4C3)	; &I-HZK09-C4C3;
diff --git a/lisp/utf-2000/Ideograph-R122-Net.el b/lisp/utf-2000/Ideograph-R122-Net.el
index bada860..4bb4c34 100644
--- a/lisp/utf-2000/Ideograph-R122-Net.el
+++ b/lisp/utf-2000/Ideograph-R122-Net.el
@@ -1591,8 +1591,8 @@
 (define-char
   '((ideographic-radical . 122)	; â½¹
     (=ucs		. #x7F72)	; ç½²
+    (=>jis-x0208@1997	. #x3D70)	; ç½² [29-80]
     (=big5		. #xB870)	; &I-B-B870;
-    (=jis-x0208@1997	. #x3D70)	; ç½² [29-80]
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R124-Feather.el b/lisp/utf-2000/Ideograph-R124-Feather.el
index 7fca7ea..9a33ce5 100644
--- a/lisp/utf-2000/Ideograph-R124-Feather.el
+++ b/lisp/utf-2000/Ideograph-R124-Feather.el
@@ -23,16 +23,6 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x7FBD)	; ç¾½
-      ))
-    (ideographic-radical . 124)	; â½»
-    (ideographic-strokes . 0)
-    (total-strokes	 . 6)
-    (=gt		. 36834)	; &GT-36834;
-    (=gt-pj-9		. #x4B7C)	; &GT-36834; [43-92]
-    ))
-(define-char
-  '((<-denotational
      ((=ks-x1001	  . #x6962)	; &GT-36832; [73-66]
       (=daikanwa	  . 28614)	; &I-M-28614;
       ))
@@ -50,6 +40,16 @@
   '((<-denotational
      ((=ucs		  . #x7FBD)	; ç¾½
       ))
+    (ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 0)
+    (total-strokes	 . 6)
+    (=gt		. 36834)	; &GT-36834;
+    (=gt-pj-9		. #x4B7C)	; &GT-36834; [43-92]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7FBD)	; ç¾½
+      ))
     (morohashi-daikanwa	28614 1)
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 0)
@@ -68,9 +68,28 @@
   '((ideographic-radical . 124)	; â½»
     (ideographic-strokes . 1)
     (total-strokes	 . 7)
+    (=ucs		. #x263F3)	; 𦏳
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x263F3)	; 𦏳
+      ))
+    (ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 1)
+    (total-strokes	 . 7)
     (=gt		. 36835)	; &GT-36835;
     (=gt-pj-6		. #x326B)	; &GT-36835; [18-75]
     (=daikanwa		. 28615)	; &I-M-28615;
+    (=hanziku-9		. #xB3E8)	; &I-HZK09-B3E8;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x263F3)	; 𦏳
+      ))
+    (ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 1)
+    (total-strokes	 . 7)
+    (=ucs@iso		. #x263F3)	; &U-000263F3;
     ))
 (define-char
   '((ideographic-radical . 124)	; â½»
@@ -3526,34 +3545,70 @@
   '((ideographic-radical . 124)	; â½»
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
+    (=ucs		. #x26461)	; 𦑡
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x26461)	; 𦑡
+      ))
+    (ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
     (=daikanwa		. 28761)	; &M-28761;
     ))
 (define-char
-  '((=>ucs		. #x7FE9)	; ç¿©
+  '((<-denotational
+     ((=ucs		  . #x26461)	; 𦑡
+      ))
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
+    (=ucs@iso		. #x26461)	; &U-00026461;
+    ))
+(define-char
+  '((ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@big5	  . #x6241)	; &GT-14816;
+     ((=ucs		  . #x6241)	; 扁
+      )
+     ((=ucs		  . #x7FBD)	; ç¾½
+      ))
+    (=ucs		. #x7FE9)	; ç¿©
+    (=big5		. #xBDA1)	; &I-B-BDA1;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x7FE9)	; ç¿©
+      ))
+    (ideographic-radical . 124)	; â½»
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@jis/2004	  . #x6241)	; &GT-14816;
       (=ks-x1001	  . #x7837)	; &GT-14816; [88-23]
       (=cns11643-1	  . #x5137)	; &I-C1-5137; [49-23]
+      (=jis-x0213-1@2004  . #x5928)	; &I-JX3-5928; [57-08]
       (=daikanwa	  . 11724)	; &I-M-11724;
       )
      ((=ks-x1001	  . #x6962)	; &GT-36832; [73-66]
       (=daikanwa	  . 28614)	; &I-M-28614;
       ))
     (=ks-x1001		. #x783B)	; &GT-37157; [88-27]
-    (=big5		. #xBDA1)	; &I-B-BDA1;
     (=gt		. 37157)	; &I-GT-37157;
     (=gt-pj-6		. #x3440)	; &I-GT-37157; [20-32]
     (=daikanwa		. 28762)	; &I-M-28762;
     ))
 (define-char
-  '((=>ucs		. #x7FE9)	; ç¿©
-    (morohashi-daikanwa	28762 0 1)
+  '((<-denotational
+     ((=ucs		  . #x7FE9)	; ç¿©
+      ))
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
@@ -3561,22 +3616,22 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@jis		  . #x6241)	; &GT-14817;
-      (=jis-x0208	  . #x5928)	; &GT-14817; [57-08]
-      (=jis-x0213-1	  . #x5928)	; &I-JX1-5928; [57-08]
+     ((=ucs@unicode	  . #x6241)	; &G0-3162;
+      (=gb2312		  . #x3162)	; &G0-3162; [17-66]
       )
-     ((=ks-x1001	  . #x6962)	; &GT-36832; [73-66]
-      (=daikanwa	  . 28614)	; &I-M-28614;
+     ((=ucs@unicode	  . #x7FBD)	; &GT-36833;
+      (=jis-x0208	  . #x3129)	; &GT-36833; [17-09]
+      (=gb2312		  . #x5370)	; &I-G0-5370; [51-80]
+      (=cns11643-1	  . #x4851)	; &I-C1-4851; [40-49]
+      (=jis-x0213-1	  . #x3129)	; &I-JX1-3129; [17-09]
       ))
-    (=ucs@jis		. #x7FE9)	; &GT-37158;
-    (=jis-x0208		. #x6649)	; &GT-37158; [70-41]
-    (=jis-x0213-1	. #x6649)	; &I-JX1-6649; [70-41]
-    (=gt		. 37158)	; &I-GT-37158;
-    (=gt-pj-1		. #x6649)	; &I-GT-37158; [70-41]
+    (=ucs@unicode	. #x7FE9)	; &G0-7466;
+    (=gb2312		. #x7466)	; &G0-7466; [84-70]
     ))
 (define-char
-  '((=>ucs		. #x7FE9)	; ç¿©
-    (morohashi-daikanwa	28762 0 2)
+  '((<-denotational
+     ((=ucs		  . #x7FE9)	; ç¿©
+      ))
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
@@ -3584,18 +3639,24 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@big5	  . #x6241)	; &GT-14816;
+     ((=ucs@jis/2004	  . #x6241)	; &GT-14816;
       (=ks-x1001	  . #x7837)	; &GT-14816; [88-23]
       (=cns11643-1	  . #x5137)	; &I-C1-5137; [49-23]
+      (=jis-x0213-1@2004  . #x5928)	; &I-JX3-5928; [57-08]
       (=daikanwa	  . 11724)	; &I-M-11724;
       )
-     ((=ucs		  . #x7FBD)	; ç¾½
+     ((=ucs@unicode	  . #x7FBD)	; &GT-36833;
+      (=jis-x0208	  . #x3129)	; &GT-36833; [17-09]
+      (=gb2312		  . #x5370)	; &I-G0-5370; [51-80]
+      (=cns11643-1	  . #x4851)	; &I-C1-4851; [40-49]
+      (=jis-x0213-1	  . #x3129)	; &I-JX1-3129; [17-09]
       ))
     (=cns11643-1	. #x6E4A)	; &C1-6E4A; [78-42]
     ))
 (define-char
-  '((=>ucs		. #x7FE9)	; ç¿©
-    (morohashi-daikanwa	28762 0 3)
+  '((<-denotational
+     ((=ucs		  . #x7FE9)	; ç¿©
+      ))
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
@@ -3603,17 +3664,24 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs@jis		  . #x6241)	; &GT-14817;
+     ((=ucs@jis/1990	  . #x6241)	; &GT-14817;
+      (=ucs@jis/2000	  . #x6241)	; &GT-14817;
       (=jis-x0208	  . #x5928)	; &GT-14817; [57-08]
-      (=jis-x0213-1	  . #x5928)	; &I-JX1-5928; [57-08]
+      (=jis-x0213-1@2000  . #x5928)	; &I-JX1-5928; [57-08]
       )
-     ((=ucs		  . #x7FBD)	; ç¾½
+     ((=ks-x1001	  . #x6962)	; &GT-36832; [73-66]
+      (=daikanwa	  . 28614)	; &I-M-28614;
       ))
-    (=gt		. 37159)	; &GT-37159;
-    (=gt-pj-11		. #x3A4A)	; &GT-37159; [26-42]
+    (=ucs@jis		. #x7FE9)	; &GT-37158;
+    (=jis-x0208		. #x6649)	; &GT-37158; [70-41]
+    (=jis-x0213-1	. #x6649)	; &I-JX1-6649; [70-41]
+    (=gt		. 37158)	; &I-GT-37158;
+    (=gt-pj-1		. #x6649)	; &I-GT-37158; [70-41]
     ))
 (define-char
-  '((morohashi-daikanwa	28762 0 4)
+  '((<-denotational
+     ((=ucs		  . #x7FE9)	; ç¿©
+      ))
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
@@ -3621,12 +3689,19 @@
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
       )
-     ((=ucs		  . #x6241)	; 扁
+     ((=ucs@jis/1990	  . #x6241)	; &GT-14817;
+      (=ucs@jis/2000	  . #x6241)	; &GT-14817;
+      (=jis-x0208	  . #x5928)	; &GT-14817; [57-08]
+      (=jis-x0213-1@2000  . #x5928)	; &I-JX1-5928; [57-08]
       )
-     ((=ucs		  . #x7FBD)	; ç¾½
+     ((=ucs@unicode	  . #x7FBD)	; &GT-36833;
+      (=jis-x0208	  . #x3129)	; &GT-36833; [17-09]
+      (=gb2312		  . #x5370)	; &I-G0-5370; [51-80]
+      (=cns11643-1	  . #x4851)	; &I-C1-4851; [40-49]
+      (=jis-x0213-1	  . #x3129)	; &I-JX1-3129; [17-09]
       ))
-    (=ucs		. #x7FE9)	; ç¿©
-    (=gb2312		. #x7466)	; &I-G0-7466; [84-70]
+    (=gt		. 37159)	; &GT-37159;
+    (=gt-pj-11		. #x3A4A)	; &GT-37159; [26-42]
     ))
 (define-char
   '((=>ucs		. #x7FEA)	; 翪
@@ -3740,6 +3815,14 @@
   '((ideographic-radical . 124)	; â½»
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x7FD2)	; 習
+      )
+     ((=ucs		  . #x5143)	; 元
+      ))
     (=ucs		. #x7FEB)	; ç¿«
     (=big5		. #xE6F6)	; &I-B-E6F6;
     (=jef-china3	. #x60B3)	; &I-JC3-60B3;
@@ -3759,8 +3842,10 @@
       )
      ((=ucs		  . #x5143)	; 元
       ))
+    (=ucs@jis/2004	. #x7FEB)	; &M-28766;
     (=jis-x0208@1978	. #x3465)	; &M-28766; [20-69]
     (=ks-x1001		. #x6851)	; &I-K0-6851; [72-49]
+    (=jis-x0213-1@2004	. #x3465)	; &I-JX3-3465; [20-69]
     (=daikanwa		. 28766)	; &I-M-28766;
     ))
 (define-char
@@ -3793,14 +3878,22 @@
 	)
        ((=ucs		    . #x5143)	; 元
 	))
-      (=ucs@jis		  . #x7FEB)	; &GT-37114;
+      (=ucs@jis/1990	  . #x7FEB)	; &GT-37114;
+      (=ucs@jis/2000	  . #x7FEB)	; &GT-37114;
       (=jis-x0208@1983	  . #x3465)	; &GT-37114; [20-69]
       (=jis-x0208@1990	  . #x3465)	; &I-J90-3465; [20-69]
       (=cns11643-2	  . #x527E)	; &I-C2-527E; [50-94]
-      (=jis-x0213-1	  . #x3465)	; &I-JX1-3465; [20-69]
+      (=jis-x0213-1@2000  . #x3465)	; &I-JX1-3465; [20-69]
       (=gt		  . 37114)	; &I-GT-37114;
       (=gt-k		  . 11896)	; &I-GT-K11896;
       (=gt-pj-1		  . #x3465)	; &I-GT-37114; [20-69]
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x7FEB)	; &M-28766;
+	(=jis-x0208@1978    . #x3465)	; &M-28766; [20-69]
+	(=ks-x1001	    . #x6851)	; &I-K0-6851; [72-49]
+	(=jis-x0213-1@2004  . #x3465)	; &I-JX3-3465; [20-69]
+	(=daikanwa	    . 28766)	; &I-M-28766;
+	))
       ))
     ))
 (define-char
@@ -4136,8 +4229,10 @@
     (ideographic-radical . 124)	; â½»
     (ideographic-strokes . 10)
     (total-strokes	 . 16)
+    (=ucs@jis/2004	. #x7FF0)	; &GT-37164;
     (=jis-x0208@1978	. #x344D)	; &GT-37164; [20-45]
     (=ks-x1001		. #x7957)	; &I-K0-7957; [89-55]
+    (=jis-x0213-1@2004	. #x344D)	; &I-JX3-344D; [20-45]
     (=gt		. 37164)	; &I-GT-37164;
     (=gt-pj-6		. #x3452)	; &I-GT-37164; [20-50]
     (=daikanwa		. 28780)	; &I-M-28780;
@@ -4154,13 +4249,15 @@
     (=jis-x0208@1983	. #x344D)	; &I-J83-344D; [20-45]
     (=jis-x0208@1990	. #x344D)	; &I-J90-344D; [20-45]
     (=cns11643-1	. #x7173)	; &I-C1-7173; [81-83]
-    (=jis-x0213-1	. #x344D)	; &I-JX1-344D; [20-45]
+    (=jis-x0213-1@2000	. #x344D)	; &I-JX1-344D; [20-45]
     (=gt		. 37165)	; &I-GT-37165;
     (=gt-pj-1		. #x344D)	; &I-GT-37165; [20-45]
     (=jef-china3	. #x60B2)	; &I-JC3-60B2;
     (<-simplified@JP/jis
-     ((=jis-x0208@1978	  . #x344D)	; &GT-37164; [20-45]
+     ((=ucs@jis/2004	  . #x7FF0)	; &GT-37164;
+      (=jis-x0208@1978	  . #x344D)	; &GT-37164; [20-45]
       (=ks-x1001	  . #x7957)	; &I-K0-7957; [89-55]
+      (=jis-x0213-1@2004  . #x344D)	; &I-JX3-344D; [20-45]
       (=daikanwa	  . 28780)	; &I-M-28780;
       ))
     ))
diff --git a/lisp/utf-2000/Ideograph-R125-Old.el b/lisp/utf-2000/Ideograph-R125-Old.el
index be77b1f..3b60216 100644
--- a/lisp/utf-2000/Ideograph-R125-Old.el
+++ b/lisp/utf-2000/Ideograph-R125-Old.el
@@ -131,7 +131,7 @@
       (=gt-k		  . 06628)	; &I-GT-K06628;
       (=gt-pj-1		  . #x664E)	; &I-GT-37319; [70-46]
       (=daikanwa	  . 28848)	; &I-M-28848;
-      (=shinjigen@rev	  .  6344)	; &GT-37319;
+      (=shinjigen	  .  6344)	; &GT-37319;
       )
      ((=cns11643-1	  . #x5753)	; &C1-5753; [55-51]
       ))
@@ -141,20 +141,21 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
     (=ucs		. #x8006)	; 耆
+    (=big5		. #xAFCF)	; &I-B-AFCF;
     (->subsumptive
      ((=ucs@unicode	  . #x8006)	; &GT-37316;
       (=jis-x0208	  . #x664D)	; &GT-37316; [70-45]
       (=gb2312		  . #x6A48)	; &I-G0-6A48; [74-40]
       (=ks-x1001	  . #x513D)	; &I-K0-513D; [49-29]
       (=jis-x0213-1	  . #x664D)	; &I-JX1-664D; [70-45]
-      (=big5		  . #xAFCF)	; &I-B-AFCF;
       (=gt		  . 37316)	; &I-GT-37316;
       (=gt-k		  . 06627)	; &I-GT-K06627;
       (=gt-pj-1		  . #x664D)	; &I-GT-37316; [70-45]
       (=daikanwa	  . 28849)	; &I-M-28849;
-      (=shinjigen@rev	  .  6341)	; &GT-37316;
+      (=shinjigen	  .  6341)	; &GT-37316;
       )
-     ((=cns11643-1	  . #x5752)	; &C1-5752; [55-50]
+     ((=ucs@cns		  . #x8006)	; &C1-5752;
+      (=cns11643-1	  . #x5752)	; &C1-5752; [55-50]
       ))
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R127-Plow.el b/lisp/utf-2000/Ideograph-R127-Plow.el
index 39a0558..6a9d64c 100644
--- a/lisp/utf-2000/Ideograph-R127-Plow.el
+++ b/lisp/utf-2000/Ideograph-R127-Plow.el
@@ -110,6 +110,7 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
     (=ucs		. #x8015)	; 耕
+    (=big5		. #xAFD1)	; &I-B-AFD1;
     ))
 (define-char
   '((<-denotational
@@ -119,11 +120,11 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
     (=cns11643-1	. #x5755)	; &GT-37380; [55-53]
-    (=big5		. #xAFD1)	; &I-B-AFD1;
     (=gt		. 37380)	; &I-GT-37380;
     (=gt-k		. 07540)	; &I-GT-K07540;
     (=gt-pj-6		. #x3568)	; &I-GT-37380; [21-72]
     (=daikanwa		. 28907)	; &I-M-28907;
+    (=shinjigen		.  6357)	; &GT-37380;
     (mojikyo		. 028907)	; &MCS-600070EB;
     ))
 (define-char
@@ -142,18 +143,25 @@
     (=gt		. 37381)	; &I-GT-37381;
     (=gt-k		. 06427)	; &I-GT-K06427;
     (=gt-pj-1		. #x394C)	; &I-GT-37381; [25-44]
+    (=shinjigen		.  6356)	; &GT-37381;
     (mojikyo		. 050364)	; &MCS-6000C4BC;
+    (<-same
+     ((=cns11643-1	  . #x5755)	; &GT-37380; [55-53]
+      (=daikanwa	  . 28907)	; &I-M-28907;
+      ))
+    (<-same*sources
+     daikanwa)
     ))
 (define-char
   '((ideographic-radical . 127)	; â½¾
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
     (=ucs		. #x8016)	; 耖
+    (=big5		. #xD366)	; &I-B-D366;
     (->subsumptive
      ((=ucs@jis		  . #x8016)	; &M-28908;
       (=jis-x0212	  . #x5551)	; &M-28908; [53-49]
       (=jis-x0213-2	  . #x7527)	; &I-JX2-7527; [85-07]
-      (=big5		  . #xD366)	; &I-B-D366;
       (=daikanwa	  . 28908)	; &I-M-28908;
       (=jef-china3	  . #x8BF3)	; &I-JC3-8BF3;
       )
diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el
index c5e2487..c007653 100644
--- a/lisp/utf-2000/Ideograph-R130-Meat.el
+++ b/lisp/utf-2000/Ideograph-R130-Meat.el
@@ -4244,10 +4244,16 @@
     (=cns11643-4	. #x2F44)	; &C4-2F44; [15-36]
     ))
 (define-char
+  '((ideographic-radical . 130)	; ⾁
+    (=ucs@big5		. #x80FC)	; &J97-6726;
+    (=>jis-x0208	. #x6726)	; &J97-6726; [71-06]
+    (=>jis-x0213-1	. #x6726)	; &J97-6726; [71-06]
+    (=big5		. #xAFE2)	; &J97-6726;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x80FC)	; &B-AFE2;
-      (=big5		  . #xAFE2)	; &B-AFE2;
-      (=jis-x0208@1997	  . #x6726)	; &B-AFE2; [71-06]
+     ((=ucs@big5	  . #x80FC)	; &J97-6726;
+      (=>jis-x0208	  . #x6726)	; &J97-6726; [71-06]
       ))
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 6)
@@ -4267,12 +4273,6 @@
     ))
 (define-char
   '((ideographic-radical . 130)	; ⾁
-    (=ucs@big5		. #x80FC)	; &B-AFE2;
-    (=big5		. #xAFE2)	; &B-AFE2;
-    (=jis-x0208@1997	. #x6726)	; &B-AFE2; [71-06]
-    ))
-(define-char
-  '((ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=ucs		. #x80FD)	; 能
@@ -5828,9 +5828,18 @@
     (=cns11643-4	. #x3454)	; &C4-3454; [20-52]
     ))
 (define-char
+  '((ideographic-radical . 130)	; ⾁
+    (ideographic-strokes . 7)
+    (total-strokes	 . 11)
+    (=ucs@big5		. #x812B)	; &J97-4326;
+    (=>jis-x0208	. #x4326)	; &J97-4326; [35-06]
+    (=>jis-x0213-1	. #x4326)	; &J97-4326; [35-06]
+    (=big5		. #xB2E6)	; &J97-4326;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x812B)	; &B-B2E6;
-      (=big5		  . #xB2E6)	; &B-B2E6;
+     ((=ucs@big5	  . #x812B)	; &J97-4326;
+      (=>jis-x0208	  . #x4326)	; &J97-4326; [35-06]
       ))
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 7)
@@ -5850,16 +5859,9 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 130)	; ⾁
-    (ideographic-strokes . 7)
-    (total-strokes	 . 11)
-    (=ucs@big5		. #x812B)	; &B-B2E6;
-    (=big5		. #xB2E6)	; &B-B2E6;
-    ))
-(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x812B)	; &B-B2E6;
-      (=big5		  . #xB2E6)	; &B-B2E6;
+     ((=ucs@big5	  . #x812B)	; &J97-4326;
+      (=>jis-x0208	  . #x4326)	; &J97-4326; [35-06]
       ))
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 7)
@@ -6786,9 +6788,8 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x80FC)	; &B-AFE2;
-      (=big5		  . #xAFE2)	; &B-AFE2;
-      (=jis-x0208@1997	  . #x6726)	; &B-AFE2; [71-06]
+     ((=ucs@big5	  . #x80FC)	; &J97-6726;
+      (=>jis-x0208	  . #x6726)	; &J97-6726; [71-06]
       ))
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 8)
@@ -9110,20 +9111,24 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x8171)	; 腱
+    (=>jis-x0208	. #x6727)	; 腱 [71-07]
+    (=>jis-x0213-1	. #x6727)	; 腱 [71-07]
     (=big5		. #xB878)	; &I-B-B878;
     (->subsumptive
-     ((=ucs@jis		  . #x8171)	; &GT-38384;
+     ((=ucs@jis/1990	  . #x8171)	; &GT-38384;
+      (=ucs@jis/2000	  . #x8171)	; &GT-38384;
       (=jis-x0208	  . #x6727)	; &GT-38384; [71-07]
       (=ks-x1001	  . #x4B72)	; &I-K0-4B72; [43-82]
-      (=jis-x0213-1	  . #x6727)	; &I-JX1-6727; [71-07]
+      (=jis-x0213-1@2000  . #x6727)	; &I-JX1-6727; [71-07]
       (=gt		  . 38384)	; &I-GT-38384;
       (=gt-k		  . 10341)	; &I-GT-K10341;
       (=gt-pj-1		  . #x6727)	; &I-GT-38384; [71-07]
       (=daikanwa	  . 29708)	; &I-M-29708;
-      (=shinjigen@rev	  .  6524)	; &GT-38384;
+      (=shinjigen	  .  6524)	; &GT-38384;
       )
-     ((=ucs@unicode	  . #x8171)	; &G0-6B6C;
-      (=gb2312		  . #x6B6C)	; &G0-6B6C; [75-76]
+     ((=ucs@unicode	  . #x8171)	; &JX3-6727;
+      (=gb2312		  . #x6B6C)	; &JX3-6727; [75-76]
+      (=jis-x0213-1@2004  . #x6727)	; &I-JX3-6727; [71-07]
       )
      ((=cns11643-1	  . #x6621)	; &C1-6621; [70-01]
       ))
@@ -9133,10 +9138,10 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=ucs		. #x8172)	; 腲
+    (=big5		. #xDF79)	; &I-B-DF79;
     (->subsumptive
      ((=ucs@unicode	  . #x8172)	; &M-29709;
-      (=big5		  . #xDF79)	; &M-29709;
-      (=daikanwa	  . 29709)	; &I-M-29709;
+      (=daikanwa	  . 29709)	; &M-29709;
       )
      ((=cns11643-2	  . #x4640)	; &C2-4640; [38-32]
       ))
@@ -9851,8 +9856,10 @@
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=ucs@jis/2004	. #x817F)	; &M-29747;
     (=jis-x0208@1978	. #x425C)	; &M-29747; [34-60]
     (=ks-x1001		. #x775A)	; &I-K0-775A; [87-58]
+    (=jis-x0213-1@2004	. #x425C)	; &I-JX3-425C; [34-60]
     (=daikanwa		. 29747)	; &I-M-29747;
     ))
 (define-char
@@ -9875,10 +9882,17 @@
     (=gb2312		. #x4D48)	; &GT-38421; [45-40]
     (=jis-x0208@1983	. #x425C)	; &I-J83-425C; [34-60]
     (=jis-x0208@1990	. #x425C)	; &I-J90-425C; [34-60]
-    (=jis-x0213-1	. #x425C)	; &I-JX1-425C; [34-60]
+    (=jis-x0213-1@2000	. #x425C)	; &I-JX1-425C; [34-60]
     (=gt		. 38421)	; &I-GT-38421;
     (=gt-pj-1		. #x425C)	; &I-GT-38421; [34-60]
     (=jef-china3	. #x52E2)	; &I-JC3-52E2;
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x817F)	; &M-29747;
+      (=jis-x0208@1978	  . #x425C)	; &M-29747; [34-60]
+      (=ks-x1001	  . #x775A)	; &I-K0-775A; [87-58]
+      (=jis-x0213-1@2004  . #x425C)	; &I-JX3-425C; [34-60]
+      (=daikanwa	  . 29747)	; &I-M-29747;
+      ))
     ))
 (define-char
   '((ideographic-radical . 130)	; ⾁
@@ -10864,68 +10878,72 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x818E)	; 膎
-    (ideographic-radical . 130)	; ⾁
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=ucs@jis		. #x818E)	; &M-29798;
-    (=jis-x0212		. #x564B)	; &M-29798; [54-43]
-    (=daikanwa		. 29798)	; &I-M-29798;
-    ))
-(define-char
-  '((morohashi-daikanwa	29798 0 2)
-    (ideographic-radical . 130)	; ⾁
+  '((ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x818E)	; 膎
-    (=cns11643-4	. #x4646)	; &I-C4-4646; [38-38]
     ))
 (define-char
-  '((=>ucs		. #x267AD)	; 𦞭
+  '((<-denotational
+     ((=ucs		  . #x818E)	; 膎
+      ))
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (=daikanwa		. 29799)	; &M-29799;
+    (=ucs@jis		. #x818E)	; &M-29798;
+    (=jis-x0212		. #x564B)	; &M-29798; [54-43]
+    (=daikanwa		. 29798)	; &I-M-29798;
     ))
 (define-char
-  '((=>ucs		. #x267AD)	; 𦞭
-    (morohashi-daikanwa	29799 0 0)
+  '((<-denotational
+     ((=ucs		  . #x818E)	; 膎
+      ))
     (ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
-    (hanyu-dazidian	3 2105 7)
-    (=hanziku-6		. #xB17C)	; &HZK06-B17C;
+    (->subsumptive
+     ((=ucs@unicode	  . #x818E)	; &UU+818E;
+      )
+     ((=cns11643-4	  . #x4646)	; &C4-4646; [38-38]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	29799 0 1)
-    (ideographic-radical . 130)	; ⾁
+  '((ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x267AD)	; 𦞭
-    ))
-(define-char
-  '((=>ucs		. #x267AD)	; 𦞭
-    (morohashi-daikanwa	29799 0 2)
-    (ideographic-radical . 130)	; ⾁
-    (ideographic-strokes . 10)
-    (total-strokes	 . 14)
-    (=cns11643-5	. #x4879)	; &C5-4879; [40-89]
+    (->subsumptive
+     ((=daikanwa	  . 29799)	; &M-29799;
+      )
+     ((hanyu-dazidian	  3 2105 7)
+      (=hanziku-6	  . #xB17C)	; &HZK06-B17C;
+      )
+     ((=ucs@iso		  . #x267AD)	; &U-000267AD;
+      )
+     ((=cns11643-5	  . #x4879)	; &C5-4879; [40-89]
+      ))
     ))
 (define-char
   '((ideographic-radical . 130)	; ⾁
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
     (=ucs		. #x818F)	; 膏
+    (=>jis-x0208	. #x3951)	; 膏 [25-49]
+    (=>jis-x0213-1	. #x3951)	; 膏 [25-49]
     (=big5		. #xBB49)	; &I-B-BB49;
     (->subsumptive
-     ((=ucs@jis		  . #x818F)	; &GT-38495;
-      (=jis-x0208	  . #x3951)	; &GT-38495; [25-49]
-      (=ks-x1001	  . #x4D47)	; &I-K0-4D47; [45-39]
-      (=jis-x0213-1	  . #x3951)	; &I-JX1-3951; [25-49]
+     ((=ucs@jis/2004	  . #x818F)	; &GT-38495;
+      (=ks-x1001	  . #x4D47)	; &GT-38495; [45-39]
+      (=jis-x0213-1@2004  . #x3951)	; &I-JX3-3951; [25-49]
       (=gt		  . 38495)	; &I-GT-38495;
       (=gt-pj-1		  . #x3951)	; &I-GT-38495; [25-49]
       (=daikanwa	  . 29800)	; &I-M-29800;
-      (=shinjigen@rev	  .  6543)	; &GT-38495;
+      (=shinjigen	  .  6543)	; &GT-38495;
+      )
+     ((=ucs@jis/1990	  . #x818F)	; &J90-3951;
+      (=ucs@jis/2000	  . #x818F)	; &J90-3951;
+      (=jis-x0208	  . #x3951)	; &J90-3951; [25-49]
+      (=jis-x0213-1@2000  . #x3951)	; &I-JX1-3951; [25-49]
       )
      ((=ucs@unicode	  . #x818F)	; &G0-3860;
       (=gb2312		  . #x3860)	; &G0-3860; [24-64]
@@ -14715,7 +14733,7 @@
     (ideographic-radical@cns . 130)	; ⾁
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (<=>gt		. 38767)	; &aGT-38767;
+    (=>>gt		. 38767)	; &G-GT-38767;
     (->subsumptive
      ((ideographic-radical . 130)	; ⾁
       (=gt		  . 38767)	; &GT-38767;
@@ -14735,7 +14753,7 @@
     (ideographic-radical@cns . 130)	; ⾁
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
-    (<=>gt		. 38769)	; &aGT-38769;
+    (=>>gt		. 38769)	; &G-GT-38769;
     (->subsumptive
      ((ideographic-radical . 86)	; ⽕
       (=ucs@iso		  . #x24443)	; &GT-38769;
diff --git a/lisp/utf-2000/Ideograph-R133-Arrive.el b/lisp/utf-2000/Ideograph-R133-Arrive.el
index 706d2e0..f85296f 100644
--- a/lisp/utf-2000/Ideograph-R133-Arrive.el
+++ b/lisp/utf-2000/Ideograph-R133-Arrive.el
@@ -71,7 +71,8 @@
 (define-char
   '((ideographic-radical . 133)	; ⾄
     (=ucs		. #x81F4)	; 致
-    (=jis-x0208@1997	. #x4357)	; 致 [35-55]
+    (=>jis-x0208	. #x4357)	; 致 [35-55]
+    (=>jis-x0213-1	. #x4357)	; 致 [35-55]
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R134-Mortar.el b/lisp/utf-2000/Ideograph-R134-Mortar.el
index 86e07cb..0d050ec 100644
--- a/lisp/utf-2000/Ideograph-R134-Mortar.el
+++ b/lisp/utf-2000/Ideograph-R134-Mortar.el
@@ -314,8 +314,18 @@
     (ideographic-radical@ucs/compat . 55)	; ⼶
     (ideographic-radical@ucs/compat*sources
      cns11643-6)
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x81FC)	; 臼
+      )
+     ((=ucs		  . #x5EFE)	; 廾
+      ))
     (=ucs		. #x8201)	; 舁
-    (=jis-x0208@1997	. #x674D)	; 舁 [71-45]
+    (=>jis-x0208	. #x674D)	; 舁 [71-45]
+    (=>jis-x0213-1	. #x674D)	; 舁 [71-45]
+    (=big5		. #xD370)	; &I-B-D370;
     ))
 (define-char
   '((<-denotational
@@ -370,7 +380,6 @@
     (=gb2312		. #x7428)	; &I-G0-7428; [84-08]
     (=cns11643-6	. #x3074)	; &I-C6-3074; [16-84]
     (=jis-x0213-1	. #x674D)	; &I-JX1-674D; [71-45]
-    (=big5		. #xD370)	; &I-B-D370;
     (=gt		. 39043)	; &I-GT-39043;
     (=gt-pj-1		. #x674D)	; &I-GT-39043; [71-45]
     ))
diff --git a/lisp/utf-2000/Ideograph-R137-Boat.el b/lisp/utf-2000/Ideograph-R137-Boat.el
index c475077..b2f40a4 100644
--- a/lisp/utf-2000/Ideograph-R137-Boat.el
+++ b/lisp/utf-2000/Ideograph-R137-Boat.el
@@ -2438,19 +2438,41 @@
     ))
 (define-char
   '((ideographic-radical . 137)	; ⾈
-    (ideographic-strokes . 10)
-    (total-strokes	 . 16)
     (=ucs		. #x8258)	; 艘
+    (=>jis-x0208	. #x675B)	; 艘 [71-59]
+    (=>jis-x0213-1	. #x675B)	; 艘 [71-59]
     (=big5		. #xBFB4)	; &I-B-BFB4;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8258)	; 艘
+      ))
+    (ideographic-radical . 137)	; ⾈
+    (ideographic-strokes . 10)
+    (total-strokes	 . 16)
     (->subsumptive
-     ((=ucs@jis		  . #x8258)	; &GT-39430;
+     ((=ucs@jis/2004	  . #x8258)	; &M-30511;
+      (=jis-x0213-1@2004  . #x675B)	; &M-30511; [71-59]
+      (=daikanwa	  . 30511)	; &I-M-30511;
+      (=shinjigen	  .  6661)	; &M-30511;
+      )
+     ((=cns11643-1	  . #x717C)	; &C1-717C; [81-92]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8258)	; 艘
+      ))
+    (ideographic-radical . 137)	; ⾈
+    (ideographic-strokes . 9)
+    (total-strokes	 . 15)
+    (->subsumptive
+     ((=ucs@jis/1990	  . #x8258)	; &GT-39430;
+      (=ucs@jis/2000	  . #x8258)	; &GT-39430;
       (=jis-x0208	  . #x675B)	; &GT-39430; [71-59]
-      (=cns11643-1	  . #x717C)	; &I-C1-717C; [81-92]
-      (=jis-x0213-1	  . #x675B)	; &I-JX1-675B; [71-59]
+      (=jis-x0213-1@2000  . #x675B)	; &I-JX1-675B; [71-59]
       (=gt		  . 39430)	; &I-GT-39430;
       (=gt-pj-1		  . #x675B)	; &I-GT-39430; [71-59]
-      (=daikanwa	  . 30511)	; &I-M-30511;
-      (=shinjigen	  .  6661)	; &GT-39430;
       )
      ((=ucs@unicode	  . #x8258)	; &G0-4B52;
       (=gb2312		  . #x4B52)	; &G0-4B52; [43-50]
diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el
index 2d1b709..eea241c 100644
--- a/lisp/utf-2000/Ideograph-R140-Grass.el
+++ b/lisp/utf-2000/Ideograph-R140-Grass.el
@@ -63,6 +63,21 @@
     ))
 (define-char
   '((<-denotational
+     ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA5E")
+      (=ucs		  . #xFA5E)	; 艹
+      ))
+    (name		. "CJK RADICAL GRASS TWO")
+    (general-category	symbol other) ; Informative Category
+    (bidi-category	. "ON")
+    (mirrored		. nil)
+    (=ucs		. #x2EBF)	; ⺿
+    (<-identical@component
+     ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA5E")
+      (=ucs		  . #xFA5E)	; 艹
+      ))
+    ))
+(define-char
+  '((<-denotational
      ((=ucs		  . #x8279)	; 艹
       ))
     (name		. "CJK RADICAL GRASS ONE")
@@ -84,21 +99,6 @@
     ))
 (define-char
   '((<-denotational
-     ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA5E")
-      (=ucs		  . #xFA5E)	; 艹
-      ))
-    (name		. "CJK RADICAL GRASS TWO")
-    (general-category	symbol other) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (=ucs		. #x2EBF)	; ⺿
-    (<-identical@component
-     ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA5E")
-      (=ucs		  . #xFA5E)	; 艹
-      ))
-    ))
-(define-char
-  '((<-denotational
      ((=ucs		  . #x8279)	; 艹
       ))
     (name		. "CJK COMPATIBILITY IDEOGRAPH-FA5D")
@@ -1277,6 +1277,8 @@
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 3)
     (=ucs		. #x8292)	; 芒
+    (=>jis-x0208	. #x676A)	; 芒 [71-74]
+    (=>jis-x0213-1	. #x676A)	; 芒 [71-74]
     (=big5		. #xA87E)	; &I-B-A87E;
     ))
 (define-char
@@ -1299,14 +1301,23 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
+    (=>>jis-x0213-1	. #x676A)	; &G-JX1-676A; [71-74]
     (->subsumptive
-     ((=ucs@jis		  . #x8292)	; &GT-39713;
+     ((=ucs@jis/2004	  . #x8292)	; &JX3-676A;
+      (=jis-x0213-1@2004  . #x676A)	; &JX3-676A; [71-74]
+      )
+     ((=ucs@jis/1990	  . #x8292)	; &GT-39713;
+      (=ucs@jis/2000	  . #x8292)	; &GT-39713;
       (=jis-x0208	  . #x676A)	; &GT-39713; [71-74]
       (=ks-x1001	  . #x5853)	; &I-K0-5853; [56-51]
-      (=jis-x0213-1	  . #x676A)	; &I-JX1-676A; [71-74]
+      (=jis-x0213-1@2000  . #x676A)	; &I-JX1-676A; [71-74]
       (=gt		  . 39713)	; &I-GT-39713;
       (=gt-k		  . 01739)	; &I-GT-K01739;
       (=gt-pj-1		  . #x676A)	; &I-GT-39713; [71-74]
+      (<-simplified@JP/extra/design
+       ((=ucs@jis/2004	    . #x8292)	; &JX3-676A;
+	(=jis-x0213-1@2004  . #x676A)	; &JX3-676A; [71-74]
+	))
       )
      ((=ucs@unicode	  . #x8292)	; &G0-4322;
       (=gb2312		  . #x4322)	; &G0-4322; [35-02]
@@ -1954,7 +1965,15 @@
     (=hanziku-8		. #xE8CA)	; &I-HZK08-E8CA;
     ))
 (define-char
-  '((=>ucs		. #x82A4)	; 芤
+  '((ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 4)
+    (=ucs		. #x82A4)	; 芤
+    (=big5		. #xCDC3)	; &I-B-CDC3;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x82A4)	; 芤
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
@@ -1962,18 +1981,27 @@
     (=daikanwa		. 30714)	; &I-M-30714;
     ))
 (define-char
-  '((morohashi-daikanwa	30714 0 3)
+  '((<-denotational
+     ((=ucs		  . #x82A4)	; 芤
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=ucs		. #x82A4)	; 芤
-    (=gb2312		. #x5C52)	; &I-G0-5C52; [60-50]
+    (=ucs@unicode	. #x82A4)	; &JX1-7A61;
+    (=gb2312		. #x5C52)	; &JX1-7A61; [60-50]
     (=jis-x0212		. #x5740)	; &I-JSP-5740; [55-32]
     (=jis-x0213-1	. #x7A61)	; &I-JX1-7A61; [90-65]
-    (=big5		. #xCDC3)	; &I-B-CDC3;
     ))
 (define-char
-  '((=>ucs		. #x82A5)	; 芥
+  '((ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 4)
+    (=ucs		. #x82A5)	; 芥
+    (=big5		. #xAAE3)	; &I-B-AAE3;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x82A5)	; 芥
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
@@ -1981,16 +2009,17 @@
     (=daikanwa		. 30715)	; &I-M-30715;
     ))
 (define-char
-  '((morohashi-daikanwa	30715 0 2)
+  '((<-denotational
+     ((=ucs		  . #x82A5)	; 芥
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=ucs		. #x82A5)	; 芥
-    (=jis-x0208		. #x3329)	; &I-J90-3329; [19-09]
+    (=ucs@unicode	. #x82A5)	; &GT-39731;
+    (=jis-x0208		. #x3329)	; &GT-39731; [19-09]
     (=gb2312		. #x3D66)	; &I-G0-3D66; [29-70]
     (=ks-x1001		. #x4B4E)	; &I-K0-4B4E; [43-46]
     (=jis-x0213-1	. #x3329)	; &I-JX1-3329; [19-09]
-    (=big5		. #xAAE3)	; &I-B-AAE3;
     (=gt		. 39731)	; &I-GT-39731;
     (=gt-pj-1		. #x3329)	; &I-GT-39731; [19-09]
     ))
@@ -1998,8 +2027,11 @@
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 4)
     (total-strokes	 . 8)
+    (sound@ja/on/p=hu4	"ko")
+    (sound@ja/on/p=lu2	"ro")
     (=ucs		. #x82A6)	; 芦
-    (=jis-x0208@1997	. #x3032)	; 芦 [16-18]
+    (=>jis-x0208	. #x3032)	; 芦 [16-18]
+    (=>jis-x0213-1	. #x3032)	; 芦 [16-18]
     ))
 (define-char
   '((<-denotational
@@ -2010,6 +2042,17 @@
     (total-strokes	 . 8)
     (=cns11643-3	. #x2A6B)	; &M-30716; [10-75]
     (=daikanwa		. 30716)	; &I-M-30716;
+    (<-same@p=hu4
+     ((=cns11643-2	  . #x2479)	; &M-30680; [04-89]
+      (=daikanwa	  . 30680)	; &I-M-30680;
+      ))
+    (<-same@p=hu4*sources
+     jiyun daikanwa)
+    (<-vulgar@p=lu2
+     ((=daikanwa	  . 32425)	; &M-32425;
+      ))
+    (<-vulgar@p=lu2*sources
+     zihui daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -2018,9 +2061,10 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
-    (=jis-x0208@1978*note . "ISO-IR-042 = 1978/i-4")
+    (=jis-x0208@1978*note "ISO-IR-042 = 1978/i-4")
     (jisx0208-difference . 78/4-)
-    (=ucs@jis		. #x82A6)	; &GT-39829;
+    (=ucs@jis/1990	. #x82A6)	; &GT-39829;
+    (=ucs@jis/2000	. #x82A6)	; &GT-39829;
     (=jis-x0208@1978/-4pr . #x3032)	; &GT-39829; [16-18]
     (=jis-x0208@1983	. #x3032)	; &I-J83-3032; [16-18]
     (=jis-x0208@1990	. #x3032)	; &I-J90-3032; [16-18]
@@ -2029,6 +2073,14 @@
     (=gt-pj-1		. #x3032)	; &I-GT-39829; [16-18]
     (=shinjigen		.  7065)	; &GT-39829;
     (=jef-china3	. #x61B3)	; &I-JC3-61B3;
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x82A6)	; &JX3-3032;
+      (=ks-x1001	  . #x7B58)	; &JX3-3032; [91-56]
+      (=jis-x0213-1@2004  . #x3032)	; &I-JX3-3032; [16-18]
+      ))
+    (<-simplified@JP/misc
+     ((=daikanwa	  . 32425)	; &M-32425;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -2049,9 +2101,19 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
+    (=ucs@jis/2004	. #x82A6)	; &JX3-3032;
     (=jis-x0208@1978/4-pr . #x3032)	; &JX3-3032; [16-18]
     (=ks-x1001		. #x7B58)	; &JX3-3032; [91-56]
     (=jis-x0213-1@2004	. #x3032)	; &I-JX3-3032; [16-18]
+    (<-simplified@JP/extra
+     ((=ucs@unicode	  . #x8606)	; &GT-43620;
+      (=jis-x0208	  . #x6943)	; &GT-43620; [73-35]
+      (=ks-x1001	  . #x5656)	; &I-K0-5656; [54-54]
+      (=jis-x0213-1	  . #x6943)	; &I-JX1-6943; [73-35]
+      ))
+    (<-simplified@JP/misc
+     ((=daikanwa	  . 32425)	; &M-32425;
+      ))
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -6243,26 +6305,38 @@
     (=ucs		. #x44B4)	; 䒴
     ))
 (define-char
-  '((=>ucs		. #x8327)	; 茧
+  '((ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 6)
+    (=ucs		. #x8327)	; 茧
+    (=big5		. #xD3B5)	; &I-B-D3B5;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8327)	; 茧
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=cns11643-2	. #x3257)	; &M-30895; [18-55]
     (=daikanwa		. 30895)	; &I-M-30895;
+    (=jef-china3	. #x61E1)	; &I-JC3-61E1;
     ))
 (define-char
-  '((morohashi-daikanwa	30895 0 1)
+  '((<-denotational
+     ((=ucs		  . #x8327)	; 茧
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=ucs		. #x8327)	; 茧
-    (=gb2312		. #x3C6B)	; &I-G0-3C6B; [28-75]
-    (=big5		. #xD3B5)	; &I-B-D3B5;
+    (=ucs@unicode	. #x8327)	; &G0-3C6B;
+    (=gb2312		. #x3C6B)	; &G0-3C6B; [28-75]
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (=ucs		. #x8328)	; 茨
+    (=>jis-x0208	. #x3071)	; 茨 [16-81]
+    (=>jis-x0213-1	. #x3071)	; 茨 [16-81]
     (=big5		. #xAFFD)	; &I-B-AFFD;
     ))
 (define-char
@@ -6308,6 +6382,7 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (=ucs@jis/2004	. #x8328)	; &JX3-3071;
     (=jis-x0213-1@2004	. #x3071)	; &JX3-3071; [16-81]
     ))
 (define-char
@@ -6317,10 +6392,16 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
+    (=>>gt		. 40112)	; &G-GT-40112;
     (->subsumptive
-     ((=ucs@jis		  . #x8328)	; &J90-3071;
+     ((=ucs@jis/1990	  . #x8328)	; &J90-3071;
+      (=ucs@jis/2000	  . #x8328)	; &J90-3071;
       (=jis-x0208	  . #x3071)	; &J90-3071; [16-81]
       (=jis-x0213-1@2000  . #x3071)	; &I-JX1-3071; [16-81]
+      (<-simplified@JP/extra/design
+       ((=ucs@jis/2004	    . #x8328)	; &JX3-3071;
+	(=jis-x0213-1@2004  . #x3071)	; &JX3-3071; [16-81]
+	))
       )
      ((=gt		  . 40112)	; &GT-40112;
       (=gt-pj-1		  . #x3071)	; &GT-40112; [16-81]
@@ -7277,10 +7358,16 @@
     (=ucs@unicode	. #x44BA)	; &UU+44BA;
     ))
 (define-char
+  '((ideographic-radical . 140)	; ⾋
+    (=ucs@big5		. #x834A)	; &J97-3755;
+    (=>jis-x0208	. #x3755)	; &J97-3755; [23-53]
+    (=>jis-x0213-1	. #x3755)	; &J97-3755; [23-53]
+    (=big5		. #xAFF0)	; &J97-3755;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x834A)	; &B-AFF0;
-      (=big5		  . #xAFF0)	; &B-AFF0;
-      (=jis-x0208@1997	  . #x3755)	; &B-AFF0; [23-53]
+     ((=ucs@big5	  . #x834A)	; &J97-3755;
+      (=>jis-x0208	  . #x3755)	; &J97-3755; [23-53]
       ))
     (ideographic-radical . 140)	; ⾋
     (=ucs		. #x8346)	; 荆
@@ -7302,107 +7389,155 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 140)	; ⾋
-    (=ucs@big5		. #x834A)	; &B-AFF0;
-    (=big5		. #xAFF0)	; &B-AFF0;
-    (=jis-x0208@1997	. #x3755)	; &B-AFF0; [23-53]
+  '((<-denotational
+     ((=ucs@big5	  . #x834A)	; &J97-3755;
+      (=>jis-x0208	  . #x3755)	; &J97-3755; [23-53]
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 6)
+    (=ucs		. #x834A)	; 荊
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x834A)	; &B-AFF0;
-      (=big5		  . #xAFF0)	; &B-AFF0;
-      (=jis-x0208@1997	  . #x3755)	; &B-AFF0; [23-53]
+     ((=ucs		  . #x834A)	; 荊
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
-    (=ucs		. #x834A)	; 荊
-    (->subsumptive
-     ((total-strokes	   . 10)
-      (=cns11643-1	  . #x5774)	; &C1-5774; [55-84]
-      )
-     ((total-strokes	   . 9)
-      (=ucs@unicode	  . #x834A)	; &GT-40077;
-      (=jis-x0208@1983	  . #x3755)	; &GT-40077; [23-53]
-      (=ks-x1001	  . #x7B2A)	; &I-K0-7B2A; [91-10]
-      (=jis-x0208@1990	  . #x3755)	; &I-J90-3755; [23-53]
-      (=jis-x0213-1	  . #x3755)	; &I-JX1-3755; [23-53]
-      (=gt		  . 40077)	; &I-GT-40077;
-      (=gt-pj-1		  . #x3755)	; &I-GT-40077; [23-53]
+    (total-strokes	 . 9)
+    (=ucs@unicode	. #x834A)	; &GT-40077;
+    (=jis-x0208@1983	. #x3755)	; &GT-40077; [23-53]
+    (=ks-x1001		. #x7B2A)	; &I-K0-7B2A; [91-10]
+    (=jis-x0208@1990	. #x3755)	; &I-J90-3755; [23-53]
+    (=jis-x0213-1	. #x3755)	; &I-JX1-3755; [23-53]
+    (=gt		. 40077)	; &I-GT-40077;
+    (=gt-pj-1		. #x3755)	; &I-GT-40077; [23-53]
+    (<-same@JP/jis
+     ((=ucs@unicode	  . #x8346)	; &J78-3755;
+      (=jis-x0208@1978	  . #x3755)	; &J78-3755; [23-53]
+      (=gb2312		  . #x3E23)	; &I-G0-3E23; [30-03]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x834A)	; 荊
       ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=cns11643-1	. #x5774)	; &C1-5774; [55-84]
+    (=jef-china3	. #x61EA)	; &I-JC3-61EA;
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (=ucs		. #x44BB)	; 䒻
-    (->subsumptive
-     ((total-strokes	   . 10)
-      (=cns11643-5	  . #x3021)	; &M-30941; [16-01]
-      (=daikanwa	  . 30941)	; &I-M-30941;
-      )
-     ((=ucs@unicode	  . #x44BB)	; &UU+44BB;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x44BB)	; 䒻
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=cns11643-5	. #x3021)	; &M-30941; [16-01]
+    (=daikanwa		. 30941)	; &I-M-30941;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x44BB)	; 䒻
       ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 6)
+    (=ucs@unicode	. #x44BB)	; &UU+44BB;
     ))
 (define-char
-  '((=>ucs		. #x8347)	; 荇
+  '((ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 6)
+    (=ucs		. #x8347)	; 荇
+    (=big5		. #xD3AE)	; &I-B-D3AE;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8347)	; 荇
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
     (=cns11643-2	. #x3250)	; &M-30942; [18-48]
     (=daikanwa		. 30942)	; &I-M-30942;
+    (=jef-china3	. #x61EB)	; &I-JC3-61EB;
     ))
 (define-char
-  '((morohashi-daikanwa	30942 0 1)
+  '((<-denotational
+     ((=ucs		  . #x8347)	; 荇
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=ucs		. #x8347)	; 荇
-    (=gb2312		. #x5C74)	; &I-G0-5C74; [60-84]
+    (=ucs@unicode	. #x8347)	; &JX1-7A72;
+    (=gb2312		. #x5C74)	; &JX1-7A72; [60-84]
     (=ks-x1001		. #x7A3B)	; &I-K0-7A3B; [90-27]
     (=jis-x0212		. #x5776)	; &I-JSP-5776; [55-86]
     (=jis-x0213-1	. #x7A72)	; &I-JX1-7A72; [90-82]
-    (=big5		. #xD3AE)	; &I-B-D3AE;
     ))
 (define-char
-  '((=>ucs		. #x8348)	; 荈
-    (ideographic-radical . 140)	; ⾋
+  '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
-    (total-strokes	 . 10)
-    (=daikanwa		. 30943)	; &M-30943;
-    (=jef-china3	. #x9FE4)	; &I-JC3-9FE4;
+    (=ucs		. #x8348)	; 荈
+    (=big5		. #xD3B6)	; &I-B-D3B6;
     ))
 (define-char
-  '((=>ucs		. #x8348)	; 荈
-    (morohashi-daikanwa	30943 0 0)
+  '((<-denotational
+     ((=ucs		  . #x8348)	; 荈
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (total-strokes	 . 10)
-    (=cns11643-2	. #x3258)	; &C2-3258; [18-56]
+    (->subsumptive
+     ((=daikanwa	  . 30943)	; &M-30943;
+      (=jef-china3	  . #x9FE4)	; &I-JC3-9FE4;
+      )
+     ((=cns11643-2	  . #x3258)	; &C2-3258; [18-56]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	30943 0 1)
+  '((<-denotational
+     ((=ucs		  . #x8348)	; 荈
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
-    (=ucs		. #x8348)	; 荈
-    (=big5		. #xD3B6)	; &I-B-D3B6;
+    (=ucs@unicode	. #x8348)	; &UU+8348;
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (=ucs		. #x44BC)	; 䒼
-    (->subsumptive
-     ((total-strokes	   . 10)
-      (=cns11643-4	  . #x2F59)	; &M-30944; [15-57]
-      (=daikanwa	  . 30944)	; &I-M-30944;
-      )
-     ((total-strokes	   . 9)
-      (=ucs@unicode	  . #x44BC)	; &UU+44BC;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x44BC)	; 䒼
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 6)
+    (total-strokes	 . 10)
+    (=cns11643-4	. #x2F59)	; &M-30944; [15-57]
+    (=daikanwa		. 30944)	; &I-M-30944;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x44BC)	; 䒼
       ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 6)
+    (total-strokes	 . 9)
+    (=ucs@unicode	. #x44BC)	; &UU+44BC;
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 6)
     (=ucs		. #x8349)	; 草
+    (=big5		. #xAFF3)	; &I-B-AFF3;
     ))
 (define-char
   '((<-denotational
@@ -7430,7 +7565,6 @@
     (=gb2312		. #x325D)	; &I-G0-325D; [18-61]
     (=ks-x1001		. #x752E)	; &I-K0-752E; [85-14]
     (=jis-x0213-1	. #x4170)	; &I-JX1-4170; [33-80]
-    (=big5		. #xAFF3)	; &I-B-AFF3;
     (=gt		. 40157)	; &I-GT-40157;
     (=gt-k		. 05128)	; &I-GT-K05128;
     (=gt-pj-1		. #x4170)	; &I-GT-40157; [33-80]
@@ -14269,34 +14403,45 @@
     (=hanziku-8		. #xF4A1)	; &I-HZK08-F4A1;
     ))
 (define-char
+  '((ideographic-radical . 140)	; ⾋
+    (=>jis-x0208@1997	. #x4D69)	; &J97-4D69; [45-73]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4D69)	; &J97-4D69; [45-73]
+     ((=>jis-x0208@1997	  . #x4D69)	; &J97-4D69; [45-73]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 8)
     (=ucs		. #x840A)	; 萊
-    (->subsumptive
-     ((total-strokes	   . 12)
-      (=cns11643-1	  . #x6162)	; &M-31262; [65-66]
-      (=daikanwa	  . 31262)	; &I-M-31262;
-      )
-     ((total-strokes	   . 11)
-      (=ucs@unicode	  . #x840A)	; &JX1-7B26;
-      (=jis-x0208@1978	  . #x4D69)	; &JX1-7B26; [45-73]
-      (=ks-x1001	  . #x5551)	; &I-K0-5551; [53-49]
-      (=jis-x0212	  . #x5847)	; &I-JSP-5847; [56-39]
-      (=jis-x0213-1	  . #x7B26)	; &I-JX1-7B26; [91-06]
-      (=gb12345		  . #x4033)	; &JX1-7B26; [32-19]
-      (=big5		  . #xB5DC)	; &I-B-B5DC;
+    (=big5		. #xB5DC)	; &I-B-B5DC;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x840A)	; 萊
       ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 8)
+    (total-strokes	 . 12)
+    (=cns11643-1	. #x6162)	; &M-31262; [65-66]
+    (=daikanwa		. 31262)	; &I-M-31262;
     ))
 (define-char
-  '((ideographic-radical . 140)	; ⾋
-    (=jis-x0208@1997	. #x4D69)	; &J97-4D69; [45-73]
+  '((<-denotational
+     ((=ucs		  . #x840A)	; 萊
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 8)
+    (total-strokes	 . 11)
+    (=ucs@unicode	. #x840A)	; &JX1-7B26;
+    (=jis-x0208@1978	. #x4D69)	; &JX1-7B26; [45-73]
+    (=ks-x1001		. #x5551)	; &I-K0-5551; [53-49]
+    (=jis-x0212		. #x5847)	; &I-JSP-5847; [56-39]
+    (=jis-x0213-1	. #x7B26)	; &I-JX1-7B26; [91-06]
+    (=gb12345		. #x4033)	; &JX1-7B26; [32-19]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4D69)	; &J97-4D69; [45-73]
+     ((=>jis-x0208@1997	  . #x4D69)	; &J97-4D69; [45-73]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 7)
@@ -14310,6 +14455,7 @@
     (=gt		. 40545)	; &I-GT-40545;
     (=gt-pj-1		. #x4D69)	; &I-GT-40545; [45-73]
     (=hanziku-8		. #xF073)	; &I-HZK08-F073;
+    (=jef-china3	. #x63A2)	; &I-JC3-63A2;
     (<-simplified@JP/jis
      ((=ucs@unicode	  . #x840A)	; &JX1-7B26;
       (=jis-x0208@1978	  . #x4D69)	; &JX1-7B26; [45-73]
@@ -17768,7 +17914,8 @@
 (define-char
   '((ideographic-radical . 140)	; ⾋
     (=ucs		. #x845B)	; 葛
-    (=jis-x0208@1997	. #x336B)	; 葛 [19-75]
+    (=>jis-x0208	. #x336B)	; 葛 [19-75]
+    (=>jis-x0213-1	. #x336B)	; 葛 [19-75]
     ))
 (define-char
   '((<-denotational
@@ -17776,21 +17923,34 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 9)
-    (=big5		. #xB8AF)	; &B-B8AF;
+    (=>>jis-x0213-1@2004 . #x336B)	; &G-JX3-336B; [19-75]
+    (=big5		. #xB8AF)	; &G-JX3-336B;
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2004 . #x336B)	; &G-JX3-336B; [19-75]
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
     (->subsumptive
-     ((total-strokes	   . 13)
-      (=daikanwa	  . 31420)	; &M-31420;
-      )
-     ((total-strokes	   . 13)
-      (=cns11643-1	  . #x6636)	; &C1-6636; [70-22]
+     ((=daikanwa	  . 31420)	; &M-31420;
       )
-     ((total-strokes	   . 12)
-      (=ucs@unicode	  . #x845B)	; &JX3-336B;
-      (=jis-x0208@1978	  . #x336B)	; &JX3-336B; [19-75]
-      (=gb2312		  . #x3870)	; &I-G0-3870; [24-80]
-      (=ks-x1001	  . #x4A67)	; &I-K0-4A67; [42-71]
-      (=jis-x0213-1@2004  . #x336B)	; &I-JX3-336B; [19-75]
+     ((=cns11643-1	  . #x6636)	; &C1-6636; [70-22]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2004 . #x336B)	; &G-JX3-336B; [19-75]
       ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (=ucs@unicode	. #x845B)	; &JX3-336B;
+    (=jis-x0208@1978	. #x336B)	; &JX3-336B; [19-75]
+    (=gb2312		. #x3870)	; &I-G0-3870; [24-80]
+    (=ks-x1001		. #x4A67)	; &I-K0-4A67; [42-71]
+    (=jis-x0213-1@2004	. #x336B)	; &I-JX3-336B; [19-75]
     ))
 (define-char
   '((<-denotational
@@ -24546,6 +24706,8 @@
 (define-char
   '((ideographic-radical . 140)	; ⾋
     (=ucs		. #x84EC)	; 蓬
+    (=>jis-x0208	. #x4B29)	; 蓬 [43-09]
+    (=>jis-x0213-1	. #x4B29)	; 蓬 [43-09]
     (=big5		. #xBDB4)	; &I-B-BDB4;
     ))
 (define-char
@@ -24553,16 +24715,29 @@
      ((=ucs		  . #x84EC)	; 蓬
       ))
     (ideographic-radical . 140)	; ⾋
-    (->subsumptive
-     ((ideographic-strokes . 11)
-      (total-strokes	   . 15)
-      (=daikanwa	  . 31720)	; &M-31720;
-      )
-     ((ideographic-strokes . 11)
-      (total-strokes	   . 14)
-      (=jis-x0208@1978	  . #x4B29)	; &J78-4B29; [43-09]
-      (=ks-x1001	  . #x5C6F)	; &I-K0-5C6F; [60-79]
+    (=>>jis-x0208@1978	. #x4B29)	; &G-JX3-4B29; [43-09]
+    (=>>jis-x0213-1@2004 . #x4B29)	; &G-JX3-4B29; [43-09]
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2004 . #x4B29)	; &G-JX3-4B29; [43-09]
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=daikanwa		. 31720)	; &M-31720;
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2004 . #x4B29)	; &G-JX3-4B29; [43-09]
       ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=ucs@jis/2004	. #x84EC)	; &JX3-4B29;
+    (=jis-x0208@1978	. #x4B29)	; &JX3-4B29; [43-09]
+    (=ks-x1001		. #x5C6F)	; &I-K0-5C6F; [60-79]
+    (=jis-x0213-1@2004	. #x4B29)	; &I-JX3-4B29; [43-09]
     ))
 (define-char
   '((<-denotational
@@ -24584,13 +24759,16 @@
     (=gb2312		. #x456E)	; &GT-41746; [37-78]
     (=jis-x0208@1983	. #x4B29)	; &I-J83-4B29; [43-09]
     (=jis-x0208@1990	. #x4B29)	; &I-J90-4B29; [43-09]
-    (=jis-x0213-1	. #x4B29)	; &I-JX1-4B29; [43-09]
+    (=jis-x0213-1@2000	. #x4B29)	; &I-JX1-4B29; [43-09]
     (=gt		. 41746)	; &I-GT-41746;
     (=gt-k		. 10268)	; &I-GT-K10268;
     (=gt-pj-1		. #x4B29)	; &I-GT-41746; [43-09]
-    (<-simplified@JP/jis
-     ((=jis-x0208@1978	  . #x4B29)	; &J78-4B29; [43-09]
+    (=jef-china3	. #x63A4)	; &I-JC3-63A4;
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x84EC)	; &JX3-4B29;
+      (=jis-x0208@1978	  . #x4B29)	; &JX3-4B29; [43-09]
       (=ks-x1001	  . #x5C6F)	; &I-K0-5C6F; [60-79]
+      (=jis-x0213-1@2004  . #x4B29)	; &I-JX3-4B29; [43-09]
       ))
     (<-simplified@JP/misc
      ((=daikanwa	  . 31720)	; &M-31720;
@@ -25134,6 +25312,12 @@
     (=hanziku-9		. #xA7AF)	; &HZK09-A7AF;
     ))
 (define-char
+  '((ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 11)
+    (=ucs@big5		. #x853B)	; &B-E74D;
+    (=big5		. #xE74D)	; &B-E74D;
+    ))
+(define-char
   '((<-denotational
      ((=ucs@big5	  . #x853B)	; &B-E74D;
       (=big5		  . #xE74D)	; &B-E74D;
@@ -25141,6 +25325,7 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 11)
     (=ucs		. #x8532)	; 蔲
+    (=>jis-x0213-1	. #x7B34)	; 蔲 [91-20]
     ))
 (define-char
   '((<-denotational
@@ -25158,10 +25343,21 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 140)	; ⾋
+  '((<-denotational
+     ((=ucs		  . #x8532)	; 蔲
+      ))
+    (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 11)
-    (=ucs@big5		. #x853B)	; &B-E74D;
-    (=big5		. #xE74D)	; &B-E74D;
+    (total-strokes	 . 14)
+    (->subsumptive
+     ((=ucs@jis		  . #x8532)	; &JX1-7B34;
+      (=jis-x0212	  . #x5929)	; &JX1-7B34; [57-09]
+      (=jis-x0213-1	  . #x7B34)	; &I-JX1-7B34; [91-20]
+      )
+     ((mojikyo		  . 056290)	; &MCS-6000DBE2;
+      )
+     ((=ucs@unicode	  . #x8532)	; &UU+8532;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -25193,23 +25389,6 @@
     (=cns11643-2	. #x5336)	; &C2-5336; [51-22]
     ))
 (define-char
-  '((<-denotational
-     ((=ucs		  . #x8532)	; 蔲
-      ))
-    (ideographic-radical . 140)	; ⾋
-    (ideographic-strokes . 11)
-    (total-strokes	 . 14)
-    (->subsumptive
-     ((=ucs@jis		  . #x8532)	; &JX1-7B34;
-      (=jis-x0212	  . #x5929)	; &JX1-7B34; [57-09]
-      (=jis-x0213-1	  . #x7B34)	; &I-JX1-7B34; [91-20]
-      )
-     ((mojikyo		  . 056290)	; &MCS-6000DBE2;
-      )
-     ((=ucs@unicode	  . #x8532)	; &UU+8532;
-      ))
-    ))
-(define-char
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 11)
     (=ucs		. #x84FA)	; 蓺
@@ -26248,22 +26427,57 @@
   '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 11)
     (=ucs		. #x8511)	; 蔑
+    (=>jis-x0208	. #x4A4E)	; 蔑 [42-46]
+    (=>jis-x0213-1	. #x4A4E)	; 蔑 [42-46]
     (=big5		. #xBDB0)	; &I-B-BDB0;
-    (->subsumptive
-     ((total-strokes	   . 15)
-      (=cns11643-1	  . #x6E59)	; &M-31781; [78-57]
-      (=daikanwa	  . 31781)	; &I-M-31781;
-      )
-     ((total-strokes	   . 14)
-      (=ucs@unicode	  . #x8511)	; &GT-42131;
-      (=jis-x0208	  . #x4A4E)	; &GT-42131; [42-46]
-      (=gb2312		  . #x436F)	; &I-G0-436F; [35-79]
-      (=ks-x1001	  . #x5921)	; &I-K0-5921; [57-01]
-      (=jis-x0213-1	  . #x4A4E)	; &I-JX1-4A4E; [42-46]
-      (=gt		  . 42131)	; &I-GT-42131;
-      (=gt-k		  . 11172)	; &I-GT-K11172;
-      (=gt-pj-1		  . #x4A4E)	; &I-GT-42131; [42-46]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8511)	; 蔑
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 11)
+    (=>>jis-x0208	. #x4A4E)	; &G-J78-4A4E; [42-46]
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0208	  . #x4A4E)	; &G-J78-4A4E; [42-46]
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 11)
+    (total-strokes	 . 15)
+    (=cns11643-1	. #x6E59)	; &M-31781; [78-57]
+    (=daikanwa		. 31781)	; &I-M-31781;
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0208	  . #x4A4E)	; &G-J78-4A4E; [42-46]
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=ucs@unicode	. #x8511)	; &GT-42131;
+    (=jis-x0208		. #x4A4E)	; &GT-42131; [42-46]
+    (=gb2312		. #x436F)	; &I-G0-436F; [35-79]
+    (=ks-x1001		. #x5921)	; &I-K0-5921; [57-01]
+    (=jis-x0213-1@2000	. #x4A4E)	; &I-JX1-4A4E; [42-46]
+    (=gt		. 42131)	; &I-GT-42131;
+    (=gt-k		. 11172)	; &I-GT-K11172;
+    (=gt-pj-1		. #x4A4E)	; &I-GT-42131; [42-46]
+    (<-simplified@JP/extra/design
+     ((=ucs@jis/2004	  . #x8511)	; &JX3-4A4E;
+      (=jis-x0213-1@2004  . #x4A4E)	; &JX3-4A4E; [42-46]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8511)	; 蔑
       ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=ucs@jis/2004	. #x8511)	; &JX3-4A4E;
+    (=jis-x0213-1@2004	. #x4A4E)	; &JX3-4A4E; [42-46]
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -27128,8 +27342,12 @@
     (=jis-x0212		. #x5935)	; &JSP-5935; [57-21]
     ))
 (define-char
+  '((ideographic-radical . 140)	; ⾋
+    (=>jis-x0208@1997	. #x3E55)	; &J97-3E55; [30-53]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3E55)	; &J97-3E55; [30-53]
+     ((=>jis-x0208@1997	  . #x3E55)	; &J97-3E55; [30-53]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 11)
@@ -27150,10 +27368,6 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 140)	; ⾋
-    (=jis-x0208@1997	. #x3E55)	; &J97-3E55; [30-53]
-    ))
-(define-char
   '((<-denotational
      ((=ucs		  . #x8523)	; 蔣
       ))
@@ -27169,7 +27383,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3E55)	; &J97-3E55; [30-53]
+     ((=>jis-x0208@1997	  . #x3E55)	; &J97-3E55; [30-53]
       ))
     (ideographic-radical . 140)	; ⾋
     (=ucs		. #x848B)	; 蒋
@@ -27187,6 +27401,7 @@
     (=jis-x0213-1	. #x3E55)	; &I-JX1-3E55; [30-53]
     (=gt		. 41587)	; &I-GT-41587;
     (=gt-pj-1		. #x3E55)	; &I-GT-41587; [30-53]
+    (=jef-china3	. #x61B9)	; &I-JC3-61B9;
     (<-simplified@JP/jis
      ((=ucs@unicode	  . #x8523)	; &JX1-7B36;
       (=jis-x0208@1978	  . #x3E55)	; &JX1-7B36; [30-53]
@@ -28840,7 +29055,7 @@
   '((ideographic-radical . 140)	; ⾋
     (=ucs		. #x853D)	; 蔽
     (=big5		. #xBDAA)	; &I-B-BDAA;
-    (mojikyo		. 058170)	; &MCS-6000E33A;
+    (=jef-china3	. #x62FD)	; &I-JC3-62FD;
     ))
 (define-char
   '((<-denotational
@@ -28848,14 +29063,30 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 12)
-    (->subsumptive
-     ((total-strokes	   . 16)
-      (=daikanwa	  . 31888)	; &M-31888;
-      )
-     ((total-strokes	   . 15)
-      (=jis-x0208@1978	  . #x4A43)	; &J78-4A43; [42-35]
-      (=ks-x1001	  . #x784C)	; &I-K0-784C; [88-44]
+    (=>>jis-x0208@1978	. #x4A43)	; &G-JX3-4A43; [42-35]
+    (=>>jis-x0213-1@2004 . #x4A43)	; &G-JX3-4A43; [42-35]
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2004 . #x4A43)	; &G-JX3-4A43; [42-35]
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (=daikanwa		. 31888)	; &M-31888;
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2004 . #x4A43)	; &G-JX3-4A43; [42-35]
       ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs@jis/2004	. #x853D)	; &JX3-4A43;
+    (=jis-x0208@1978	. #x4A43)	; &JX3-4A43; [42-35]
+    (=ks-x1001		. #x784C)	; &I-K0-784C; [88-44]
+    (=jis-x0213-1@2004	. #x4A43)	; &I-JX3-4A43; [42-35]
+    (mojikyo		. 058170)	; &MCS-6000E33A;
     ))
 (define-char
   '((<-denotational
@@ -28863,22 +29094,48 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 12)
+    (=>>jis-x0213-1@2000 . #x4A43)	; &G-JX1-4A43; [42-35]
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2000 . #x4A43)	; &G-JX1-4A43; [42-35]
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (=cns11643-1	. #x6E53)	; &C1-6E53; [78-51]
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2000 . #x4A43)	; &G-JX1-4A43; [42-35]
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
     (->subsumptive
-     ((total-strokes	   . 16)
-      (=cns11643-1	  . #x6E53)	; &C1-6E53; [78-51]
-      )
-     ((total-strokes	   . 15)
-      (=ucs@unicode	  . #x853D)	; &GT-42512;
+     ((=ucs@unicode	  . #x853D)	; &GT-42512;
       (=gb2312		  . #x314E)	; &GT-42512; [17-46]
       (=jis-x0208@1983	  . #x4A43)	; &I-J83-4A43; [42-35]
       (=gt		  . 42512)	; &I-GT-42512;
       (=gt-pj-1		  . #x4A43)	; &I-GT-42512; [42-35]
       (mojikyo		  . 054347)	; &MCS-6000D44B;
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x853D)	; &JX3-4A43;
+	(=jis-x0208@1978    . #x4A43)	; &JX3-4A43; [42-35]
+	(=ks-x1001	    . #x784C)	; &I-K0-784C; [88-44]
+	(=jis-x0213-1@2004  . #x4A43)	; &I-JX3-4A43; [42-35]
+	))
       )
-     ((total-strokes	   . 15)
-      (=ucs@jis		  . #x853D)	; &J90-4A43;
+     ((=ucs@jis/1990	  . #x853D)	; &J90-4A43;
+      (=ucs@jis/2000	  . #x853D)	; &J90-4A43;
       (=jis-x0208@1990	  . #x4A43)	; &J90-4A43; [42-35]
-      (=jis-x0213-1	  . #x4A43)	; &I-JX1-4A43; [42-35]
+      (=jis-x0213-1@2000  . #x4A43)	; &I-JX1-4A43; [42-35]
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x853D)	; &JX3-4A43;
+	(=jis-x0208@1978    . #x4A43)	; &JX3-4A43; [42-35]
+	(=ks-x1001	    . #x784C)	; &I-K0-784C; [88-44]
+	(=jis-x0213-1@2004  . #x4A43)	; &I-JX3-4A43; [42-35]
+	))
       ))
     ))
 (define-char
@@ -28999,6 +29256,11 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 140)	; ⾋
+    (=ucs@big5		. #x848D)	; &B-DFAF;
+    (=big5		. #xDFAF)	; &B-DFAF;
+    ))
+(define-char
   '((<-denotational
      ((=ucs@big5	  . #x848D)	; &B-DFAF;
       (=big5		  . #xDFAF)	; &B-DFAF;
@@ -29006,26 +29268,44 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 12)
     (=ucs		. #x853F)	; 蔿
-    (->subsumptive
-     ((total-strokes	   . 16)
-      (=daikanwa	  . 31895)	; &M-31895;
-      )
-     ((total-strokes	   . 15)
-      (=ucs@jis		  . #x853F)	; &JSP-5940;
-      (=ks-x1001	  . #x6A59)	; &JSP-5940; [74-57]
-      (=jis-x0212	  . #x5940)	; &I-JSP-5940; [57-32]
-      )
-     ((total-strokes	   . 16)
-      (=cns11643-3	  . #x525A)	; &C3-525A; [50-58]
-      )
-     ((total-strokes	   . 15)
-      (=ucs@unicode	  . #x853F)	; &UU+853F;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x853F)	; 蔿
       ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (=daikanwa		. 31895)	; &M-31895;
     ))
 (define-char
-  '((ideographic-radical . 140)	; ⾋
-    (=ucs@big5		. #x848D)	; &B-DFAF;
-    (=big5		. #xDFAF)	; &B-DFAF;
+  '((<-denotational
+     ((=ucs		  . #x853F)	; 蔿
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs@unicode	. #x853F)	; &UU+853F;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x853F)	; 蔿
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 12)
+    (total-strokes	 . 15)
+    (=ucs@jis		. #x853F)	; &JSP-5940;
+    (=ks-x1001		. #x6A59)	; &JSP-5940; [74-57]
+    (=jis-x0212		. #x5940)	; &I-JSP-5940; [57-32]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x853F)	; 蔿
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 12)
+    (total-strokes	 . 16)
+    (=cns11643-3	. #x525A)	; &C3-525A; [50-58]
     ))
 (define-char
   '((<-denotational
@@ -29035,13 +29315,24 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 9)
     (=ucs		. #x848D)	; 蒍
-    (->subsumptive
-     ((total-strokes	   . 13)
-      (=cns11643-2	  . #x4654)	; &C2-4654; [38-52]
-      )
-     ((total-strokes	   . 12)
-      (=ucs@unicode	  . #x848D)	; &UU+848D;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x848D)	; 蒍
       ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (=ucs@unicode	. #x848D)	; &UU+848D;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x848D)	; 蒍
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 9)
+    (total-strokes	 . 13)
+    (=cns11643-2	. #x4654)	; &C2-4654; [38-52]
     ))
 (define-char
   '((=>ucs		. #x26E8A)	; 𦺊
@@ -35205,7 +35496,10 @@
     (=shinjigen@1ed	.  7008)	; &GT-42657;
     (=shinjigen@rev	.  7007)	; &GT-42657;
     (<-simplified@JP/Jouyou
-     ((=ucs		  . #x85B0)	; 薰
+     ((=ucs@unicode	  . #x85B0)	; &JX1-7B40;
+      (=gb2312		  . #x5E39)	; &JX1-7B40; [62-25]
+      (=ks-x1001	  . #x7D39)	; &I-K0-7D39; [93-25]
+      (=jis-x0213-1	  . #x7B40)	; &I-JX1-7B40; [91-32]
       ))
     ))
 (define-char
@@ -35722,7 +36016,17 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 14)
+    (=>>jis-x0208@1978	. #x3B27)	; &G-JX3-3B27; [27-07]
+    (=>>jis-x0213-1@2004 . #x3B27)	; &G-JX3-3B27; [27-07]
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2004 . #x3B27)	; &G-JX3-3B27; [27-07]
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 14)
     (total-strokes	 . 18)
+    (=>>gt		. 43266)	; &G-GT-43266;
     (->subsumptive
      ((morohashi-daikanwa	32189 1)
       (=gt		  . 43266)	; &GT-43266;
@@ -35735,13 +36039,15 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x85A9)	; 薩
+     ((=>>jis-x0213-1@2004 . #x3B27)	; &G-JX3-3B27; [27-07]
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=jis-x0208@1978	. #x3B27)	; &J78-3B27; [27-07]
+    (=ucs@jis/2004	. #x85A9)	; &JX3-3B27;
+    (=jis-x0208@1978	. #x3B27)	; &JX3-3B27; [27-07]
     (=ks-x1001		. #x5F31)	; &I-K0-5F31; [63-17]
+    (=jis-x0213-1@2004	. #x3B27)	; &I-JX3-3B27; [27-07]
     (mojikyo		. 055114)	; &MCS-6000D74A;
     ))
 (define-char
@@ -35751,15 +36057,26 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
+    (=>>gt		. 43022)	; &G-GT-43022;
     (->subsumptive
-     ((=ucs@jis		  . #x85A9)	; &GT-43022;
+     ((=ucs@jis/1990	  . #x85A9)	; &GT-43022;
+      (=ucs@jis/2000	  . #x85A9)	; &GT-43022;
       (=jis-x0208@1983	  . #x3B27)	; &GT-43022; [27-07]
       (=jis-x0208@1990	  . #x3B27)	; &I-J90-3B27; [27-07]
-      (=jis-x0213-1	  . #x3B27)	; &I-JX1-3B27; [27-07]
+      (=jis-x0213-1@2000  . #x3B27)	; &I-JX1-3B27; [27-07]
       (=gt		  . 43022)	; &I-GT-43022;
       (=gt-pj-1		  . #x3B27)	; &I-GT-43022; [27-07]
       (=jef-china3	  . #x61B6)	; &I-JC3-61B6;
       (mojikyo		  . 054136)	; &MCS-6000D378;
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x85A9)	; &JX3-3B27;
+	(=jis-x0208@1978    . #x3B27)	; &JX3-3B27; [27-07]
+	(=ks-x1001	    . #x5F31)	; &I-K0-5F31; [63-17]
+	(=jis-x0213-1@2004  . #x3B27)	; &I-JX3-3B27; [27-07]
+	))
+      (<-simplified@JP/misc
+       ((=gt		    . 43266)	; &GT-43266;
+	))
       )
      ((=ucs@unicode	  . #x85A9)	; &UU+85A9;
       (=gb12345		  . #x4878)	; &UU+85A9; [40-88]
@@ -35784,6 +36101,8 @@
 (define-char
   '((ideographic-radical . 140)	; ⾋
     (=ucs		. #x85AF)	; 薯
+    (=>jis-x0208	. #x3D72)	; 薯 [29-82]
+    (=>jis-x0213-1	. #x3D72)	; 薯 [29-82]
     (=big5		. #xC1A6)	; &I-B-C1A6;
     ))
 (define-char
@@ -35792,14 +36111,29 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 14)
-    (->subsumptive
-     ((total-strokes	   . 18)
-      (=daikanwa	  . 32191)	; &M-32191;
-      )
-     ((total-strokes	   . 17)
-      (=jis-x0208@1978	  . #x3D72)	; &J78-3D72; [29-82]
-      (=ks-x1001	  . #x6023)	; &I-K0-6023; [64-03]
+    (=>>jis-x0208@1978	. #x3D72)	; &G-JX3-3D72; [29-82]
+    (=>>jis-x0213-1@2004 . #x3D72)	; &G-JX3-3D72; [29-82]
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2004 . #x3D72)	; &G-JX3-3D72; [29-82]
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 14)
+    (total-strokes	 . 18)
+    (=daikanwa		. 32191)	; &M-32191;
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2004 . #x3D72)	; &G-JX3-3D72; [29-82]
       ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 14)
+    (total-strokes	 . 17)
+    (=ucs@jis/2004	. #x85AF)	; &JX3-3D72;
+    (=jis-x0208@1978	. #x3D72)	; &JX3-3D72; [29-82]
+    (=ks-x1001		. #x6023)	; &I-K0-6023; [64-03]
+    (=jis-x0213-1@2004	. #x3D72)	; &I-JX3-3D72; [29-82]
     ))
 (define-char
   '((<-denotational
@@ -35807,68 +36141,95 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 13)
-    (->subsumptive
-     ((total-strokes	   . 17)
-      (=cns11643-1	  . #x7530)	; &C1-7530; [85-16]
-      )
-     ((total-strokes	   . 16)
-      (=ucs@unicode	  . #x85AF)	; &GT-42730;
-      (=gb2312		  . #x4A6D)	; &GT-42730; [42-77]
-      (=jis-x0208@1983	  . #x3D72)	; &I-J83-3D72; [29-82]
-      (=jis-x0208@1990	  . #x3D72)	; &I-J90-3D72; [29-82]
-      (=jis-x0213-1	  . #x3D72)	; &I-JX1-3D72; [29-82]
-      (=gt		  . 42730)	; &I-GT-42730;
-      (=gt-pj-1		  . #x3D72)	; &I-GT-42730; [29-82]
-      (<-simplified@JP/jis
-       ((=jis-x0208@1978    . #x3D72)	; &J78-3D72; [29-82]
-	(=ks-x1001	    . #x6023)	; &I-K0-6023; [64-03]
-	))
-      (<-simplified@JP/misc
-       ((=daikanwa	    . 32191)	; &M-32191;
-	))
+    (=>>jis-x0213-1@2000 . #x3D72)	; &G-JX1-3D72; [29-82]
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2000 . #x3D72)	; &G-JX1-3D72; [29-82]
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 13)
+    (total-strokes	 . 16)
+    (=ucs@unicode	. #x85AF)	; &GT-42730;
+    (=gb2312		. #x4A6D)	; &GT-42730; [42-77]
+    (=jis-x0208@1983	. #x3D72)	; &I-J83-3D72; [29-82]
+    (=jis-x0208@1990	. #x3D72)	; &I-J90-3D72; [29-82]
+    (=jis-x0213-1@2000	. #x3D72)	; &I-JX1-3D72; [29-82]
+    (=gt		. 42730)	; &I-GT-42730;
+    (=gt-pj-1		. #x3D72)	; &I-GT-42730; [29-82]
+    (=jef-china3	. #x61B7)	; &I-JC3-61B7;
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x85AF)	; &JX3-3D72;
+      (=jis-x0208@1978	  . #x3D72)	; &JX3-3D72; [29-82]
+      (=ks-x1001	  . #x6023)	; &I-K0-6023; [64-03]
+      (=jis-x0213-1@2004  . #x3D72)	; &I-JX3-3D72; [29-82]
+      ))
+    (<-simplified@JP/misc
+     ((=daikanwa	  . 32191)	; &M-32191;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2000 . #x3D72)	; &G-JX1-3D72; [29-82]
       ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 13)
+    (total-strokes	 . 17)
+    (=cns11643-1	. #x7530)	; &C1-7530; [85-16]
+    ))
+(define-char
+  '((ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 14)
+    (=ucs		. #x85B0)	; 薰
+    (=big5		. #xC2C8)	; &I-B-C2C8;
     ))
 (define-char
-  '((=>ucs		. #x85B0)	; 薰
+  '((<-denotational
+     ((=ucs		  . #x85B0)	; 薰
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 14)
     (total-strokes	 . 18)
     (=cns11643-1	. #x7734)	; &M-32192; [87-20]
     (=daikanwa		. 32192)	; &I-M-32192;
+    (=jef-china3	. #x62E5)	; &I-JC3-62E5;
     ))
 (define-char
-  '((morohashi-daikanwa	32192 0 1)
+  '((<-denotational
+     ((=ucs		  . #x85B0)	; 薰
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=ucs		. #x85B0)	; 薰
-    (=gb2312		. #x5E39)	; &I-G0-5E39; [62-25]
+    (=ucs@unicode	. #x85B0)	; &JX1-7B40;
+    (=gb2312		. #x5E39)	; &JX1-7B40; [62-25]
     (=ks-x1001		. #x7D39)	; &I-K0-7D39; [93-25]
     (=jis-x0213-1	. #x7B40)	; &I-JX1-7B40; [91-32]
-    (=big5		. #xC2C8)	; &I-B-C2C8;
     ))
 (define-char
-  '((=>ucs		. #x85B1)	; 薱
-    (ideographic-radical . 140)	; ⾋
+  '((ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 14)
-    (total-strokes	 . 18)
-    (=cns11643-2	. #x627D)	; &M-32193; [66-93]
-    (=daikanwa		. 32193)	; &I-M-32193;
+    (=ucs		. #x85B1)	; 薱
+    (=big5		. #xF0B3)	; &I-B-F0B3;
     ))
 (define-char
-  '((morohashi-daikanwa	32193 0 1)
+  '((<-denotational
+     ((=ucs		  . #x85B1)	; 薱
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 14)
-    (total-strokes	 . 17)
-    (=ucs		. #x85B1)	; 薱
+    (total-strokes	 . 18)
+    (=cns11643-2	. #x627D)	; &M-32193; [66-93]
+    (=daikanwa		. 32193)	; &I-M-32193;
     ))
 (define-char
-  '((=>ucs		. #x85B1)	; 薱
-    (morohashi-daikanwa	32193 0 2)
+  '((<-denotational
+     ((=ucs		  . #x85B1)	; 薱
+      ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 14)
     (total-strokes	 . 17)
-    (=big5		. #xF0B3)	; &B-F0B3;
+    (=ucs@unicode	. #x85B1)	; &UU+85B1;
     ))
 (define-char
   '((=>ucs		. #x85B2)	; 薲
@@ -40378,13 +40739,29 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 16)
-    (->subsumptive
-     ((total-strokes	   . 20)
-      (=daikanwa	  . 32391)	; &M-32391;
-      )
-     ((total-strokes	   . 19)
-      (=ks-x1001	  . #x6E4B)	; &K0-6E4B; [78-43]
+    (=>>jis-x0208@1978	. #x3D73)	; &G-JX3-3D73; [29-83]
+    (=>>jis-x0213-1@2004 . #x3D73)	; &G-JX3-3D73; [29-83]
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2004 . #x3D73)	; &G-JX3-3D73; [29-83]
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=daikanwa		. 32391)	; &M-32391;
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2004 . #x3D73)	; &G-JX3-3D73; [29-83]
       ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (=ucs@jis/2004	. #x85F7)	; &JX3-3D73;
+    (=jis-x0208@1978	. #x3D73)	; &JX3-3D73; [29-83]
+    (=ks-x1001		. #x6E4B)	; &I-K0-6E4B; [78-43]
+    (=jis-x0213-1@2004	. #x3D73)	; &I-JX3-3D73; [29-83]
     ))
 (define-char
   '((<-denotational
@@ -40392,20 +40769,45 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 15)
+    (=>>jis-x0213-1@2000 . #x3D73)	; &G-JX1-3D73; [29-83]
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2000 . #x3D73)	; &G-JX1-3D73; [29-83]
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 15)
+    (total-strokes	 . 19)
+    (=cns11643-1	. #x7870)	; &C1-7870; [88-80]
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0213-1@2000 . #x3D73)	; &G-JX1-3D73; [29-83]
+      ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 15)
+    (total-strokes	 . 18)
+    (=>>gt		. 43288)	; &G-GT-43288;
     (->subsumptive
-     ((total-strokes	   . 19)
-      (=cns11643-1	  . #x7870)	; &C1-7870; [88-80]
-      )
-     ((total-strokes	   . 18)
-      (=ucs@jis		  . #x85F7)	; &GT-43288;
+     ((=ucs@jis/1990	  . #x85F7)	; &GT-43288;
+      (=ucs@jis/2000	  . #x85F7)	; &GT-43288;
       (=jis-x0208@1983	  . #x3D73)	; &GT-43288; [29-83]
       (=jis-x0208@1990	  . #x3D73)	; &I-J90-3D73; [29-83]
-      (=jis-x0213-1	  . #x3D73)	; &I-JX1-3D73; [29-83]
+      (=jis-x0213-1@2000  . #x3D73)	; &I-JX1-3D73; [29-83]
       (=gt		  . 43288)	; &I-GT-43288;
       (=gt-pj-1		  . #x3D73)	; &I-GT-43288; [29-83]
+      (=jef-china3	  . #x61B8)	; &I-JC3-61B8;
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x85F7)	; &JX3-3D73;
+	(=jis-x0208@1978    . #x3D73)	; &JX3-3D73; [29-83]
+	(=ks-x1001	    . #x6E4B)	; &I-K0-6E4B; [78-43]
+	(=jis-x0213-1@2004  . #x3D73)	; &I-JX3-3D73; [29-83]
+	))
+      (<-simplified@JP/misc
+       ((=daikanwa	    . 32391)	; &M-32391;
+	))
       )
-     ((total-strokes	   . 18)
-      (=ucs@unicode	  . #x85F7)	; &UU+85F7;
+     ((=ucs@unicode	  . #x85F7)	; &UU+85F7;
       ))
     ))
 (define-char
@@ -42151,20 +42553,37 @@
       ))
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 16)
-    (->subsumptive
-     ((morohashi-daikanwa	32477 2)
-      (total-strokes	   . 19)
-      (=ucs@jis		  . #x862D)	; &GT-43607;
-      (=jis-x0208	  . #x4D76)	; &GT-43607; [45-86]
-      (=jis-x0213-1	  . #x4D76)	; &I-JX1-4D76; [45-86]
-      (=gt		  . 43607)	; &I-GT-43607;
-      (=gt-pj-1		  . #x4D76)	; &I-GT-43607; [45-86]
-      (mojikyo		  . 050429)	; &MCS-6000C4FD;
-      )
-     ((total-strokes	   . 20)
-      (=gt		  . 43786)	; &GT-43786;
-      (=gt-pj-10	  . #x6F6E)	; &GT-43786; [79-78]
+    (=>>jis-x0208	. #x4D76)	; &G-J78-4D76; [45-86]
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0208	  . #x4D76)	; &G-J78-4D76; [45-86]
+      ))
+    (morohashi-daikanwa	32477 2)
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 16)
+    (total-strokes	 . 19)
+    (=ucs@jis		. #x862D)	; &GT-43607;
+    (=jis-x0208		. #x4D76)	; &GT-43607; [45-86]
+    (=jis-x0213-1	. #x4D76)	; &I-JX1-4D76; [45-86]
+    (=gt		. 43607)	; &I-GT-43607;
+    (=gt-pj-1		. #x4D76)	; &I-GT-43607; [45-86]
+    (mojikyo		. 050429)	; &MCS-6000C4FD;
+    (<-simplified
+     ((=daikanwa	  . 32519)	; &M-32519;
+      ))
+    (<-simplified*sources
+     daikanwa)
+    ))
+(define-char
+  '((<-denotational
+     ((=>>jis-x0208	  . #x4D76)	; &G-J78-4D76; [45-86]
       ))
+    (ideographic-radical . 140)	; ⾋
+    (ideographic-strokes . 16)
+    (total-strokes	 . 20)
+    (=gt		. 43786)	; &GT-43786;
+    (=gt-pj-10		. #x6F6E)	; &GT-43786; [79-78]
     ))
 (define-char
   '((ideographic-radical . 140)	; ⾋
@@ -43384,21 +43803,6 @@
     ))
 (define-char
   '((<-denotational
-     ((=big5		  . #xC4F5)	; &B-C4F5;
-      ))
-    (ideographic-radical . 140)	; ⾋
-    (ideographic-strokes . 17)
-    (total-strokes	 . 21)
-    (->subsumptive
-     ((=daikanwa	  . 32519)	; &M-32519;
-      )
-     ((=cns11643-1	  . #x7B22)	; &GT-43909; [91-02]
-      (=gt		  . 43909)	; &I-GT-43909;
-      (=gt-pj-6		  . #x5C23)	; &I-GT-43909; [60-03]
-      ))
-    ))
-(define-char
-  '((<-denotational
      ((=ucs		  . #x862D)	; 蘭
       ))
     (ideographic-radical . 140)	; ⾋
@@ -43411,7 +43815,16 @@
     (ideographic-radical . 140)	; ⾋
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=jef-china3	. #x62F6)	; &JC3-62F6;
+    (=>>gt		. 43909)	; &G-GT-43909;
+    (->subsumptive
+     ((=daikanwa	  . 32519)	; &M-32519;
+      )
+     ((=cns11643-1	  . #x7B22)	; &GT-43909; [91-02]
+      (=gt		  . 43909)	; &I-GT-43909;
+      (=gt-pj-6		  . #x5C23)	; &I-GT-43909; [60-03]
+      )
+     ((=jef-china3	  . #x62F6)	; &JC3-62F6;
+      ))
     ))
 (define-char
   '((<-denotational
diff --git a/lisp/utf-2000/Ideograph-R141-Tiger.el b/lisp/utf-2000/Ideograph-R141-Tiger.el
index 555947f..f41c7ed 100644
--- a/lisp/utf-2000/Ideograph-R141-Tiger.el
+++ b/lisp/utf-2000/Ideograph-R141-Tiger.el
@@ -334,18 +334,23 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 10)
     (=ucs		. #x8654)	; 虔
+    (=>jis-x0208	. #x694A)	; 虔 [73-42]
+    (=>jis-x0213-1	. #x694A)	; 虔 [73-42]
     (=big5		. #xB040)	; &I-B-B040;
     (->subsumptive
-     ((=ucs@jis		  . #x8654)	; &M-32686;
+     ((=ucs@jis/1990	  . #x8654)	; &M-32686;
+      (=ucs@jis/2000	  . #x8654)	; &M-32686;
       (=jis-x0208	  . #x694A)	; &M-32686; [73-42]
       (=ks-x1001	  . #x4B73)	; &I-K0-4B73; [43-83]
-      (=jis-x0213-1	  . #x694A)	; &I-JX1-694A; [73-42]
+      (=jis-x0213-1@2000  . #x694A)	; &I-JX1-694A; [73-42]
       (=daikanwa	  . 32686)	; &I-M-32686;
-      (=shinjigen@rev	  .  7083)	; &M-32686;
+      (=shinjigen	  .  7083)	; &M-32686;
       )
-     ((=gt		  . 44188)	; &GT-44188;
+     ((=ucs@jis/2004	  . #x8654)	; &GT-44188;
+      (=jis-x0213-1@2004  . #x694A)	; &GT-44188; [73-42]
+      (=gt		  . 44188)	; &I-GT-44188;
       (=gt-k		  . 06639)	; &I-GT-K06639;
-      (=gt-pj-1		  . #x694A)	; &GT-44188; [73-42]
+      (=gt-pj-1		  . #x694A)	; &I-GT-44188; [73-42]
       )
      ((=ucs@unicode	  . #x8654)	; &G0-722F;
       (=gb2312		  . #x722F)	; &G0-722F; [82-15]
diff --git a/lisp/utf-2000/Ideograph-R142-Insect.el b/lisp/utf-2000/Ideograph-R142-Insect.el
index 0f7ab08..21eb47c 100644
--- a/lisp/utf-2000/Ideograph-R142-Insect.el
+++ b/lisp/utf-2000/Ideograph-R142-Insect.el
@@ -2787,15 +2787,19 @@
     (=daikanwa		. 33018)	; &I-M-33018;
     ))
 (define-char
+  '((ideographic-radical . 142)	; ⾍
+    (=ucs		. #x86E2)	; 蛢
+    (=big5		. #xDBB2)	; &I-B-DBB2;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x86E2)	; &B-DBB2;
-      (=big5		  . #xDBB2)	; &B-DBB2;
+     ((=ucs		  . #x86E2)	; 蛢
       ))
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
-    (=ucs		. #x86E2)	; 蛢
-    (=cns11643-2	. #x3F76)	; &I-C2-3F76; [31-86]
+    (=ucs@unicode	. #x86E2)	; &M-33019;
+    (=cns11643-2	. #x3F76)	; &M-33019; [31-86]
     (=daikanwa		. 33019)	; &I-M-33019;
     (<-vulgar
      ((=daikanwa	  . 33198)	; &M-33198;
@@ -2805,11 +2809,6 @@
     ))
 (define-char
   '((ideographic-radical . 142)	; ⾍
-    (=ucs@big5		. #x86E2)	; &B-DBB2;
-    (=big5		. #xDBB2)	; &B-DBB2;
-    ))
-(define-char
-  '((ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 6)
     (total-strokes	 . 12)
     (=ucs		. #x86E3)	; 蛣
@@ -3520,7 +3519,9 @@
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
+    (=ucs@jis/2004	. #x86F8)	; &GT-44659;
     (=jis-x0208@1978	. #x427D)	; &GT-44659; [34-93]
+    (=jis-x0213-1@2004	. #x427D)	; &I-JX3-427D; [34-93]
     (=gt		. 44659)	; &I-GT-44659;
     (=gt-pj-6		. #x615F)	; &I-GT-44659; [65-63]
     (=daikanwa		. 33072)	; &I-M-33072;
@@ -3532,14 +3533,22 @@
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
+    (=>>jis-x0213-1@2000 . #x427D)	; &G-GT-44660; [34-93]
+    (=>>gt		. 44660)	; &G-GT-44660;
     (->subsumptive
      ((=ucs@unicode	  . #x86F8)	; &GT-44660;
       (=gb2312		  . #x7259)	; &GT-44660; [82-57]
       (=jis-x0208@1983	  . #x427D)	; &I-J83-427D; [34-93]
       (=jis-x0208@1990	  . #x427D)	; &I-J90-427D; [34-93]
-      (=jis-x0213-1	  . #x427D)	; &I-JX1-427D; [34-93]
+      (=jis-x0213-1@2000  . #x427D)	; &I-JX1-427D; [34-93]
       (=gt		  . 44660)	; &I-GT-44660;
       (=gt-pj-1		  . #x427D)	; &I-GT-44660; [34-93]
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x86F8)	; &GT-44659;
+	(=jis-x0208@1978    . #x427D)	; &GT-44659; [34-93]
+	(=jis-x0213-1@2004  . #x427D)	; &I-JX3-427D; [34-93]
+	(=daikanwa	    . 33072)	; &I-M-33072;
+	))
       )
      ((=cns11643-2	  . #x4731)	; &C2-4731; [39-17]
       ))
@@ -3605,9 +3614,18 @@
     (=jef-china3	. #x63CA)	; &I-JC3-63CA;
     ))
 (define-char
+  '((ideographic-radical . 142)	; ⾍
+    (ideographic-strokes . 7)
+    (total-strokes	 . 13)
+    (=ucs@big5		. #x86FB)	; &J97-6968;
+    (=>jis-x0208	. #x6968)	; &J97-6968; [73-72]
+    (=>jis-x0213-1	. #x6968)	; &J97-6968; [73-72]
+    (=big5		. #xB8C0)	; &J97-6968;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x86FB)	; &B-B8C0;
-      (=big5		  . #xB8C0)	; &B-B8C0;
+     ((=ucs@big5	  . #x86FB)	; &J97-6968;
+      (=>jis-x0208	  . #x6968)	; &J97-6968; [73-72]
       ))
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 7)
@@ -3629,16 +3647,9 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 142)	; ⾍
-    (ideographic-strokes . 7)
-    (total-strokes	 . 13)
-    (=ucs@big5		. #x86FB)	; &B-B8C0;
-    (=big5		. #xB8C0)	; &B-B8C0;
-    ))
-(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x86FB)	; &B-B8C0;
-      (=big5		  . #xB8C0)	; &B-B8C0;
+     ((=ucs@big5	  . #x86FB)	; &J97-6968;
+      (=>jis-x0208	  . #x6968)	; &J97-6968; [73-72]
       ))
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 7)
@@ -3796,6 +3807,9 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
     (=ucs		. #x8703)	; 蜃
+    (=>jis-x0208	. #x6967)	; 蜃 [73-71]
+    (=>jis-x0213-1	. #x6967)	; 蜃 [73-71]
+    (=big5		. #xB8C2)	; &I-B-B8C2;
     ))
 (define-char
   '((<-denotational
@@ -3804,17 +3818,24 @@
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 7)
     (total-strokes	 . 13)
-    (=ucs@jis		. #x8703)	; &GT-44663;
-    (=jis-x0208		. #x6967)	; &GT-44663; [73-71]
-    (=ks-x1001		. #x6371)	; &I-K0-6371; [67-81]
-    (=cns11643-1	. #x6649)	; &I-C1-6649; [70-41]
-    (=jis-x0213-1	. #x6967)	; &I-JX1-6967; [73-71]
-    (=big5		. #xB8C2)	; &I-B-B8C2;
-    (=gt		. 44663)	; &I-GT-44663;
-    (=gt-pj-1		. #x6967)	; &I-GT-44663; [73-71]
-    (=daikanwa		. 33089)	; &I-M-33089;
-    (=shinjigen@1ed	.  7181)	; &GT-44663;
-    (=shinjigen@rev	.  7182)	; &GT-44663;
+    (=>>jis-x0213-1	. #x6967)	; &G-GT-44663; [73-71]
+    (=>>gt		. 44663)	; &G-GT-44663;
+    (->subsumptive
+     ((=ucs@jis/1990	  . #x8703)	; &M-33089;
+      (=ucs@jis/2000	  . #x8703)	; &M-33089;
+      (=jis-x0208	  . #x6967)	; &M-33089; [73-71]
+      (=cns11643-1	  . #x6649)	; &I-C1-6649; [70-41]
+      (=jis-x0213-1@2000  . #x6967)	; &I-JX1-6967; [73-71]
+      (=daikanwa	  . 33089)	; &I-M-33089;
+      )
+     ((=ucs@jis/2004	  . #x8703)	; &GT-44663;
+      (=ks-x1001	  . #x6371)	; &GT-44663; [67-81]
+      (=jis-x0213-1@2004  . #x6967)	; &I-JX3-6967; [73-71]
+      (=gt		  . 44663)	; &I-GT-44663;
+      (=gt-pj-1		  . #x6967)	; &I-GT-44663; [73-71]
+      (=shinjigen@1ed	  .  7181)	; &GT-44663;
+      (=shinjigen@rev	  .  7182)	; &GT-44663;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -5322,8 +5343,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x86E2)	; &B-DBB2;
-      (=big5		  . #xDBB2)	; &B-DBB2;
+     ((=ucs		  . #x86E2)	; 蛢
       ))
     (=>ucs*		. #x86E2)	; 蛢
     (ideographic-radical . 142)	; ⾍
@@ -6335,8 +6355,10 @@
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
+    (=ucs@jis/2004	. #x8755)	; &M-33264;
     (=jis-x0208@1978	. #x3F2A)	; &M-33264; [31-10]
     (=ks-x1001		. #x635A)	; &I-K0-635A; [67-58]
+    (=jis-x0213-1@2004	. #x3F2A)	; &I-JX3-3F2A; [31-10]
     (=daikanwa		. 33264)	; &I-M-33264;
     ))
 (define-char
@@ -6346,18 +6368,23 @@
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 8)
     (total-strokes	 . 14)
+    (=>>jis-x0213-1@2000 . #x3F2A)	; &G-GT-44785; [31-10]
+    (=>>gt		. 44785)	; &G-GT-44785;
     (->subsumptive
      ((=cns11643-1	  . #x6A73)	; &C1-6A73; [74-83]
       )
-     ((=ucs@jis		  . #x8755)	; &GT-44785;
+     ((=ucs@jis/1990	  . #x8755)	; &GT-44785;
+      (=ucs@jis/2000	  . #x8755)	; &GT-44785;
       (=jis-x0208@1983	  . #x3F2A)	; &GT-44785; [31-10]
       (=jis-x0208@1990	  . #x3F2A)	; &I-J90-3F2A; [31-10]
-      (=jis-x0213-1	  . #x3F2A)	; &I-JX1-3F2A; [31-10]
+      (=jis-x0213-1@2000  . #x3F2A)	; &I-JX1-3F2A; [31-10]
       (=gt		  . 44785)	; &I-GT-44785;
       (=gt-pj-1		  . #x3F2A)	; &I-GT-44785; [31-10]
       (<-simplified@JP/jis
-       ((=jis-x0208@1978    . #x3F2A)	; &M-33264; [31-10]
+       ((=ucs@jis/2004	    . #x8755)	; &M-33264;
+	(=jis-x0208@1978    . #x3F2A)	; &M-33264; [31-10]
 	(=ks-x1001	    . #x635A)	; &I-K0-635A; [67-58]
+	(=jis-x0213-1@2004  . #x3F2A)	; &I-JX3-3F2A; [31-10]
 	(=daikanwa	    . 33264)	; &I-M-33264;
 	))
       )
@@ -7723,11 +7750,15 @@
     (=gt		. 45000)	; &I-GT-45000;
     (=gt-pj-1		. #x4768)	; &I-GT-45000; [39-72]
     (<-simplified@JP/jis
-     ((=ucs@jis		  . #x8805)	; &J90-6A24;
+     ((=ucs@unicode	  . #x8805)	; &GT-45494;
+      (=jis-x0213-1@2004  . #x6A24)	; &GT-45494; [74-04]
+      )
+     ((=ucs@jis/1990	  . #x8805)	; &J90-6A24;
+      (=ucs@jis/2000	  . #x8805)	; &J90-6A24;
       (=jis-x0208@1978	  . #x4768)	; &J90-6A24; [39-72]
       (=jis-x0208@1983	  . #x6A24)	; &I-J83-6A24; [74-04]
       (=jis-x0208@1990	  . #x6A24)	; &I-J90-6A24; [74-04]
-      (=jis-x0213-1	  . #x6A24)	; &I-JX1-6A24; [74-04]
+      (=jis-x0213-1@2000  . #x6A24)	; &I-JX1-6A24; [74-04]
       ))
     ))
 (define-char
@@ -11786,8 +11817,12 @@
     (=big5		. #xF0BF)	; &I-B-F0BF;
     ))
 (define-char
+  '((ideographic-radical . 142)	; ⾍
+    (=>jis-x0208@1997	. #x4066)	; &J97-4066; [32-70]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4066)	; &J97-4066; [32-70]
+     ((=>jis-x0208@1997	  . #x4066)	; &J97-4066; [32-70]
       ))
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 12)
@@ -11802,12 +11837,8 @@
     (=daikanwa		. 33616)	; &I-M-33616;
     ))
 (define-char
-  '((ideographic-radical . 142)	; ⾍
-    (=jis-x0208@1997	. #x4066)	; &J97-4066; [32-70]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4066)	; &J97-4066; [32-70]
+     ((=>jis-x0208@1997	  . #x4066)	; &J97-4066; [32-70]
       ))
     (ideographic-radical . 142)	; ⾍
     (=ucs		. #x8749)	; 蝉
@@ -11825,6 +11856,7 @@
     (=jis-x0213-1	. #x4066)	; &I-JX1-4066; [32-70]
     (=gt		. 44946)	; &I-GT-44946;
     (=gt-pj-1		. #x4066)	; &I-GT-44946; [32-70]
+    (=jef-china3	. #x63B3)	; &I-JC3-63B3;
     (<-simplified@JP/jis
      ((=ucs		  . #x87EC)	; 蟬
       (=jis-x0208@1978	  . #x4066)	; &I-J78-4066; [32-70]
@@ -11845,8 +11877,13 @@
     (ideographic-strokes . 12)
     (total-strokes	 . 18)
     (=ucs		. #x27453)	; 𧑓
-    (=cns11643-4	. #x5D3A)	; &I-C4-5D3A; [61-26]
-    (=daikanwa		. 33617)	; &I-M-33617;
+    (->subsumptive
+     ((=daikanwa	  . 33617)	; &M-33617;
+      )
+     ((=ucs@iso		  . #x27453)	; &U-00027453;
+      )
+     ((=cns11643-4	  . #x5D3A)	; &C4-5D3A; [61-26]
+      ))
     ))
 (define-char
   '((=>ucs		. #x27454)	; 𧑔
@@ -12555,6 +12592,7 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 19)
     (=ucs		. #x87F9)	; 蟹
+    (=>jis-x0213-1	. #x332A)	; 蟹 [19-10]
     (=big5		. #xC3C9)	; &I-B-C3C9;
     ))
 (define-char
@@ -12564,6 +12602,8 @@
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 13)
     (total-strokes	 . 19)
+    (=>jis-x0208@1997	. #x332A)	; &G-GT-45432; [19-10]
+    (=>>gt		. 45432)	; &G-GT-45432;
     (->subsumptive
      ((=ucs@jis/2004	  . #x87F9)	; &GT-45432;
       (=ks-x1001	  . #x7A2F)	; &GT-45432; [90-15]
@@ -12595,6 +12635,7 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 19)
     (=ucs		. #x880F)	; 蠏
+    (=>jis-x0213-1	. #x6A37)	; 蠏 [74-23]
     ))
 (define-char
   '((<-denotational
@@ -12610,7 +12651,25 @@
     (=gt		. 45433)	; &I-GT-45433;
     (=gt-pj-1		. #x6A37)	; &I-GT-45433; [74-23]
     (=daikanwa		. 33669)	; &I-M-33669;
-    (=shinjigen@rev	.  7275)	; &GT-45433;
+    (=shinjigen		.  7275)	; &GT-45433;
+    (<-original
+     ((=ucs@jis/1990	  . #x87F9)	; &J90-332A;
+      (=ucs@jis/2000	  . #x87F9)	; &J90-332A;
+      (=jis-x0208	  . #x332A)	; &J90-332A; [19-10]
+      (=jis-x0213-1@2000  . #x332A)	; &I-JX1-332A; [19-10]
+      (=shinjigen	  .  7274)	; &J90-332A;
+      ))
+    (<-original*sources
+     shuowen-changjian shinjigen)
+    (<-same
+     ((=ucs@jis/2004	  . #x87F9)	; &GT-45432;
+      (=ks-x1001	  . #x7A2F)	; &GT-45432; [90-15]
+      (=cns11643-1	  . #x7874)	; &I-C1-7874; [88-84]
+      (=jis-x0213-1@2004  . #x332A)	; &I-JX3-332A; [19-10]
+      (=daikanwa	  . 33668)	; &I-M-33668;
+      ))
+    (<-same*sources
+     shuowen-changjian daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -12969,24 +13028,33 @@
     (total-strokes	 . 19)
     (=ucs		. #x8805)	; 蠅
     (=big5		. #xC3C7)	; &I-B-C3C7;
+    (=>>gt		. 45494)	; 蠅
     (->subsumptive
-     ((=daikanwa	  . 33690)	; &M-33690;
-      )
-     ((=cns11643-1	  . #x7872)	; &C1-7872; [88-82]
-      )
-     ((=ucs@unicode	  . #x8805)	; &GT-45494;
-      (=gb12345		  . #x532C)	; &GT-45494; [51-12]
-      (=gt		  . 45494)	; &GT-45494;
-      (=gt-pj-1		  . #x6A24)	; &GT-45494; [74-04]
-      )
-     ((=ucs@jis		  . #x8805)	; &J90-6A24;
-      (=jis-x0208@1978	  . #x4768)	; &J90-6A24; [39-72]
-      (=jis-x0208@1983	  . #x6A24)	; &I-J83-6A24; [74-04]
-      (=jis-x0208@1990	  . #x6A24)	; &I-J90-6A24; [74-04]
-      (=jis-x0213-1	  . #x6A24)	; &I-JX1-6A24; [74-04]
+     ((=>>jis-x0213-1@2004 . #x6A24)	; &G-JX3-6A24; [74-04]
+      (->subsumptive
+       ((=daikanwa	    . 33690)	; &M-33690;
+	)
+       ((=cns11643-1	    . #x7872)	; &C1-7872; [88-82]
+	)
+       ((=ucs@unicode	    . #x8805)	; &GT-45494;
+	(=jis-x0213-1@2004  . #x6A24)	; &GT-45494; [74-04]
+	(=gb12345	    . #x532C)	; &GT-45494; [51-12]
+	(=gt		    . 45494)	; &I-GT-45494;
+	(=gt-pj-1	    . #x6A24)	; &I-GT-45494; [74-04]
+	))
       )
-     ((=ks-x1001	  . #x6332)	; &K0-6332; [67-18]
-      (=shinjigen	  .  7286)	; &K0-6332;
+     ((=>>jis-x0213-1@2000 . #x6A24)	; &G-JX1-6A24; [74-04]
+      (->subsumptive
+       ((=ucs@jis/1990	    . #x8805)	; &J90-6A24;
+	(=ucs@jis/2000	    . #x8805)	; &J90-6A24;
+	(=jis-x0208@1978    . #x4768)	; &J90-6A24; [39-72]
+	(=jis-x0208@1983    . #x6A24)	; &I-J83-6A24; [74-04]
+	(=jis-x0208@1990    . #x6A24)	; &I-J90-6A24; [74-04]
+	(=jis-x0213-1@2000  . #x6A24)	; &I-JX1-6A24; [74-04]
+	)
+       ((=ks-x1001	    . #x6332)	; &K0-6332; [67-18]
+	(=shinjigen	    .  7286)	; &K0-6332;
+	))
       ))
     ))
 (define-char
@@ -13120,15 +13188,17 @@
     (ideographic-strokes . 13)
     (total-strokes	 . 19)
     (=daikanwa		. 33700)	; &M-33700;
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x45F9)	; 䗹
+    (<-formed
+     ((=ucs		  . #x86D3)	; 蛓
       ))
-    (ideographic-radical . 142)	; ⾍
-    (ideographic-strokes . 13)
-    (total-strokes	 . 19)
-    (=ucs@unicode	. #x45F9)	; &UU+45F9;
+    (<-formed*sources
+     jiyun)
+    (<-same
+     ((=ucs		  . #x86D3)	; 蛓
+      (=daikanwa	  . 32988)	; &I-M-32988;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -13141,6 +13211,15 @@
     (=cns11643-4	. #x643F)	; &C4-643F; [68-31]
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x45F9)	; 䗹
+      ))
+    (ideographic-radical . 142)	; ⾍
+    (ideographic-strokes . 13)
+    (total-strokes	 . 19)
+    (=ucs@unicode	. #x45F9)	; &UU+45F9;
+    ))
+(define-char
   '((ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 13)
     (total-strokes	 . 19)
@@ -14426,17 +14505,22 @@
     (=cns11643-4	. #x6126)	; &I-C4-6126; [65-06]
     ))
 (define-char
+  '((ideographic-radical . 142)	; ⾍
+    (=>jis-x0208@1997	. #x4F39)	; &J97-4F39; [47-25]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4F39)	; &J97-4F39; [47-25]
+     ((=>jis-x0208@1997	  . #x4F39)	; &J97-4F39; [47-25]
       ))
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 15)
     (total-strokes	 . 21)
     (=ucs		. #x881F)	; 蠟
+    (=big5		. #xC4FA)	; &I-B-C4FA;
     ))
 (define-char
   '((<-denotational
-     ((=big5		  . #xC4FA)	; &B-C4FA;
+     ((=ucs		  . #x881F)	; 蠟
       ))
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 15)
@@ -14456,15 +14540,11 @@
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 15)
     (total-strokes	 . 21)
-    (=big5		. #xC4FA)	; &B-C4FA;
-    ))
-(define-char
-  '((ideographic-radical . 142)	; ⾍
-    (=jis-x0208@1997	. #x4F39)	; &J97-4F39; [47-25]
+    (=cns11643-1	. #x7B27)	; &C1-7B27; [91-07]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4F39)	; &J97-4F39; [47-25]
+     ((=>jis-x0208@1997	  . #x4F39)	; &J97-4F39; [47-25]
       ))
     (ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 8)
@@ -14475,7 +14555,8 @@
     (=jis-x0213-1	. #x4F39)	; &I-JX1-4F39; [47-25]
     (=gt		. 44863)	; &I-GT-44863;
     (=gt-pj-1		. #x4F39)	; &I-GT-44863; [47-25]
-    (<-simplified@JP/jis
+    (=jef-china3	. #x63B5)	; &I-JC3-63B5;
+    (<-simplified@JP/extra
      ((=ucs@unicode	  . #x881F)	; &M-33786;
       (=jis-x0208@1978	  . #x4F39)	; &M-33786; [47-25]
       (=ks-x1001	  . #x5545)	; &I-K0-5545; [53-37]
@@ -14485,15 +14566,6 @@
       ))
     ))
 (define-char
-  '((<-denotational
-     ((=big5		  . #xC4FA)	; &B-C4FA;
-      ))
-    (ideographic-radical . 142)	; ⾍
-    (ideographic-strokes . 15)
-    (total-strokes	 . 21)
-    (=cns11643-1	. #x7B27)	; &C1-7B27; [91-07]
-    ))
-(define-char
   '((ideographic-radical . 142)	; ⾍
     (ideographic-strokes . 15)
     (total-strokes	 . 21)
diff --git a/lisp/utf-2000/Ideograph-R146-West.el b/lisp/utf-2000/Ideograph-R146-West.el
index f8918b7..30b02fe 100644
--- a/lisp/utf-2000/Ideograph-R146-West.el
+++ b/lisp/utf-2000/Ideograph-R146-West.el
@@ -139,15 +139,16 @@
     (=cns11643-5	. #x2B47)	; &I-C5-2B47; [11-39]
     ))
 (define-char
-  '((=>ucs		. #x8981)	; 要
-    (ideographic-radical . 146)	; ⾑
+  '((ideographic-radical . 146)	; ⾑
     (ideographic-strokes . 3)
     (total-strokes	 . 9)
-    (=jis-x0208@1997	. #x4D57)	; &J97-4D57; [45-55]
+    (=ucs		. #x8981)	; 要
+    (=>jis-x0208	. #x4D57)	; 要 [45-55]
+    (=>jis-x0213-1	. #x4D57)	; 要 [45-55]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4D57)	; &J97-4D57; [45-55]
+     ((=ucs		  . #x8981)	; 要
       ))
     (ideographic-radical . 146)	; ⾑
     (ideographic-strokes . 3)
@@ -158,12 +159,15 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4D57)	; &J97-4D57; [45-55]
+     ((=ucs		  . #x8981)	; 要
       ))
     (ideographic-radical . 146)	; ⾑
     (ideographic-strokes . 3)
     (total-strokes	 . 9)
-    (=ucs		. #x8981)	; 要
+    (=>>jis-x0208	. #x4D57)	; &G-GT-46811; [45-55]
+    (=>>jis-x0213-1	. #x4D57)	; &G-GT-46811; [45-55]
+    (=big5		. #xAD6E)	; &G-GT-46811;
+    (=>>gt		. 46811)	; &G-GT-46811;
     (->subsumptive
      ((morohashi-daikanwa	34768 1)
       (=ucs@unicode	  . #x8981)	; &GT-46811;
@@ -171,7 +175,6 @@
       (=gb2312		  . #x522A)	; &I-G0-522A; [50-10]
       (=ks-x1001	  . #x6929)	; &I-K0-6929; [73-09]
       (=jis-x0213-1	  . #x4D57)	; &I-JX1-4D57; [45-55]
-      (=big5		  . #xAD6E)	; &I-B-AD6E;
       (=gt		  . 46811)	; &I-GT-46811;
       (=gt-k		  . 05360)	; &I-GT-K05360;
       (=gt-pj-1		  . #x4D57)	; &I-GT-46811; [45-55]
@@ -184,9 +187,27 @@
   '((ideographic-radical . 146)	; ⾑
     (ideographic-strokes . 3)
     (total-strokes	 . 9)
+    (=ucs		. #x277E5)	; 𧟥
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x277E5)	; 𧟥
+      ))
+    (ideographic-radical . 146)	; ⾑
+    (ideographic-strokes . 3)
+    (total-strokes	 . 9)
     (=daikanwa		. 34769)	; &M-34769;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x277E5)	; 𧟥
+      ))
+    (ideographic-radical . 146)	; ⾑
+    (ideographic-strokes . 3)
+    (total-strokes	 . 9)
+    (=ucs@iso		. #x277E5)	; &U-000277E5;
+    ))
+(define-char
   '((ideographic-radical . 146)	; ⾑
     (ideographic-strokes . 3)
     (total-strokes	 . 9)
diff --git a/lisp/utf-2000/Ideograph-R149-Speech.el b/lisp/utf-2000/Ideograph-R149-Speech.el
index c64f1d2..9eede92 100644
--- a/lisp/utf-2000/Ideograph-R149-Speech.el
+++ b/lisp/utf-2000/Ideograph-R149-Speech.el
@@ -434,14 +434,19 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 10)
     (=ucs		. #x8A0A)	; 訊
+    (=>jis-x0208	. #x3F56)	; 訊 [31-54]
+    (=>jis-x0213-1	. #x3F56)	; 訊 [31-54]
     (=big5		. #xB054)	; &I-B-B054;
     (->subsumptive
-     ((=ks-x1001	  . #x6372)	; &M-35224; [67-82]
+     ((=ucs@jis/2004	  . #x8A0A)	; &M-35224;
+      (=ks-x1001	  . #x6372)	; &M-35224; [67-82]
+      (=jis-x0213-1@2004  . #x3F56)	; &I-JX3-3F56; [31-54]
       (=daikanwa	  . 35224)	; &I-M-35224;
       )
-     ((=ucs@jis		  . #x8A0A)	; &GT-47390;
+     ((=ucs@jis/1990	  . #x8A0A)	; &GT-47390;
+      (=ucs@jis/2000	  . #x8A0A)	; &GT-47390;
       (=jis-x0208	  . #x3F56)	; &GT-47390; [31-54]
-      (=jis-x0213-1	  . #x3F56)	; &I-JX1-3F56; [31-54]
+      (=jis-x0213-1@2000  . #x3F56)	; &I-JX1-3F56; [31-54]
       (=gt		  . 47390)	; &I-GT-47390;
       (=gt-pj-1		  . #x3F56)	; &I-GT-47390; [31-54]
       )
@@ -1117,34 +1122,39 @@
 (define-char
   '((ideographic-radical . 149)	; ⾔
     (=ucs		. #x8A1D)	; 訝
+    (=>jis-x0208	. #x6B43)	; 訝 [75-35]
+    (=>jis-x0213-1	. #x6B43)	; 訝 [75-35]
     (=big5		. #xB359)	; &I-B-B359;
     (->subsumptive
      ((ideographic-strokes . 4)
       (total-strokes	   . 11)
-      (=daikanwa	  . 35260)	; &M-35260;
-      )
-     ((ideographic-strokes . 4)
-      (total-strokes	   . 11)
-      (=ucs@unicode	  . #x8A1D)	; &UU+8A1D;
-      (=gb12345		  . #x5148)	; &UU+8A1D; [49-40]
-      )
-     ((ideographic-strokes . 4)
-      (total-strokes	   . 11)
-      (=cns11643-1	  . #x5D3F)	; &C1-5D3F; [61-31]
-      )
-     ((ideographic-strokes . 5)
-      (total-strokes	   . 12)
-      (=ucs@jis		  . #x8A1D)	; &J90-6B43;
-      (=jis-x0208@1990	  . #x6B43)	; &J90-6B43; [75-35]
-      (=jis-x0213-1	  . #x6B43)	; &I-JX1-6B43; [75-35]
+      (=>>jis-x0213-1@2004 . #x6B43)	; &G-JX3-6B43; [75-35]
+      (->subsumptive
+       ((=ucs@jis/2004	    . #x8A1D)	; &M-35260;
+	(=jis-x0213-1@2004  . #x6B43)	; &M-35260; [75-35]
+	(=daikanwa	    . 35260)	; &I-M-35260;
+	)
+       ((=ucs@unicode	    . #x8A1D)	; &UU+8A1D;
+	(=gb12345	    . #x5148)	; &UU+8A1D; [49-40]
+	)
+       ((=cns11643-1	    . #x5D3F)	; &C1-5D3F; [61-31]
+	))
       )
      ((ideographic-strokes . 5)
       (total-strokes	   . 12)
-      (=jis-x0208@1978	  . #x6B43)	; &GT-47493; [75-35]
-      (=jis-x0208@1983	  . #x6B43)	; &I-J83-6B43; [75-35]
-      (=ks-x1001	  . #x6438)	; &I-K0-6438; [68-24]
-      (=gt		  . 47493)	; &I-GT-47493;
-      (=gt-pj-1		  . #x6B43)	; &I-GT-47493; [75-35]
+      (=>>jis-x0213-1@2000 . #x6B43)	; &G-JX1-6B43; [75-35]
+      (->subsumptive
+       ((=ucs@jis/1990	    . #x8A1D)	; &J90-6B43;
+	(=ucs@jis/2000	    . #x8A1D)	; &J90-6B43;
+	(=jis-x0208@1990    . #x6B43)	; &J90-6B43; [75-35]
+	(=jis-x0213-1@2000  . #x6B43)	; &I-JX1-6B43; [75-35]
+	)
+       ((=jis-x0208@1978    . #x6B43)	; &GT-47493; [75-35]
+	(=jis-x0208@1983    . #x6B43)	; &I-J83-6B43; [75-35]
+	(=ks-x1001	    . #x6438)	; &I-K0-6438; [68-24]
+	(=gt		    . 47493)	; &I-GT-47493;
+	(=gt-pj-1	    . #x6B43)	; &I-GT-47493; [75-35]
+	))
       ))
     ))
 (define-char
@@ -2606,8 +2616,10 @@
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
+    (=ucs@jis/2004	. #x8A3B)	; &GT-47539;
     (=jis-x0208@1978	. #x4370)	; &GT-47539; [35-80]
     (=ks-x1001		. #x7149)	; &I-K0-7149; [81-41]
+    (=jis-x0213-1@2004	. #x4370)	; &I-JX3-4370; [35-80]
     (=gt		. 47539)	; &I-GT-47539;
     (=gt-pj-7		. #x3377)	; &I-GT-47539; [19-87]
     (=daikanwa		. 35340)	; &I-M-35340;
@@ -2620,13 +2632,23 @@
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
+    (=>>jis-x0213-1@2000 . #x4370)	; &G-GT-47540; [35-80]
+    (=>>gt		. 47540)	; &G-GT-47540;
     (->subsumptive
-     ((=ucs@jis		  . #x8A3B)	; &GT-47540;
+     ((=ucs@jis/1990	  . #x8A3B)	; &GT-47540;
+      (=ucs@jis/2000	  . #x8A3B)	; &GT-47540;
       (=jis-x0208@1983	  . #x4370)	; &GT-47540; [35-80]
       (=jis-x0208@1990	  . #x4370)	; &I-J90-4370; [35-80]
-      (=jis-x0213-1	  . #x4370)	; &I-JX1-4370; [35-80]
+      (=jis-x0213-1@2000  . #x4370)	; &I-JX1-4370; [35-80]
       (=gt		  . 47540)	; &I-GT-47540;
       (=gt-pj-1		  . #x4370)	; &I-GT-47540; [35-80]
+      (<-simplified@JP/extra/design
+       ((=ucs@jis/2004	    . #x8A3B)	; &GT-47539;
+	(=jis-x0208@1978    . #x4370)	; &GT-47539; [35-80]
+	(=ks-x1001	    . #x7149)	; &I-K0-7149; [81-41]
+	(=jis-x0213-1@2004  . #x4370)	; &I-JX3-4370; [35-80]
+	(=daikanwa	    . 35340)	; &I-M-35340;
+	))
       )
      ((=ucs@unicode	  . #x8A3B)	; &C1-6221;
       (=cns11643-1	  . #x6221)	; &C1-6221; [66-01]
@@ -4489,9 +4511,13 @@
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
+    (=>>jis-x0208@1978	. #x4127)	; &G-JX3-4127; [33-07]
+    (=>>jis-x0213-1@2004 . #x4127)	; &G-JX3-4127; [33-07]
     (->subsumptive
-     ((=jis-x0208@1978	  . #x4127)	; &M-35435; [33-07]
+     ((=ucs@jis/2004	  . #x8A6E)	; &M-35435;
+      (=jis-x0208@1978	  . #x4127)	; &M-35435; [33-07]
       (=ks-x1001	  . #x6F2C)	; &I-K0-6F2C; [79-12]
+      (=jis-x0213-1@2004  . #x4127)	; &I-JX3-4127; [33-07]
       (=daikanwa	  . 35435)	; &I-M-35435;
       )
      ((=cns11643-1	  . #x6667)	; &C1-6667; [70-71]
@@ -4504,14 +4530,24 @@
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 6)
     (total-strokes	 . 13)
+    (=>>jis-x0213-1@2000 . #x4127)	; &G-GT-47640; [33-07]
+    (=>>gt		. 47640)	; &G-GT-47640;
     (->subsumptive
-     ((=ucs@jis		  . #x8A6E)	; &GT-47640;
+     ((=ucs@jis/1990	  . #x8A6E)	; &GT-47640;
+      (=ucs@jis/2000	  . #x8A6E)	; &GT-47640;
       (=jis-x0208@1983	  . #x4127)	; &GT-47640; [33-07]
       (=jis-x0208@1990	  . #x4127)	; &I-J90-4127; [33-07]
-      (=jis-x0213-1	  . #x4127)	; &I-JX1-4127; [33-07]
+      (=jis-x0213-1@2000  . #x4127)	; &I-JX1-4127; [33-07]
       (=gt		  . 47640)	; &I-GT-47640;
       (=gt-pj-1		  . #x4127)	; &I-GT-47640; [33-07]
       (=jef-china3	  . #x64D6)	; &I-JC3-64D6;
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x8A6E)	; &M-35435;
+	(=jis-x0208@1978    . #x4127)	; &M-35435; [33-07]
+	(=ks-x1001	    . #x6F2C)	; &I-K0-6F2C; [79-12]
+	(=jis-x0213-1@2004  . #x4127)	; &I-JX3-4127; [33-07]
+	(=daikanwa	    . 35435)	; &I-M-35435;
+	))
       )
      ((=ucs@unicode	  . #x8A6E)	; &UU+8A6E;
       (=gb12345		  . #x5A39)	; &UU+8A6E; [58-25]
@@ -6913,10 +6949,18 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 149)	; ⾔
+    (ideographic-strokes . 7)
+    (total-strokes	 . 14)
+    (=ucs@big5		. #x8AAA)	; &J97-4062;
+    (=>jis-x0208	. #x4062)	; &J97-4062; [32-66]
+    (=>jis-x0213-1	. #x4062)	; &J97-4062; [32-66]
+    (=big5		. #xBBA1)	; &J97-4062;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x8AAA)	; &B-BBA1;
-      (=big5		  . #xBBA1)	; &B-BBA1;
-      (=jis-x0208@1997	  . #x4062)	; &B-BBA1; [32-66]
+     ((=ucs@big5	  . #x8AAA)	; &J97-4062;
+      (=>jis-x0208	  . #x4062)	; &J97-4062; [32-66]
       ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 7)
@@ -6938,18 +6982,9 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 7)
-    (total-strokes	 . 14)
-    (=ucs@big5		. #x8AAA)	; &B-BBA1;
-    (=big5		. #xBBA1)	; &B-BBA1;
-    (=jis-x0208@1997	. #x4062)	; &B-BBA1; [32-66]
-    ))
-(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x8AAA)	; &B-BBA1;
-      (=big5		  . #xBBA1)	; &B-BBA1;
-      (=jis-x0208@1997	  . #x4062)	; &B-BBA1; [32-66]
+     ((=ucs@big5	  . #x8AAA)	; &J97-4062;
+      (=>jis-x0208	  . #x4062)	; &J97-4062; [32-66]
       ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 7)
@@ -7761,26 +7796,38 @@
   '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
-    (=cns11643-7	. #x2871)	; &M-35600; [08-81]
-    (=daikanwa		. 35600)	; &I-M-35600;
+    (=ucs		. #x27A2B)	; 𧨫
+    (->subsumptive
+     ((=daikanwa	  . 35600)	; &M-35600;
+      )
+     ((hanyu-dazidian	  6 3984 16)
+      (=ucs@iso		  . #x27A2B)	; &HZK10-E6AA;
+      (=cns11643-7	  . #x2871)	; &HZK10-E6AA; [08-81]
+      (=hanziku-10	  . #xE6AA)	; &I-HZK10-E6AA;
+      ))
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
     (=ucs		. #x8AB9)	; 誹
+    (=>jis-x0208	. #x4870)	; 誹 [40-80]
+    (=>jis-x0213-1	. #x4870)	; 誹 [40-80]
     (=big5		. #xBDDA)	; &I-B-BDDA;
     (->subsumptive
-     ((=ucs@jis		  . #x8AB9)	; &GT-47883;
+     ((=ucs@jis/1990	  . #x8AB9)	; &GT-47883;
+      (=ucs@jis/2000	  . #x8AB9)	; &GT-47883;
       (=ks-x1001	  . #x5E26)	; &GT-47883; [62-06]
       (=jis-x0208@1990	  . #x4870)	; &I-J90-4870; [40-80]
-      (=jis-x0213-1	  . #x4870)	; &I-JX1-4870; [40-80]
+      (=jis-x0213-1@2000  . #x4870)	; &I-JX1-4870; [40-80]
       (=gt		  . 47883)	; &I-GT-47883;
       (=gt-pj-1		  . #x4870)	; &I-GT-47883; [40-80]
       (=daikanwa	  . 35601)	; &I-M-35601;
       )
-     ((=jis-x0208@1978	  . #x4870)	; &J83-4870; [40-80]
+     ((=ucs@jis/2004	  . #x8AB9)	; &J83-4870;
+      (=jis-x0208@1978	  . #x4870)	; &J83-4870; [40-80]
       (=jis-x0208@1983	  . #x4870)	; &I-J83-4870; [40-80]
+      (=jis-x0213-1@2004  . #x4870)	; &I-JX3-4870; [40-80]
       (=shinjigen	  .  7681)	; &J83-4870;
       )
      ((=cns11643-1	  . #x6F25)	; &C1-6F25; [79-05]
@@ -8508,6 +8555,17 @@
 (define-char
   '((ideographic-radical . 149)	; ⾔
     (=ucs		. #x8ACD)	; 諍
+    (=>jis-x0208	. #x6B5A)	; 諍 [75-58]
+    (=>jis-x0213-1	. #x6B5A)	; 諍 [75-58]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8ACD)	; 諍
+      ))
+    (ideographic-radical . 149)	; ⾔
+    (ideographic-strokes . 8)
+    (total-strokes	 . 15)
+    (=big5		. #xBDD8)	; &B-BDD8;
     ))
 (define-char
   '((<-denotational
@@ -8523,16 +8581,7 @@
     (=gt		. 47834)	; &I-GT-47834;
     (=gt-pj-1		. #x6B5A)	; &I-GT-47834; [75-58]
     (=daikanwa		. 35643)	; &I-M-35643;
-    (=shinjigen@rev	.  7671)	; &GT-47834;
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x8ACD)	; 諍
-      ))
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 8)
-    (total-strokes	 . 15)
-    (=big5		. #xBDD8)	; &B-BDD8;
+    (=shinjigen		.  7671)	; &GT-47834;
     ))
 (define-char
   '((<-denotational
@@ -9204,15 +9253,21 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 149)	; ⾔
+    (=ucs		. #x8AF8)	; 諸
+    (=>jis-x0208@1997	. #x3D74)	; 諸 [29-84]
+    (=big5		. #xBDD1)	; &I-B-BDD1;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x8AF8)	; &B-BDD1;
-      (=big5		  . #xBDD1)	; &B-BDD1;
-      (=jis-x0208@1997	  . #x3D74)	; &B-BDD1; [29-84]
+     ((=ucs		  . #x8AF8)	; 諸
       ))
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
-    (=ucs		. #x8AF8)	; 諸
+    (=>>jis-x0208	. #x3D74)	; &G-GT-47831; [29-84]
+    (=>jis-x0213-1	. #x3D74)	; &G-GT-47831; [29-84]
+    (=>>gt		. 47831)	; &G-GT-47831;
     (->subsumptive
      ((morohashi-daikanwa	35691 1)
       (=ucs@jis		  . #x8AF8)	; &GT-47831;
@@ -9234,16 +9289,17 @@
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
-    (=ucs@big5		. #x8AF8)	; &B-BDD1;
-    (=big5		. #xBDD1)	; &B-BDD1;
-    (=jis-x0208@1997	. #x3D74)	; &B-BDD1; [29-84]
-    ))
-(define-char
-  '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
-    (=cns11643-7	. #x287A)	; &M-35692; [08-90]
-    (=daikanwa		. 35692)	; &I-M-35692;
+    (=ucs		. #x27A60)	; 𧩠
+    (->subsumptive
+     ((=daikanwa	  . 35692)	; &M-35692;
+      )
+     ((hanyu-dazidian	  6 3990 2)
+      (=ucs@iso		  . #x27A60)	; &HZK10-E7BF;
+      (=cns11643-7	  . #x287A)	; &HZK10-E7BF; [08-90]
+      (=hanziku-10	  . #xE7BF)	; &I-HZK10-E7BF;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -9252,6 +9308,8 @@
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
+    (=>>jis-x0208	. #x4342)	; &G-JX1-4342; [35-34]
+    (=>>jis-x0213-1	. #x4342)	; &G-JX1-4342; [35-34]
     (->subsumptive
      ((morohashi-daikanwa	35692 1)
       (=jis-x0208@1978	  . #x4342)	; &GT-47860; [35-34]
@@ -9275,8 +9333,15 @@
   '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
-    (=cns11643-7	. #x2872)	; &M-49723; [08-82]
-    (=daikanwa		. 49723)	; &I-M-49723;
+    (=ucs		. #x27A58)	; 𧩘
+    (->subsumptive
+     ((=daikanwa	  . 49723)	; &M-49723;
+      )
+     ((hanyu-dazidian	  8 40 24)
+      (=ucs@iso		  . #x27A58)	; &HZK12-F0A7;
+      (=cns11643-7	  . #x2872)	; &HZK12-F0A7; [08-82]
+      (=hanziku-12	  . #xF0A7)	; &I-HZK12-F0A7;
+      ))
     ))
 (define-char
   '((=>ucs		. #x8AAE)	; 誮
@@ -10061,6 +10126,15 @@
     ))
 (define-char
   '((<-denotational
+     ((=ucs		  . #x8AED)	; è«­
+      ))
+    (ideographic-radical . 149)	; ⾔
+    (ideographic-strokes . 9)
+    (total-strokes	 . 16)
+    (=big5		. #xBFD9)	; &B-BFD9;
+    ))
+(define-char
+  '((<-denotational
      ((=big5		  . #xBFD9)	; &B-BFD9;
       ))
     (ideographic-radical . 149)	; ⾔
@@ -10082,15 +10156,6 @@
       ))
     ))
 (define-char
-  '((<-denotational
-     ((=ucs		  . #x8AED)	; è«­
-      ))
-    (ideographic-radical . 149)	; ⾔
-    (ideographic-strokes . 9)
-    (total-strokes	 . 16)
-    (=big5		. #xBFD9)	; &B-BFD9;
-    ))
-(define-char
   '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
@@ -10409,14 +10474,20 @@
   '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
-    (=cns11643-7	. #x333D)	; &M-35742; [19-29]
-    (=daikanwa		. 35742)	; &I-M-35742;
+    (=ucs		. #x27A75)	; 𧩵
+    (->subsumptive
+     ((=daikanwa	  . 35742)	; &M-35742;
+      )
+     ((hanyu-dazidian	  6 4002 1)
+      (=ucs@iso		  . #x27A75)	; &HZK10-EA45;
+      (=hanziku-10	  . #xEA45)	; &HZK10-EA45;
+      )
+     ((=cns11643-7	  . #x333D)	; &C7-333D; [19-29]
+      ))
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x8AF8)	; &B-BDD1;
-      (=big5		  . #xBDD1)	; &B-BDD1;
-      (=jis-x0208@1997	  . #x3D74)	; &B-BDD1; [29-84]
+     ((=ucs		  . #x8AF8)	; 諸
       ))
     (name		. "CJK COMPATIBILITY IDEOGRAPH-FA22")
     (=>ucs*		. #x8AF8)	; 諸
@@ -10489,6 +10560,9 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
     (=ucs		. #x8AFA)	; 諺
+    (=>jis-x0208	. #x3841)	; 諺 [24-33]
+    (=>jis-x0213-1	. #x3841)	; 諺 [24-33]
+    (=big5		. #xBFCE)	; &I-B-BFCE;
     ))
 (define-char
   '((<-denotational
@@ -10497,10 +10571,14 @@
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
-    (=big5		. #xBFCE)	; &B-BFCE;
+    (=>>jis-x0208@1978	. #x3841)	; &G-GT-47945; [24-33]
+    (=>>jis-x0213-1@2004 . #x3841)	; &G-GT-47945; [24-33]
+    (=>>gt		. 47945)	; &G-GT-47945;
     (->subsumptive
-     ((=jis-x0208@1978	  . #x3841)	; &GT-47945; [24-33]
+     ((=ucs@jis/2004	  . #x8AFA)	; &GT-47945;
+      (=jis-x0208@1978	  . #x3841)	; &GT-47945; [24-33]
       (=ks-x1001	  . #x656C)	; &I-K0-656C; [69-76]
+      (=jis-x0213-1@2004  . #x3841)	; &I-JX3-3841; [24-33]
       (=gt		  . 47945)	; &I-GT-47945;
       (=gt-pj-7		  . #x375A)	; &I-GT-47945; [23-58]
       (=daikanwa	  . 35747)	; &I-M-35747;
@@ -10515,11 +10593,14 @@
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
+    (=>>jis-x0213-1@2000 . #x3841)	; &G-GT-47946; [24-33]
+    (=>>gt		. 47946)	; &G-GT-47946;
     (->subsumptive
-     ((=ucs@jis		  . #x8AFA)	; &GT-47946;
+     ((=ucs@jis/1990	  . #x8AFA)	; &GT-47946;
+      (=ucs@jis/2000	  . #x8AFA)	; &GT-47946;
       (=jis-x0208@1983	  . #x3841)	; &GT-47946; [24-33]
       (=jis-x0208@1990	  . #x3841)	; &I-J90-3841; [24-33]
-      (=jis-x0213-1	  . #x3841)	; &I-JX1-3841; [24-33]
+      (=jis-x0213-1@2000  . #x3841)	; &I-JX1-3841; [24-33]
       (=gt		  . 47946)	; &I-GT-47946;
       (=gt-pj-1		  . #x3841)	; &I-GT-47946; [24-33]
       (=jef-china3	  . #x64D5)	; &I-JC3-64D5;
@@ -10532,8 +10613,15 @@
   '((ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
-    (=cns11643-7	. #x334E)	; &M-35748; [19-46]
-    (=daikanwa		. 35748)	; &I-M-35748;
+    (=ucs		. #x27A78)	; 𧩸
+    (->subsumptive
+     ((=daikanwa	  . 35748)	; &M-35748;
+      )
+     ((hanyu-dazidian	  6 3999 15)
+      (=ucs@iso		  . #x27A78)	; &HZK10-E9B2;
+      (=cns11643-7	  . #x334E)	; &HZK10-E9B2; [19-46]
+      (=hanziku-10	  . #xE9B2)	; &I-HZK10-E9B2;
+      ))
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
@@ -11532,8 +11620,10 @@
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
+    (=ucs@jis/2004	. #x8B0E)	; &M-35800;
     (=jis-x0208@1978	. #x4666)	; &M-35800; [38-70]
     (=ks-x1001		. #x5A3A)	; &I-K0-5A3A; [58-26]
+    (=jis-x0213-1@2004	. #x4666)	; &I-JX3-4666; [38-70]
     (=daikanwa		. 35800)	; &I-M-35800;
     ))
 (define-char
@@ -11552,14 +11642,24 @@
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
+    (=>>jis-x0213-1@2000 . #x4666)	; &G-GT-48002; [38-70]
+    (=>>gt		. 48002)	; &G-GT-48002;
     (->subsumptive
-     ((=ucs@jis		  . #x8B0E)	; &GT-48002;
+     ((=ucs@jis/1990	  . #x8B0E)	; &GT-48002;
+      (=ucs@jis/2000	  . #x8B0E)	; &GT-48002;
       (=jis-x0208@1983	  . #x4666)	; &GT-48002; [38-70]
       (=jis-x0208@1990	  . #x4666)	; &I-J90-4666; [38-70]
-      (=jis-x0213-1	  . #x4666)	; &I-JX1-4666; [38-70]
+      (=jis-x0213-1@2000  . #x4666)	; &I-JX1-4666; [38-70]
       (=gt		  . 48002)	; &I-GT-48002;
       (=gt-pj-1		  . #x4666)	; &I-GT-48002; [38-70]
       (=jef-china3	  . #x64D7)	; &I-JC3-64D7;
+      (<-simplified@JP/extra
+       ((=ucs@jis/2004	    . #x8B0E)	; &M-35800;
+	(=jis-x0208@1978    . #x4666)	; &M-35800; [38-70]
+	(=ks-x1001	    . #x5A3A)	; &I-K0-5A3A; [58-26]
+	(=jis-x0213-1@2004  . #x4666)	; &I-JX3-4666; [38-70]
+	(=daikanwa	    . 35800)	; &I-M-35800;
+	))
       )
      ((=ucs@unicode	  . #x8B0E)	; &UU+8B0E;
       (=gb12345		  . #x4355)	; &UU+8B0E; [35-53]
@@ -12923,8 +13023,10 @@
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 11)
     (total-strokes	 . 18)
+    (=ucs@jis/2004	. #x8B2C)	; &GT-48190;
     (=jis-x0208@1978	. #x4935)	; &GT-48190; [41-21]
     (=ks-x1001		. #x573D)	; &I-K0-573D; [55-29]
+    (=jis-x0213-1@2004	. #x4935)	; &I-JX3-4935; [41-21]
     (=gt		. 48190)	; &I-GT-48190;
     (=gt-pj-7		. #x386E)	; &I-GT-48190; [24-78]
     (=daikanwa		. 35872)	; &I-M-35872;
@@ -12936,27 +13038,37 @@
     (ideographic-radical . 149)	; ⾔
     (ideographic-strokes . 11)
     (total-strokes	 . 18)
+    (=>>jis-x0213-1@2000 . #x4935)	; &G-JX1-4935; [41-21]
     (->subsumptive
-     ((=gt		  . 48192)	; &GT-48192;
-      (=gt-pj-11	  . #x3556)	; &GT-48192; [21-54]
-      (=jef-china3	  . #x65D4)	; &I-JC3-65D4;
-      )
-     ((=ucs@unicode	  . #x8B2C)	; &UU+8B2C;
-      (=gb12345		  . #x437D)	; &UU+8B2C; [35-93]
-      )
-     ((=ucs@jis		  . #x8B2C)	; &GT-48191;
-      (=jis-x0208@1983	  . #x4935)	; &GT-48191; [41-21]
-      (=jis-x0208@1990	  . #x4935)	; &I-J90-4935; [41-21]
-      (=jis-x0213-1	  . #x4935)	; &I-JX1-4935; [41-21]
-      (=gt		  . 48191)	; &I-GT-48191;
-      (=gt-pj-1		  . #x4935)	; &I-GT-48191; [41-21]
-      (<-simplified@JP/jis
-       ((=jis-x0208@1978    . #x4935)	; &GT-48190; [41-21]
-	(=ks-x1001	    . #x573D)	; &I-K0-573D; [55-29]
-	(=daikanwa	    . 35872)	; &I-M-35872;
+     ((=>>gt		  . 48192)	; &G-GT-48192;
+      (->subsumptive
+       ((=gt		    . 48192)	; &GT-48192;
+	(=gt-pj-11	    . #x3556)	; &GT-48192; [21-54]
+	(=jef-china3	    . #x65D4)	; &I-JC3-65D4;
+	)
+       ((=ucs@unicode	    . #x8B2C)	; &UU+8B2C;
+	(=gb12345	    . #x437D)	; &UU+8B2C; [35-93]
 	))
       )
-     ((=cns11643-1	  . #x7740)	; &C1-7740; [87-32]
+     ((=>>gt		  . 48191)	; &G-GT-48191;
+      (->subsumptive
+       ((=ucs@jis/1990	    . #x8B2C)	; &GT-48191;
+	(=ucs@jis/2000	    . #x8B2C)	; &GT-48191;
+	(=jis-x0208@1983    . #x4935)	; &GT-48191; [41-21]
+	(=jis-x0208@1990    . #x4935)	; &I-J90-4935; [41-21]
+	(=jis-x0213-1@2000  . #x4935)	; &I-JX1-4935; [41-21]
+	(=gt		    . 48191)	; &I-GT-48191;
+	(=gt-pj-1	    . #x4935)	; &I-GT-48191; [41-21]
+	(<-simplified@JP/jis
+	 ((=ucs@jis/2004      . #x8B2C)	; &GT-48190;
+	  (=jis-x0208@1978    . #x4935)	; &GT-48190; [41-21]
+	  (=ks-x1001	      . #x573D)	; &I-K0-573D; [55-29]
+	  (=jis-x0213-1@2004  . #x4935)	; &I-JX3-4935; [41-21]
+	  (=daikanwa	      . 35872)	; &I-M-35872;
+	  ))
+	)
+       ((=cns11643-1	    . #x7740)	; &C1-7740; [87-32]
+	))
       ))
     ))
 (define-char
@@ -18406,12 +18518,6 @@
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
-    (hanyu-dazidian	6 3984 16)
-    (=ucs		. #x27A2B)	; 𧨫
-    (=hanziku-10	. #xE6AA)	; &I-HZK10-E6AA;
-    ))
-(define-char
-  '((ideographic-radical . 149)	; ⾔
     (hanyu-dazidian	6 3986 4)
     (=ucs		. #x27A2C)	; 𧨬
     (=hanziku-10	. #xE6DE)	; &I-HZK10-E6DE;
@@ -18532,12 +18638,6 @@
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
-    (hanyu-dazidian	8 40 24)
-    (=ucs		. #x27A58)	; 𧩘
-    (=hanziku-12	. #xF0A7)	; &I-HZK12-F0A7;
-    ))
-(define-char
-  '((ideographic-radical . 149)	; ⾔
     (hanyu-dazidian	6 3990 4)
     (=ucs		. #x27A5B)	; 𧩛
     (=hanziku-10	. #xE7C1)	; &I-HZK10-E7C1;
@@ -18562,12 +18662,6 @@
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
-    (hanyu-dazidian	6 3990 2)
-    (=ucs		. #x27A60)	; 𧩠
-    (=hanziku-10	. #xE7BF)	; &I-HZK10-E7BF;
-    ))
-(define-char
-  '((ideographic-radical . 149)	; ⾔
     (hanyu-dazidian	6 3985 12)
     (=ucs		. #x27A61)	; 𧩡
     (=hanziku-10	. #xE6C6)	; &I-HZK10-E6C6;
@@ -18628,24 +18722,12 @@
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
-    (hanyu-dazidian	6 4002 1)
-    (=ucs		. #x27A75)	; 𧩵
-    (=hanziku-10	. #xEA45)	; &I-HZK10-EA45;
-    ))
-(define-char
-  '((ideographic-radical . 149)	; ⾔
     (hanyu-dazidian	6 4000 12)
     (=ucs		. #x27A77)	; 𧩷
     (=hanziku-10	. #xE9CF)	; &I-HZK10-E9CF;
     ))
 (define-char
   '((ideographic-radical . 149)	; ⾔
-    (hanyu-dazidian	6 3999 15)
-    (=ucs		. #x27A78)	; 𧩸
-    (=hanziku-10	. #xE9B2)	; &I-HZK10-E9B2;
-    ))
-(define-char
-  '((ideographic-radical . 149)	; ⾔
     (hanyu-dazidian	6 3999 14)
     (=ucs		. #x27A7A)	; 𧩺
     (=hanziku-10	. #xE9B1)	; &I-HZK10-E9B1;
diff --git a/lisp/utf-2000/Ideograph-R152-Pig.el b/lisp/utf-2000/Ideograph-R152-Pig.el
index a29c328..18099c8 100644
--- a/lisp/utf-2000/Ideograph-R152-Pig.el
+++ b/lisp/utf-2000/Ideograph-R152-Pig.el
@@ -378,6 +378,11 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 152)	; ⾗
+    (=ucs@big5		. #x8C5C)	; &B-D7CF;
+    (=big5		. #xD7CF)	; &B-D7CF;
+    ))
+(define-char
   '((<-denotational
      ((=ucs@big5	  . #x8C5C)	; &B-D7CF;
       (=big5		  . #xD7CF)	; &B-D7CF;
@@ -398,11 +403,6 @@
     ))
 (define-char
   '((ideographic-radical . 152)	; ⾗
-    (=ucs@big5		. #x8C5C)	; &B-D7CF;
-    (=big5		. #xD7CF)	; &B-D7CF;
-    ))
-(define-char
-  '((ideographic-radical . 152)	; ⾗
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
     (=ucs		. #x22461)	; 𢑡
diff --git a/lisp/utf-2000/Ideograph-R153-Badger.el b/lisp/utf-2000/Ideograph-R153-Badger.el
index a742f02..8bf5c4d 100644
--- a/lisp/utf-2000/Ideograph-R153-Badger.el
+++ b/lisp/utf-2000/Ideograph-R153-Badger.el
@@ -40,6 +40,8 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 10)
     (=ucs		. #x8C79)	; è±¹
+    (=>jis-x0208	. #x493F)	; è±¹ [41-31]
+    (=>jis-x0213-1	. #x493F)	; è±¹ [41-31]
     (=big5		. #xB05C)	; &I-B-B05C;
     ))
 (define-char
@@ -49,7 +51,9 @@
     (ideographic-radical . 153)	; ⾘
     (ideographic-strokes . 3)
     (total-strokes	 . 10)
+    (=ucs@jis/2004	. #x8C79)	; &GT-48933;
     (=ks-x1001		. #x787B)	; &GT-48933; [88-91]
+    (=jis-x0213-1@2004	. #x493F)	; &I-JX3-493F; [41-31]
     (=gt		. 48933)	; &I-GT-48933;
     (=gt-k		. 06540)	; &I-GT-K06540;
     (=gt-pj-7		. #x3F2B)	; &I-GT-48933; [31-11]
@@ -66,10 +70,16 @@
     (=jis-x0208		. #x493F)	; &GT-48934; [41-31]
     (=gb2312		. #x312A)	; &I-G0-312A; [17-10]
     (=cns11643-1	. #x5841)	; &I-C1-5841; [56-33]
-    (=jis-x0213-1	. #x493F)	; &I-JX1-493F; [41-31]
+    (=jis-x0213-1@2000	. #x493F)	; &I-JX1-493F; [41-31]
     (=gt		. 48934)	; &I-GT-48934;
     (=gt-k		. 06541)	; &I-GT-K06541;
     (=gt-pj-1		. #x493F)	; &I-GT-48934; [41-31]
+    (<-simplified@JP/extra/design
+     ((=ucs@jis/2004	  . #x8C79)	; &GT-48933;
+      (=ks-x1001	  . #x787B)	; &GT-48933; [88-91]
+      (=jis-x0213-1@2004  . #x493F)	; &I-JX3-493F; [41-31]
+      (=daikanwa	  . 36499)	; &I-M-36499;
+      ))
     ))
 (define-char
   '((ideographic-radical . 153)	; ⾘
diff --git a/lisp/utf-2000/Ideograph-R154-Shell.el b/lisp/utf-2000/Ideograph-R154-Shell.el
index 595bda9..ce862db 100644
--- a/lisp/utf-2000/Ideograph-R154-Shell.el
+++ b/lisp/utf-2000/Ideograph-R154-Shell.el
@@ -1214,14 +1214,20 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 154)	; ⾙
+    (=ucs		. #x8CC1)	; 賁
+    (=>jis-x0208	. #x6C4C)	; 賁 [76-44]
+    (=>jis-x0213-1	. #x6C4C)	; 賁 [76-44]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x6C4C)	; &J97-6C4C; [76-44]
+     ((=ucs		  . #x8CC1)	; 賁
       ))
     (ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 5)
     (total-strokes	 . 12)
-    (=ucs		. #x8CC1)	; 賁
-    (=big5		. #xB64E)	; &I-B-B64E;
+    (=big5		. #xB64E)	; &G-GT-49201;
+    (=>>gt		. 49201)	; &G-GT-49201;
     (->subsumptive
      ((=ucs@unicode	  . #x8CC1)	; &GT-49201;
       (=jis-x0208	  . #x6C4C)	; &GT-49201; [76-44]
@@ -1245,10 +1251,6 @@
     ))
 (define-char
   '((ideographic-radical . 154)	; ⾙
-    (=jis-x0208@1997	. #x6C4C)	; &J97-6C4C; [76-44]
-    ))
-(define-char
-  '((ideographic-radical . 154)	; ⾙
     (ideographic-strokes@ucs . 5)
     (total-strokes@ucs	     . 12)
     (ideographic-strokes@ucs*sources
@@ -1442,7 +1444,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x6C4C)	; &J97-6C4C; [76-44]
+     ((=ucs		  . #x8CC1)	; 賁
       ))
     (=>ucs*		. #x8CC1)	; 賁
     (ideographic-radical . 154)	; ⾙
@@ -3183,6 +3185,8 @@
 (define-char
   '((ideographic-radical . 154)	; ⾙
     (=ucs		. #x8CED)	; è³­
+    (=>jis-x0208	. #x4552)	; è³­ [37-50]
+    (=>jis-x0213-1	. #x4552)	; è³­ [37-50]
     (=big5		. #xBDE4)	; &I-B-BDE4;
     ))
 (define-char
@@ -3192,8 +3196,10 @@
     (ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 9)
     (total-strokes	 . 15)
+    (=ucs@jis/2004	. #x8CED)	; &M-36847;
     (=jis-x0208@1978	. #x4552)	; &M-36847; [37-50]
     (=ks-x1001		. #x542E)	; &I-K0-542E; [52-14]
+    (=jis-x0213-1@2004	. #x4552)	; &I-JX3-4552; [37-50]
     (=daikanwa		. 36847)	; &I-M-36847;
     ))
 (define-char
@@ -3207,7 +3213,7 @@
     (=jis-x0208@1983	. #x4552)	; &GT-49329; [37-50]
     (=jis-x0208@1990	. #x4552)	; &I-J90-4552; [37-50]
     (=cns11643-1	. #x6F2F)	; &I-C1-6F2F; [79-15]
-    (=jis-x0213-1	. #x4552)	; &I-JX1-4552; [37-50]
+    (=jis-x0213-1@2000	. #x4552)	; &I-JX1-4552; [37-50]
     (=gb12345		. #x3644)	; &GT-49329; [22-36]
     (=gt		. 49329)	; &I-GT-49329;
     (=gt-pj-1		. #x4552)	; &I-GT-49329; [37-50]
@@ -4327,7 +4333,7 @@
 (define-char
   '((ideographic-radical . 154)	; ⾙
     (=ucs		. #x8D08)	; 贈
-    (=jis-x0208@1997	. #x4223)	; 贈 [34-03]
+    (=>jis-x0208@1997	. #x4223)	; 贈 [34-03]
     ))
 (define-char
   '((<-denotational
@@ -4462,8 +4468,20 @@
      ((=ucs		  . #x8D08)	; 贈
       ))
     (=>ucs*		. #x8D08)	; 贈
+    (=>ucs@jis		. #xFA65)	; ï©¥
+    (ideographic-radical . 154)	; ⾙
+    (ideographic-strokes . 12)
+    (total-strokes	 . 19)
+    (=>jis-x0213-1	. #x7C3D)	; &A-JX1-7C3D; [92-29]
+    ))
+(define-char
+  '((<-denotational
+     ((=>jis-x0213-1	  . #x7C3D)	; &A-JX1-7C3D; [92-29]
+      ))
+    (=>ucs*		. #x8D08)	; 贈
     (ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 12)
+    (total-strokes	 . 19)
     (=ucs		. #xFA65)	; ï©¥
     (=ucs@ks		. #x8D08)	; ï©¥
     (=ks-x1001		. #x717C)	; &I-K0-717C; [81-92]
@@ -4473,10 +4491,8 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x8D08)	; 贈
+     ((=>jis-x0213-1	  . #x7C3D)	; &A-JX1-7C3D; [92-29]
       ))
-    (=>ucs@jis		. #xFA65)	; ï©¥
-    (=>daikanwa		. 36929)	; ï©¥
     (ideographic-radical . 154)	; ⾙
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
diff --git a/lisp/utf-2000/Ideograph-R158-Body.el b/lisp/utf-2000/Ideograph-R158-Body.el
index 456f68d..91932c1 100644
--- a/lisp/utf-2000/Ideograph-R158-Body.el
+++ b/lisp/utf-2000/Ideograph-R158-Body.el
@@ -1008,13 +1008,26 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 158)	; ⾝
+    (=>jis-x0208@1997	. #x366D)	; &J97-366D; [22-77]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x366D)	; &J97-366D; [22-77]
+     ((=>jis-x0208@1997	  . #x366D)	; &J97-366D; [22-77]
       ))
     (ideographic-radical . 158)	; ⾝
     (ideographic-strokes . 11)
     (total-strokes	 . 18)
     (=ucs		. #x8EC0)	; 軀
+    (=>jis-x0213-1	. #x7C4A)	; 軀 [92-42]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8EC0)	; 軀
+      ))
+    (ideographic-radical . 158)	; ⾝
+    (ideographic-strokes . 11)
+    (total-strokes	 . 18)
     (->subsumptive
      ((=ucs@jis		  . #x8EC0)	; &M-38137;
       (=jis-x0208@1978	  . #x366D)	; &M-38137; [22-77]
@@ -1025,44 +1038,54 @@
       )
      ((=ucs@unicode	  . #x8EC0)	; &UU+8EC0;
       (=gb12345		  . #x477B)	; &UU+8EC0; [39-91]
-      )
-     ((=cns11643-1	  . #x774A)	; &C1-774A; [87-42]
       ))
     ))
 (define-char
-  '((ideographic-radical . 158)	; ⾝
-    (=jis-x0208@1997	. #x366D)	; &J97-366D; [22-77]
+  '((<-denotational
+     ((=ucs		  . #x8EC0)	; 軀
+      ))
+    (ideographic-radical . 158)	; ⾝
+    (ideographic-strokes . 11)
+    (total-strokes	 . 18)
+    (=cns11643-1	. #x774A)	; &C1-774A; [87-42]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x366D)	; &J97-366D; [22-77]
+     ((=>jis-x0208@1997	  . #x366D)	; &J97-366D; [22-77]
       ))
     (ideographic-radical . 158)	; ⾝
     (ideographic-strokes . 4)
     (total-strokes	 . 11)
     (=ucs		. #x8EAF)	; 躯
+    (=>jis-x0213-1	. #x366D)	; 躯 [22-77]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8EAF)	; 躯
+      ))
+    (ideographic-radical . 158)	; ⾝
+    (ideographic-strokes . 4)
+    (total-strokes	 . 11)
+    (=cns11643-3	. #x3940)	; &C3-3940; [25-32]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8EAF)	; 躯
+      ))
+    (ideographic-radical . 158)	; ⾝
+    (ideographic-strokes . 4)
+    (total-strokes	 . 11)
     (->subsumptive
-     ((<-denotational
-       ((=ucs@jis	    . #x8EC0)	; &M-38137;
-	(=jis-x0208@1978    . #x366D)	; &M-38137; [22-77]
-	(=ks-x1001	    . #x4F46)	; &I-K0-4F46; [47-38]
-	(=jis-x0212	    . #x6054)	; &I-JSP-6054; [64-52]
-	(=jis-x0213-1	    . #x7C4A)	; &I-JX1-7C4A; [92-42]
-	(=daikanwa	    . 38137)	; &I-M-38137;
-	))
-      (=ucs@jis		  . #x8EAF)	; &GT-50820;
+     ((=ucs@jis		  . #x8EAF)	; &GT-50820;
       (=jis-x0208@1983	  . #x366D)	; &GT-50820; [22-77]
       (=jis-x0208@1990	  . #x366D)	; &I-J90-366D; [22-77]
       (=jis-x0213-1	  . #x366D)	; &I-JX1-366D; [22-77]
       (=gt		  . 50820)	; &I-GT-50820;
       (=gt-pj-1		  . #x366D)	; &I-GT-50820; [22-77]
-      )
-     ((=jef-china3	  . #x66EA)	; &JC3-66EA;
+      (=jef-china3	  . #x66EA)	; &I-JC3-66EA;
       )
      ((=ucs@unicode	  . #x8EAF)	; &G0-477B;
       (=gb2312		  . #x477B)	; &G0-477B; [39-91]
-      )
-     ((=cns11643-3	  . #x3940)	; &C3-3940; [25-32]
       ))
     ))
 (define-char
diff --git a/lisp/utf-2000/Ideograph-R162-Walk.el b/lisp/utf-2000/Ideograph-R162-Walk.el
index 2bed3a1..909dbd8 100644
--- a/lisp/utf-2000/Ideograph-R162-Walk.el
+++ b/lisp/utf-2000/Ideograph-R162-Walk.el
@@ -272,7 +272,8 @@
     (total-strokes	 . 6)
     (=daikanwa		. 38706)	; &M-38706;
     (<-same
-     ((=jis-x0213-1@2004  . #x4B78)	; &M-38724; [43-88]
+     ((=ucs@jis/2004	  . #x8FC4)	; &M-38724;
+      (=jis-x0213-1@2004  . #x4B78)	; &M-38724; [43-88]
       (=daikanwa	  . 38724)	; &I-M-38724;
       ))
     (<-same*sources
@@ -432,6 +433,8 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 2)
     (=ucs		. #x8FBB)	; è¾»
+    (=>jis-x0208	. #x4454)	; è¾» [36-52]
+    (=>jis-x0213-1	. #x4454)	; è¾» [36-52]
     ))
 (define-char
   '((<-denotational
@@ -440,8 +443,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 2)
     (total-strokes	 . 6)
-    (jisx0208-type	. 78/4-)
-    (=jis-x0208@1978	. #x4454)	; &M-38711; [36-52]
+    (=ucs@jis/2004	. #x8FBB)	; &M-38711;
+    (=jis-x0208@1978/4-pr . #x4454)	; &M-38711; [36-52]
+    (=jis-x0213-1@2004	. #x4454)	; &M-38711; [36-52]
     (=daikanwa		. 38711)	; &I-M-38711;
     (=shinjigen		.  8212)	; &M-38711;
     (=jef-china3	. #x67A5)	; &I-JC3-67A5;
@@ -453,13 +457,18 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
-    (jisx0208-difference . 78/4-)
     (=ucs@unicode	. #x8FBB)	; &GT-51653;
-    (=jis-x0208@1983	. #x4454)	; &GT-51653; [36-52]
+    (=jis-x0208@1978/-4pr . #x4454)	; &GT-51653; [36-52]
+    (=jis-x0208@1983	. #x4454)	; &I-J83-4454; [36-52]
     (=jis-x0208@1990	. #x4454)	; &I-J90-4454; [36-52]
-    (=jis-x0213-1	. #x4454)	; &I-JX1-4454; [36-52]
+    (=jis-x0213-1@2000	. #x4454)	; &I-JX1-4454; [36-52]
     (=gt		. 51653)	; &I-GT-51653;
     (=gt-pj-1		. #x4454)	; &I-GT-51653; [36-52]
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x8FBB)	; &M-38711;
+      (=jis-x0213-1@2004  . #x4454)	; &M-38711; [36-52]
+      (=daikanwa	  . 38711)	; &I-M-38711;
+      ))
     ))
 (define-char
   '((=>ucs		. #x8FBC)	; è¾¼
@@ -684,7 +693,9 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
+    (=ucs@jis/2004	. #x8FBF)	; &M-38718;
     (=jis-x0208@1978	. #x4329)	; &M-38718; [35-09]
+    (=jis-x0213-1@2004	. #x4329)	; &I-JX3-4329; [35-09]
     (=daikanwa		. 38718)	; &I-M-38718;
     ))
 (define-char
@@ -697,10 +708,16 @@
     (=ucs@unicode	. #x8FBF)	; &GT-51679;
     (=jis-x0208@1983	. #x4329)	; &GT-51679; [35-09]
     (=jis-x0208@1990	. #x4329)	; &I-J90-4329; [35-09]
-    (=jis-x0213-1	. #x4329)	; &I-JX1-4329; [35-09]
+    (=jis-x0213-1@2000	. #x4329)	; &I-JX1-4329; [35-09]
     (=gt		. 51679)	; &I-GT-51679;
     (=gt-pj-1		. #x4329)	; &I-GT-51679; [35-09]
     (=jef-china3	. #x70F6)	; &I-JC3-70F6;
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x8FBF)	; &M-38718;
+      (=jis-x0208@1978	  . #x4329)	; &M-38718; [35-09]
+      (=jis-x0213-1@2004  . #x4329)	; &I-JX3-4329; [35-09]
+      (=daikanwa	  . 38718)	; &I-M-38718;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -836,8 +853,9 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (=ucs		. #x8FC2)	; 迂
+    (=>jis-x0208	. #x312A)	; 迂 [17-10]
+    (=>jis-x0213-1	. #x312A)	; 迂 [17-10]
     (=big5		. #xA8B1)	; &I-B-A8B1;
-    (=jis-x0208@1997	. #x312A)	; 迂 [17-10]
     ))
 (define-char
   '((<-denotational
@@ -878,6 +896,13 @@
     (=gt		. 51658)	; &I-GT-51658;
     (=gt-pj-1		. #x312A)	; &I-GT-51658; [17-10]
     (=jef-china3	. #x70EE)	; &I-JC3-70EE;
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x8FC2)	; &M-38722;
+      (=jis-x0208@1978	  . #x312A)	; &M-38722; [17-10]
+      (=ks-x1001	  . #x6966)	; &I-K0-6966; [73-70]
+      (=jis-x0213-1@2004  . #x312A)	; &I-JX3-312A; [17-10]
+      (=daikanwa	  . 38722)	; &I-M-38722;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -943,6 +968,7 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 7)
     (=jis-x0208@1978/4-pr*sources jis-x0208@1978/4-pr jis-x0208@1997)
+    (=ucs@jis/2004	. #x8FC4)	; &M-38724;
     (=jis-x0208@1978/4-pr . #x4B78)	; &M-38724; [43-88]
     (=jis-x0213-1@2004	. #x4B78)	; &M-38724; [43-88]
     (=daikanwa		. 38724)	; &I-M-38724;
@@ -954,8 +980,8 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 3)
     (total-strokes	 . 6)
-    (=jis-x0208@1978*note . "ISO-IR-042 = 1978/i-4")
-    (=jis-x0208@1978*sources jis-x0208@1978/i-4 jis-x0208@1997)
+    (=jis-x0208@1978/-4pr*note "ISO-IR-042 = 1978/-4pr")
+    (=jis-x0208@1978/-4pr*sources jis-x0208@1978/-4pr jis-x0208@1997)
     (=ucs@unicode	. #x8FC4)	; &GT-51666;
     (=jis-x0208@1978/-4pr . #x4B78)	; &GT-51666; [43-88]
     (=gb2312		. #x4679)	; &I-G0-4679; [38-89]
@@ -966,6 +992,11 @@
     (=gt-k		. 01691)	; &I-GT-K01691;
     (=gt-pj-1		. #x4B78)	; &I-GT-51666; [43-88]
     (=jef-china3	. #x70F4)	; &I-JC3-70F4;
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x8FC4)	; &M-38724;
+      (=jis-x0213-1@2004  . #x4B78)	; &M-38724; [43-88]
+      (=daikanwa	  . 38724)	; &I-M-38724;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -1987,7 +2018,9 @@
     (=jis-x0213-2	. #x7971)	; &I-JX2-7971; [89-81]
     (=daikanwa		. 38756)	; &I-M-38756;
     (<-same
-     ((=daikanwa	  . 35260)	; &M-35260;
+     ((=ucs@jis/2004	  . #x8A1D)	; &M-35260;
+      (=jis-x0213-1@2004  . #x6B43)	; &M-35260; [75-35]
+      (=daikanwa	  . 35260)	; &I-M-35260;
       ))
     (<-same*sources
      jiyun shangshu shangshu-zhuan shangshu-caizhuan taixuanjing daikanwa)
@@ -2391,7 +2424,8 @@
     (total-strokes	 . 8)
     (=daikanwa		. 38768)	; &M-38768;
     (<-same
-     ((=jis-x0213-1@2004  . #x4B78)	; &M-38724; [43-88]
+     ((=ucs@jis/2004	  . #x8FC4)	; &M-38724;
+      (=jis-x0213-1@2004  . #x4B78)	; &M-38724; [43-88]
       (=daikanwa	  . 38724)	; &I-M-38724;
       ))
     (<-same*sources
@@ -2547,8 +2581,10 @@
     (total-strokes	 . 8)
     (=daikanwa		. 38772)	; &M-38772;
     (<-vulgar
-     ((=jis-x0208@1978	  . #x4767)	; &M-38889; [39-71]
+     ((=ucs@jis/2004	  . #x9019)	; &M-38889;
+      (=jis-x0208@1978	  . #x4767)	; &M-38889; [39-71]
       (=ks-x1001	  . #x6E4F)	; &I-K0-6E4F; [78-47]
+      (=jis-x0213-1@2004  . #x4767)	; &I-JX3-4767; [39-71]
       (=daikanwa	  . 38889)	; &I-M-38889;
       ))
     (<-vulgar*sources
@@ -2577,18 +2613,30 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 4)
     (=ucs		. #x8FDA)	; 迚
-    (->subsumptive
-     ((total-strokes	   . 8)
-      (=ucs@jis		  . #x8FDA)	; &GT-51828;
-      (=jis-x0208	  . #x6D69)	; &GT-51828; [77-73]
-      (=jis-x0213-1	  . #x6D69)	; &I-JX1-6D69; [77-73]
-      (=gt		  . 51828)	; &I-GT-51828;
-      (=gt-pj-1		  . #x6D69)	; &I-GT-51828; [77-73]
-      (=daikanwa	  . 38773)	; &I-M-38773;
-      (=shinjigen	  .  8232)	; &GT-51828;
-      )
-     ((=ucs@unicode	  . #x8FDA)	; &UU+8FDA;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8FDA)	; 迚
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 4)
+    (total-strokes	 . 8)
+    (=ucs@jis		. #x8FDA)	; &GT-51828;
+    (=jis-x0208		. #x6D69)	; &GT-51828; [77-73]
+    (=jis-x0213-1	. #x6D69)	; &I-JX1-6D69; [77-73]
+    (=gt		. 51828)	; &I-GT-51828;
+    (=gt-pj-1		. #x6D69)	; &I-GT-51828; [77-73]
+    (=daikanwa		. 38773)	; &I-M-38773;
+    (=shinjigen		.  8232)	; &GT-51828;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x8FDA)	; 迚
       ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 4)
+    (total-strokes	 . 7)
+    (=ucs@unicode	. #x8FDA)	; &UU+8FDA;
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
@@ -2721,7 +2769,8 @@
     (=jis-x0213-2	. #x7973)	; &I-JX2-7973; [89-83]
     (=daikanwa		. 38777)	; &I-M-38777;
     (<-wrong@JP
-     ((=jis-x0213-1@2004  . #x4B78)	; &M-38724; [43-88]
+     ((=ucs@jis/2004	  . #x8FC4)	; &M-38724;
+      (=jis-x0213-1@2004  . #x4B78)	; &M-38724; [43-88]
       (=daikanwa	  . 38724)	; &I-M-38724;
       ))
     (<-wrong@JP*sources
@@ -3176,8 +3225,9 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 5)
     (=ucs		. #x8FE6)	; 迦
+    (=>jis-x0208	. #x3260)	; 迦 [18-64]
+    (=>jis-x0213-1	. #x3260)	; 迦 [18-64]
     (=big5		. #xAD7B)	; &I-B-AD7B;
-    (=jis-x0208@1997	. #x3260)	; 迦 [18-64]
     ))
 (define-char
   '((<-denotational
@@ -3231,6 +3281,13 @@
     (=gt-k		. 03654)	; &I-GT-K03654;
     (=gt-pj-1		. #x3260)	; &I-GT-51758; [18-64]
     (=jef-china3	. #x70EF)	; &I-JC3-70EF;
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x8FE6)	; &M-38789;
+      (=jis-x0208@1978	  . #x3260)	; &M-38789; [18-64]
+      (=ks-x1001	  . #x4A3C)	; &I-K0-4A3C; [42-28]
+      (=jis-x0213-1@2004  . #x3260)	; &I-JX3-3260; [18-64]
+      (=daikanwa	  . 38789)	; &I-M-38789;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -4408,7 +4465,7 @@
     (total-strokes	 . 10)
     (=daikanwa		. 38820)	; &M-38820;
     (<-synonyms
-     ((=jis-x0208@1978	  . #x3872)	; &M-00291; [24-82]
+     ((=jis-x0208@1978	  . #x3872)	; &GT-00389; [24-82]
       (=jis-x0208@1983	  . #x3872)	; &I-J83-3872; [24-82]
       (=ks-x1001	  . #x4E5F)	; &I-K0-4E5F; [46-63]
       (=daikanwa	  . 00291)	; &I-M-00291;
@@ -5415,7 +5472,8 @@
     (=jis-x0212		. #x614C)	; &M-38847; [65-44]
     (=daikanwa		. 38847)	; &I-M-38847;
     (->mistakable
-     ((=ks-x1001	  . #x5C71)	; &M-38901; [60-81]
+     ((=ucs@jis/2004	  . #x9022)	; &M-38901;
+      (=ks-x1001	  . #x5C71)	; &M-38901; [60-81]
       (=jis-x0213-1@2004  . #x3029)	; &I-JX3-3029; [16-09]
       (=daikanwa	  . 38901)	; &I-M-38901;
       ))
@@ -5779,7 +5837,7 @@
     (total-strokes	 . 10)
     (=daikanwa		. 38857)	; &M-38857;
     (<-same
-     ((=jis-x0208@1978	  . #x446D)	; &M-09337; [36-77]
+     ((=jis-x0208@1978	  . #x446D)	; &GT-11748; [36-77]
       (=jis-x0208@1983	  . #x446D)	; &I-J83-446D; [36-77]
       (=ks-x1001	  . #x6F54)	; &I-K0-6F54; [79-52]
       (=daikanwa	  . 09337)	; &I-M-09337;
@@ -5997,9 +6055,16 @@
     (=cns11643-6	. #x3C57)	; &C6-3C57; [28-55]
     ))
 (define-char
+  '((ideographic-radical . 162)	; ⾡
+    (=ucs@big5		. #x8FF8)	; &J97-6D7E;
+    (=>jis-x0208	. #x6D7E)	; &J97-6D7E; [77-94]
+    (=>jis-x0213-1	. #x6D7E)	; &J97-6D7E; [77-94]
+    (=big5		. #xB06E)	; &J97-6D7E;
+    ))
+(define-char
   '((<-denotational
-     ((=ucs@big5	  . #x8FF8)	; &B-B06E;
-      (=big5		  . #xB06E)	; &B-B06E;
+     ((=ucs@big5	  . #x8FF8)	; &J97-6D7E;
+      (=>jis-x0208	  . #x6D7E)	; &J97-6D7E; [77-94]
       ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 6)
@@ -6029,11 +6094,6 @@
      zhengzitong daikanwa shinjigen@1ed)
     ))
 (define-char
-  '((ideographic-radical . 162)	; ⾡
-    (=ucs@big5		. #x8FF8)	; &B-B06E;
-    (=big5		. #xB06E)	; &B-B06E;
-    ))
-(define-char
   '((<-denotational
      ((=ucs		  . #x8FF8)	; 迸
       ))
@@ -6936,8 +6996,10 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=ucs@jis/2004	. #x9017)	; &M-38887;
     (=jis-x0208@1978	. #x3F60)	; &M-38887; [31-64]
     (=ks-x1001		. #x5468)	; &I-K0-5468; [52-72]
+    (=jis-x0213-1@2004	. #x3F60)	; &I-JX3-3F60; [31-64]
     (=daikanwa		. 38887)	; &I-M-38887;
     (<-synonyms
      ((=daikanwa	  . 00505)	; &M-00505;
@@ -6956,10 +7018,17 @@
     (=gb2312		. #x363A)	; &GT-51992; [22-26]
     (=jis-x0208@1983	. #x3F60)	; &I-J83-3F60; [31-64]
     (=jis-x0208@1990	. #x3F60)	; &I-J90-3F60; [31-64]
-    (=jis-x0213-1	. #x3F60)	; &I-JX1-3F60; [31-64]
+    (=jis-x0213-1@2000	. #x3F60)	; &I-JX1-3F60; [31-64]
     (=gt		. 51992)	; &I-GT-51992;
     (=gt-pj-1		. #x3F60)	; &I-GT-51992; [31-64]
     (=jef-china3	. #x70F0)	; &I-JC3-70F0;
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x9017)	; &M-38887;
+      (=jis-x0208@1978	  . #x3F60)	; &M-38887; [31-64]
+      (=ks-x1001	  . #x5468)	; &I-K0-5468; [52-72]
+      (=jis-x0213-1@2004  . #x3F60)	; &I-JX3-3F60; [31-64]
+      (=daikanwa	  . 38887)	; &I-M-38887;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -7017,6 +7086,8 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (=ucs		. #x9019)	; 這
+    (=>jis-x0208	. #x4767)	; 這 [39-71]
+    (=>jis-x0213-1	. #x4767)	; 這 [39-71]
     (=big5		. #xB36F)	; &I-B-B36F;
     ))
 (define-char
@@ -7026,8 +7097,10 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=ucs@jis/2004	. #x9019)	; &M-38889;
     (=jis-x0208@1978	. #x4767)	; &M-38889; [39-71]
     (=ks-x1001		. #x6E4F)	; &I-K0-6E4F; [78-47]
+    (=jis-x0213-1@2004	. #x4767)	; &I-JX3-4767; [39-71]
     (=daikanwa		. 38889)	; &I-M-38889;
     ))
 (define-char
@@ -7046,18 +7119,27 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
+    (=>>jis-x0213-1@2000 . #x4767)	; &G-GT-51972; [39-71]
+    (=>>gt		. 51972)	; &G-GT-51972;
     (->subsumptive
-     ((=ucs@jis		  . #x9019)	; &GT-51972;
+     ((=ucs@jis/1990	  . #x9019)	; &GT-51972;
+      (=ucs@jis/2000	  . #x9019)	; &GT-51972;
       (=jis-x0208@1983	  . #x4767)	; &GT-51972; [39-71]
       (=jis-x0208@1990	  . #x4767)	; &I-J90-4767; [39-71]
-      (=jis-x0213-1	  . #x4767)	; &I-JX1-4767; [39-71]
+      (=jis-x0213-1@2000  . #x4767)	; &I-JX1-4767; [39-71]
       (=gt		  . 51972)	; &I-GT-51972;
       (=gt-k		  . 06528)	; &I-GT-K06528;
       (=gt-pj-1		  . #x4767)	; &I-GT-51972; [39-71]
       (=jef-china3	  . #x70F2)	; &I-JC3-70F2;
+      (<-simplified@JP/extra
+       ((=ucs@jis/2004	    . #x9019)	; &M-38889;
+	(=jis-x0208@1978    . #x4767)	; &M-38889; [39-71]
+	(=ks-x1001	    . #x6E4F)	; &I-K0-6E4F; [78-47]
+	(=jis-x0213-1@2004  . #x4767)	; &I-JX3-4767; [39-71]
+	(=daikanwa	    . 38889)	; &I-M-38889;
+	))
       )
-     ((total-strokes	   . 10)
-      (=ucs@unicode	  . #x9019)	; &UU+9019;
+     ((=ucs@unicode	  . #x9019)	; &UU+9019;
       (=gb12345		  . #x5562)	; &UU+9019; [53-66]
       ))
     ))
@@ -7389,8 +7471,9 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (=ucs		. #x901F)	; 速
+    (=>jis-x0208	. #x422E)	; 速 [34-14]
+    (=>jis-x0213-1	. #x422E)	; 速 [34-14]
     (=big5		. #xB374)	; &I-B-B374;
-    (=jis-x0208@1997	. #x422E)	; 速 [34-14]
     ))
 (define-char
   '((<-denotational
@@ -7414,8 +7497,7 @@
 	))
       (->Large-Seal*sources
        shuowen daikanwa/fixed)
-      (->Large-Seal*sources@daikanwa/fixed*note
-       . "M-39079 seems a typo of M-39080.")
+      (->Large-Seal*sources@daikanwa/fixed*note "M-39079 seems a typo of M-39080.")
       )
      ((=jef-china3	  . #x67C8)	; &JC3-67C8;
       ))
@@ -7603,8 +7685,9 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (=ucs		. #x9022)	; 逢
+    (=>jis-x0208	. #x3029)	; 逢 [16-09]
+    (=>jis-x0213-1	. #x3029)	; 逢 [16-09]
     (=big5		. #xB37B)	; &I-B-B37B;
-    (=jis-x0208@1997	. #x3029)	; 逢 [16-09]
     ))
 (define-char
   '((<-denotational
@@ -7613,6 +7696,7 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 11)
+    (=ucs@jis/2004	. #x9022)	; &M-38901;
     (=jis-x0208@1978/4-pr . #x3029)	; &M-38901; [16-09]
     (=ks-x1001		. #x5C71)	; &M-38901; [60-81]
     (=jis-x0213-1@2004	. #x3029)	; &I-JX3-3029; [16-09]
@@ -7632,7 +7716,6 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
-    (jisx0208-difference . 78/4-)
     (=ucs@unicode	. #x9022)	; &GT-52042;
     (=jis-x0208@1978/-4pr . #x3029)	; &GT-52042; [16-09]
     (=gb2312		. #x376A)	; &I-G0-376A; [23-74]
@@ -7643,6 +7726,12 @@
     (=gt-k		. 06727)	; &I-GT-K06727;
     (=gt-pj-1		. #x3029)	; &I-GT-52042; [16-09]
     (=shinjigen		.  8295)	; &GT-52042;
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x9022)	; &M-38901;
+      (=ks-x1001	  . #x5C71)	; &M-38901; [60-81]
+      (=jis-x0213-1@2004  . #x3029)	; &I-JX3-3029; [16-09]
+      (=daikanwa	  . 38901)	; &I-M-38901;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -8482,8 +8571,8 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs@big5	  . #x8FF8)	; &B-B06E;
-      (=big5		  . #xB06E)	; &B-B06E;
+     ((=ucs@big5	  . #x8FF8)	; &J97-6D7E;
+      (=>jis-x0208	  . #x6D7E)	; &J97-6D7E; [77-94]
       ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 8)
@@ -8509,6 +8598,7 @@
     (<-synonyms
      ((=jis-x0208@1978	  . #x5622)	; &M-07734; [54-02]
       (=ks-x1001	  . #x5C33)	; &I-K0-5C33; [60-19]
+      (=jis-x0213-1@2004  . #x7E7B)	; &I-JX3-7E7B; [94-91]
       (=daikanwa	  . 07734)	; &I-M-07734;
       ))
     (<-synonyms*sources
@@ -10049,8 +10139,10 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=ucs@jis/2004	. #x903C)	; &M-38973;
     (=jis-x0208@1978	. #x492F)	; &M-38973; [41-15]
     (=ks-x1001		. #x793A)	; &I-K0-793A; [89-26]
+    (=jis-x0213-1@2004	. #x492F)	; &I-JX3-492F; [41-15]
     (=daikanwa		. 38973)	; &I-M-38973;
     (->formed
      ((name		  . "CJK COMPATIBILITY IDEOGRAPH-FA1B")
@@ -10071,10 +10163,17 @@
     (=gb2312		. #x3146)	; &GT-52281; [17-38]
     (=jis-x0208@1983	. #x492F)	; &I-J83-492F; [41-15]
     (=jis-x0208@1990	. #x492F)	; &I-J90-492F; [41-15]
-    (=jis-x0213-1	. #x492F)	; &I-JX1-492F; [41-15]
+    (=jis-x0213-1@2000	. #x492F)	; &I-JX1-492F; [41-15]
     (=gt		. 52281)	; &I-GT-52281;
     (=gt-pj-1		. #x492F)	; &I-GT-52281; [41-15]
     (=jef-china3	. #x70F3)	; &I-JC3-70F3;
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x903C)	; &M-38973;
+      (=jis-x0208@1978	  . #x492F)	; &M-38973; [41-15]
+      (=ks-x1001	  . #x793A)	; &I-K0-793A; [89-26]
+      (=jis-x0213-1@2004  . #x492F)	; &I-JX3-492F; [41-15]
+      (=daikanwa	  . 38973)	; &I-M-38973;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -10395,8 +10494,10 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (total-strokes	 . 13)
+    (=ucs@jis/2004	. #x9041)	; &M-38982;
     (=jis-x0208@1978	. #x465B)	; &M-38982; [38-59]
     (=ks-x1001		. #x546D)	; &I-K0-546D; [52-77]
+    (=jis-x0213-1@2004	. #x465B)	; &I-JX3-465B; [38-59]
     (=daikanwa		. 38982)	; &I-M-38982;
     (<-same
      ((=daikanwa	  . 38983)	; &M-38983;
@@ -10415,11 +10516,18 @@
     (=gb2312		. #x365D)	; &GT-52278; [22-61]
     (=jis-x0208@1983	. #x465B)	; &I-J83-465B; [38-59]
     (=jis-x0208@1990	. #x465B)	; &I-J90-465B; [38-59]
-    (=jis-x0213-1	. #x465B)	; &I-JX1-465B; [38-59]
+    (=jis-x0213-1@2000	. #x465B)	; &I-JX1-465B; [38-59]
     (=gt		. 52278)	; &I-GT-52278;
     (=gt-k		. 09118)	; &I-GT-K09118;
     (=gt-pj-1		. #x465B)	; &I-GT-52278; [38-59]
     (=jef-china3	. #x70F5)	; &I-JC3-70F5;
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x9041)	; &M-38982;
+      (=jis-x0208@1978	  . #x465B)	; &M-38982; [38-59]
+      (=ks-x1001	  . #x546D)	; &I-K0-546D; [52-77]
+      (=jis-x0213-1@2004  . #x465B)	; &I-JX3-465B; [38-59]
+      (=daikanwa	  . 38982)	; &I-M-38982;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -11169,10 +11277,11 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (=ucs		. #x904D)	; 遍
+    (=big5		. #xB94D)	; &I-B-B94D;
     ))
 (define-char
   '((<-denotational
-     ((=big5		  . #xB94D)	; &B-B94D;
+     ((=ucs		  . #x904D)	; 遍
       ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
@@ -11195,14 +11304,6 @@
       ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
-    (=big5		. #xB94D)	; &B-B94D;
-    ))
-(define-char
-  '((<-denotational
-     ((=big5		  . #xB94D)	; &B-B94D;
-      ))
-    (ideographic-radical . 162)	; ⾡
-    (ideographic-strokes . 9)
     (total-strokes	 . 13)
     (=cns11643-1	. #x6735)	; &C1-6735; [71-21]
     ))
@@ -11233,8 +11334,17 @@
     ))
 (define-char
   '((<-denotational
-     ((=big5		  . #xB94C)	; &B-B94C;
-      (=jis-x0208@1997	  . #x3261)	; &B-B94C; [18-65]
+     ((=ucs		  . #x904E)	; 過
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 9)
+    (=>jis-x0208	. #x3261)	; &J97-3261; [18-65]
+    (=>jis-x0213-1	. #x3261)	; &J97-3261; [18-65]
+    (=big5		. #xB94C)	; &J97-3261;
+    ))
+(define-char
+  '((<-denotational
+     ((=>jis-x0208	  . #x3261)	; &J97-3261; [18-65]
       ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
@@ -11250,17 +11360,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x904E)	; 過
-      ))
-    (ideographic-radical . 162)	; ⾡
-    (ideographic-strokes . 9)
-    (=big5		. #xB94C)	; &B-B94C;
-    (=jis-x0208@1997	. #x3261)	; &B-B94C; [18-65]
-    ))
-(define-char
-  '((<-denotational
-     ((=big5		  . #xB94C)	; &B-B94C;
-      (=jis-x0208@1997	  . #x3261)	; &B-B94C; [18-65]
+     ((=>jis-x0208	  . #x3261)	; &J97-3261; [18-65]
       ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
@@ -11280,8 +11380,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=big5		  . #xB94C)	; &B-B94C;
-      (=jis-x0208@1997	  . #x3261)	; &B-B94C; [18-65]
+     ((=>jis-x0208	  . #x3261)	; &J97-3261; [18-65]
       ))
     (morohashi-daikanwa	39002 1)
     (ideographic-radical . 162)	; ⾡
@@ -12325,6 +12424,36 @@
     ))
 (define-char
   '((ideographic-radical . 162)	; ⾡
+    (=ucs		. #x9065)	; 遥
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9065)	; 遥
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 9)
+    (total-strokes	 . 12)
+    (=ucs@jis		. #x9065)	; &GT-52297;
+    (=jis-x0208@1983	. #x4D5A)	; &GT-52297; [45-58]
+    (=jis-x0208@1990	. #x4D5A)	; &I-J90-4D5A; [45-58]
+    (=jis-x0213-1	. #x4D5A)	; &I-JX1-4D5A; [45-58]
+    (=gt		. 52297)	; &I-GT-52297;
+    (=gt-k		. 09156)	; &I-GT-K09156;
+    (=gt-pj-1		. #x4D5A)	; &I-GT-52297; [45-58]
+    (=shinjigen@rev	.  8352)	; &GT-52297;
+    (=jef-china3	. #x70EB)	; &I-JC3-70EB;
+    (<-simplified@JP/jis
+     ((=ucs@jis		  . #x9059)	; &GT-52486;
+      (=jis-x0208@1978	  . #x4D5A)	; &GT-52486; [45-58]
+      (=jis-x0208@1983	  . #x7423)	; &I-J83-7423; [84-03]
+      (=ks-x1001	  . #x692B)	; &I-K0-692B; [73-11]
+      (=jis-x0208@1990	  . #x7423)	; &I-J90-7423; [84-03]
+      (=jis-x0213-1	  . #x7423)	; &I-JX1-7423; [84-03]
+      (=daikanwa	  . 39035)	; &I-M-39035;
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 9)
     (=ucs		. #x28553)	; 𨕓
     ))
@@ -12517,12 +12646,11 @@
     (=cns11643-3	. #x4A25)	; &C3-4A25; [42-05]
     ))
 (define-char
-  '((<-denotational
-     ((=jis-x0208@1997	  . #x4D5A)	; &J97-4D5A; [45-58]
-      ))
-    (ideographic-radical . 162)	; ⾡
+  '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (=ucs		. #x9059)	; 遙
+    (=>jis-x0208	. #x7423)	; 遙 [84-03]
+    (=>jis-x0213-1	. #x7423)	; 遙 [84-03]
     (=big5		. #xBBBB)	; &I-B-BBBB;
     ))
 (define-char
@@ -12543,7 +12671,7 @@
     (=gt-pj-1		. #x7423)	; &I-GT-52486; [84-03]
     (=daikanwa		. 39035)	; &I-M-39035;
     (=shinjigen@1ed	.  8364)	; &GT-52486;
-    (=shinjigen@rev	.  8352)	; &GT-52486;
+    (=shinjigen/+p@rev	.  8352)	; &GT-52486;
     (->formed
      ((=ucs@unicode	  . #x6416)	; &GT-15861;
       (=jis-x0208	  . #x596A)	; &GT-15861; [57-74]
@@ -12555,10 +12683,6 @@
      maoshi daikanwa)
     ))
 (define-char
-  '((ideographic-radical . 162)	; ⾡
-    (=jis-x0208@1997	. #x4D5A)	; &J97-4D5A; [45-58]
-    ))
-(define-char
   '((<-denotational
      ((=ucs		  . #x9059)	; 遙
       ))
@@ -12577,48 +12701,6 @@
     (=cns11643-1	. #x6B43)	; &C1-6B43; [75-35]
     ))
 (define-char
-  '((<-denotational
-     ((=jis-x0208@1997	  . #x4D5A)	; &J97-4D5A; [45-58]
-      ))
-    (ideographic-radical . 162)	; ⾡
-    (=ucs		. #x9065)	; 遥
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x9065)	; 遥
-      ))
-    (ideographic-radical . 162)	; ⾡
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=ucs@unicode	. #x9065)	; &G0-5223;
-    (=gb2312		. #x5223)	; &G0-5223; [50-03]
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x9065)	; 遥
-      ))
-    (ideographic-radical . 162)	; ⾡
-    (ideographic-strokes . 9)
-    (total-strokes	 . 12)
-    (=ucs@jis		. #x9065)	; &GT-52297;
-    (=jis-x0208@1983	. #x4D5A)	; &GT-52297; [45-58]
-    (=jis-x0208@1990	. #x4D5A)	; &I-J90-4D5A; [45-58]
-    (=jis-x0213-1	. #x4D5A)	; &I-JX1-4D5A; [45-58]
-    (=gt		. 52297)	; &I-GT-52297;
-    (=gt-k		. 09156)	; &I-GT-K09156;
-    (=gt-pj-1		. #x4D5A)	; &I-GT-52297; [45-58]
-    (=jef-china3	. #x70EB)	; &I-JC3-70EB;
-    (<-simplified@JP/jis
-     ((=ucs@jis		  . #x9059)	; &GT-52486;
-      (=jis-x0208@1978	  . #x4D5A)	; &GT-52486; [45-58]
-      (=jis-x0208@1983	  . #x7423)	; &I-J83-7423; [84-03]
-      (=ks-x1001	  . #x692B)	; &I-K0-692B; [73-11]
-      (=jis-x0208@1990	  . #x7423)	; &I-J90-7423; [84-03]
-      (=jis-x0213-1	  . #x7423)	; &I-JX1-7423; [84-03]
-      (=daikanwa	  . 39035)	; &I-M-39035;
-      ))
-    ))
-(define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (=ucs		. #x905A)	; 遚
@@ -12705,8 +12787,10 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=ucs@jis/2004	. #x905C)	; &M-39038;
     (=jis-x0208@1978	. #x423D)	; &M-39038; [34-29]
     (=ks-x1001		. #x6161)	; &I-K0-6161; [65-65]
+    (=jis-x0213-1@2004	. #x423D)	; &I-JX3-423D; [34-29]
     (=daikanwa		. 39038)	; &I-M-39038;
     (<-synonyms
      ((=cns11643-2	  . #x4A39)	; &M-11023; [42-25]
@@ -12716,7 +12800,6 @@
      shuowen-tongxundingsheng shangshu shangshu-zhuan daikanwa)
     (->formed
      ((=ucs@jis		  . #x5B6B)	; &GT-08784;
-      (=ucs@big5	  . #x5B6B)	; &GT-08784;
       (=jis-x0208	  . #x4239)	; &GT-08784; [34-25]
       (=ks-x1001	  . #x615D)	; &I-K0-615D; [65-61]
       (=jis-x0213-1	  . #x4239)	; &I-JX1-4239; [34-25]
@@ -12740,19 +12823,26 @@
       ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
+    (total-strokes	 . 13)
     (->subsumptive
-     ((total-strokes	   . 13)
-      (=ucs@jis		  . #x905C)	; &GT-52366;
+     ((=ucs@jis/1990	  . #x905C)	; &GT-52366;
+      (=ucs@jis/2000	  . #x905C)	; &GT-52366;
       (=jis-x0208@1983	  . #x423D)	; &GT-52366; [34-29]
       (=jis-x0208@1990	  . #x423D)	; &I-J90-423D; [34-29]
-      (=jis-x0213-1	  . #x423D)	; &I-JX1-423D; [34-29]
+      (=jis-x0213-1@2000  . #x423D)	; &I-JX1-423D; [34-29]
       (=gt		  . 52366)	; &I-GT-52366;
       (=gt-k		  . 10240)	; &I-GT-K10240;
       (=gt-pj-1		  . #x423D)	; &I-GT-52366; [34-29]
       (=jef-china3	  . #x70F7)	; &I-JC3-70F7;
+      (<-simplified@JP/extra
+       ((=ucs@jis/2004	    . #x905C)	; &M-39038;
+	(=jis-x0208@1978    . #x423D)	; &M-39038; [34-29]
+	(=ks-x1001	    . #x6161)	; &I-K0-6161; [65-65]
+	(=jis-x0213-1@2004  . #x423D)	; &I-JX3-423D; [34-29]
+	(=daikanwa	    . 39038)	; &I-M-39038;
+	))
       )
-     ((total-strokes	   . 13)
-      (=ucs@unicode	  . #x905C)	; &UU+905C;
+     ((=ucs@unicode	  . #x905C)	; &UU+905C;
       (=gb12345		  . #x5137)	; &UU+905C; [49-23]
       ))
     ))
@@ -12964,10 +13054,11 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (=ucs		. #x905E)	; 遞
+    (=big5		. #xBBBC)	; &I-B-BBBC;
     ))
 (define-char
   '((<-denotational
-     ((=big5		  . #xBBBC)	; &B-BBBC;
+     ((=ucs		  . #x905E)	; 遞
       ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
@@ -13012,21 +13103,13 @@
       ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
-    (=big5		. #xBBBC)	; &B-BBBC;
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x905E)	; 遞
-      ))
-    (ideographic-radical . 162)	; ⾡
-    (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs@unicode	. #x905E)	; &UU+905E;
     (=gb12345		. #x355D)	; &UU+905E; [21-61]
     ))
 (define-char
   '((<-denotational
-     ((=big5		  . #xBBBC)	; &B-BBBC;
+     ((=ucs		  . #x905E)	; 遞
       ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
@@ -13134,8 +13217,10 @@
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 10)
     (total-strokes	 . 14)
+    (=ucs@jis/2004	. #x9061)	; &M-39048;
     (=jis-x0208@1978	. #x414C)	; &M-39048; [33-44]
     (=ks-x1001		. #x614F)	; &I-K0-614F; [65-47]
+    (=jis-x0213-1@2004	. #x414C)	; &I-JX3-414C; [33-44]
     (=daikanwa		. 39048)	; &I-M-39048;
     (<-same
      ((=ucs@jis		  . #x3D11)	; &M-17777;
@@ -13161,10 +13246,17 @@
     (=ucs@unicode	. #x9061)	; &GT-52360;
     (=jis-x0208@1983	. #x414C)	; &GT-52360; [33-44]
     (=jis-x0208@1990	. #x414C)	; &I-J90-414C; [33-44]
-    (=jis-x0213-1	. #x414C)	; &I-JX1-414C; [33-44]
+    (=jis-x0213-1@2000	. #x414C)	; &I-JX1-414C; [33-44]
     (=gt		. 52360)	; &I-GT-52360;
     (=gt-pj-1		. #x414C)	; &I-GT-52360; [33-44]
     (=jef-china3	. #x70F1)	; &I-JC3-70F1;
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x9061)	; &M-39048;
+      (=jis-x0208@1978	  . #x414C)	; &M-39048; [33-44]
+      (=ks-x1001	  . #x614F)	; &I-K0-614F; [65-47]
+      (=jis-x0213-1@2004  . #x414C)	; &I-JX3-414C; [33-44]
+      (=daikanwa	  . 39048)	; &I-M-39048;
+      ))
     ))
 (define-char
   '((<-denotational
@@ -13650,6 +13742,16 @@
     (=gb12345		. #x7D6F)	; 遤 [93-79]
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x9065)	; 遥
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs@unicode	. #x9065)	; &G0-5223;
+    (=gb2312		. #x5223)	; &G0-5223; [50-03]
+    ))
+(define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (=ucs		. #x9066)	; 遦
@@ -14811,18 +14913,39 @@
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
+    (=ucs		. #x285A1)	; 𨖡
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x285A1)	; 𨖡
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
     (total-strokes	 . 15)
     (=daikanwa		. 39104)	; &M-39104;
     (<-same
-     ((=jis-x0208@1978	  . #x465B)	; &M-38982; [38-59]
+     ((=ucs@jis/2004	  . #x9041)	; &M-38982;
+      (=jis-x0208@1978	  . #x465B)	; &M-38982; [38-59]
       (=ks-x1001	  . #x546D)	; &I-K0-546D; [52-77]
+      (=jis-x0213-1@2004  . #x465B)	; &I-JX3-465B; [38-59]
       (=daikanwa	  . 38982)	; &I-M-38982;
       ))
     (<-same*sources
      chuanpian daikanwa)
     ))
 (define-char
-  '((morohashi-daikanwa	39104 0 3)
+  '((<-denotational
+     ((=ucs		  . #x285A1)	; 𨖡
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 11)
+    (total-strokes	 . 14)
+    (=ucs@iso		. #x285A1)	; &U-000285A1;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x285A1)	; 𨖡
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 11)
     (total-strokes	 . 15)
@@ -15449,6 +15572,14 @@
     ))
 (define-char
   '((<-denotational
+     ((=ucs		  . #x9078)	; 選
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 12)
+    (=big5		. #xBFEF)	; &B-BFEF;
+    ))
+(define-char
+  '((<-denotational
      ((=big5		  . #xBFEF)	; &B-BFEF;
       ))
     (ideographic-radical . 162)	; ⾡
@@ -15472,14 +15603,6 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x9078)	; 選
-      ))
-    (ideographic-radical . 162)	; ⾡
-    (ideographic-strokes . 12)
-    (=big5		. #xBFEF)	; &B-BFEF;
-    ))
-(define-char
-  '((<-denotational
      ((=big5		  . #xBFEF)	; &B-BFEF;
       ))
     (ideographic-radical . 162)	; ⾡
@@ -16701,10 +16824,20 @@
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (=ucs		. #x9082)	; 邂
+    (=>jis-x0213-1	. #x6E30)	; 邂 [78-16]
+    (=big5		. #xC1DB)	; &I-B-C1DB;
     ))
 (define-char
   '((<-denotational
-     ((=big5		  . #xC1DB)	; &B-C1DB;
+     ((=ucs		  . #x9082)	; 邂
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 13)
+    (=>jis-x0208@1997	. #x6E30)	; &J97-6E30; [78-16]
+    ))
+(define-char
+  '((<-denotational
+     ((=>jis-x0208@1997	  . #x6E30)	; &J97-6E30; [78-16]
       ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
@@ -16729,11 +16862,12 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x9082)	; 邂
+     ((=>jis-x0208@1997	  . #x6E30)	; &J97-6E30; [78-16]
       ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
-    (=big5		. #xC1DB)	; &B-C1DB;
+    (total-strokes	 . 17)
+    (=cns11643-1	. #x7566)	; &C1-7566; [85-70]
     ))
 (define-char
   '((<-denotational
@@ -16746,15 +16880,6 @@
     (=gb2312		. #x6562)	; &G0-6562; [69-66]
     ))
 (define-char
-  '((<-denotational
-     ((=big5		  . #xC1DB)	; &B-C1DB;
-      ))
-    (ideographic-radical . 162)	; ⾡
-    (ideographic-strokes . 13)
-    (total-strokes	 . 17)
-    (=cns11643-1	. #x7566)	; &C1-7566; [85-70]
-    ))
-(define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 13)
     (=ucs		. #x9084)	; 還
@@ -18407,22 +18532,38 @@
 (define-char
   '((ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 17)
+    (=ucs		. #x28646)	; 𨙆
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x28646)	; 𨙆
+      ))
+    (ideographic-radical . 162)	; ⾡
+    (ideographic-strokes . 17)
     (total-strokes	 . 21)
     (=daikanwa		. 39246)	; &M-39246;
     (<-ancient
-     ((=jis-x0208@1978	  . #x465B)	; &M-38982; [38-59]
+     ((=ucs@jis/2004	  . #x9041)	; &M-38982;
+      (=jis-x0208@1978	  . #x465B)	; &M-38982; [38-59]
       (=ks-x1001	  . #x546D)	; &I-K0-546D; [52-77]
+      (=jis-x0213-1@2004  . #x465B)	; &I-JX3-465B; [38-59]
       (=daikanwa	  . 38982)	; &I-M-38982;
       ))
     (<-ancient*sources
      wuyin-jiyun daikanwa)
     ))
 (define-char
-  '((morohashi-daikanwa	39246 0 2)
+  '((<-denotational
+     ((=ucs		  . #x28646)	; 𨙆
+      ))
     (ideographic-radical . 162)	; ⾡
     (ideographic-strokes . 17)
     (total-strokes	 . 21)
-    (=cns11643-7	. #x554E)	; &C7-554E; [53-46]
+    (->subsumptive
+     ((=cns11643-7	  . #x554E)	; &C7-554E; [53-46]
+      )
+     ((=ucs@iso		  . #x28646)	; &U-00028646;
+      ))
     ))
 (define-char
   '((=>ucs		. #x2864E)	; 𨙎
diff --git a/lisp/utf-2000/Ideograph-R163-City.el b/lisp/utf-2000/Ideograph-R163-City.el
index 90e0bce..b97c023 100644
--- a/lisp/utf-2000/Ideograph-R163-City.el
+++ b/lisp/utf-2000/Ideograph-R163-City.el
@@ -562,31 +562,25 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=ucs		. #x90A6)	; 邦
-    (=jis-x0208		. #x4B2E)	; &I-J90-4B2E; [43-14]
-    (=gb2312		. #x306E)	; &I-G0-306E; [16-78]
-    (=jis-x0213-1	. #x4B2E)	; &I-JX1-4B2E; [43-14]
-    (=gt		. 52932)	; &I-GT-52932;
-    (=gt-k		. 02649)	; &I-GT-K02649;
-    (=gt-pj-1		. #x4B2E)	; &I-GT-52932; [43-14]
-    (=daikanwa		. 39310)	; &I-M-39310;
-    (=shinjigen@rev	.  8417)	; 邦
-    ))
-(define-char
-  '((=>ucs		. #x90A6)	; 邦
-    (morohashi-daikanwa	39310 0 0)
-    (ideographic-radical . 163)	; â¾¢
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=cns11643-1	. #x4B5A)	; &C1-4B5A; [43-58]
     (=big5		. #xA8B9)	; &I-B-A8B9;
-    ))
-(define-char
-  '((=>ucs		. #x90A6)	; 邦
-    (morohashi-daikanwa	39310 0 1)
-    (ideographic-radical . 163)	; â¾¢
-    (ideographic-strokes . 4)
-    (total-strokes	 . 7)
-    (=ks-x1001		. #x5B40)	; &K0-5B40; [59-32]
+    (->subsumptive
+     ((=ucs@unicode	  . #x90A6)	; &GT-52932;
+      (=jis-x0208	  . #x4B2E)	; &GT-52932; [43-14]
+      (=gb2312		  . #x306E)	; &I-G0-306E; [16-78]
+      (=ks-x1001	  . #x5B40)	; &I-K0-5B40; [59-32]
+      (=jis-x0213-1	  . #x4B2E)	; &I-JX1-4B2E; [43-14]
+      (=gt		  . 52932)	; &I-GT-52932;
+      (=gt-k		  . 02649)	; &I-GT-K02649;
+      (=gt-pj-1		  . #x4B2E)	; &I-GT-52932; [43-14]
+      (=daikanwa	  . 39310)	; &I-M-39310;
+      (=shinjigen@1ed	  .  8417)	; &GT-52932;
+      (=shinjigen@rev	  .  8418)	; &GT-52932;
+      )
+     ((=jef-china3	  . #x67F9)	; &JC3-67F9;
+      )
+     ((=cns11643-1	  . #x4B5A)	; &C1-4B5A; [43-58]
+      (=shinjigen@1ed	  .  8418)	; &C1-4B5A;
+      ))
     ))
 (define-char
   '((ideographic-radical . 163)	; â¾¢
@@ -1710,14 +1704,20 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 163)	; â¾¢
+    (=>jis-x0208@1997	. #x4F3A)	; &J97-4F3A; [47-26]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4F3A)	; &J97-4F3A; [47-26]
+     ((=>jis-x0208@1997	  . #x4F3A)	; &J97-4F3A; [47-26]
       ))
     (ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x90CE)	; 郎
+    (=>jis-x0213-1	. #x4F3A)	; 郎 [47-26]
     (=big5		. #xADA6)	; &I-B-ADA6;
+    (=>>gt		. 53018)	; 郎
     (->subsumptive
      ((morohashi-daikanwa	39405 1)
       (=ucs@jis		  . #x90CE)	; &GT-53018;
@@ -1741,10 +1741,6 @@
     ))
 (define-char
   '((ideographic-radical . 163)	; â¾¢
-    (=jis-x0208@1997	. #x4F3A)	; &J97-4F3A; [47-26]
-    ))
-(define-char
-  '((ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x48C3)	; 䣃
@@ -1774,6 +1770,25 @@
     ))
 (define-char
   '((ideographic-radical . 163)	; â¾¢
+    (=ucs		. #x90D2)	; 郒
+    (<-unknown
+     ((=ucs@jis		  . #x90DE)	; &M-39431;
+      (=ks-x1001	  . #x554D)	; &M-39431; [53-45]
+      (=jis-x0213-1	  . #x7C67)	; &I-JX1-7C67; [92-71]
+      (=daikanwa	  . 39431)	; &I-M-39431;
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x90D2)	; 郒
+      ))
+    (ideographic-radical . 163)	; â¾¢
+    (ideographic-strokes . 6)
+    (total-strokes	 . 13)
+    (=ucs@unicode	. #x90D2)	; &UU+90D2;
+    ))
+(define-char
+  '((ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 6)
     (total-strokes	 . 9)
     (=ucs		. #x90D3)	; 郓
@@ -2091,12 +2106,13 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4F3A)	; &J97-4F3A; [47-26]
+     ((=>jis-x0208@1997	  . #x4F3A)	; &J97-4F3A; [47-26]
       ))
     (ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
     (=ucs		. #x90DE)	; 郞
+    (=>jis-x0213-1	. #x7C67)	; 郞 [92-71]
     (->subsumptive
      ((=ucs@jis		  . #x90DE)	; &M-39431;
       (=ks-x1001	  . #x554D)	; &M-39431; [53-45]
@@ -2109,30 +2125,6 @@
       ))
     ))
 (define-char
-  '((=>daikanwa		. 39431)	; &M-39431;
-    (ideographic-radical . 163)	; â¾¢
-    (=ucs		. #x90D2)	; 郒
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x90D2)	; 郒
-      ))
-    (ideographic-radical . 163)	; â¾¢
-    (ideographic-strokes . 7)
-    (total-strokes	 . 14)
-    (=ucs@jis		. #x90D2)	; &JSP-622D;
-    (=jis-x0212		. #x622D)	; &JSP-622D; [66-13]
-    ))
-(define-char
-  '((<-denotational
-     ((=ucs		  . #x90D2)	; 郒
-      ))
-    (ideographic-radical . 163)	; â¾¢
-    (ideographic-strokes . 6)
-    (total-strokes	 . 13)
-    (=ucs@unicode	. #x90D2)	; &UU+90D2;
-    ))
-(define-char
   '((ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
@@ -2412,6 +2404,16 @@
     (=daikanwa		. 49776)	; &I-M-49776;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x90D2)	; 郒
+      ))
+    (ideographic-radical . 163)	; â¾¢
+    (ideographic-strokes . 7)
+    (total-strokes	 . 14)
+    (=ucs@jis		. #x90D2)	; &JSP-622D;
+    (=jis-x0212		. #x622D)	; &JSP-622D; [66-13]
+    ))
+(define-char
   '((ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 7)
     (total-strokes	 . 10)
@@ -3115,8 +3117,12 @@
     (=daikanwa		. 39498)	; &I-M-39498;
     ))
 (define-char
+  '((ideographic-radical . 163)	; â¾¢
+    (=>jis-x0208@1997	. #x363F)	; &J97-363F; [22-31]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x363F)	; &J97-363F; [22-31]
+     ((=>jis-x0208@1997	  . #x363F)	; &J97-363F; [22-31]
       ))
     (morohashi-daikanwa	39498 1)
     (ideographic-radical . 163)	; â¾¢
@@ -3137,10 +3143,6 @@
     ))
 (define-char
   '((ideographic-radical . 163)	; â¾¢
-    (=jis-x0208@1997	. #x363F)	; &J97-363F; [22-31]
-    ))
-(define-char
-  '((ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
     (=cns11643-7	. #x2977)	; &M-49777; [09-87]
@@ -4149,6 +4151,14 @@
     ))
 (define-char
   '((<-denotational
+     ((=>jis-x0208@1997	  . #x363F)	; &J97-363F; [22-31]
+      ))
+    (ideographic-radical . 163)	; â¾¢
+    (=ucs@big5		. #x9109)	; &B-B66D;
+    (=big5		. #xB66D)	; &B-B66D;
+    ))
+(define-char
+  '((<-denotational
      ((=ucs@big5	  . #x9109)	; &B-B66D;
       (=big5		  . #xB66D)	; &B-B66D;
       ))
@@ -4175,11 +4185,13 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x363F)	; &J97-363F; [22-31]
+     ((=ucs		  . #x9115)	; 鄕
       ))
     (ideographic-radical . 163)	; â¾¢
-    (=ucs@big5		. #x9109)	; &B-B66D;
-    (=big5		. #xB66D)	; &B-B66D;
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=ucs@jis		. #x9115)	; &JX1-7C6C;
+    (=jis-x0213-1	. #x7C6C)	; &JX1-7C6C; [92-76]
     ))
 (define-char
   '((<-denotational
@@ -4195,16 +4207,6 @@
     (=gb12345		. #x4F67)	; 鄉 [47-71]
     ))
 (define-char
-  '((<-denotational
-     ((=ucs		  . #x9115)	; 鄕
-      ))
-    (ideographic-radical . 163)	; â¾¢
-    (ideographic-strokes . 10)
-    (total-strokes	 . 13)
-    (=ucs@jis		. #x9115)	; &JX1-7C6C;
-    (=jis-x0213-1	. #x7C6C)	; &JX1-7C6C; [92-76]
-    ))
-(define-char
   '((ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
@@ -5224,11 +5226,16 @@
     (ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (=>>jis-x0208@1978	. #x4522)	; &G-GT-53324; [37-02]
+    (=>>jis-x0213-1@2004 . #x4522)	; &G-GT-53324; [37-02]
+    (=>>gt		. 53324)	; &G-GT-53324;
     (->subsumptive
      ((=daikanwa	  . 39647)	; &M-39647;
       )
-     ((=jis-x0208@1978	  . #x4522)	; &GT-53324; [37-02]
+     ((=ucs@jis/2004	  . #x912D)	; &GT-53324;
+      (=jis-x0208@1978	  . #x4522)	; &GT-53324; [37-02]
       (=ks-x1001	  . #x6F77)	; &I-K0-6F77; [79-87]
+      (=jis-x0213-1@2004  . #x4522)	; &I-JX3-4522; [37-02]
       (=gt		  . 53324)	; &I-GT-53324;
       (=gt-pj-7		  . #x5E6A)	; &I-GT-53324; [62-74]
       ))
@@ -5240,13 +5247,16 @@
     (ideographic-radical . 163)	; â¾¢
     (ideographic-strokes . 12)
     (total-strokes	 . 15)
+    (=>>jis-x0213-1@2000 . #x4522)	; &G-GT-53325; [37-02]
+    (=>>gt		. 53325)	; &G-GT-53325;
     (->subsumptive
      ((=cns11643-1	  . #x6F51)	; &C1-6F51; [79-49]
       )
-     ((=ucs@jis		  . #x912D)	; &GT-53325;
+     ((=ucs@jis/1990	  . #x912D)	; &GT-53325;
+      (=ucs@jis/2000	  . #x912D)	; &GT-53325;
       (=jis-x0208@1983	  . #x4522)	; &GT-53325; [37-02]
       (=jis-x0208@1990	  . #x4522)	; &I-J90-4522; [37-02]
-      (=jis-x0213-1	  . #x4522)	; &I-JX1-4522; [37-02]
+      (=jis-x0213-1@2000  . #x4522)	; &I-JX1-4522; [37-02]
       (=gt		  . 53325)	; &I-GT-53325;
       (=gt-k		  . 11926)	; &I-GT-K11926;
       (=gt-pj-1		  . #x4522)	; &I-GT-53325; [37-02]
diff --git a/lisp/utf-2000/Ideograph-R164-Wine.el b/lisp/utf-2000/Ideograph-R164-Wine.el
index 6688936..34736b5 100644
--- a/lisp/utf-2000/Ideograph-R164-Wine.el
+++ b/lisp/utf-2000/Ideograph-R164-Wine.el
@@ -58,12 +58,17 @@
     (ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 2)
     (total-strokes	 . 9)
+    (=>>jis-x0208@1978	. #x3D36)	; &G-GT-53498; [29-22]
+    (=>>jis-x0213-1@2004 . #x3D36)	; &G-GT-53498; [29-22]
+    (=>>gt		. 53498)	; &G-GT-53498;
     (->subsumptive
      ((=daikanwa	  . 39765)	; &M-39765;
       )
-     ((=jis-x0208@1978	  . #x3D36)	; &J78-3D36; [29-22]
+     ((=ucs@jis/2004	  . #x914B)	; &JX3-3D36;
+      (=jis-x0208@1978	  . #x3D36)	; &JX3-3D36; [29-22]
       (=ks-x1001	  . #x755C)	; &I-K0-755C; [85-60]
-      (=shinjigen@1ed	  .  8490)	; &J78-3D36;
+      (=jis-x0213-1@2004  . #x3D36)	; &I-JX3-3D36; [29-22]
+      (=shinjigen	  .  8490)	; &JX3-3D36;
       )
      ((=gt		  . 53498)	; &GT-53498;
       (=gt-k		  . 05098)	; &I-GT-K05098;
@@ -77,13 +82,22 @@
     (ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 2)
     (total-strokes	 . 9)
+    (=>>jis-x0213-1@2000 . #x3D36)	; &G-GT-53499; [29-22]
+    (=>>gt		. 53499)	; &G-GT-53499;
     (->subsumptive
      ((=cns11643-1	  . #x536A)	; &C1-536A; [51-74]
       )
-     ((=ucs@jis		  . #x914B)	; &J90-3D36;
+     ((=ucs@jis/1990	  . #x914B)	; &J90-3D36;
+      (=ucs@jis/2000	  . #x914B)	; &J90-3D36;
       (=jis-x0208@1983	  . #x3D36)	; &J90-3D36; [29-22]
       (=jis-x0208@1990	  . #x3D36)	; &I-J90-3D36; [29-22]
-      (=jis-x0213-1	  . #x3D36)	; &I-JX1-3D36; [29-22]
+      (=jis-x0213-1@2000  . #x3D36)	; &I-JX1-3D36; [29-22]
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x914B)	; &JX3-3D36;
+	(=jis-x0208@1978    . #x3D36)	; &JX3-3D36; [29-22]
+	(=ks-x1001	    . #x755C)	; &I-K0-755C; [85-60]
+	(=jis-x0213-1@2004  . #x3D36)	; &I-JX3-3D36; [29-22]
+	))
       )
      ((=ucs@unicode	  . #x914B)	; &GT-53499;
       (=gb2312		  . #x4775)	; &GT-53499; [39-85]
@@ -3546,13 +3560,18 @@
     (=daikanwa		. 40010)	; &I-M-40010;
     ))
 (define-char
+  '((ideographic-radical . 164)	; â¾£
+    (=>jis-x0208@1997	. #x3E5F)	; &J97-3E5F; [30-63]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3E5F)	; &J97-3E5F; [30-63]
+     ((=>jis-x0208@1997	  . #x3E5F)	; &J97-3E5F; [30-63]
       ))
     (ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 11)
     (total-strokes	 . 18)
     (=ucs		. #x91AC)	; 醬
+    (=>jis-x0213-1	. #x7C79)	; 醬 [92-89]
     (->subsumptive
      ((=daikanwa	  . 40011)	; &M-40011;
       )
@@ -3569,17 +3588,14 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 164)	; â¾£
-    (=jis-x0208@1997	. #x3E5F)	; &J97-3E5F; [30-63]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3E5F)	; &J97-3E5F; [30-63]
+     ((=>jis-x0208@1997	  . #x3E5F)	; &J97-3E5F; [30-63]
       ))
     (ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 10)
     (total-strokes	 . 17)
     (=ucs		. #x91A4)	; 醤
+    (=>jis-x0213-1	. #x3E5F)	; 醤 [30-63]
     (<-simplified
      ((=ucs		  . #x91AC)	; 醬
       ))
@@ -3591,6 +3607,13 @@
       (=gt		  . 53761)	; &I-GT-53761;
       (=gt-pj-1		  . #x3E5F)	; &I-GT-53761; [30-63]
       (=jef-china3	  . #x69A1)	; &I-JC3-69A1;
+      (<-simplified@JP/extra
+       ((=ucs@jis	    . #x91AC)	; &JX1-7C79;
+	(=jis-x0208@1978    . #x3E5F)	; &JX1-7C79; [30-63]
+	(=ks-x1001	    . #x6D7D)	; &I-K0-6D7D; [77-93]
+	(=jis-x0212	    . #x6273)	; &I-JSP-6273; [66-83]
+	(=jis-x0213-1	    . #x7C79)	; &I-JX1-7C79; [92-89]
+	))
       )
      ((=ucs@unicode	  . #x91A4)	; &UU+91A4;
       ))
@@ -3939,13 +3962,18 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 164)	; â¾£
+    (=>jis-x0208@1997	. #x4830)	; &J97-4830; [40-16]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4830)	; &J97-4830; [40-16]
+     ((=>jis-x0208@1997	  . #x4830)	; &J97-4830; [40-16]
       ))
     (ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 12)
     (total-strokes	 . 19)
     (=ucs		. #x91B1)	; 醱
+    (=>jis-x0213-1	. #x7C7A)	; 醱 [92-90]
     (->subsumptive
      ((=daikanwa	  . 40041)	; &M-40041;
       )
@@ -3961,17 +3989,15 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 164)	; â¾£
-    (=jis-x0208@1997	. #x4830)	; &J97-4830; [40-16]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4830)	; &J97-4830; [40-16]
+     ((=>jis-x0208@1997	  . #x4830)	; &J97-4830; [40-16]
       ))
     (ideographic-radical . 164)	; â¾£
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
     (=ucs		. #x9197)	; 醗
+    (=>jis-x0213-1	. #x4830)	; 醗 [40-16]
+    (=jef-china3	. #x69A2)	; &I-JC3-69A2;
     (<-simplified
      ((=ucs		  . #x91B1)	; 醱
       ))
@@ -3980,6 +4006,13 @@
       (=jis-x0208@1983	  . #x4830)	; &J90-4830; [40-16]
       (=jis-x0208@1990	  . #x4830)	; &I-J90-4830; [40-16]
       (=jis-x0213-1	  . #x4830)	; &I-JX1-4830; [40-16]
+      (<-simplified@JP/jis
+       ((=ucs@jis	    . #x91B1)	; &JX1-7C7A;
+	(=jis-x0208@1978    . #x4830)	; &JX1-7C7A; [40-16]
+	(=ks-x1001	    . #x5B23)	; &I-K0-5B23; [59-03]
+	(=jis-x0212	    . #x6277)	; &I-JSP-6277; [66-87]
+	(=jis-x0213-1	    . #x7C7A)	; &I-JX1-7C7A; [92-90]
+	))
       )
      ((=ucs@unicode	  . #x9197)	; &GT-53728;
       (=gt		  . 53728)	; &GT-53728;
diff --git a/lisp/utf-2000/Ideograph-R167-Gold.el b/lisp/utf-2000/Ideograph-R167-Gold.el
index 6509984..fd12d45 100644
--- a/lisp/utf-2000/Ideograph-R167-Gold.el
+++ b/lisp/utf-2000/Ideograph-R167-Gold.el
@@ -190,28 +190,29 @@
     (=daikanwa		. 40163)	; &I-M-40163;
     ))
 (define-char
-  '((=>ucs		. #x91DC)	; 釜
-    (ideographic-radical . 167)	; ⾦
-    (ideographic-strokes . 2)
-    (total-strokes	 . 10)
-    (=ucs@jis		. #x91DC)	; &GT-54011;
-    (=jis-x0208		. #x3378)	; &GT-54011; [19-88]
-    (=ks-x1001		. #x5D3C)	; &I-K0-5D3C; [61-28]
-    (=jis-x0213-1	. #x3378)	; &I-JX1-3378; [19-88]
-    (=gt		. 54011)	; &I-GT-54011;
-    (=gt-k		. 06391)	; &I-GT-K06391;
-    (=gt-pj-1		. #x3378)	; &I-GT-54011; [19-88]
-    (=daikanwa		. 40164)	; &I-M-40164;
-    (=shinjigen@rev	.  8575)	; &GT-54011;
-    ))
-(define-char
-  '((morohashi-daikanwa	40164 0 0)
-    (ideographic-radical . 167)	; ⾦
+  '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 2)
     (total-strokes	 . 10)
     (=ucs		. #x91DC)	; 釜
-    (=gb2312		. #x382A)	; &I-G0-382A; [24-10]
-    (=cns11643-1	. #x585E)	; &I-C1-585E; [56-62]
+    (=>jis-x0208	. #x3378)	; 釜 [19-88]
+    (=>jis-x0213-1	. #x3378)	; 釜 [19-88]
+    (->subsumptive
+     ((=ucs@jis/1990	  . #x91DC)	; &GT-54011;
+      (=ucs@jis/2000	  . #x91DC)	; &GT-54011;
+      (=jis-x0208	  . #x3378)	; &GT-54011; [19-88]
+      (=ks-x1001	  . #x5D3C)	; &I-K0-5D3C; [61-28]
+      (=jis-x0213-1@2000  . #x3378)	; &I-JX1-3378; [19-88]
+      (=gt		  . 54011)	; &I-GT-54011;
+      (=gt-k		  . 06391)	; &I-GT-K06391;
+      (=gt-pj-1		  . #x3378)	; &I-GT-54011; [19-88]
+      (=daikanwa	  . 40164)	; &I-M-40164;
+      (=shinjigen	  .  8575)	; &GT-54011;
+      )
+     ((=ucs@unicode	  . #x91DC)	; &JX3-3378;
+      (=gb2312		  . #x382A)	; &JX3-3378; [24-10]
+      (=cns11643-1	  . #x585E)	; &I-C1-585E; [56-62]
+      (=jis-x0213-1@2004  . #x3378)	; &I-JX3-3378; [19-88]
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
@@ -541,8 +542,15 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 167)	; ⾦
+    (ideographic-strokes . 3)
+    (total-strokes	 . 11)
+    (=>jis-x0208	. #x6E5F)	; &J97-6E5F; [78-63]
+    (=>jis-x0213-1	. #x6E5F)	; &J97-6E5F; [78-63]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x6E5F)	; &J97-6E5F; [78-63]
+     ((=>jis-x0208	  . #x6E5F)	; &J97-6E5F; [78-63]
       ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 3)
@@ -566,12 +574,6 @@
     (=jef-china3	. #x69C7)	; &I-JC3-69C7;
     ))
 (define-char
-  '((ideographic-radical . 167)	; ⾦
-    (ideographic-strokes . 3)
-    (total-strokes	 . 11)
-    (=jis-x0208@1997	. #x6E5F)	; &J97-6E5F; [78-63]
-    ))
-(define-char
   '((<-denotational
      ((=ucs		  . #x91F0)	; 釰
       ))
@@ -761,7 +763,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x6E5F)	; &J97-6E5F; [78-63]
+     ((=>jis-x0208	  . #x6E5F)	; &J97-6E5F; [78-63]
       ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 3)
@@ -5792,13 +5794,20 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 167)	; ⾦
+    (ideographic-strokes . 8)
+    (total-strokes	 . 16)
+    (=>jis-x0208@1997	. #x4F3F)	; &J97-4F3F; [47-31]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4F3F)	; &J97-4F3F; [47-31]
+     ((=>jis-x0208@1997	  . #x4F3F)	; &J97-4F3F; [47-31]
       ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
     (=ucs		. #x9304)	; 錄
+    (=>jis-x0213-1	. #x7D35)	; 錄 [93-21]
     (->subsumptive
      ((=ucs@unicode	  . #x9304)	; &M-40519;
       (=ks-x1001	  . #x5662)	; &M-40519; [54-66]
@@ -5810,19 +5819,14 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 167)	; ⾦
-    (ideographic-strokes . 8)
-    (total-strokes	 . 16)
-    (=jis-x0208@1997	. #x4F3F)	; &J97-4F3F; [47-31]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4F3F)	; &J97-4F3F; [47-31]
+     ((=>jis-x0208@1997	  . #x4F3F)	; &J97-4F3F; [47-31]
       ))
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
     (=ucs		. #x9332)	; 録
+    (=>jis-x0213-1	. #x4F3F)	; 録 [47-31]
     (->subsumptive
      ((morohashi-daikanwa	40519 1)
       (=ucs@jis		  . #x9332)	; &J90-4F3F;
@@ -5890,7 +5894,9 @@
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
+    (=ucs@jis/2004	. #x9306)	; &GT-54506;
     (=jis-x0208@1978	. #x3B2C)	; &GT-54506; [27-12]
+    (=jis-x0213-1@2004	. #x3B2C)	; &I-JX3-3B2C; [27-12]
     (=gt		. 54506)	; &I-GT-54506;
     (=gt-pj-7		. #x6746)	; &I-GT-54506; [71-38]
     (=daikanwa		. 40523)	; &I-M-40523;
@@ -5906,13 +5912,15 @@
      ((=ucs@unicode	  . #x9306)	; &GT-54510;
       (=jis-x0208@1983	  . #x3B2C)	; &GT-54510; [27-12]
       (=jis-x0208@1990	  . #x3B2C)	; &I-J90-3B2C; [27-12]
-      (=jis-x0213-1	  . #x3B2C)	; &I-JX1-3B2C; [27-12]
+      (=jis-x0213-1@2000  . #x3B2C)	; &I-JX1-3B2C; [27-12]
       (=gb12345		  . #x6F3A)	; &GT-54510; [79-26]
       (=gt		  . 54510)	; &I-GT-54510;
       (=gt-pj-1		  . #x3B2C)	; &I-GT-54510; [27-12]
       (=jef-china3	  . #x69A9)	; &I-JC3-69A9;
       (<-simplified@JP/jis
-       ((=jis-x0208@1978    . #x3B2C)	; &GT-54506; [27-12]
+       ((=ucs@jis/2004	    . #x9306)	; &GT-54506;
+	(=jis-x0208@1978    . #x3B2C)	; &GT-54506; [27-12]
+	(=jis-x0213-1@2004  . #x3B2C)	; &I-JX3-3B2C; [27-12]
 	(=daikanwa	    . 40523)	; &I-M-40523;
 	))
       )
@@ -7790,27 +7798,28 @@
     (=daikanwa		. 40653)	; &I-M-40653;
     ))
 (define-char
-  '((=>ucs		. #x9375)	; 鍵
-    (ideographic-radical . 167)	; ⾦
-    (ideographic-strokes . 9)
-    (total-strokes	 . 17)
-    (=ucs@jis		. #x9375)	; &GT-54611;
-    (=jis-x0208		. #x3830)	; &GT-54611; [24-16]
-    (=ks-x1001		. #x4B75)	; &I-K0-4B75; [43-85]
-    (=jis-x0213-1	. #x3830)	; &I-JX1-3830; [24-16]
-    (=gt		. 54611)	; &I-GT-54611;
-    (=gt-pj-1		. #x3830)	; &I-GT-54611; [24-16]
-    (=daikanwa		. 40654)	; &I-M-40654;
-    (=shinjigen@rev	.  8691)	; &GT-54611;
-    ))
-(define-char
-  '((morohashi-daikanwa	40654 0 0)
-    (ideographic-radical . 167)	; ⾦
+  '((ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 9)
     (total-strokes	 . 17)
     (=ucs		. #x9375)	; 鍵
-    (=cns11643-1	. #x756F)	; &I-C1-756F; [85-79]
-    (=gb12345		. #x3C7C)	; 鍵 [28-92]
+    (=>jis-x0208	. #x3830)	; 鍵 [24-16]
+    (=>jis-x0213-1	. #x3830)	; 鍵 [24-16]
+    (->subsumptive
+     ((=ucs@jis/1990	  . #x9375)	; &GT-54611;
+      (=ucs@jis/2000	  . #x9375)	; &GT-54611;
+      (=jis-x0208	  . #x3830)	; &GT-54611; [24-16]
+      (=ks-x1001	  . #x4B75)	; &I-K0-4B75; [43-85]
+      (=jis-x0213-1@2000  . #x3830)	; &I-JX1-3830; [24-16]
+      (=gt		  . 54611)	; &I-GT-54611;
+      (=gt-pj-1		  . #x3830)	; &I-GT-54611; [24-16]
+      (=daikanwa	  . 40654)	; &I-M-40654;
+      (=shinjigen	  .  8691)	; &GT-54611;
+      )
+     ((=ucs@unicode	  . #x9375)	; &JX3-3830;
+      (=cns11643-1	  . #x756F)	; &JX3-3830; [85-79]
+      (=jis-x0213-1@2004  . #x3830)	; &I-JX3-3830; [24-16]
+      (=gb12345		  . #x3C7C)	; &JX3-3830; [28-92]
+      ))
     ))
 (define-char
   '((ideographic-radical . 167)	; ⾦
@@ -8681,8 +8690,10 @@
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 10)
     (total-strokes	 . 18)
+    (=ucs@jis/2004	. #x939A)	; &GT-54783;
     (=jis-x0208@1978	. #x444A)	; &GT-54783; [36-42]
     (=ks-x1001		. #x7560)	; &I-K0-7560; [85-64]
+    (=jis-x0213-1@2004	. #x444A)	; &I-JX3-444A; [36-42]
     (=gt		. 54783)	; &I-GT-54783;
     (=gt-pj-7		. #x6931)	; &I-GT-54783; [73-17]
     (=daikanwa		. 40715)	; &I-M-40715;
@@ -8706,13 +8717,15 @@
     (=ucs@unicode	. #x939A)	; &GT-54670;
     (=jis-x0208@1983	. #x444A)	; &GT-54670; [36-42]
     (=jis-x0208@1990	. #x444A)	; &I-J90-444A; [36-42]
-    (=jis-x0213-1	. #x444A)	; &I-JX1-444A; [36-42]
+    (=jis-x0213-1@2000	. #x444A)	; &I-JX1-444A; [36-42]
     (=gt		. 54670)	; &I-GT-54670;
     (=gt-pj-1		. #x444A)	; &I-GT-54670; [36-42]
     (=jef-china3	. #x69AA)	; &I-JC3-69AA;
-    (<-simplified@JP/jis
-     ((=jis-x0208@1978	  . #x444A)	; &GT-54783; [36-42]
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x939A)	; &GT-54783;
+      (=jis-x0208@1978	  . #x444A)	; &GT-54783; [36-42]
       (=ks-x1001	  . #x7560)	; &I-K0-7560; [85-64]
+      (=jis-x0213-1@2004  . #x444A)	; &I-JX3-444A; [36-42]
       (=daikanwa	  . 40715)	; &I-M-40715;
       ))
     ))
@@ -12394,7 +12407,9 @@
     (ideographic-radical . 167)	; ⾦
     (ideographic-strokes . 14)
     (total-strokes	 . 22)
+    (=ucs@jis/2004	. #x9453)	; &GT-55156;
     (=jis-x0208@1978	. #x4C7A)	; &GT-55156; [44-90]
+    (=jis-x0213-1@2004	. #x4C7A)	; &I-JX3-4C7A; [44-90]
     (=gt		. 55156)	; &I-GT-55156;
     (=gt-pj-7		. #x6B7A)	; &I-GT-55156; [75-90]
     (=daikanwa		. 40998)	; &I-M-40998;
@@ -12409,12 +12424,14 @@
     (=ucs@unicode	. #x9453)	; &GT-55096;
     (=jis-x0208@1983	. #x4C7A)	; &GT-55096; [44-90]
     (=jis-x0208@1990	. #x4C7A)	; &I-J90-4C7A; [44-90]
-    (=jis-x0213-1	. #x4C7A)	; &I-JX1-4C7A; [44-90]
+    (=jis-x0213-1@2000	. #x4C7A)	; &I-JX1-4C7A; [44-90]
     (=gt		. 55096)	; &I-GT-55096;
     (=gt-pj-1		. #x4C7A)	; &I-GT-55096; [44-90]
     (=jef-china3	. #x69AB)	; &I-JC3-69AB;
-    (<-simplified@JP/jis
-     ((=jis-x0208@1978	  . #x4C7A)	; &GT-55156; [44-90]
+    (<-simplified@JP/extra
+     ((=ucs@jis/2004	  . #x9453)	; &GT-55156;
+      (=jis-x0208@1978	  . #x4C7A)	; &GT-55156; [44-90]
+      (=jis-x0213-1@2004  . #x4C7A)	; &I-JX3-4C7A; [44-90]
       (=daikanwa	  . 40998)	; &I-M-40998;
       ))
     ))
diff --git a/lisp/utf-2000/Ideograph-R169-Gate.el b/lisp/utf-2000/Ideograph-R169-Gate.el
index 97f0dad..35d9ff3 100644
--- a/lisp/utf-2000/Ideograph-R169-Gate.el
+++ b/lisp/utf-2000/Ideograph-R169-Gate.el
@@ -603,8 +603,15 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 169)	; ⾨
+    (ideographic-strokes . 4)
+    (total-strokes	 . 12)
+    (=>jis-x0208	. #x313C)	; &J97-313C; [17-28]
+    (=>jis-x0213-1	. #x313C)	; &J97-313C; [17-28]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x313C)	; &J97-313C; [17-28]
+     ((=>jis-x0208	  . #x313C)	; &J97-313C; [17-28]
       ))
     (ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
@@ -621,20 +628,20 @@
       (<-wrong@s=intercalary*sources
        zhengzitong daikanwa)
       )
-     ((=jis-x0208@1978*note . "ISO-IR-042 = 1978/i1")
-      (=jis-x0208@1978/1pr . #x313C)	; &I-J78-313C; [17-28]
+     ((=jis-x0208@1978/1pr*note "ISO-IR-042 = 1978/1pr")
+      (=jis-x0208@1978/1pr . #x313C)	; &GT-55472; [17-28]
       (=cns11643-3	  . #x3F6D)	; &I-C3-3F6D; [31-77]
       (=gt		  . 55472)	; &I-GT-55472;
       (=gt-pj-7		  . #x6E48)	; &I-GT-55472; [78-40]
       (<-error@jis/x0208
        ((=ucs@unicode	    . #x958F)	; &GT-55468;
-	(=jis-x0208	    . #x313C)	; &GT-55468; [17-28]
+	(=jis-x0208@1983    . #x313C)	; &GT-55468; [17-28]
 	(=ks-x1001	    . #x6B4E)	; &I-K0-6B4E; [75-46]
 	(=cns11643-1	    . #x6263)	; &I-C1-6263; [66-67]
 	(=jis-x0213-1	    . #x313C)	; &I-JX1-313C; [17-28]
 	))
       (<-error@jis/x0208*sources
-       jis-x0208/1978/errata jis-x0208/1997)
+       jis-x0208@1978/errata jis-x0208@1997)
       )
      ((=jef-china3	  . #x6BE0)	; &JC3-6BE0;
       )
@@ -642,14 +649,8 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 4)
-    (total-strokes	 . 12)
-    (=jis-x0208@1997	. #x313C)	; &J97-313C; [17-28]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x313C)	; &J97-313C; [17-28]
+     ((=>jis-x0208	  . #x313C)	; &J97-313C; [17-28]
       ))
     (ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 4)
@@ -661,15 +662,17 @@
      ((=daikanwa	  . 41244)	; &M-41244;
       )
      ((=ucs@unicode	  . #x958F)	; &GT-55468;
-      (=jis-x0208	  . #x313C)	; &GT-55468; [17-28]
+      (=jis-x0208@1978/1er-pr . #x313C)	; &GT-55468; [17-28]
+      (=jis-x0208@1983	  . #x313C)	; &GT-55468; [17-28]
       (=ks-x1001	  . #x6B4E)	; &I-K0-6B4E; [75-46]
+      (=jis-x0208@1990	  . #x313C)	; &I-J90-313C; [17-28]
       (=cns11643-1	  . #x6263)	; &I-C1-6263; [66-67]
       (=jis-x0213-1	  . #x313C)	; &I-JX1-313C; [17-28]
       (=gb12345		  . #x4872)	; &GT-55468; [40-82]
       (=gt		  . 55468)	; &I-GT-55468;
       (=gt-k		  . 08995)	; &I-GT-K08995;
       (=gt-pj-1		  . #x313C)	; &I-GT-55468; [17-28]
-      (=shinjigen@rev	  .  8806)	; &GT-55468;
+      (=shinjigen	  .  8806)	; &GT-55468;
       ))
     ))
 (define-char
@@ -2555,21 +2558,31 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 169)	; ⾨
+    (ideographic-strokes . 8)
+    (total-strokes	 . 16)
+    (=ucs		. #x95BB)	; 閻
+    (=>jis-x0208	. #x6F65)	; 閻 [79-69]
+    (=>jis-x0213-1	. #x6F65)	; 閻 [79-69]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x6F65)	; &J97-6F65; [79-69]
+     ((=ucs		  . #x95BB)	; 閻
       ))
     (ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
-    (=ucs		. #x95BB)	; 閻
+    (=>>jis-x0213-1	. #x6F65)	; &G-GT-55612; [79-69]
+    (=>>gt		. 55612)	; &G-GT-55612;
     (->subsumptive
      ((=daikanwa	  . 41379)	; &M-41379;
       )
-     ((jisx0208-difference . 78/1)
-      (=ucs@jis		  . #x95BB)	; &GT-55612;
+     ((=ucs@jis		  . #x95BB)	; &GT-55612;
       (=ucs@ks		  . #x95BB)	; &GT-55612;
-      (=jis-x0208	  . #x6F65)	; &GT-55612; [79-69]
+      (=jis-x0208@1978/1er-pr . #x6F65)	; &GT-55612; [79-69]
+      (=jis-x0208@1983	  . #x6F65)	; &GT-55612; [79-69]
       (=ks-x1001	  . #x6722)	; &I-K0-6722; [71-02]
+      (=jis-x0208@1990	  . #x6F65)	; &I-J90-6F65; [79-69]
       (=jis-x0213-1	  . #x6F65)	; &I-JX1-6F65; [79-69]
       (=gt		  . 55612)	; &I-GT-55612;
       (=gt-pj-1		  . #x6F65)	; &I-GT-55612; [79-69]
@@ -2581,30 +2594,23 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x95BB)	; 閻
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 8)
-    (total-strokes	 . 16)
-    (=jis-x0208@1997	. #x6F65)	; &J97-6F65; [79-69]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x6F65)	; &J97-6F65; [79-69]
+     ((=ucs		  . #x95BB)	; 閻
       ))
     (ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 8)
     (total-strokes	 . 16)
-    (=jis-x0208@1978*note . "ISO-IR-042 = 1978/i1")
-    (=jis-x0208@1978/1pr . #x6F65)	; &I-J78-6F65; [79-69]
+    (=jis-x0208@1978/1pr*note "ISO-IR-042 = 1978/1pr")
+    (=jis-x0208@1978/1pr . #x6F65)	; &J78-6F65; [79-69]
     (<-error@jis/x0208
      ((=ucs@jis		  . #x95BB)	; &GT-55612;
       (=ucs@ks		  . #x95BB)	; &GT-55612;
-      (=jis-x0208	  . #x6F65)	; &GT-55612; [79-69]
+      (=jis-x0208@1983	  . #x6F65)	; &GT-55612; [79-69]
       (=ks-x1001	  . #x6722)	; &I-K0-6722; [71-02]
       (=jis-x0213-1	  . #x6F65)	; &I-JX1-6F65; [79-69]
       ))
     (<-error@jis/x0208*sources
-     jis-x0208/1978/errata jis-x0208/1997)
+     jis-x0208@1978/errata jis-x0208@1997)
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
@@ -2620,7 +2626,7 @@
       (=jis-x0213-1	  . #x6F64)	; &I-JX1-6F64; [79-68]
       (=gt		  . 55605)	; &I-GT-55605;
       (=gt-pj-1		  . #x6F64)	; &I-GT-55605; [79-68]
-      (=shinjigen@rev	  .  8823)	; &GT-55605;
+      (=shinjigen	  .  8823)	; &GT-55605;
       )
      ((=ucs@unicode	  . #x95BC)	; &C2-5B52;
       (=cns11643-2	  . #x5B52)	; &C2-5B52; [59-50]
@@ -3207,49 +3213,60 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 17)
     (=ucs		. #x95C9)	; 闉
-    (=jis-x0212		. #x6636)	; &I-JSP-6636; [70-22]
-    (=cns11643-2	. #x603D)	; &I-C2-603D; [64-29]
-    (=daikanwa		. 41428)	; &I-M-41428;
-    ))
-(define-char
-  '((=>ucs		. #x95CA)	; 闊
-    (ideographic-radical . 169)	; ⾨
-    (ideographic-strokes . 9)
-    (total-strokes	 . 17)
-    (=daikanwa		. 41429)	; &M-41429;
+    (->subsumptive
+     ((=daikanwa	  . 41428)	; &M-41428;
+      )
+     ((=ucs@unicode	  . #x95C9)	; &JSP-6636;
+      (=jis-x0212	  . #x6636)	; &JSP-6636; [70-22]
+      )
+     ((=cns11643-2	  . #x603D)	; &C2-603D; [64-29]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	41429 0 0)
-    (ideographic-radical . 169)	; ⾨
+  '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 9)
     (total-strokes	 . 17)
     (=ucs		. #x95CA)	; 闊
-    (=jis-x0208		. #x6F68)	; &I-J90-6F68; [79-72]
-    (=ks-x1001		. #x7C44)	; &I-K0-7C44; [92-36]
-    (=cns11643-1	. #x757A)	; &I-C1-757A; [85-90]
-    (=jis-x0213-1	. #x6F68)	; &I-JX1-6F68; [79-72]
-    (=gb12345		. #x402B)	; 闊 [32-11]
-    (=gt		. 55664)	; &I-GT-55664;
-    (=gt-pj-1		. #x6F68)	; &I-GT-55664; [79-72]
-    (=shinjigen		.  8831)	; 闊
+    (->subsumptive
+     ((=daikanwa	  . 41429)	; &M-41429;
+      )
+     ((=ucs@unicode	  . #x95CA)	; &GT-55664;
+      (=jis-x0208	  . #x6F68)	; &GT-55664; [79-72]
+      (=ks-x1001	  . #x7C44)	; &I-K0-7C44; [92-36]
+      (=cns11643-1	  . #x757A)	; &I-C1-757A; [85-90]
+      (=jis-x0213-1	  . #x6F68)	; &I-JX1-6F68; [79-72]
+      (=gb12345		  . #x402B)	; &GT-55664; [32-11]
+      (=gt		  . 55664)	; &I-GT-55664;
+      (=gt-pj-1		  . #x6F68)	; &I-GT-55664; [79-72]
+      (=shinjigen	  .  8831)	; &GT-55664;
+      ))
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 9)
     (total-strokes	 . 17)
     (=ucs		. #x95CB)	; 闋
-    (=jis-x0212		. #x6637)	; &I-JSP-6637; [70-23]
-    (=cns11643-1	. #x757B)	; &I-C1-757B; [85-91]
-    (=jis-x0213-1	. #x7D55)	; &I-JX1-7D55; [93-53]
-    (=gb12345		. #x6357)	; 闋 [67-55]
-    (=daikanwa		. 41430)	; &I-M-41430;
+    (->subsumptive
+     ((=daikanwa	  . 41430)	; &M-41430;
+      )
+     ((=ucs@unicode	  . #x95CB)	; &JX1-7D55;
+      (=jis-x0212	  . #x6637)	; &JX1-7D55; [70-23]
+      (=cns11643-1	  . #x757B)	; &I-C1-757B; [85-91]
+      (=jis-x0213-1	  . #x7D55)	; &I-JX1-7D55; [93-53]
+      (=gb12345		  . #x6357)	; &JX1-7D55; [67-55]
+      ))
     ))
 (define-char
   '((ideographic-radical . 169)	; ⾨
     (ideographic-strokes . 9)
     (total-strokes	 . 17)
-    (=cns11643-7	. #x3D2D)	; &M-41431; [29-13]
-    (=daikanwa		. 41431)	; &I-M-41431;
+    (=ucs		. #x28D6D)	; 𨵭
+    (->subsumptive
+     ((=daikanwa	  . 41431)	; &M-41431;
+      )
+     ((=ucs@iso		  . #x28D6D)	; &C7-3D2D;
+      (=cns11643-7	  . #x3D2D)	; &C7-3D2D; [29-13]
+      ))
     ))
 (define-char
   '((=>ucs		. #x28D6E)	; 𨵮
diff --git a/lisp/utf-2000/Ideograph-R170-Mound.el b/lisp/utf-2000/Ideograph-R170-Mound.el
index 4bbb0cd..ac61ae9 100644
--- a/lisp/utf-2000/Ideograph-R170-Mound.el
+++ b/lisp/utf-2000/Ideograph-R170-Mound.el
@@ -37,6 +37,20 @@
       ))
     ))
 (define-char
+  '((ideographic-radical@ucs . 170)	; ⾩
+    (ideographic-radical@cns . 163)	; â¾¢
+    (ideographic-radical@cns*sources
+     cns11643 jis-x0213)
+    (ideographic-strokes . 0)
+    (total-strokes	 . 3)
+    (=ucs		. #x961D)	; 阝
+    (=jis-x0212		. #x6644)	; &I-JSP-6644; [70-36]
+    (=cns11643-3	. #x2143)	; &I-C3-2143; [01-35]
+    (=jis-x0213-2	. #x7A25)	; &I-JX2-7A25; [90-05]
+    (=big5-cdp		. #x8B43)	; &I-CDP-8B43;
+    (=jef-china3	. #x67F6)	; &I-JC3-67F6;
+    ))
+(define-char
   '((<-denotational
      ((=ucs		  . #x961D)	; 阝
       ))
@@ -59,20 +73,6 @@
       ))
     ))
 (define-char
-  '((ideographic-radical@ucs . 170)	; ⾩
-    (ideographic-radical@cns . 163)	; â¾¢
-    (ideographic-radical@cns*sources
-     cns11643 jis-x0213)
-    (ideographic-strokes . 0)
-    (total-strokes	 . 3)
-    (=ucs		. #x961D)	; 阝
-    (=jis-x0212		. #x6644)	; &I-JSP-6644; [70-36]
-    (=cns11643-3	. #x2143)	; &I-C3-2143; [01-35]
-    (=jis-x0213-2	. #x7A25)	; &I-JX2-7A25; [90-05]
-    (=big5-cdp		. #x8B43)	; &I-CDP-8B43;
-    (=jef-china3	. #x67F6)	; &I-JC3-67F6;
-    ))
-(define-char
   '((ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 2)
     (total-strokes	 . 5)
@@ -2520,7 +2520,7 @@
 (define-char
   '((ideographic-radical . 170)	; ⾩
     (=ucs		. #x9686)	; 隆
-    (=jis-x0208@1997	. #x4E34)	; 隆 [46-20]
+    (=>jis-x0208@1997	. #x4E34)	; 隆 [46-20]
     ))
 (define-char
   '((<-denotational
@@ -3584,6 +3584,17 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
     (=ucs		. #x9698)	; 隘
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9698)	; 隘
+      ))
+    (ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=>>jis-x0208	. #x7027)	; &G-GT-56109; [80-07]
+    (=>>jis-x0213-1	. #x7027)	; &G-GT-56109; [80-07]
+    (=>>gt		. 56109)	; &G-GT-56109;
     (->subsumptive
      ((=ucs@jis		  . #x9698)	; &GT-56109;
       (=ks-x1001	  . #x6476)	; &GT-56109; [68-86]
@@ -3592,11 +3603,21 @@
       (=gt		  . 56109)	; &I-GT-56109;
       (=gt-pj-1		  . #x7027)	; &I-GT-56109; [80-07]
       (=daikanwa	  . 41791)	; &I-M-41791;
-      (=shinjigen@rev	  .  8913)	; &GT-56109;
+      (=shinjigen	  .  8913)	; &GT-56109;
       )
      ((=jis-x0208@1978	  . #x7027)	; &J83-7027; [80-07]
       (=jis-x0208@1983	  . #x7027)	; &I-J83-7027; [80-07]
-      )
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9698)	; 隘
+      ))
+    (ideographic-radical . 170)	; ⾩
+    (ideographic-strokes . 10)
+    (total-strokes	 . 13)
+    (=>>gt		. 56110)	; &G-GT-56110;
+    (->subsumptive
      ((=gt		  . 56110)	; &GT-56110;
       (=gt-pj-10	  . #x453F)	; &GT-56110; [37-31]
       )
@@ -3606,8 +3627,13 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 170)	; ⾩
+    (=>jis-x0208	. #x3764)	; &J97-3764; [23-68]
+    (=>jis-x0213-1	. #x3764)	; &J97-3764; [23-68]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3764)	; &J97-3764; [23-68]
+     ((=>jis-x0208	  . #x3764)	; &J97-3764; [23-68]
       ))
     (ideographic-radical . 170)	; ⾩
     (=ucs		. #x9699)	; 隙
@@ -3619,27 +3645,28 @@
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 10)
     (total-strokes	 . 13)
+    (=>>jis-x0213-1	. #x3764)	; &G-GT-56129; [23-68]
+    (=>>gt		. 56129)	; &G-GT-56129;
     (->subsumptive
      ((=ucs@unicode	  . #x9699)	; &M-41792;
       (=gb2312		  . #x4F36)	; &M-41792; [47-22]
+      (=jis-x0213-1@2004  . #x3764)	; &I-JX3-3764; [23-68]
       (=daikanwa	  . 41792)	; &I-M-41792;
       (=jef-china3	  . #x68D2)	; &I-JC3-68D2;
       )
-     ((=ucs@jis		  . #x9699)	; &GT-56129;
+     ((=ucs@jis/1990	  . #x9699)	; &GT-56129;
+      (=ucs@jis/2000	  . #x9699)	; &GT-56129;
+      (=jis-x0208@1978/-4X . #x3764)	; &GT-56129; [23-68]
       (=jis-x0208@1983	  . #x3764)	; &GT-56129; [23-68]
       (=ks-x1001	  . #x5040)	; &I-K0-5040; [48-32]
       (=jis-x0208@1990	  . #x3764)	; &I-J90-3764; [23-68]
-      (=jis-x0213-1	  . #x3764)	; &I-JX1-3764; [23-68]
+      (=jis-x0213-1@2000  . #x3764)	; &I-JX1-3764; [23-68]
       (=gt		  . 56129)	; &I-GT-56129;
       (=gt-pj-1		  . #x3764)	; &I-GT-56129; [23-68]
-      (=shinjigen@rev	  .  8920)	; &GT-56129;
+      (=shinjigen	  .  8920)	; &GT-56129;
       ))
     ))
 (define-char
-  '((ideographic-radical . 170)	; ⾩
-    (=jis-x0208@1997	. #x3764)	; &J97-3764; [23-68]
-    ))
-(define-char
   '((<-denotational
      ((=ucs		  . #x9699)	; 隙
       ))
@@ -3900,7 +3927,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3764)	; &J97-3764; [23-68]
+     ((=>jis-x0208	  . #x3764)	; &J97-3764; [23-68]
       ))
     (ideographic-radical . 170)	; ⾩
     (ideographic-strokes . 11)
@@ -3913,6 +3940,7 @@
       (<-vulgar
        ((=ucs@unicode	    . #x9699)	; &M-41792;
 	(=gb2312	    . #x4F36)	; &M-41792; [47-22]
+	(=jis-x0213-1@2004  . #x3764)	; &I-JX3-3764; [23-68]
 	(=daikanwa	    . 41792)	; &I-M-41792;
 	))
       (<-vulgar*sources
diff --git a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
index 2ad01a4..15de1fa 100644
--- a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
+++ b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
@@ -429,7 +429,7 @@
       (=gt-k		  . 09019)	; &I-GT-K09019;
       (=gt-pj-1		  . #x3467)	; &I-GT-56379; [20-71]
       (=daikanwa	  . 41960)	; &I-M-41960;
-      (=shinjigen@rev	  .  8943)	; &GT-56379;
+      (=shinjigen	  .  8943)	; &GT-56379;
       )
      ((=ucs@unicode	  . #x96C1)	; &C1-6272;
       (=gb2312		  . #x5163)	; &C1-6272; [49-67]
diff --git a/lisp/utf-2000/Ideograph-R173-Rain.el b/lisp/utf-2000/Ideograph-R173-Rain.el
index c1528c7..deb5f75 100644
--- a/lisp/utf-2000/Ideograph-R173-Rain.el
+++ b/lisp/utf-2000/Ideograph-R173-Rain.el
@@ -4625,15 +4625,21 @@
     (ideographic-strokes . 16)
     (total-strokes	 . 24)
     (=ucs		. #x9744)	; 靄
+    (=>jis-x0208	. #x704B)	; 靄 [80-43]
+    (=>jis-x0213-1	. #x704B)	; 靄 [80-43]
     (->subsumptive
-     ((=ucs@jis		  . #x9744)	; &GT-57072;
-      (=jis-x0208	  . #x704B)	; &GT-57072; [80-43]
-      (=ks-x1001	  . #x6477)	; &I-K0-6477; [68-87]
-      (=jis-x0213-1	  . #x704B)	; &I-JX1-704B; [80-43]
+     ((=ucs@jis/2004	  . #x9744)	; &GT-57072;
+      (=ks-x1001	  . #x6477)	; &GT-57072; [68-87]
+      (=jis-x0213-1@2004  . #x704B)	; &I-JX3-704B; [80-43]
       (=gt		  . 57072)	; &I-GT-57072;
       (=gt-pj-1		  . #x704B)	; &I-GT-57072; [80-43]
       (=daikanwa	  . 42526)	; &I-M-42526;
-      (=shinjigen@rev	  .  9028)	; &GT-57072;
+      (=shinjigen	  .  9028)	; &GT-57072;
+      )
+     ((=ucs@jis/1990	  . #x9744)	; &J90-704B;
+      (=ucs@jis/2000	  . #x9744)	; &J90-704B;
+      (=jis-x0208	  . #x704B)	; &J90-704B; [80-43]
+      (=jis-x0213-1@2000  . #x704B)	; &I-JX1-704B; [80-43]
       )
      ((=ucs@unicode	  . #x9744)	; &UU+9744;
       (=gb12345		  . #x7630)	; &UU+9744; [86-16]
diff --git a/lisp/utf-2000/Ideograph-R177-Leather.el b/lisp/utf-2000/Ideograph-R177-Leather.el
index 1186747..bbbfcc1 100644
--- a/lisp/utf-2000/Ideograph-R177-Leather.el
+++ b/lisp/utf-2000/Ideograph-R177-Leather.el
@@ -196,11 +196,22 @@
     (ideographic-strokes . 3)
     (total-strokes	 . 12)
     (=ucs		. #x9771)	; 靱
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9771)	; 靱
+      ))
+    (ideographic-radical . 177)	; â¾°
+    (ideographic-strokes . 3)
+    (total-strokes	 . 12)
+    (=>>jis-x0213-1	. #x7057)	; &G-GT-57335; [80-55]
+    (=>>gt		. 57335)	; &G-GT-57335;
     (->subsumptive
      ((morohashi-daikanwa	ho 701)
-      (=ucs@jis		  . #x9771)	; &GT-57335;
+      (=ucs@jis/1990	  . #x9771)	; &GT-57335;
+      (=ucs@jis/2000	  . #x9771)	; &GT-57335;
       (=jis-x0208@1990	  . #x7057)	; &GT-57335; [80-55]
-      (=jis-x0213-1	  . #x7057)	; &I-JX1-7057; [80-55]
+      (=jis-x0213-1@2000  . #x7057)	; &I-JX1-7057; [80-55]
       (=gt		  . 57335)	; &I-GT-57335;
       (=gt-pj-1		  . #x7057)	; &I-GT-57335; [80-55]
       (<-vulgar@ruijumyougishou
@@ -222,9 +233,17 @@
       )
      ((=ucs@unicode	  . #x9771)	; &J83-7057;
       (=jis-x0208@1983	  . #x7057)	; &J83-7057; [80-55]
-      )
-     ((=jis-x0208@1978	  . #x3F59)	; &J78-3F59; [31-57]
+      (=jis-x0213-1@2004  . #x7057)	; &I-JX3-7057; [80-55]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9771)	; 靱
       ))
+    (ideographic-radical . 177)	; â¾°
+    (ideographic-strokes . 3)
+    (total-strokes	 . 12)
+    (=jis-x0208@1978	. #x3F59)	; &J78-3F59; [31-57]
     ))
 (define-char
   '((ideographic-radical . 177)	; â¾°
@@ -787,6 +806,7 @@
     (=ucs@unicode	. #x9784)	; &GT-57409;
     (=jis-x0208@1978	. #x3373)	; &GT-57409; [19-83]
     (=cns11643-2	. #x4F2E)	; &I-C2-4F2E; [47-14]
+    (=jis-x0213-1@2004	. #x3373)	; &I-JX3-3373; [19-83]
     (=gt		. 57409)	; &I-GT-57409;
     (=gt-pj-8		. #x394E)	; &I-GT-57409; [25-46]
     (=daikanwa		. 42781)	; &I-M-42781;
@@ -798,13 +818,21 @@
     (ideographic-radical . 177)	; â¾°
     (ideographic-strokes . 5)
     (total-strokes	 . 14)
-    (=ucs@jis		. #x9784)	; &GT-57412;
+    (=ucs@jis/1990	. #x9784)	; &GT-57412;
+    (=ucs@jis/2000	. #x9784)	; &GT-57412;
     (=jis-x0208@1983	. #x3373)	; &GT-57412; [19-83]
     (=jis-x0208@1990	. #x3373)	; &I-J90-3373; [19-83]
-    (=jis-x0213-1	. #x3373)	; &I-JX1-3373; [19-83]
+    (=jis-x0213-1@2000	. #x3373)	; &I-JX1-3373; [19-83]
     (=gt		. 57412)	; &I-GT-57412;
     (=gt-pj-1		. #x3373)	; &I-GT-57412; [19-83]
     (=jef-china3	. #x6CCA)	; &I-JC3-6CCA;
+    (<-simplified@JP/jis
+     ((=ucs@unicode	  . #x9784)	; &GT-57409;
+      (=jis-x0208@1978	  . #x3373)	; &GT-57409; [19-83]
+      (=cns11643-2	  . #x4F2E)	; &I-C2-4F2E; [47-14]
+      (=jis-x0213-1@2004  . #x3373)	; &I-JX3-3373; [19-83]
+      (=daikanwa	  . 42781)	; &I-M-42781;
+      ))
     ))
 (define-char
   '((ideographic-radical . 177)	; â¾°
@@ -1394,7 +1422,9 @@
     (ideographic-radical . 177)	; â¾°
     (ideographic-strokes . 7)
     (total-strokes	 . 16)
+    (=ucs@jis/2004	. #x9798)	; &GT-57472;
     (=jis-x0208@1978	. #x3E64)	; &GT-57472; [30-68]
+    (=jis-x0213-1@2004	. #x3E64)	; &I-JX3-3E64; [30-68]
     (=gt		. 57472)	; &I-GT-57472;
     (=gt-pj-8		. #x3A2F)	; &I-GT-57472; [26-15]
     (=daikanwa		. 42850)	; &I-M-42850;
@@ -1406,15 +1436,23 @@
     (ideographic-radical . 177)	; â¾°
     (ideographic-strokes . 7)
     (total-strokes	 . 16)
+    (=>>jis-x0213-1@2000 . #x3E64)	; &G-GT-57473; [30-68]
+    (=>>gt		. 57473)	; &G-GT-57473;
     (->subsumptive
      ((=ucs@unicode	  . #x9798)	; &GT-57473;
       (=gb2312		  . #x474A)	; &GT-57473; [39-42]
       (=jis-x0208@1983	  . #x3E64)	; &I-J83-3E64; [30-68]
       (=jis-x0208@1990	  . #x3E64)	; &I-J90-3E64; [30-68]
-      (=jis-x0213-1	  . #x3E64)	; &I-JX1-3E64; [30-68]
+      (=jis-x0213-1@2000  . #x3E64)	; &I-JX1-3E64; [30-68]
       (=gt		  . 57473)	; &I-GT-57473;
       (=gt-pj-1		  . #x3E64)	; &I-GT-57473; [30-68]
       (=jef-china3	  . #x6CCC)	; &I-JC3-6CCC;
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x9798)	; &GT-57472;
+	(=jis-x0208@1978    . #x3E64)	; &GT-57472; [30-68]
+	(=jis-x0213-1@2004  . #x3E64)	; &I-JX3-3E64; [30-68]
+	(=daikanwa	    . 42850)	; &I-M-42850;
+	))
       )
      ((=cns11643-1	  . #x727D)	; &C1-727D; [82-93]
       ))
@@ -2228,46 +2266,64 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 18)
     (=ucs		. #x292EF)	; 𩋯
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x292EF)	; 𩋯
+      ))
+    (ideographic-radical . 177)	; â¾°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 18)
     (->subsumptive
      ((=daikanwa	  . 42936)	; &M-42936;
       )
      ((=cns11643-5	  . #x6623)	; &C5-6623; [70-03]
-      )
-     ((=ucs@iso		  . #x292EF)	; &U-000292EF;
       ))
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x292EF)	; 𩋯
+      ))
+    (ideographic-radical . 177)	; â¾°
+    (ideographic-strokes . 9)
+    (total-strokes	 . 18)
+    (=ucs@iso		. #x292EF)	; &U-000292EF;
+    ))
+(define-char
   '((ideographic-radical . 177)	; â¾°
     (ideographic-strokes . 9)
     (total-strokes	 . 18)
     (=ucs		. #x97AD)	; 鞭
+    (=>jis-x0208	. #x4A5C)	; 鞭 [42-60]
+    (=>jis-x0213-1	. #x4A5C)	; 鞭 [42-60]
     (->subsumptive
-     ((=ucs@jis		  . #x97AD)	; &GT-57605;
+     ((=ucs@jis/1990	  . #x97AD)	; &GT-57605;
+      (=ucs@jis/2000	  . #x97AD)	; &GT-57605;
       (=jis-x0208	  . #x4A5C)	; &GT-57605; [42-60]
       (=ks-x1001	  . #x783D)	; &I-K0-783D; [88-29]
-      (=jis-x0213-1	  . #x4A5C)	; &I-JX1-4A5C; [42-60]
+      (=jis-x0213-1@2000  . #x4A5C)	; &I-JX1-4A5C; [42-60]
       (=gt		  . 57605)	; &I-GT-57605;
       (=gt-pj-1		  . #x4A5C)	; &I-GT-57605; [42-60]
       (=daikanwa	  . 42937)	; &I-M-42937;
-      (=shinjigen@rev	  .  9087)	; &GT-57605;
+      (=shinjigen	  .  9087)	; &GT-57605;
       )
-     ((=ucs@unicode	  . #x97AD)	; &C1-776A;
-      (=gb2312		  . #x315E)	; &C1-776A; [17-62]
+     ((=ucs@unicode	  . #x97AD)	; &JX3-4A5C;
+      (=gb2312		  . #x315E)	; &JX3-4A5C; [17-62]
       (=cns11643-1	  . #x776A)	; &I-C1-776A; [87-74]
+      (=jis-x0213-1@2004  . #x4A5C)	; &I-JX3-4A5C; [42-60]
       ))
     ))
 (define-char
   '((ideographic-radical . 177)	; â¾°
     (ideographic-strokes . 9)
     (total-strokes	 . 18)
-    (=daikanwa		. 42938)	; &M-42938;
-    ))
-(define-char
-  '((morohashi-daikanwa	42938 0 0)
-    (ideographic-radical . 177)	; â¾°
-    (ideographic-strokes . 9)
-    (total-strokes	 . 18)
-    (=cns11643-7	. #x4471)	; &C7-4471; [36-81]
+    (=ucs		. #x292F0)	; 𩋰
+    (->subsumptive
+     ((=daikanwa	  . 42938)	; &M-42938;
+      )
+     ((=ucs@iso		  . #x292F0)	; &C7-4471;
+      (=cns11643-7	  . #x4471)	; &C7-4471; [36-81]
+      ))
     ))
 (define-char
   '((ideographic-radical . 177)	; â¾°
diff --git a/lisp/utf-2000/Ideograph-R180-Sound.el b/lisp/utf-2000/Ideograph-R180-Sound.el
index e1ed284..ee8ceb5 100644
--- a/lisp/utf-2000/Ideograph-R180-Sound.el
+++ b/lisp/utf-2000/Ideograph-R180-Sound.el
@@ -673,13 +673,18 @@
   '((ideographic-radical . 180)	; â¾³
     (ideographic-strokes . 11)
     (total-strokes	 . 20)
-    (=cns11643-7	. #x514A)	; &M-43318; [49-42]
-    (=daikanwa		. 43318)	; &I-M-43318;
+    (=ucs		. #x2943A)	; 𩐺
+    (->subsumptive
+     ((=daikanwa	  . 43318)	; &M-43318;
+      )
+     ((=ucs@iso		  . #x2943A)	; &C7-514A;
+      (=cns11643-7	  . #x514A)	; &C7-514A; [49-42]
+      ))
     ))
 (define-char
   '((ideographic-radical . 180)	; â¾³
     (=ucs		. #x97FF)	; 響
-    (=jis-x0208@1997	. #x3641)	; 響 [22-33]
+    (=>jis-x0208@1997	. #x3641)	; 響 [22-33]
     ))
 (define-char
   '((<-denotational
@@ -694,7 +699,7 @@
     (=jis-x0213-1	. #x3641)	; &I-JX1-3641; [22-33]
     (=gt		. 58170)	; &I-GT-58170;
     (=gt-pj-1		. #x3641)	; &I-GT-58170; [22-33]
-    (=shinjigen@1ed	.  9139)	; &GT-58170;
+    (=shinjigen		.  9139)	; &GT-58170;
     (mojikyo		. 050573)	; &MCS-6000C58D;
     (<-simplified@JP/Jouyou
      ((=ucs		  . #xFA69)	; ï©©
@@ -704,8 +709,13 @@
   '((ideographic-radical . 180)	; â¾³
     (ideographic-strokes . 12)
     (total-strokes	 . 21)
-    (=cns11643-7	. #x562E)	; &M-43319; [54-14]
-    (=daikanwa		. 43319)	; &I-M-43319;
+    (=ucs		. #x2943F)	; 𩐿
+    (->subsumptive
+     ((=daikanwa	  . 43319)	; &M-43319;
+      )
+     ((=ucs@iso		  . #x2943F)	; &C7-562E;
+      (=cns11643-7	  . #x562E)	; &C7-562E; [54-14]
+      ))
     ))
 (define-char
   '((ideographic-radical . 180)	; â¾³
@@ -781,14 +791,22 @@
     (ideographic-radical . 180)	; â¾³
     (ideographic-strokes . 13)
     (total-strokes	 . 22)
+    (=>jis-x0213-1	. #x7D76)	; &A-JX1-7D76; [93-86]
+    ))
+(define-char
+  '((<-denotational
+     ((=>jis-x0213-1	  . #x7D76)	; &A-JX1-7D76; [93-86]
+      ))
+    (ideographic-radical . 180)	; â¾³
+    (ideographic-strokes . 13)
+    (total-strokes	 . 22)
     (=ks-x1001		. #x7A42)	; &M-43325; [90-34]
     (=daikanwa		. 43325)	; &I-M-43325;
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x97FF)	; 響
+     ((=>jis-x0213-1	  . #x7D76)	; &A-JX1-7D76; [93-86]
       ))
-    (=>daikanwa		. 43325)	; &M-43325;
     (ideographic-radical . 180)	; â¾³
     (ideographic-strokes . 12)
     (total-strokes	 . 21)
@@ -798,15 +816,19 @@
     ))
 (define-char
   '((<-denotational
-     ((=ucs		  . #x97FF)	; 響
+     ((=>jis-x0213-1	  . #x7D76)	; &A-JX1-7D76; [93-86]
       ))
-    (=>ucs*		. #x97FF)	; 響
-    (=>daikanwa		. 43325)	; &M-43325;
     (ideographic-radical . 180)	; â¾³
     (ideographic-strokes . 13)
     (total-strokes	 . 22)
-    (=ucs		. #xFA69)	; ï©©
-    (=jis-x0213-1	. #x7D76)	; &I-JX1-7D76; [93-86]
+    (=>>jis-x0213-1	. #x7D76)	; &G-JX1-7D76; [93-86]
+    (->subsumptive
+     ((=>ucs*		  . #x97FF)	; 響
+      (=ucs		  . #xFA69)	; ï©©
+      (=jis-x0213-1	  . #x7D76)	; &I-JX1-7D76; [93-86]
+      )
+     ((=shinjigen	  .  9140)	; &SJG2-9140;
+      ))
     ))
 (define-char
   '((ideographic-radical . 180)	; â¾³
diff --git a/lisp/utf-2000/Ideograph-R181-Leaf.el b/lisp/utf-2000/Ideograph-R181-Leaf.el
index 663ca19..90d99a5 100644
--- a/lisp/utf-2000/Ideograph-R181-Leaf.el
+++ b/lisp/utf-2000/Ideograph-R181-Leaf.el
@@ -2108,8 +2108,12 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 181)	; â¾´
+    (=>jis-x0208@1997	. #x4B4B)	; &J97-4B4B; [43-43]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4B4B)	; &J97-4B4B; [43-43]
+     ((=>jis-x0208@1997	  . #x4B4B)	; &J97-4B4B; [43-43]
       ))
     (ideographic-radical . 181)	; â¾´
     (ideographic-strokes . 7)
@@ -2126,12 +2130,8 @@
     (=daikanwa		. 43496)	; &I-M-43496;
     ))
 (define-char
-  '((ideographic-radical . 181)	; â¾´
-    (=jis-x0208@1997	. #x4B4B)	; &J97-4B4B; [43-43]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4B4B)	; &J97-4B4B; [43-43]
+     ((=>jis-x0208@1997	  . #x4B4B)	; &J97-4B4B; [43-43]
       ))
     (ideographic-strokes . 6)
     (total-strokes	 . 15)
@@ -3814,13 +3814,20 @@
       ))
     ))
 (define-char
+  '((ideographic-radical . 181)	; â¾´
+    (ideographic-strokes . 10)
+    (total-strokes	 . 19)
+    (=>jis-x0208@1997	. #x453F)	; &J97-453F; [37-31]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x453F)	; &J97-453F; [37-31]
+     ((=>jis-x0208@1997	  . #x453F)	; &J97-453F; [37-31]
       ))
     (ideographic-radical . 181)	; â¾´
     (ideographic-strokes . 10)
     (total-strokes	 . 19)
     (=ucs		. #x985A)	; 顚
+    (=>jis-x0213-1	. #x7E23)	; 顚 [94-03]
     (->subsumptive
      ((=ucs@unicode	  . #x985A)	; &GT-58555;
       (=jis-x0208@1978	  . #x453F)	; &GT-58555; [37-31]
@@ -3835,24 +3842,8 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 181)	; â¾´
-    (ideographic-strokes . 10)
-    (total-strokes	 . 19)
-    (=jis-x0208@1997	. #x453F)	; &J97-453F; [37-31]
-    ))
-(define-char
   '((<-denotational
-     ((=ucs		  . #x985A)	; 顚
-      ))
-    (ideographic-radical . 181)	; â¾´
-    (ideographic-strokes . 10)
-    (total-strokes	 . 19)
-    (=gt		. 58556)	; &GT-58556;
-    (=gt-pj-8		. #x4230)	; &GT-58556; [34-16]
-    ))
-(define-char
-  '((<-denotational
-     ((=jis-x0208@1997	  . #x453F)	; &J97-453F; [37-31]
+     ((=>jis-x0208@1997	  . #x453F)	; &J97-453F; [37-31]
       ))
     (ideographic-radical . 181)	; â¾´
     (ideographic-strokes . 10)
@@ -3895,6 +3886,16 @@
     (=jef-china3	. #x6CFC)	; &I-JC3-6CFC;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x985B)	; 顛
+      ))
+    (ideographic-radical . 181)	; â¾´
+    (ideographic-strokes . 10)
+    (total-strokes	 . 19)
+    (=gt		. 58556)	; &GT-58556;
+    (=gt-pj-8		. #x4230)	; &GT-58556; [34-16]
+    ))
+(define-char
   '((ideographic-radical . 181)	; â¾´
     (ideographic-strokes . 10)
     (total-strokes	 . 19)
diff --git a/lisp/utf-2000/Ideograph-R184-Eat.el b/lisp/utf-2000/Ideograph-R184-Eat.el
index 65ed38a..f1b9747 100644
--- a/lisp/utf-2000/Ideograph-R184-Eat.el
+++ b/lisp/utf-2000/Ideograph-R184-Eat.el
@@ -1436,27 +1436,30 @@
     (total-strokes	 . 12)
     (=ucs		. #x98F2)	; 飲
     (->subsumptive
-     ((morohashi-daikanwa	44063 1)
-      (=ucs@jis		  . #x98F2)	; &GT-59066;
-      (=jis-x0208	  . #x307B)	; &GT-59066; [16-91]
-      (=jis-x0213-1	  . #x307B)	; &I-JX1-307B; [16-91]
-      (=gt		  . 59066)	; &I-GT-59066;
-      (=gt-k		  . 08993)	; &I-GT-K08993;
-      (=gt-pj-1		  . #x307B)	; &I-GT-59066; [16-91]
-      (<-same
-       ((=ucs@jis	    . #x98EE)	; &GT-59113;
-	(=jis-x0208	    . #x5D3B)	; &GT-59113; [61-27]
-	(=ks-x1001	    . #x6B66)	; &I-K0-6B66; [75-70]
-	(=jis-x0213-1	    . #x5D3B)	; &I-JX1-5D3B; [61-27]
-	(=daikanwa	    . 44063)	; &I-M-44063;
+     ((=>>gt		  . 59066)	; &G-GT-59066;
+      (->subsumptive
+       ((morohashi-daikanwa	44063 1)
+	(=ucs@jis	    . #x98F2)	; &GT-59066;
+	(=jis-x0208	    . #x307B)	; &GT-59066; [16-91]
+	(=jis-x0213-1	    . #x307B)	; &I-JX1-307B; [16-91]
+	(=gt		    . 59066)	; &I-GT-59066;
+	(=gt-k		    . 08993)	; &I-GT-K08993;
+	(=gt-pj-1	    . #x307B)	; &I-GT-59066; [16-91]
+	(<-same
+	 ((=ucs@jis	      . #x98EE)	; &GT-59113;
+	  (=jis-x0208	      . #x5D3B)	; &GT-59113; [61-27]
+	  (=ks-x1001	      . #x6B66)	; &I-K0-6B66; [75-70]
+	  (=jis-x0213-1	      . #x5D3B)	; &I-JX1-5D3B; [61-27]
+	  (=daikanwa	      . 44063)	; &I-M-44063;
+	  ))
+	(<-same*sources
+	 daikanwa)
+	)
+       ((mojikyo	    . 050582)	; &MCS-6000C596;
+	)
+       ((=ucs@unicode	    . #x98F2)	; &UU+98F2;
+	(=gb12345	    . #x527B)	; &UU+98F2; [50-91]
 	))
-      (<-same*sources
-       daikanwa)
-      )
-     ((mojikyo		  . 050582)	; &MCS-6000C596;
-      )
-     ((=ucs@unicode	  . #x98F2)	; &UU+98F2;
-      (=gb12345		  . #x527B)	; &UU+98F2; [50-91]
       )
      ((=cns11643-1	  . #x6323)	; &C1-6323; [67-03]
       ))
@@ -1465,7 +1468,8 @@
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 4)
     (=ucs		. #x98EF)	; 飯
-    (=jis-x0208@1997	. #x4853)	; 飯 [40-51]
+    (=>jis-x0208	. #x4853)	; 飯 [40-51]
+    (=>jis-x0213-1	. #x4853)	; 飯 [40-51]
     ))
 (define-char
   '((<-denotational
@@ -1491,6 +1495,7 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 4)
     (total-strokes	 . 12)
+    (=>gt		. 59101)	; &A-GT-59101;
     (->subsumptive
      ((morohashi-daikanwa	44064 1)
       (=ucs@jis		  . #x98EF)	; &GT-59101;
@@ -1501,10 +1506,10 @@
       )
      ((mojikyo		  . 050583)	; &MCS-6000C597;
       )
-     ((=cns11643-1	  . #x6321)	; &C1-6321; [67-01]
-      )
      ((=ucs@unicode	  . #x98EF)	; &UU+98EF;
       (=gb12345		  . #x3739)	; &UU+98EF; [23-25]
+      )
+     ((=cns11643-1	  . #x6321)	; &C1-6321; [67-01]
       ))
     ))
 (define-char
@@ -1907,7 +1912,8 @@
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 5)
     (=ucs		. #x98F4)	; 飴
-    (=jis-x0208@1997	. #x303B)	; 飴 [16-27]
+    (=>jis-x0208	. #x303B)	; 飴 [16-27]
+    (=>jis-x0213-1	. #x303B)	; 飴 [16-27]
     ))
 (define-char
   '((<-denotational
@@ -1916,6 +1922,7 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 5)
     (total-strokes	 . 14)
+    (=ucs@jis/2004	. #x98F4)	; &M-44080;
     (=jis-x0208@1978	. #x303B)	; &M-44080; [16-27]
     (=ks-x1001		. #x6C47)	; &I-K0-6C47; [76-39]
     (=jis-x0213-1@2004	. #x303B)	; &I-JX3-303B; [16-27]
@@ -1932,22 +1939,28 @@
     (->subsumptive
      ((=cns11643-1	  . #x6766)	; &C1-6766; [71-70]
       )
-     ((=ucs@jis		  . #x98F4)	; &GT-59108;
-      (=jis-x0208@1983	  . #x303B)	; &GT-59108; [16-27]
-      (=jis-x0208@1990	  . #x303B)	; &I-J90-303B; [16-27]
-      (=jis-x0213-1@2000  . #x303B)	; &I-JX1-303B; [16-27]
-      (=gt		  . 59108)	; &I-GT-59108;
-      (=gt-pj-1		  . #x303B)	; &I-GT-59108; [16-27]
-      (<-simplified@JP/jis
-       ((=jis-x0208@1978    . #x303B)	; &M-44080; [16-27]
-	(=ks-x1001	    . #x6C47)	; &I-K0-6C47; [76-39]
-	(=jis-x0213-1@2004  . #x303B)	; &I-JX3-303B; [16-27]
-	(=daikanwa	    . 44080)	; &I-M-44080;
+     ((=>>jis-x0213-1@2000 . #x303B)	; &G-GT-59108; [16-27]
+      (=>>gt		  . 59108)	; &G-GT-59108;
+      (->subsumptive
+       ((=ucs@jis/1990	    . #x98F4)	; &GT-59108;
+	(=ucs@jis/2000	    . #x98F4)	; &GT-59108;
+	(=jis-x0208@1983    . #x303B)	; &GT-59108; [16-27]
+	(=jis-x0208@1990    . #x303B)	; &I-J90-303B; [16-27]
+	(=jis-x0213-1@2000  . #x303B)	; &I-JX1-303B; [16-27]
+	(=gt		    . 59108)	; &I-GT-59108;
+	(=gt-pj-1	    . #x303B)	; &I-GT-59108; [16-27]
+	(=jef-china3	    . #x6DC8)	; &I-JC3-6DC8;
+	(<-simplified@JP/extra
+	 ((=ucs@jis/2004      . #x98F4)	; &M-44080;
+	  (=jis-x0208@1978    . #x303B)	; &M-44080; [16-27]
+	  (=ks-x1001	      . #x6C47)	; &I-K0-6C47; [76-39]
+	  (=jis-x0213-1@2004  . #x303B)	; &I-JX3-303B; [16-27]
+	  (=daikanwa	      . 44080)	; &I-M-44080;
+	  ))
+	)
+       ((=ucs@unicode	    . #x98F4)	; &UU+98F4;
+	(=gb12345	    . #x6242)	; &UU+98F4; [66-34]
 	))
-      )
-     ((=ucs@unicode	  . #x98F4)	; &JC3-6DC8;
-      (=gb12345		  . #x6242)	; &JC3-6DC8; [66-34]
-      (=jef-china3	  . #x6DC8)	; &JC3-6DC8;
       ))
     ))
 (define-char
@@ -2610,17 +2623,21 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 5)
     (total-strokes	 . 13)
-    (->subsumptive
-     ((morohashi-daikanwa	44107 1)
-      (=ucs@jis		  . #x98FC)	; &GT-59133;
-      (=jis-x0208	  . #x3B74)	; &GT-59133; [27-84]
-      (=jis-x0213-1	  . #x3B74)	; &I-JX1-3B74; [27-84]
-      (=gt		  . 59133)	; &I-GT-59133;
-      (=gt-pj-1		  . #x3B74)	; &I-GT-59133; [27-84]
-      (mojikyo		  . 050584)	; &MCS-6000C598;
-      )
-     ((=ucs@unicode	  . #x98FC)	; &UU+98FC;
-      (=gb12345		  . #x4B47)	; &UU+98FC; [43-39]
+    (=>gt		. 59133)	; &A-GT-59133;
+    (->subsumptive
+     ((=>>gt		  . 59133)	; &G-GT-59133;
+      (->subsumptive
+       ((morohashi-daikanwa	44107 1)
+	(=ucs@jis	    . #x98FC)	; &GT-59133;
+	(=jis-x0208	    . #x3B74)	; &GT-59133; [27-84]
+	(=jis-x0213-1	    . #x3B74)	; &I-JX1-3B74; [27-84]
+	(=gt		    . 59133)	; &I-GT-59133;
+	(=gt-pj-1	    . #x3B74)	; &I-GT-59133; [27-84]
+	(mojikyo	    . 050584)	; &MCS-6000C598;
+	)
+       ((=ucs@unicode	    . #x98FC)	; &UU+98FC;
+	(=gb12345	    . #x4B47)	; &UU+98FC; [43-39]
+	))
       )
      ((=cns11643-1	  . #x6765)	; &C1-6765; [71-69]
       ))
@@ -2637,7 +2654,29 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 5)
     (total-strokes	 . 14)
-    (=daikanwa		. 44108)	; &M-44108;
+    (=>gt		. 59233)	; &A-GT-59233;
+    (->subsumptive
+     ((=gt		  . 59233)	; &GT-59233;
+      (=gt-pj-8		  . #x472C)	; &GT-59233; [39-12]
+      (=daikanwa	  . 44108)	; &I-M-44108;
+      (=shinjigen@rev	  .  5617)	; &GT-59233;
+      (<-original
+       ((=ucs		    . #x79E3)	; 秣
+	(=jis-x0208	    . #x6342)	; &I-J90-6342; [67-34]
+	(=shinjigen	    .  5616)	; 秣
+	))
+      (<-original*sources
+       shinjigen@rev)
+      )
+     ((=shinjigen@1ed	  .  5617)	; &SJG1-5617;
+      (<-original
+       ((=ucs		    . #x79E3)	; 秣
+	(=jis-x0208	    . #x6342)	; &I-J90-6342; [67-34]
+	(=shinjigen	    .  5616)	; 秣
+	))
+      (<-original*sources
+       shinjigen@1ed)
+      ))
     ))
 (define-char
   '((<-denotational
@@ -2646,17 +2685,26 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 5)
     (total-strokes	 . 13)
+    (=>gt		. 59165)	; &A-GT-59165;
     (->subsumptive
      ((=cns11643-4	  . #x417A)	; &C4-417A; [33-90]
       )
-     ((=ucs@unicode	  . #x4B34)	; &UU+4B34;
+     ((=>>gt		  . 59165)	; &G-GT-59165;
+      (->subsumptive
+       ((=gt		    . 59165)	; &GT-59165;
+	(=gt-pj-10	    . #x492A)	; &GT-59165; [41-10]
+	)
+       ((=ucs@unicode	    . #x4B34)	; &HZK11-F1A6;
+	(=hanziku-11	    . #xF1A6)	; &HZK11-F1A6;
+	))
       ))
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 5)
     (=ucs		. #x98FD)	; 飽
-    (=jis-x0208@1997	. #x4B30)	; 飽 [43-16]
+    (=>jis-x0208	. #x4B30)	; 飽 [43-16]
+    (=>jis-x0213-1	. #x4B30)	; 飽 [43-16]
     ))
 (define-char
   '((<-denotational
@@ -2665,7 +2713,9 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 5)
     (total-strokes	 . 14)
-    (=ks-x1001		. #x7869)	; &M-44109; [88-73]
+    (=ks-x1001		. #x7869)	; &GT-59241; [88-73]
+    (=gt		. 59241)	; &I-GT-59241;
+    (=gt-pj-8		. #x472D)	; &I-GT-59241; [39-13]
     (=daikanwa		. 44109)	; &I-M-44109;
     (=jef-china3	. #x6DB5)	; &I-JC3-6DB5;
     (mojikyo		. 044109)	; &MCS-6000AC4D;
@@ -2716,7 +2766,8 @@
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 5)
     (=ucs		. #x98FE)	; 飾
-    (=jis-x0208@1997	. #x3E7E)	; 飾 [30-94]
+    (=>jis-x0208	. #x3E7E)	; 飾 [30-94]
+    (=>jis-x0213-1	. #x3E7E)	; 飾 [30-94]
     ))
 (define-char
   '((<-denotational
@@ -2727,6 +2778,7 @@
     (total-strokes	 . 14)
     (=ks-x1001		. #x635E)	; &M-44111; [67-62]
     (=daikanwa		. 44111)	; &I-M-44111;
+    (=jef-china3	. #x6DB6)	; &I-JC3-6DB6;
     (mojikyo		. 044111)	; &MCS-6000AC4F;
     ))
 (define-char
@@ -2736,17 +2788,23 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 5)
     (total-strokes	 . 13)
-    (->subsumptive
-     ((morohashi-daikanwa	44111 1)
-      (=ucs@jis		  . #x98FE)	; &GT-59144;
-      (=jis-x0208	  . #x3E7E)	; &GT-59144; [30-94]
-      (=jis-x0213-1	  . #x3E7E)	; &I-JX1-3E7E; [30-94]
-      (=gt		  . 59144)	; &I-GT-59144;
-      (=gt-pj-1		  . #x3E7E)	; &I-GT-59144; [30-94]
-      (mojikyo		  . 050586)	; &MCS-6000C59A;
-      )
-     ((=ucs@unicode	  . #x98FE)	; &UU+98FE;
-      (=gb12345		  . #x4A4E)	; &UU+98FE; [42-46]
+    (=>gt		. 59144)	; &A-GT-59144;
+    (->subsumptive
+     ((=>>jis-x0208	  . #x3E7E)	; &G-GT-59144; [30-94]
+      (=>>jis-x0213-1	  . #x3E7E)	; &G-GT-59144; [30-94]
+      (=>>gt		  . 59144)	; &G-GT-59144;
+      (->subsumptive
+       ((morohashi-daikanwa	44111 1)
+	(=ucs@jis	    . #x98FE)	; &GT-59144;
+	(=jis-x0208	    . #x3E7E)	; &GT-59144; [30-94]
+	(=jis-x0213-1	    . #x3E7E)	; &I-JX1-3E7E; [30-94]
+	(=gt		    . 59144)	; &I-GT-59144;
+	(=gt-pj-1	    . #x3E7E)	; &I-GT-59144; [30-94]
+	(mojikyo	    . 050586)	; &MCS-6000C59A;
+	)
+       ((=ucs@unicode	    . #x98FE)	; &UU+98FE;
+	(=gb12345	    . #x4A4E)	; &UU+98FE; [42-46]
+	))
       )
      ((=cns11643-1	  . #x6768)	; &C1-6768; [71-72]
       ))
@@ -3279,6 +3337,8 @@
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (=ucs		. #x9905)	; 餅
+    (=>jis-x0208	. #x4C5F)	; 餅 [44-63]
+    (=>jis-x0213-1	. #x4C5F)	; 餅 [44-63]
     ))
 (define-char
   '((<-denotational
@@ -3287,8 +3347,19 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 15)
+    (=ucs@jis/2004	. #x9905)	; &M-44133;
     (=jis-x0208@1978	. #x4C5F)	; &M-44133; [44-63]
+    (=jis-x0213-1@2004	. #x4C5F)	; &I-JX3-4C5F; [44-63]
     (=daikanwa		. 44133)	; &I-M-44133;
+    (<-vulgar
+     ((=ucs@jis		  . #x9920)	; &GT-59518;
+      (=jis-x0208	  . #x7136)	; &GT-59518; [81-22]
+      (=ks-x1001	  . #x5C3F)	; &I-K0-5C3F; [60-31]
+      (=jis-x0213-1	  . #x7136)	; &I-JX1-7136; [81-22]
+      (=daikanwa	  . 44220)	; &I-M-44220;
+      ))
+    (<-vulgar*sources
+     zihui daikanwa)
     ))
 (define-char
   '((<-denotational
@@ -3297,23 +3368,31 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 14)
+    (=>gt		. 59239)	; &A-GT-59239;
     (->subsumptive
      ((=cns11643-1	  . #x6B6F)	; &C1-6B6F; [75-79]
       )
-     ((=ucs@jis		  . #x9905)	; &GT-59239;
-      (=jis-x0208@1983	  . #x4C5F)	; &GT-59239; [44-63]
-      (=jis-x0208@1990	  . #x4C5F)	; &I-J90-4C5F; [44-63]
-      (=jis-x0213-1	  . #x4C5F)	; &I-JX1-4C5F; [44-63]
-      (=gt		  . 59239)	; &I-GT-59239;
-      (=gt-pj-1		  . #x4C5F)	; &I-GT-59239; [44-63]
-      (<-simplified@JP/jis
-       ((=jis-x0208@1978    . #x4C5F)	; &M-44133; [44-63]
-	(=daikanwa	    . 44133)	; &I-M-44133;
+     ((=>>jis-x0213-1@2000 . #x4C5F)	; &G-GT-59239; [44-63]
+      (=>>gt		  . 59239)	; &G-GT-59239;
+      (->subsumptive
+       ((=ucs@jis/1990	    . #x9905)	; &GT-59239;
+	(=ucs@jis/2000	    . #x9905)	; &GT-59239;
+	(=jis-x0208@1983    . #x4C5F)	; &GT-59239; [44-63]
+	(=jis-x0208@1990    . #x4C5F)	; &I-J90-4C5F; [44-63]
+	(=jis-x0213-1@2000  . #x4C5F)	; &I-JX1-4C5F; [44-63]
+	(=gt		    . 59239)	; &I-GT-59239;
+	(=gt-pj-1	    . #x4C5F)	; &I-GT-59239; [44-63]
+	(<-simplified@JP/extra
+	 ((=ucs@jis/2004      . #x9905)	; &M-44133;
+	  (=jis-x0208@1978    . #x4C5F)	; &M-44133; [44-63]
+	  (=jis-x0213-1@2004  . #x4C5F)	; &I-JX3-4C5F; [44-63]
+	  (=daikanwa	      . 44133)	; &I-M-44133;
+	  ))
+	)
+       ((=ucs@unicode	    . #x9905)	; &JC3-6DCD;
+	(=gb12345	    . #x317D)	; &JC3-6DCD; [17-93]
+	(=jef-china3	    . #x6DCD)	; &JC3-6DCD;
 	))
-      )
-     ((=ucs@unicode	  . #x9905)	; &JC3-6DCD;
-      (=gb12345		  . #x317D)	; &JC3-6DCD; [17-93]
-      (=jef-china3	  . #x6DCD)	; &JC3-6DCD;
       ))
     ))
 (define-char
@@ -3481,14 +3560,28 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 14)
+    (=>gt		. 59206)	; &A-GT-59206;
     (->subsumptive
      ((=cns11643-4	  . #x485B)	; &C4-485B; [40-59]
       )
-     ((=ucs@unicode	  . #x4B37)	; &UU+4B37;
+     ((=>>gt		  . 59206)	; &G-GT-59206;
+      (->subsumptive
+       ((=gt		    . 59206)	; &GT-59206;
+	(=gt-pj-10	    . #x4940)	; &GT-59206; [41-32]
+	)
+       ((=ucs@unicode	    . #x4B37)	; &UU+4B37;
+	))
       ))
     ))
 (define-char
-  '((=>ucs		. #x9909)	; 餉
+  '((ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 6)
+    (=ucs		. #x9909)	; 餉
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9909)	; 餉
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 15)
@@ -3499,118 +3592,184 @@
     (=gt		. 59286)	; &I-GT-59286;
     (=gt-pj-1		. #x712E)	; &I-GT-59286; [81-14]
     (=daikanwa		. 44140)	; &I-M-44140;
-    (=shinjigen@rev	.  9261)	; &GT-59286;
+    (=shinjigen		.  9261)	; &GT-59286;
     ))
 (define-char
-  '((=>ucs		. #x9909)	; 餉
-    (morohashi-daikanwa	44140 0 1)
+  '((<-denotational
+     ((=ucs		  . #x9909)	; 餉
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 14)
-    (=cns11643-1	. #x6B71)	; &C1-6B71; [75-81]
+    (=>gt		. 59211)	; &A-GT-59211;
+    (->subsumptive
+     ((=cns11643-1	  . #x6B71)	; &C1-6B71; [75-81]
+      )
+     ((=>>gt		  . 59211)	; &G-GT-59211;
+      (->subsumptive
+       ((=gt		    . 59211)	; &GT-59211;
+	(=gt-pj-10	    . #x4941)	; &GT-59211; [41-33]
+	)
+       ((=ucs@unicode	    . #x9909)	; &UU+9909;
+	(=gb12345	    . #x6243)	; &UU+9909; [66-35]
+	))
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	44140 0 2)
+  '((ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 6)
+    (=ucs		. #x4B39)	; 䬹
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x4B39)	; 䬹
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
-    (total-strokes	 . 14)
-    (=ucs		. #x9909)	; 餉
-    (=gb12345		. #x6243)	; 餉 [66-35]
+    (total-strokes	 . 15)
+    (=daikanwa		. 44141)	; &M-44141;
     ))
 (define-char
-  '((ideographic-radical . 184)	; â¾·
+  '((<-denotational
+     ((=ucs		  . #x4B39)	; 䬹
+      ))
+    (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
-    (=ucs		. #x4B39)	; 䬹
+    (total-strokes	 . 14)
+    (=>gt		. 59217)	; &A-GT-59217;
     (->subsumptive
-     ((total-strokes	   . 15)
-      (=daikanwa	  . 44141)	; &M-44141;
-      )
-     ((total-strokes	   . 14)
-      (=cns11643-3	  . #x4A5A)	; &C3-4A5A; [42-58]
+     ((=cns11643-3	  . #x4A5A)	; &C3-4A5A; [42-58]
       )
-     ((total-strokes	   . 14)
-      (=ucs@unicode	  . #x4B39)	; &UU+4B39;
+     ((=>>gt		  . 59217)	; &G-GT-59217;
+      (->subsumptive
+       ((=gt		    . 59217)	; &GT-59217;
+	(=gt-pj-10	    . #x4942)	; &GT-59217; [41-34]
+	)
+       ((=ucs@unicode	    . #x4B39)	; &UU+4B39;
+	))
       ))
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (=ucs		. #x296CE)	; 𩛎
-    (->subsumptive
-     ((total-strokes	   . 15)
-      (=daikanwa	  . 44142)	; &M-44142;
-      )
-     ((total-strokes	   . 14)
-      (=ucs@iso		  . #x296CE)	; &C5-4B4A;
-      (=cns11643-5	  . #x4B4A)	; &C5-4B4A; [43-42]
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x296CE)	; 𩛎
       ))
+    (ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 6)
+    (total-strokes	 . 15)
+    (=gt		. 59307)	; &GT-59307;
+    (=gt-pj-8		. #x474C)	; &GT-59307; [39-44]
+    (=daikanwa		. 44142)	; &I-M-44142;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x296CE)	; 𩛎
+      ))
+    (ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 6)
+    (total-strokes	 . 14)
+    (=ucs@iso		. #x296CE)	; &C5-4B4A;
+    (=cns11643-5	. #x4B4A)	; &C5-4B4A; [43-42]
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (=ucs		. #x4B3A)	; 䬺
-    (->subsumptive
-     ((total-strokes	   . 15)
-      (=daikanwa	  . 44143)	; &M-44143;
-      )
-     ((total-strokes	   . 14)
-      (=cns11643-4	  . #x485C)	; &C4-485C; [40-60]
-      )
-     ((total-strokes	   . 14)
-      (=ucs@unicode	  . #x4B3A)	; &UU+4B3A;
-      ))
     ))
 (define-char
-  '((=>ucs		. #x990A)	; 養
+  '((<-denotational
+     ((=ucs		  . #x4B3A)	; 䬺
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 15)
-    (=ks-x1001		. #x6557)	; &M-44144; [69-55]
-    (=cns11643-1	. #x6F72)	; &I-C1-6F72; [79-82]
-    (=daikanwa		. 44144)	; &I-M-44144;
-    (=jef-china3	. #x6DAC)	; &I-JC3-6DAC;
+    (=daikanwa		. 44143)	; &M-44143;
     ))
 (define-char
-  '((=>ucs		. #x990A)	; 養
-    (morohashi-daikanwa	44144 0 0)
+  '((<-denotational
+     ((=ucs		  . #x4B3A)	; 䬺
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
-    (total-strokes	 . 15)
-    (=ucs@jis		. #x990A)	; &GT-59327;
-    (=jis-x0208		. #x4D5C)	; &GT-59327; [45-60]
-    (=jis-x0213-1	. #x4D5C)	; &I-JX1-4D5C; [45-60]
-    (=gt		. 59327)	; &I-GT-59327;
-    (=gt-pj-1		. #x4D5C)	; &I-GT-59327; [45-60]
-    (=shinjigen@rev	.  9264)	; &GT-59327;
+    (total-strokes	 . 14)
+    (=>gt		. 59248)	; &A-GT-59248;
+    (->subsumptive
+     ((=cns11643-4	  . #x485C)	; &C4-485C; [40-60]
+      )
+     ((=>>gt		  . 59248)	; &G-GT-59248;
+      (->subsumptive
+       ((=gt		    . 59248)	; &GT-59248;
+	(=gt-pj-10	    . #x4944)	; &GT-59248; [41-36]
+	)
+       ((=ucs@unicode	    . #x4B3A)	; &UU+4B3A;
+	))
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	44144 0 2)
-    (ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 5)
-    (total-strokes	 . 14)
+  '((ideographic-radical . 184)	; â¾·
     (=ucs		. #x990A)	; 養
-    (=gb12345		. #x5178)	; 養 [49-88]
+    (->subsumptive
+     ((ideographic-strokes . 6)
+      (total-strokes	   . 15)
+      (=ks-x1001	  . #x6557)	; &M-44144; [69-55]
+      (=cns11643-1	  . #x6F72)	; &I-C1-6F72; [79-82]
+      (=daikanwa	  . 44144)	; &I-M-44144;
+      (=shinjigen	  .  9265)	; &M-44144;
+      (=jef-china3	  . #x6DAC)	; &I-JC3-6DAC;
+      )
+     ((ideographic-strokes . 6)
+      (total-strokes	   . 15)
+      (=ucs@jis		  . #x990A)	; &GT-59327;
+      (=jis-x0208	  . #x4D5C)	; &GT-59327; [45-60]
+      (=jis-x0213-1	  . #x4D5C)	; &I-JX1-4D5C; [45-60]
+      (=gt		  . 59327)	; &I-GT-59327;
+      (=gt-pj-1		  . #x4D5C)	; &I-GT-59327; [45-60]
+      (=shinjigen	  .  9264)	; &GT-59327;
+      )
+     ((ideographic-strokes . 5)
+      (total-strokes	   . 14)
+      (=ucs@unicode	  . #x990A)	; &UU+990A;
+      (=gb12345		  . #x5178)	; &UU+990A; [49-88]
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 6)
+    (total-strokes	 . 15)
+    (=ucs		. #x990B)	; 餋
     ))
 (define-char
-  '((=>ucs		. #x990B)	; 餋
+  '((<-denotational
+     ((=ucs		  . #x990B)	; 餋
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 15)
     (=daikanwa		. 44145)	; &M-44145;
     ))
 (define-char
-  '((morohashi-daikanwa	44145 0 2)
+  '((<-denotational
+     ((=ucs		  . #x990B)	; 餋
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 15)
-    (=ucs		. #x990B)	; 餋
-    (=cns11643-4	. #x4E63)	; &I-C4-4E63; [46-67]
+    (->subsumptive
+     ((=cns11643-4	  . #x4E63)	; &C4-4E63; [46-67]
+      )
+     ((=ucs@unicode	  . #x990B)	; &UU+990B;
+      ))
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (=ucs		. #x990C)	; 餌
-    (=jis-x0208@1997	. #x3142)	; 餌 [17-34]
+    (=>jis-x0208	. #x3142)	; 餌 [17-34]
+    (=>jis-x0213-1	. #x3142)	; 餌 [17-34]
     ))
 (define-char
   '((<-denotational
@@ -3619,8 +3778,12 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 15)
+    (=>>jis-x0213-1@2004 . #x3142)	; &G-GT-59281; [17-34]
+    (=>>gt		. 59281)	; &G-GT-59281;
     (->subsumptive
-     ((=daikanwa	  . 44146)	; &M-44146;
+     ((=gt		  . 59281)	; &GT-59281;
+      (=gt-pj-8		  . #x4750)	; &GT-59281; [39-48]
+      (=daikanwa	  . 44146)	; &I-M-44146;
       )
      ((=ucs@jis/2004	  . #x990C)	; &JX3-3142;
       (=jis-x0213-1@2004  . #x3142)	; &JX3-3142; [17-34]
@@ -3636,28 +3799,38 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 14)
+    (=>gt		. 59204)	; &A-GT-59204;
     (->subsumptive
      ((=cns11643-1	  . #x6B70)	; &C1-6B70; [75-80]
       )
-     ((=gt		  . 59204)	; &GT-59204;
-      (=gt-pj-1		  . #x3142)	; &GT-59204; [17-34]
-      )
-     ((=ucs@jis/1990	  . #x990C)	; &J90-3142;
-      (=ucs@jis/2000	  . #x990C)	; &J90-3142;
-      (=jis-x0208@1990	  . #x3142)	; &J90-3142; [17-34]
-      (=jis-x0213-1@2000  . #x3142)	; &I-JX1-3142; [17-34]
-      (<-simplified@JP/jis
-       ((=jis-x0208@1978    . #x3142)	; &J78-3142; [17-34]
-	(=ks-x1001	    . #x6C48)	; &I-K0-6C48; [76-40]
-	))
-      (<-simplified@JP/misc
-       ((=daikanwa	    . 44146)	; &M-44146;
+     ((=>>jis-x0213-1@2000 . #x3142)	; &G-GT-59204; [17-34]
+      (=>>gt		  . 59204)	; &G-GT-59204;
+      (->subsumptive
+       ((=gt		    . 59204)	; &GT-59204;
+	(=gt-pj-1	    . #x3142)	; &GT-59204; [17-34]
+	)
+       ((=ucs@jis/1990	    . #x990C)	; &J90-3142;
+	(=ucs@jis/2000	    . #x990C)	; &J90-3142;
+	(=jis-x0208@1990    . #x3142)	; &J90-3142; [17-34]
+	(=jis-x0213-1@2000  . #x3142)	; &I-JX1-3142; [17-34]
+	(<-simplified@JP/extra
+	 ((=ucs@jis/2004      . #x990C)	; &JX3-3142;
+	  (=jis-x0213-1@2004  . #x3142)	; &JX3-3142; [17-34]
+	  ))
+	(<-simplified@JP/jis
+	 ((=jis-x0208@1978    . #x3142)	; &J78-3142; [17-34]
+	  (=ks-x1001	      . #x6C48)	; &I-K0-6C48; [76-40]
+	  ))
+	(<-simplified@JP/misc
+	 ((=gt		      . 59281)	; &GT-59281;
+	  (=daikanwa	      . 44146)	; &I-M-44146;
+	  ))
+	)
+       ((=jis-x0208@1983    . #x3142)	; &J83-3142; [17-34]
+	)
+       ((=ucs@unicode	    . #x990C)	; &UU+990C;
+	(=gb12345	    . #x367C)	; &UU+990C; [22-92]
 	))
-      )
-     ((=jis-x0208@1983	  . #x3142)	; &J83-3142; [17-34]
-      )
-     ((=ucs@unicode	  . #x990C)	; &UU+990C;
-      (=gb12345		  . #x367C)	; &UU+990C; [22-92]
       ))
     ))
 (define-char
@@ -3672,7 +3845,9 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 15)
-    (=daikanwa		. 44147)	; &M-44147;
+    (=gt		. 59280)	; &GT-59280;
+    (=gt-pj-8		. #x4751)	; &GT-59280; [39-49]
+    (=daikanwa		. 44147)	; &I-M-44147;
     ))
 (define-char
   '((<-denotational
@@ -3681,8 +3856,15 @@
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 6)
     (total-strokes	 . 14)
+    (=>gt		. 59201)	; &A-GT-59201;
     (->subsumptive
-     ((=ucs@iso		  . #x296CF)	; &U-000296CF;
+     ((=>>gt		  . 59201)	; &G-GT-59201;
+      (->subsumptive
+       ((=gt		    . 59201)	; &GT-59201;
+	(=gt-pj-10	    . #x4945)	; &GT-59201; [41-37]
+	)
+       ((=ucs@iso	    . #x296CF)	; &U-000296CF;
+	))
       )
      ((=cns11643-4	  . #x485A)	; &C4-485A; [40-58]
       ))
@@ -3973,63 +4155,75 @@
     (=cns11643-7	. #x2B40)	; &C7-2B40; [11-32]
     ))
 (define-char
-  '((=>ucs		. #x9910)	; 餐
-    (ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 7)
-    (total-strokes	 . 16)
-    (=ks-x1001		. #x7349)	; &M-44160; [83-41]
-    (=daikanwa		. 44160)	; &I-M-44160;
-    ))
-(define-char
-  '((=>ucs		. #x9910)	; 餐
-    (morohashi-daikanwa	44160 0 0)
-    (ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 7)
-    (total-strokes	 . 16)
-    (=cns11643-1	. #x7327)	; &C1-7327; [83-07]
-    ))
-(define-char
-  '((=>ucs		. #x9910)	; 餐
-    (morohashi-daikanwa	44160 0 1)
-    (ideographic-radical . 184)	; â¾·
+  '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 7)
     (total-strokes	 . 16)
-    (=ucs@jis		. #x9910)	; &J90-3B41;
-    (=jis-x0208		. #x3B41)	; &J90-3B41; [27-33]
-    (=jis-x0213-1	. #x3B41)	; &I-JX1-3B41; [27-33]
-    (=shinjigen@rev	.  9268)	; &J90-3B41;
+    (=ucs		. #x9910)	; 餐
+    (=>jis-x0208	. #x3B41)	; 餐 [27-33]
+    (=>jis-x0213-1	. #x3B41)	; 餐 [27-33]
+    (->subsumptive
+     ((=>>jis-x0213-1@2004 . #x3B41)	; &G-GT-59369; [27-33]
+      (=>>gt		  . 59369)	; &G-GT-59369;
+      (->subsumptive
+       ((=ucs@jis/2004	    . #x9910)	; &M-44160;
+	(=ks-x1001	    . #x7349)	; &M-44160; [83-41]
+	(=jis-x0213-1@2004  . #x3B41)	; &I-JX3-3B41; [27-33]
+	(=daikanwa	    . 44160)	; &I-M-44160;
+	(=shinjigen	    .  9268)	; &M-44160;
+	)
+       ((=cns11643-1	    . #x7327)	; &GT-59369; [83-07]
+	(=gt		    . 59369)	; &I-GT-59369;
+	(=gt-pj-8	    . #x475E)	; &I-GT-59369; [39-62]
+	))
+      )
+     ((=>>jis-x0208	  . #x3B41)	; &G-GT-59370; [27-33]
+      (=>>jis-x0213-1@2000 . #x3B41)	; &G-GT-59370; [27-33]
+      (=>>gt		  . 59370)	; &G-GT-59370;
+      (->subsumptive
+       ((=ucs@jis/1990	    . #x9910)	; &J90-3B41;
+	(=ucs@jis/2000	    . #x9910)	; &J90-3B41;
+	(=jis-x0208	    . #x3B41)	; &J90-3B41; [27-33]
+	(=jis-x0213-1@2000  . #x3B41)	; &I-JX1-3B41; [27-33]
+	)
+       ((=ucs@unicode	    . #x9910)	; &G0-324D;
+	(=gb2312	    . #x324D)	; &G0-324D; [18-45]
+	)
+       ((=gt		    . 59370)	; &GT-59370;
+	(=gt-pj-1	    . #x3B41)	; &GT-59370; [27-33]
+	))
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	44160 0 2)
-    (ideographic-radical . 184)	; â¾·
+  '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 7)
-    (total-strokes	 . 16)
-    (=ucs		. #x9910)	; 餐
-    (=gb2312		. #x324D)	; &I-G0-324D; [18-45]
+    (=ucs		. #x4B3D)	; 䬽
     ))
 (define-char
-  '((=>ucs		. #x9910)	; 餐
-    (morohashi-daikanwa	44160 0 3)
+  '((<-denotational
+     ((=ucs		  . #x4B3D)	; 䬽
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 7)
     (total-strokes	 . 16)
-    (=gt		. 59370)	; &GT-59370;
-    (=gt-pj-1		. #x3B41)	; &GT-59370; [27-33]
+    (=daikanwa		. 44161)	; &M-44161;
     ))
 (define-char
-  '((=>ucs		. #x4B3D)	; 䬽
+  '((<-denotational
+     ((=ucs		  . #x4B3D)	; 䬽
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 7)
-    (total-strokes	 . 16)
-    (=daikanwa		. 44161)	; &M-44161;
+    (total-strokes	 . 15)
+    (=ucs@unicode	. #x4B3D)	; &UU+4B3D;
     ))
 (define-char
-  '((morohashi-daikanwa	44161 0 1)
+  '((<-denotational
+     ((=ucs		  . #x4B3D)	; 䬽
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 7)
     (total-strokes	 . 15)
-    (=ucs		. #x4B3D)	; 䬽
-    (=cns11643-4	. #x4E65)	; &I-C4-4E65; [46-69]
+    (=cns11643-4	. #x4E65)	; &C4-4E65; [46-69]
     ))
 (define-char
   '((=>ucs		. #x9911)	; 餑
@@ -8257,64 +8451,103 @@
     (=cns11643-2	. #x6C65)	; &I-C2-6C65; [76-69]
     ))
 (define-char
-  '((=>ucs		. #x9957)	; 饗
+  '((ideographic-radical . 184)	; â¾·
+    (=ucs		. #x9957)	; 饗
+    (=>jis-x0208	. #x3642)	; 饗 [22-34]
+    (=>jis-x0213-1	. #x3642)	; 饗 [22-34]
+    (=jef-china3	. #x6DCA)	; &I-JC3-6DCA;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9957)	; 饗
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 13)
     (total-strokes	 . 22)
     (=daikanwa		. 44431)	; &M-44431;
+    (<-same@JP/extra/design
+     ((=ucs@jis/2004	  . #x9957)	; &JX3-3642;
+      (=ks-x1001	  . #x7A44)	; &JX3-3642; [90-36]
+      (=jis-x0213-1@2004  . #x3642)	; &I-JX3-3642; [22-34]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x9957)	; 饗
-    (morohashi-daikanwa	44431 0 1)
+  '((<-denotational
+     ((=ucs		  . #x9957)	; 饗
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 13)
     (total-strokes	 . 22)
-    (=ks-x1001		. #x7A44)	; &K0-7A44; [90-36]
+    (=ucs@jis/2004	. #x9957)	; &JX3-3642;
+    (=ks-x1001		. #x7A44)	; &JX3-3642; [90-36]
+    (=jis-x0213-1@2004	. #x3642)	; &I-JX3-3642; [22-34]
     ))
 (define-char
-  '((=>ucs		. #x9957)	; 饗
-    (morohashi-daikanwa	44431 0 2)
+  '((<-denotational
+     ((=ucs		  . #x9957)	; 饗
+      ))
     (ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 12)
-    (total-strokes	 . 21)
-    (=cns11643-1	. #x7B43)	; &C1-7B43; [91-35]
+    (ideographic-strokes . 11)
+    (total-strokes	 . 20)
+    (=ucs@jis/1990	. #x9957)	; &GT-59707;
+    (=ucs@jis/2000	. #x9957)	; &GT-59707;
+    (=jis-x0208		. #x3642)	; &GT-59707; [22-34]
+    (=jis-x0213-1@2000	. #x3642)	; &I-JX1-3642; [22-34]
+    (=gt		. 59707)	; &I-GT-59707;
+    (=gt-pj-1		. #x3642)	; &I-GT-59707; [22-34]
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x9957)	; &JX3-3642;
+      (=ks-x1001	  . #x7A44)	; &JX3-3642; [90-36]
+      (=jis-x0213-1@2004  . #x3642)	; &I-JX3-3642; [22-34]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	44431 0 3)
+  '((<-denotational
+     ((=ucs		  . #x9957)	; 饗
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 12)
     (total-strokes	 . 21)
-    (=ucs		. #x9957)	; 饗
-    (=gb12345		. #x774F)	; 饗 [87-47]
+    (->subsumptive
+     ((=cns11643-1	  . #x7B43)	; &C1-7B43; [91-35]
+      )
+     ((=ucs@unicode	  . #x9957)	; &UU+9957;
+      (=gb12345		  . #x774F)	; &UU+9957; [87-47]
+      ))
     ))
 (define-char
-  '((=>ucs		. #x9957)	; 饗
-    (morohashi-daikanwa	44431 0 5)
+  '((ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 13)
+    (=ucs		. #x297CA)	; 𩟊
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x297CA)	; 𩟊
+      ))
     (ideographic-radical . 184)	; â¾·
-    (ideographic-strokes . 11)
-    (total-strokes	 . 20)
-    (jis-strokes-a	. 13)
-    (=ucs@jis		. #x9957)	; &GT-59707;
-    (=jis-x0208		. #x3642)	; &GT-59707; [22-34]
-    (=jis-x0213-1	. #x3642)	; &I-JX1-3642; [22-34]
-    (=gt		. 59707)	; &I-GT-59707;
-    (=gt-pj-1		. #x3642)	; &I-GT-59707; [22-34]
+    (ideographic-strokes . 13)
+    (total-strokes	 . 22)
+    (=daikanwa		. 44432)	; &M-44432;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x297CA)	; 𩟊
+      ))
+    (ideographic-radical . 184)	; â¾·
+    (ideographic-strokes . 13)
+    (total-strokes	 . 21)
+    (=ucs@iso		. #x297CA)	; &C5-7225;
+    (=cns11643-5	. #x7225)	; &C5-7225; [82-05]
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 13)
-    (=ucs		. #x297CA)	; 𩟊
-    (->subsumptive
-     ((total-strokes	   . 22)
-      (=daikanwa	  . 44432)	; &M-44432;
-      )
-     ((total-strokes	   . 21)
-      (=ucs@iso		  . #x297CA)	; &C5-7225;
-      (=cns11643-5	  . #x7225)	; &C5-7225; [82-05]
-      ))
+    (=ucs		. #x9958)	; 饘
     ))
 (define-char
-  '((=>ucs		. #x9958)	; 饘
+  '((<-denotational
+     ((=ucs		  . #x9958)	; 饘
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 13)
     (total-strokes	 . 22)
@@ -8322,14 +8555,20 @@
     (=jis-x0212		. #x6870)	; &M-44433; [72-80]
     (=jis-x0213-1	. #x7E2A)	; &I-JX1-7E2A; [94-10]
     (=daikanwa		. 44433)	; &I-M-44433;
+    (=jef-china3	. #x6DC7)	; &I-JC3-6DC7;
     ))
 (define-char
-  '((morohashi-daikanwa	44433 0 1)
+  '((<-denotational
+     ((=ucs		  . #x9958)	; 饘
+      ))
     (ideographic-radical . 184)	; â¾·
     (ideographic-strokes . 13)
     (total-strokes	 . 21)
-    (=ucs		. #x9958)	; 饘
-    (=cns11643-2	. #x6C64)	; &I-C2-6C64; [76-68]
+    (->subsumptive
+     ((=cns11643-2	  . #x6C64)	; &C2-6C64; [76-68]
+      )
+     ((=ucs@unicode	  . #x9958)	; &UU+9958;
+      ))
     ))
 (define-char
   '((ideographic-radical . 184)	; â¾·
diff --git a/lisp/utf-2000/Ideograph-R187-Horse.el b/lisp/utf-2000/Ideograph-R187-Horse.el
index eceb3ca..96bf8e8 100644
--- a/lisp/utf-2000/Ideograph-R187-Horse.el
+++ b/lisp/utf-2000/Ideograph-R187-Horse.el
@@ -607,27 +607,28 @@
       ))
     ))
 (define-char
-  '((=>ucs		. #x99C1)	; 駁
-    (ideographic-radical . 187)	; ⾺
-    (ideographic-strokes . 4)
-    (total-strokes	 . 14)
-    (=ucs@jis		. #x99C1)	; &GT-60103;
-    (=jis-x0208		. #x477D)	; &GT-60103; [39-93]
-    (=ks-x1001		. #x5A60)	; &I-K0-5A60; [58-64]
-    (=jis-x0213-1	. #x477D)	; &I-JX1-477D; [39-93]
-    (=gt		. 60103)	; &I-GT-60103;
-    (=gt-pj-1		. #x477D)	; &I-GT-60103; [39-93]
-    (=daikanwa		. 44619)	; &I-M-44619;
-    (=shinjigen@rev	.  9343)	; &GT-60103;
-    ))
-(define-char
-  '((morohashi-daikanwa	44619 0 0)
-    (ideographic-radical . 187)	; ⾺
+  '((ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 4)
     (total-strokes	 . 14)
     (=ucs		. #x99C1)	; 駁
-    (=cns11643-1	. #x6B72)	; &I-C1-6B72; [75-82]
-    (=gb12345		. #x3235)	; 駁 [18-21]
+    (=>jis-x0208	. #x477D)	; 駁 [39-93]
+    (=>jis-x0213-1	. #x477D)	; 駁 [39-93]
+    (->subsumptive
+     ((=ucs@jis/1990	  . #x99C1)	; &GT-60103;
+      (=ucs@jis/2000	  . #x99C1)	; &GT-60103;
+      (=jis-x0208	  . #x477D)	; &GT-60103; [39-93]
+      (=ks-x1001	  . #x5A60)	; &I-K0-5A60; [58-64]
+      (=jis-x0213-1@2000  . #x477D)	; &I-JX1-477D; [39-93]
+      (=gt		  . 60103)	; &I-GT-60103;
+      (=gt-pj-1		  . #x477D)	; &I-GT-60103; [39-93]
+      (=daikanwa	  . 44619)	; &I-M-44619;
+      (=shinjigen	  .  9343)	; &GT-60103;
+      )
+     ((=ucs@unicode	  . #x99C1)	; &JX3-477D;
+      (=cns11643-1	  . #x6B72)	; &JX3-477D; [75-82]
+      (=jis-x0213-1@2004  . #x477D)	; &I-JX3-477D; [39-93]
+      (=gb12345		  . #x3235)	; &JX3-477D; [18-21]
+      ))
     ))
 (define-char
   '((ideographic-radical . 187)	; ⾺
@@ -3388,7 +3389,8 @@
   '((ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 9)
     (total-strokes	 . 19)
-    (=cns11643-7	. #x4C2C)	; &M-44846; [44-12]
+    (=ucs		. #x2991D)	; 𩤝
+    (=cns11643-7	. #x4C2C)	; &I-C7-4C2C; [44-12]
     (=daikanwa		. 44846)	; &I-M-44846;
     ))
 (define-char
@@ -3400,7 +3402,15 @@
     (=daikanwa		. 44847)	; &I-M-44847;
     ))
 (define-char
-  '((=>ucs		. #x9A17)	; 騗
+  '((ideographic-radical . 187)	; ⾺
+    (ideographic-strokes . 9)
+    (total-strokes	 . 19)
+    (=ucs		. #x9A17)	; 騗
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9A17)	; 騗
+      ))
     (ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 9)
     (total-strokes	 . 19)
@@ -3410,8 +3420,18 @@
     (=daikanwa		. 44848)	; &I-M-44848;
     ))
 (define-char
-  '((=>ucs		. #x9A17)	; 騗
-    (morohashi-daikanwa	44848 0 2)
+  '((<-denotational
+     ((=ucs		  . #x9A17)	; 騗
+      ))
+    (ideographic-radical . 187)	; ⾺
+    (ideographic-strokes . 9)
+    (total-strokes	 . 19)
+    (=ucs@unicode	. #x9A17)	; &UU+9A17;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9A17)	; 騗
+      ))
     (ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 9)
     (total-strokes	 . 19)
@@ -3419,50 +3439,71 @@
     (=gt-pj-11		. #x3336)	; &GT-60421; [19-22]
     ))
 (define-char
-  '((morohashi-daikanwa	44848 0 3)
-    (ideographic-radical . 187)	; ⾺
+  '((ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 9)
     (total-strokes	 . 19)
-    (=ucs		. #x9A17)	; 騗
+    (=ucs		. #x9A19)	; 騙
+    (=>jis-x0208	. #x7159)	; 騙 [81-57]
+    (=>jis-x0213-1	. #x7159)	; 騙 [81-57]
     ))
 (define-char
-  '((=>ucs		. #x9A19)	; 騙
+  '((<-denotational
+     ((=ucs		  . #x9A19)	; 騙
+      ))
     (ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 9)
     (total-strokes	 . 19)
+    (=ucs@jis/2004	. #x9A19)	; &GT-60417;
     (=ks-x1001		. #x783E)	; &GT-60417; [88-30]
     (=cns11643-1	. #x7952)	; &I-C1-7952; [89-50]
+    (=jis-x0213-1@2004	. #x7159)	; &I-JX3-7159; [81-57]
     (=gt		. 60417)	; &I-GT-60417;
     (=gt-pj-8		. #x4E51)	; &I-GT-60417; [46-49]
     (=daikanwa		. 44849)	; &I-M-44849;
     ))
 (define-char
-  '((=>ucs		. #x9A19)	; 騙
-    (morohashi-daikanwa	44849 0 1)
+  '((<-denotational
+     ((=ucs		  . #x9A19)	; 騙
+      ))
     (ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 9)
     (total-strokes	 . 19)
-    (=ucs@jis		. #x9A19)	; &GT-60420;
-    (=jis-x0208		. #x7159)	; &GT-60420; [81-57]
-    (=jis-x0213-1	. #x7159)	; &I-JX1-7159; [81-57]
-    (=gt		. 60420)	; &I-GT-60420;
-    (=gt-pj-1		. #x7159)	; &I-GT-60420; [81-57]
+    (=ucs@unicode	. #x9A19)	; &UU+9A19;
+    (=gb12345		. #x462D)	; &UU+9A19; [38-13]
     ))
 (define-char
-  '((morohashi-daikanwa	44849 0 2)
+  '((<-denotational
+     ((=ucs		  . #x9A19)	; 騙
+      ))
     (ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 9)
     (total-strokes	 . 19)
-    (=ucs		. #x9A19)	; 騙
-    (=gb12345		. #x462D)	; 騙 [38-13]
+    (=ucs@jis/1990	. #x9A19)	; &GT-60420;
+    (=ucs@jis/2000	. #x9A19)	; &GT-60420;
+    (=jis-x0208		. #x7159)	; &GT-60420; [81-57]
+    (=jis-x0213-1@2000	. #x7159)	; &I-JX1-7159; [81-57]
+    (=gt		. 60420)	; &I-GT-60420;
+    (=gt-pj-1		. #x7159)	; &I-GT-60420; [81-57]
+    (<-simplified@JP/extra/design
+     ((=ucs@jis/2004	  . #x9A19)	; &GT-60417;
+      (=ks-x1001	  . #x783E)	; &GT-60417; [88-30]
+      (=cns11643-1	  . #x7952)	; &I-C1-7952; [89-50]
+      (=jis-x0213-1@2004  . #x7159)	; &I-JX3-7159; [81-57]
+      (=daikanwa	  . 44849)	; &I-M-44849;
+      ))
     ))
 (define-char
   '((ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 9)
     (total-strokes	 . 19)
     (=ucs		. #x4B9E)	; 䮞
-    (=cns11643-3	. #x5B6A)	; &I-C3-5B6A; [59-74]
-    (=daikanwa		. 44851)	; &I-M-44851;
+    (->subsumptive
+     ((=daikanwa	  . 44851)	; &M-44851;
+      (=jef-china3	  . #x6DF0)	; &I-JC3-6DF0;
+      )
+     ((=ucs@unicode	  . #x4B9E)	; &C3-5B6A;
+      (=cns11643-3	  . #x5B6A)	; &C3-5B6A; [59-74]
+      ))
     ))
 (define-char
   '((ideographic-radical . 187)	; ⾺
@@ -3477,12 +3518,32 @@
     (ideographic-strokes . 9)
     (total-strokes	 . 19)
     (=ucs		. #x9A1A)	; 騚
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9A1A)	; 騚
+      ))
+    (ideographic-radical . 187)	; ⾺
+    (ideographic-strokes . 9)
+    (total-strokes	 . 19)
+    (=ucs@jis		. #x9A1A)	; &GT-60393;
+    (=jis-x0213-2	. #x7C7D)	; &GT-60393; [92-93]
+    (=gt		. 60393)	; &I-GT-60393;
+    (=gt-pj-8		. #x4E54)	; &I-GT-60393; [46-52]
+    (=daikanwa		. 44853)	; &I-M-44853;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9A1A)	; 騚
+      ))
+    (ideographic-radical . 187)	; ⾺
+    (ideographic-strokes . 9)
+    (total-strokes	 . 19)
+    (=>>gt		. 60396)	; &G-GT-60396;
     (->subsumptive
-     ((=ucs@jis		  . #x9A1A)	; &M-44853;
-      (=jis-x0213-2	  . #x7C7D)	; &M-44853; [92-93]
-      (=daikanwa	  . 44853)	; &I-M-44853;
-      )
-     ((=ucs@unicode	  . #x9A1A)	; &UU+9A1A;
+     ((=ucs@unicode	  . #x9A1A)	; &GT-60396;
+      (=gt		  . 60396)	; &GT-60396;
+      (=gt-pj-11	  . #x4050)	; &GT-60396; [32-48]
       )
      ((=cns11643-2	  . #x6821)	; &C2-6821; [72-01]
       ))
@@ -5179,20 +5240,44 @@
   '((ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 12)
     (total-strokes	 . 22)
-    (=cns11643-7	. #x5A3B)	; &M-44997; [58-27]
-    (=daikanwa		. 44997)	; &I-M-44997;
+    (=ucs		. #x29988)	; 𩦈
+    (->subsumptive
+     ((=ucs@iso		  . #x29988)	; &M-44997;
+      (=daikanwa	  . 44997)	; &M-44997;
+      )
+     ((=cns11643-7	  . #x5A3B)	; &C7-5A3B; [58-27]
+      ))
     ))
 (define-char
   '((ideographic-radical . 187)	; ⾺
     (=ucs		. #x29989)	; 𩦉
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x29989)	; 𩦉
+      ))
+    (ideographic-radical . 187)	; ⾺
+    (ideographic-strokes . 12)
+    (total-strokes	 . 22)
+    (=gt		. 60594)	; &GT-60594;
+    (=gt-pj-8		. #x504E)	; &GT-60594; [48-46]
+    (=daikanwa		. 44998)	; &I-M-44998;
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x29989)	; 𩦉
+      ))
+    (ideographic-radical . 187)	; ⾺
+    (=>>gt		. 60595)	; &G-GT-60595;
     (->subsumptive
      ((ideographic-strokes . 12)
       (total-strokes	   . 22)
-      (=daikanwa	  . 44998)	; &M-44998;
+      (=ucs@iso		  . #x29989)	; &GT-60595;
+      (=gt		  . 60595)	; &GT-60595;
+      (=gt-pj-11	  . #x3345)	; &GT-60595; [19-37]
       )
      ((ideographic-strokes . 11)
       (total-strokes	   . 21)
-      (=ucs@iso		  . #x29989)	; &C5-7233;
       (=cns11643-5	  . #x7233)	; &C5-7233; [82-19]
       ))
     ))
@@ -5202,10 +5287,13 @@
     (total-strokes	 . 22)
     (=ucs		. #x2998A)	; 𩦊
     (->subsumptive
-     ((=daikanwa	  . 44999)	; &M-44999;
+     ((=gt		  . 60559)	; &GT-60559;
+      (=gt-pj-8		  . #x504F)	; &GT-60559; [48-47]
+      (=daikanwa	  . 44999)	; &I-M-44999;
+      )
+     ((=ucs@iso		  . #x2998A)	; &U-0002998A;
       )
-     ((=ucs@iso		  . #x2998A)	; &C5-7474;
-      (=cns11643-5	  . #x7474)	; &C5-7474; [84-84]
+     ((=cns11643-5	  . #x7474)	; &C5-7474; [84-84]
       ))
     ))
 (define-char
@@ -5214,7 +5302,9 @@
     (total-strokes	 . 22)
     (=ucs		. #x4BB5)	; 䮵
     (->subsumptive
-     ((=daikanwa	  . 45000)	; &M-45000;
+     ((=gt		  . 60582)	; &GT-60582;
+      (=gt-pj-8		  . #x5050)	; &GT-60582; [48-48]
+      (=daikanwa	  . 45000)	; &I-M-45000;
       )
      ((=ucs@iso		  . #x4BB5)	; &C4-6969;
       (=cns11643-4	  . #x6969)	; &C4-6969; [73-73]
@@ -5224,12 +5314,28 @@
   '((ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 12)
     (total-strokes	 . 22)
-    (=cns11643-7	. #x5A40)	; &M-45001; [58-32]
-    (=daikanwa		. 45001)	; &I-M-45001;
+    (=ucs		. #x2998D)	; 𩦍
+    (->subsumptive
+     ((=daikanwa	  . 45001)	; &M-45001;
+      )
+     ((=>>gt		  . 60583)	; &G-GT-60583;
+      (->subsumptive
+       ((=gt		    . 60583)	; &GT-60583;
+	(=gt-pj-8	    . #x5051)	; &GT-60583; [48-49]
+	)
+       ((=cns11643-7	    . #x5A40)	; &C7-5A40; [58-32]
+	)
+       ((=ucs@iso	    . #x2998D)	; &U-0002998D;
+	))
+      ))
+    ))
+(define-char
+  '((ideographic-radical . 187)	; ⾺
+    (=>jis-x0208@1997	. #x424D)	; &J97-424D; [34-45]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x424D)	; &J97-424D; [34-45]
+     ((=>jis-x0208@1997	  . #x424D)	; &J97-424D; [34-45]
       ))
     (ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 12)
@@ -5241,12 +5347,8 @@
     (=daikanwa		. 45002)	; &I-M-45002;
     ))
 (define-char
-  '((ideographic-radical . 187)	; ⾺
-    (=jis-x0208@1997	. #x424D)	; &J97-424D; [34-45]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x424D)	; &J97-424D; [34-45]
+     ((=>jis-x0208@1997	  . #x424D)	; &J97-424D; [34-45]
       ))
     (ideographic-radical . 187)	; ⾺
     (ideographic-strokes . 9)
@@ -5257,6 +5359,7 @@
     (=jis-x0213-1	. #x424D)	; &I-JX1-424D; [34-45]
     (=gt		. 60402)	; &I-GT-60402;
     (=gt-pj-1		. #x424D)	; &I-GT-60402; [34-45]
+    (=jef-china3	. #x6DF8)	; &I-JC3-6DF8;
     (<-simplified@JP/jis
      ((=ucs		  . #x9A52)	; 驒
       (=jis-x0208@1978	  . #x424D)	; &I-J78-424D; [34-45]
diff --git a/lisp/utf-2000/Ideograph-R189-Tall.el b/lisp/utf-2000/Ideograph-R189-Tall.el
index c3fad91..5ea0145 100644
--- a/lisp/utf-2000/Ideograph-R189-Tall.el
+++ b/lisp/utf-2000/Ideograph-R189-Tall.el
@@ -1,7 +1,13 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (define-char
+  '((ideographic-radical . 189)	; â¾¼
+    (ideographic-strokes . 0)
+    (=>jis-x0208	. #x3962)	; &J97-3962; [25-66]
+    (=>jis-x0213-1	. #x3962)	; &J97-3962; [25-66]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3962)	; &J97-3962; [25-66]
+     ((=>jis-x0208	  . #x3962)	; &J97-3962; [25-66]
       ))
     (ideographic-radical . 189)	; â¾¼
     (ideographic-strokes . 0)
@@ -25,13 +31,8 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 189)	; â¾¼
-    (ideographic-strokes . 0)
-    (=jis-x0208@1997	. #x3962)	; &J97-3962; [25-66]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3962)	; &J97-3962; [25-66]
+     ((=>jis-x0208	  . #x3962)	; &J97-3962; [25-66]
       ))
     (ideographic-radical . 189)	; â¾¼
     (ideographic-strokes . 0)
@@ -42,7 +43,7 @@
       (=gt-k		  . 08024)	; &I-GT-K08024;
       (=gt-pj-8		  . #x5362)	; &GT-60969; [51-66]
       (=daikanwa	  . 45314)	; &I-M-45314;
-      (=shinjigen@1ed	  .  9451)	; &GT-60969;
+      (=shinjigen	  .  9451)	; &GT-60969;
       (=jef-china3	  . #x6EA4)	; &I-JC3-6EA4;
       (<-vulgar
        ((=ucs@jis	    . #x9AD8)	; &GT-60968;
@@ -51,9 +52,10 @@
 	(=ks-x1001	    . #x4D54)	; &I-K0-4D54; [45-52]
 	(=jis-x0213-1	    . #x3962)	; &I-JX1-3962; [25-66]
 	(=daikanwa	    . 45313)	; &I-M-45313;
+	(=shinjigen	    .  9450)	; &GT-60968;
 	))
       (<-vulgar*sources
-       yunhai daikanwa)
+       yunhai daikanwa shinjigen)
       )
      ((hanyu-dazidian	  7 4594 1)
       (=ucs@unicode	  . #x9AD9)	; &HZK12-B9E2;
diff --git a/lisp/utf-2000/Ideograph-R190-Hair.el b/lisp/utf-2000/Ideograph-R190-Hair.el
index ec68df6..25023a8 100644
--- a/lisp/utf-2000/Ideograph-R190-Hair.el
+++ b/lisp/utf-2000/Ideograph-R190-Hair.el
@@ -1922,8 +1922,13 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 20)
     (=ucs		. #x4C09)	; 䰉
-    (=cns11643-4	. #x654F)	; &I-C4-654F; [69-47]
-    (=daikanwa		. 45541)	; &I-M-45541;
+    (->subsumptive
+     ((=daikanwa	  . 45541)	; &M-45541;
+      )
+     ((=cns11643-4	  . #x654F)	; &C4-654F; [69-47]
+      )
+     ((=ucs@unicode	  . #x4C09)	; &UU+4C09;
+      ))
     ))
 (define-char
   '((ideographic-radical . 190)	; â¾½
@@ -1934,44 +1939,89 @@
     (=daikanwa		. 45542)	; &I-M-45542;
     ))
 (define-char
-  '((=>ucs		. #x9B12)	; 鬒
+  '((ideographic-radical . 190)	; â¾½
+    (ideographic-strokes . 10)
+    (total-strokes	 . 20)
+    (=ucs		. #x9B12)	; 鬒
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9B12)	; 鬒
+      ))
     (ideographic-radical . 190)	; â¾½
     (ideographic-strokes . 10)
     (total-strokes	 . 20)
-    (=ucs@jis		. #x9B12)	; &M-45543;
-    (=jis-x0212		. #x6A2A)	; &M-45543; [74-10]
+    (=ucs@jis		. #x9B12)	; &GT-61265;
+    (=jis-x0212		. #x6A2A)	; &GT-61265; [74-10]
     (=jis-x0213-2	. #x7D39)	; &I-JX2-7D39; [93-25]
+    (=gt		. 61265)	; &I-GT-61265;
+    (=gt-pj-8		. #x5621)	; &I-GT-61265; [54-01]
     (=daikanwa		. 45543)	; &I-M-45543;
+    (<-formed
+     ((=ucs		  . #x3431)	; 㐱
+      ))
+    (<-formed*sources
+     shuowen)
+    (<-same
+     ((=ucs		  . #x3431)	; 㐱
+      (=daikanwa	  . 00372)	; &I-M-00372;
+      ))
+    (<-same*sources
+     shuowen daikanwa)
     ))
 (define-char
-  '((=>ucs		. #x9B12)	; 鬒
+  '((<-denotational
+     ((=ucs		  . #x9B12)	; 鬒
+      ))
     (ideographic-radical . 190)	; â¾½
     (ideographic-strokes . 10)
     (total-strokes	 . 20)
-    (=daikanwa		. 45544)	; &M-45544;
+    (=ucs@unicode	. #x9B12)	; &C2-6A76;
+    (=cns11643-2	. #x6A76)	; &C2-6A76; [74-86]
     ))
 (define-char
-  '((=>ucs		. #x9B12)	; 鬒
-    (morohashi-daikanwa	45544 0 1)
+  '((<-denotational
+     ((=ucs		  . #x9B12)	; 鬒
+      ))
     (ideographic-radical . 190)	; â¾½
     (ideographic-strokes . 10)
     (total-strokes	 . 20)
-    (=cns11643-7	. #x517A)	; &C7-517A; [49-90]
+    (=>gt		. 61266)	; &A-GT-61266;
     ))
 (define-char
-  '((morohashi-daikanwa	45544 0 5)
+  '((<-denotational
+     ((=>gt		  . 61266)	; &A-GT-61266;
+      ))
     (ideographic-radical . 190)	; â¾½
     (ideographic-strokes . 10)
     (total-strokes	 . 20)
-    (=ucs		. #x9B12)	; 鬒
-    (=cns11643-2	. #x6A76)	; &I-C2-6A76; [74-86]
+    (=gt		. 61266)	; &GT-61266;
+    (=gt-pj-8		. #x5622)	; &GT-61266; [54-02]
+    (=daikanwa		. 45544)	; &I-M-45544;
+    ))
+(define-char
+  '((<-denotational
+     ((=>gt		  . 61266)	; &A-GT-61266;
+      ))
+    (=>ucs*		. #x9B12)	; 鬒
+    (ideographic-radical . 190)	; â¾½
+    (ideographic-strokes . 10)
+    (total-strokes	 . 20)
+    (=ucs		. #x2FA0A)	; 鬒
+    (=cns11643-7	. #x517A)	; &I-C7-517A; [49-90]
     ))
 (define-char
   '((ideographic-radical . 190)	; â¾½
     (ideographic-strokes . 10)
     (total-strokes	 . 20)
-    (=cns11643-7	. #x5177)	; &M-45545; [49-87]
-    (=daikanwa		. 45545)	; &I-M-45545;
+    (=ucs		. #x29BA1)	; ð©®¡
+    (->subsumptive
+     ((=daikanwa	  . 45545)	; &M-45545;
+      )
+     ((=ucs@iso		  . #x29BA1)	; &U-00029BA1;
+      )
+     ((=cns11643-7	  . #x5177)	; &C7-5177; [49-87]
+      ))
     ))
 (define-char
   '((ideographic-radical . 190)	; â¾½
diff --git a/lisp/utf-2000/Ideograph-R195-Fish.el b/lisp/utf-2000/Ideograph-R195-Fish.el
index 28d589f..ec8a430 100644
--- a/lisp/utf-2000/Ideograph-R195-Fish.el
+++ b/lisp/utf-2000/Ideograph-R195-Fish.el
@@ -2025,44 +2025,47 @@
     (ideographic-strokes . 6)
     (total-strokes	 . 17)
     (=ucs		. #x9BAA)	; 鮪
-    (=jis-x0208		. #x4B6E)	; &I-J90-4B6E; [43-78]
-    (=jis-x0213-1	. #x4B6E)	; &I-JX1-4B6E; [43-78]
-    (=gb12345		. #x765B)	; 鮪 [86-59]
-    (=gt		. 62267)	; &I-GT-62267;
-    (=gt-pj-1		. #x4B6E)	; &I-GT-62267; [43-78]
-    (=daikanwa		. 46126)	; &I-M-46126;
-    (=shinjigen@rev	.  9553)	; 鮪
-    ))
-(define-char
-  '((=>ucs		. #x9BAA)	; 鮪
-    (morohashi-daikanwa	46126 0 0)
-    (ideographic-radical . 195)	; ⿂
-    (ideographic-strokes . 6)
-    (total-strokes	 . 17)
-    (=cns11643-1	. #x762F)	; &C1-762F; [86-15]
-    ))
-(define-char
-  '((=>ucs		. #x9BAB)	; 鮫
-    (ideographic-radical . 195)	; ⿂
-    (ideographic-strokes . 6)
-    (total-strokes	 . 17)
-    (=ucs@jis		. #x9BAB)	; &GT-62165;
-    (=jis-x0208		. #x3B2D)	; &GT-62165; [27-13]
-    (=ks-x1001		. #x4E77)	; &I-K0-4E77; [46-87]
-    (=jis-x0213-1	. #x3B2D)	; &I-JX1-3B2D; [27-13]
-    (=gt		. 62165)	; &I-GT-62165;
-    (=gt-pj-1		. #x3B2D)	; &I-GT-62165; [27-13]
-    (=daikanwa		. 46127)	; &I-M-46127;
-    (=shinjigen@rev	.  9558)	; &GT-62165;
+    (->subsumptive
+     ((=ucs@unicode	  . #x9BAA)	; &GT-62267;
+      (=jis-x0208	  . #x4B6E)	; &GT-62267; [43-78]
+      (=jis-x0213-1	  . #x4B6E)	; &I-JX1-4B6E; [43-78]
+      (=gb12345		  . #x765B)	; &GT-62267; [86-59]
+      (=gt		  . 62267)	; &I-GT-62267;
+      (=gt-pj-1		  . #x4B6E)	; &I-GT-62267; [43-78]
+      (=daikanwa	  . 46126)	; &I-M-46126;
+      (=shinjigen	  .  9553)	; &GT-62267;
+      )
+     ((=cns11643-1	  . #x762F)	; &C1-762F; [86-15]
+      ))
     ))
 (define-char
-  '((morohashi-daikanwa	46127 0 0)
-    (ideographic-radical . 195)	; ⿂
+  '((ideographic-radical . 195)	; ⿂
     (ideographic-strokes . 6)
     (total-strokes	 . 17)
     (=ucs		. #x9BAB)	; 鮫
-    (=cns11643-1	. #x762E)	; &I-C1-762E; [86-14]
-    (=gb12345		. #x765E)	; 鮫 [86-62]
+    (=>jis-x0208	. #x3B2D)	; 鮫 [27-13]
+    (=>jis-x0213-1	. #x3B2D)	; 鮫 [27-13]
+    (->subsumptive
+     ((=ucs@jis/1990	  . #x9BAB)	; &GT-62165;
+      (=ucs@jis/2000	  . #x9BAB)	; &GT-62165;
+      (=jis-x0208	  . #x3B2D)	; &GT-62165; [27-13]
+      (=ks-x1001	  . #x4E77)	; &I-K0-4E77; [46-87]
+      (=jis-x0213-1@2000  . #x3B2D)	; &I-JX1-3B2D; [27-13]
+      (=gt		  . 62165)	; &I-GT-62165;
+      (=gt-pj-1		  . #x3B2D)	; &I-GT-62165; [27-13]
+      (=daikanwa	  . 46127)	; &I-M-46127;
+      (=shinjigen	  .  9558)	; &GT-62165;
+      )
+     ((=>>jis-x0213-1@2004 . #x3B2D)	; &G-JX3-3B2D; [27-13]
+      (->subsumptive
+       ((=ucs@jis/2004	    . #x9BAB)	; &JX3-3B2D;
+	(=jis-x0213-1@2004  . #x3B2D)	; &JX3-3B2D; [27-13]
+	)
+       ((=ucs@unicode	    . #x9BAB)	; &C1-762E;
+	(=cns11643-1	    . #x762E)	; &C1-762E; [86-14]
+	(=gb12345	    . #x765E)	; &C1-762E; [86-62]
+	))
+      ))
     ))
 (define-char
   '((ideographic-radical . 195)	; ⿂
@@ -2071,6 +2074,12 @@
     (=ucs		. #x4C4D)	; 䱍
     (=cns11643-7	. #x3E49)	; &I-C7-3E49; [30-41]
     (=daikanwa		. 46128)	; &I-M-46128;
+    (<-same
+     ((=ucs		  . #x4C6D)	; ä±­
+      (=daikanwa	  . 46302)	; &I-M-46302;
+      ))
+    (<-same*sources
+     jiyun daikanwa)
     ))
 (define-char
   '((=>ucs		. #x29DAD)	; 𩶭
@@ -3272,6 +3281,8 @@
     (ideographic-strokes . 8)
     (total-strokes	 . 19)
     (=ucs		. #x9BD6)	; 鯖
+    (=>jis-x0208	. #x3B2A)	; 鯖 [27-10]
+    (=>jis-x0213-1	. #x3B2A)	; 鯖 [27-10]
     ))
 (define-char
   '((<-denotational
@@ -3280,8 +3291,10 @@
     (ideographic-radical . 195)	; ⿂
     (ideographic-strokes . 8)
     (total-strokes	 . 19)
+    (=ucs@jis/2004	. #x9BD6)	; &GT-62563;
     (=jis-x0208@1978	. #x3B2A)	; &GT-62563; [27-10]
     (=ks-x1001		. #x746D)	; &I-K0-746D; [84-77]
+    (=jis-x0213-1@2004	. #x3B2A)	; &I-JX3-3B2A; [27-10]
     (=gt		. 62563)	; &I-GT-62563;
     (=gt-pj-8		. #x5C63)	; &I-GT-62563; [60-67]
     (=daikanwa		. 46210)	; &I-M-46210;
@@ -3293,15 +3306,24 @@
     (ideographic-radical . 195)	; ⿂
     (ideographic-strokes . 8)
     (total-strokes	 . 19)
+    (=>>jis-x0213-1@2000 . #x3B2A)	; &G-GT-62567; [27-10]
+    (=>>gt		. 62567)	; &G-GT-62567;
     (->subsumptive
      ((=ucs@unicode	  . #x9BD6)	; &GT-62567;
       (=jis-x0208@1983	  . #x3B2A)	; &GT-62567; [27-10]
       (=jis-x0208@1990	  . #x3B2A)	; &I-J90-3B2A; [27-10]
-      (=jis-x0213-1	  . #x3B2A)	; &I-JX1-3B2A; [27-10]
+      (=jis-x0213-1@2000  . #x3B2A)	; &I-JX1-3B2A; [27-10]
       (=gb12345		  . #x766B)	; &GT-62567; [86-75]
       (=gt		  . 62567)	; &I-GT-62567;
       (=gt-pj-1		  . #x3B2A)	; &I-GT-62567; [27-10]
       (=jef-china3	  . #x6EC8)	; &I-JC3-6EC8;
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x9BD6)	; &GT-62563;
+	(=jis-x0208@1978    . #x3B2A)	; &GT-62563; [27-10]
+	(=ks-x1001	    . #x746D)	; &I-K0-746D; [84-77]
+	(=jis-x0213-1@2004  . #x3B2A)	; &I-JX3-3B2A; [27-10]
+	(=daikanwa	    . 46210)	; &I-M-46210;
+	))
       )
      ((=cns11643-1	  . #x7956)	; &C1-7956; [89-54]
       ))
@@ -6107,7 +6129,8 @@
     (ideographic-strokes . 10)
     (total-strokes	 . 21)
     (=ucs		. #x9C2F)	; é°¯
-    (=jis-x0208@1997	. #x3073)	; é°¯ [16-83]
+    (=>jis-x0208	. #x3073)	; é°¯ [16-83]
+    (=>jis-x0213-1	. #x3073)	; é°¯ [16-83]
     ))
 (define-char
   '((<-denotational
@@ -6137,6 +6160,12 @@
     (=gt		. 62857)	; &I-GT-62857;
     (=gt-pj-1		. #x3073)	; &I-GT-62857; [16-83]
     (=jef-china3	. #x6EC7)	; &I-JC3-6EC7;
+    (<-simplified@JP/jis
+     ((=ucs@jis/2004	  . #x9C2F)	; &GT-62856;
+      (=jis-x0208@1978	  . #x3073)	; &GT-62856; [16-83]
+      (=jis-x0213-1@2004  . #x3073)	; &I-JX3-3073; [16-83]
+      (=daikanwa	  . 46413)	; &I-M-46413;
+      ))
     ))
 (define-char
   '((=>ucs		. #x9C30)	; é°°
@@ -7273,10 +7302,17 @@
     (ideographic-radical . 195)	; ⿂
     (ideographic-strokes . 12)
     (total-strokes	 . 23)
-    (=jis-x0208@1978	. #x4B70)	; &GT-63238; [43-80]
-    (=gt		. 63238)	; &I-GT-63238;
-    (=gt-pj-8		. #x5F45)	; &I-GT-63238; [63-37]
-    (=daikanwa		. 46492)	; &I-M-46492;
+    (=>>jis-x0213-1@2004 . #x4B70)	; &G-GT-63238; [43-80]
+    (=>>gt		. 63238)	; &G-GT-63238;
+    (->subsumptive
+     ((=daikanwa	  . 46492)	; &M-46492;
+      )
+     ((=ucs@jis/2004	  . #x9C52)	; &GT-63238;
+      (=jis-x0208@1978	  . #x4B70)	; &GT-63238; [43-80]
+      (=jis-x0213-1@2004  . #x4B70)	; &I-JX3-4B70; [43-80]
+      (=gt		  . 63238)	; &I-GT-63238;
+      (=gt-pj-8		  . #x5F45)	; &I-GT-63238; [63-37]
+      ))
     ))
 (define-char
   '((<-denotational
@@ -7285,15 +7321,23 @@
     (ideographic-radical . 195)	; ⿂
     (ideographic-strokes . 12)
     (total-strokes	 . 23)
+    (=>>jis-x0213-1@2000 . #x4B70)	; &G-GT-63239; [43-80]
+    (=>>gt		. 63239)	; &G-GT-63239;
     (->subsumptive
      ((=cns11643-2	  . #x6F65)	; &C2-6F65; [79-69]
       )
-     ((=ucs@jis		  . #x9C52)	; &GT-63239;
+     ((=ucs@jis/1990	  . #x9C52)	; &GT-63239;
+      (=ucs@jis/2000	  . #x9C52)	; &GT-63239;
       (=jis-x0208@1983	  . #x4B70)	; &GT-63239; [43-80]
       (=jis-x0208@1990	  . #x4B70)	; &I-J90-4B70; [43-80]
-      (=jis-x0213-1	  . #x4B70)	; &I-JX1-4B70; [43-80]
+      (=jis-x0213-1@2000  . #x4B70)	; &I-JX1-4B70; [43-80]
       (=gt		  . 63239)	; &I-GT-63239;
       (=gt-pj-1		  . #x4B70)	; &I-GT-63239; [43-80]
+      (<-simplified@JP/jis
+       ((=ucs@jis/2004	    . #x9C52)	; &GT-63238;
+	(=jis-x0208@1978    . #x4B70)	; &GT-63238; [43-80]
+	(=jis-x0213-1@2004  . #x4B70)	; &I-JX3-4B70; [43-80]
+	))
       )
      ((=ucs@unicode	  . #x9C52)	; &JC3-6EEC;
       (=gb12345		  . #x772E)	; &JC3-6EEC; [87-14]
@@ -7304,16 +7348,26 @@
   '((ideographic-radical . 195)	; ⿂
     (ideographic-strokes . 12)
     (total-strokes	 . 23)
-    (=cns11643-7	. #x5D75)	; &M-46494; [61-85]
-    (=daikanwa		. 46494)	; &I-M-46494;
+    (=ucs		. #x29EE1)	; ð©»¡
+    (->subsumptive
+     ((=daikanwa	  . 46494)	; &M-46494;
+      )
+     ((=ucs@iso		  . #x29EE1)	; &C7-5D75;
+      (=cns11643-7	  . #x5D75)	; &C7-5D75; [61-85]
+      ))
     ))
 (define-char
   '((ideographic-radical . 195)	; ⿂
     (ideographic-strokes . 12)
     (total-strokes	 . 23)
     (=ucs		. #x4C8C)	; 䲌
-    (=cns11643-4	. #x6B3B)	; &I-C4-6B3B; [75-27]
-    (=daikanwa		. 46495)	; &I-M-46495;
+    (->subsumptive
+     ((=daikanwa	  . 46495)	; &M-46495;
+      )
+     ((=ucs@unicode	  . #x4C8C)	; &UU+4C8C;
+      )
+     ((=cns11643-4	  . #x6B3B)	; &C4-6B3B; [75-27]
+      ))
     ))
 (define-char
   '((ideographic-radical . 195)	; ⿂
diff --git a/lisp/utf-2000/Ideograph-R196-Bird.el b/lisp/utf-2000/Ideograph-R196-Bird.el
index cfd0504..b2d9b22 100644
--- a/lisp/utf-2000/Ideograph-R196-Bird.el
+++ b/lisp/utf-2000/Ideograph-R196-Bird.el
@@ -1140,7 +1140,17 @@
     (=gt		. 63612)	; &I-GT-63612;
     (=gt-pj-1		. #x726E)	; &I-GT-63612; [82-78]
     (=daikanwa		. 46734)	; &I-M-46734;
-    (=shinjigen@rev	.  8944)	; 鴈
+    (=shinjigen		.  8944)	; 鴈
+    (<-formed
+     ((=ucs@jis		  . #x96C1)	; &GT-56379;
+      (=jis-x0208	  . #x3467)	; &GT-56379; [20-71]
+      (=ks-x1001	  . #x6452)	; &I-K0-6452; [68-50]
+      (=jis-x0213-1	  . #x3467)	; &I-JX1-3467; [20-71]
+      (=daikanwa	  . 41960)	; &I-M-41960;
+      (=shinjigen	  .  8943)	; &GT-56379;
+      ))
+    (<-formed*sources
+     shinjigen)
     ))
 (define-char
   '((ideographic-radical . 196)	; ⿃
@@ -1159,37 +1169,78 @@
   '((ideographic-radical . 196)	; ⿃
     (ideographic-strokes . 4)
     (total-strokes	 . 15)
-    (=cns11643-7	. #x2B71)	; &M-46736; [11-81]
-    (=daikanwa		. 46736)	; &I-M-46736;
+    (=ucs		. #x29FD6)	; 𩿖
+    (->subsumptive
+     ((=daikanwa	  . 46736)	; &M-46736;
+      )
+     ((=ucs@iso		  . #x29FD6)	; &C7-2B71;
+      (=cns11643-7	  . #x2B71)	; &C7-2B71; [11-81]
+      ))
     ))
 (define-char
   '((ideographic-radical . 196)	; ⿃
     (ideographic-strokes . 4)
     (total-strokes	 . 15)
-    (=cns11643-7	. #x2B7A)	; &M-46737; [11-90]
-    (=daikanwa		. 46737)	; &I-M-46737;
+    (=ucs		. #x29FC4)	; 𩿄
+    (->subsumptive
+     ((=ucs@iso		  . #x29FC4)	; &M-46737;
+      (=daikanwa	  . 46737)	; &M-46737;
+      )
+     ((=cns11643-7	  . #x2B7A)	; &C7-2B7A; [11-90]
+      ))
     ))
 (define-char
   '((ideographic-radical . 196)	; ⿃
     (ideographic-strokes . 4)
-    (total-strokes	 . 15)
     (=ucs		. #x9D09)	; 鴉
-    (=cns11643-1	. #x7029)	; &I-C1-7029; [80-09]
-    (=gb12345		. #x513B)	; 鴉 [49-27]
-    (=daikanwa		. 46738)	; &I-M-46738;
+    (=>jis-x0208	. #x726D)	; 鴉 [82-77]
+    (=>jis-x0213-1	. #x726D)	; 鴉 [82-77]
     ))
 (define-char
-  '((=>ucs		. #x9D09)	; 鴉
-    (morohashi-daikanwa	46738 0 2)
+  '((<-denotational
+     ((=ucs		  . #x9D09)	; 鴉
+      ))
+    (ideographic-radical . 196)	; ⿃
+    (ideographic-strokes . 4)
+    (total-strokes	 . 15)
+    (=>>jis-x0213-1@2004 . #x726D)	; &G-GT-63596; [82-77]
+    (=>>gt		. 63596)	; &G-GT-63596;
+    (->subsumptive
+     ((=daikanwa	  . 46738)	; &M-46738;
+      )
+     ((=gt		  . 63596)	; &GT-63596;
+      (=gt-pj-8		  . #x616F)	; &GT-63596; [65-79]
+      )
+     ((=ucs@unicode	  . #x9D09)	; &JX3-726D;
+      (=jis-x0213-1@2004  . #x726D)	; &JX3-726D; [82-77]
+      (=gb12345		  . #x513B)	; &JX3-726D; [49-27]
+      )
+     ((=cns11643-1	  . #x7029)	; &C1-7029; [80-09]
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9D09)	; 鴉
+      ))
     (ideographic-radical . 196)	; ⿃
     (ideographic-strokes . 5)
     (total-strokes	 . 16)
-    (=ucs@jis		. #x9D09)	; &GT-63677;
-    (=jis-x0208		. #x726D)	; &GT-63677; [82-77]
-    (=ks-x1001		. #x643C)	; &I-K0-643C; [68-28]
-    (=jis-x0213-1	. #x726D)	; &I-JX1-726D; [82-77]
-    (=gt		. 63677)	; &I-GT-63677;
-    (=gt-pj-1		. #x726D)	; &I-GT-63677; [82-77]
+    (=>>jis-x0213-1@2000 . #x726D)	; &A-GT-63677; [82-77]
+    (=>gt		. 63677)	; &A-GT-63677;
+    (->subsumptive
+     ((=ucs@jis/1990	  . #x9D09)	; &GT-63677;
+      (=ucs@jis/2000	  . #x9D09)	; &GT-63677;
+      (=jis-x0208	  . #x726D)	; &GT-63677; [82-77]
+      (=jis-x0213-1@2000  . #x726D)	; &I-JX1-726D; [82-77]
+      (=gt		  . 63677)	; &I-GT-63677;
+      (=gt-pj-1		  . #x726D)	; &I-GT-63677; [82-77]
+      (<-simplified@JP/extra/design
+       ((=ucs@unicode	    . #x9D09)	; &JX3-726D;
+	(=jis-x0213-1@2004  . #x726D)	; &JX3-726D; [82-77]
+	))
+      )
+     ((=ks-x1001	  . #x643C)	; &K0-643C; [68-28]
+      ))
     ))
 (define-char
   '((ideographic-radical . 196)	; ⿃
@@ -3726,8 +3777,10 @@
     (ideographic-radical . 196)	; ⿃
     (ideographic-strokes . 7)
     (total-strokes	 . 18)
+    (=ucs@jis/2004	. #x9D60)	; &GT-63908;
     (=jis-x0208@1978	. #x3974)	; &GT-63908; [25-84]
     (=ks-x1001		. #x4D5C)	; &I-K0-4D5C; [45-60]
+    (=jis-x0213-1@2004	. #x3974)	; &I-JX3-3974; [25-84]
     (=gt		. 63908)	; &I-GT-63908;
     (=gt-pj-8		. #x637D)	; &I-GT-63908; [67-93]
     (=daikanwa		. 46961)	; &I-M-46961;
@@ -3743,11 +3796,18 @@
     (=jis-x0208@1983	. #x3974)	; &GT-63909; [25-84]
     (=jis-x0208@1990	. #x3974)	; &I-J90-3974; [25-84]
     (=cns11643-1	. #x7827)	; &I-C1-7827; [88-07]
-    (=jis-x0213-1	. #x3974)	; &I-JX1-3974; [25-84]
+    (=jis-x0213-1@2000	. #x3974)	; &I-JX1-3974; [25-84]
     (=gb12345		. #x7040)	; &GT-63909; [80-32]
     (=gt		. 63909)	; &I-GT-63909;
     (=gt-pj-1		. #x3974)	; &I-GT-63909; [25-84]
     (=jef-china3	. #x6FB1)	; &I-JC3-6FB1;
+    (<-simplified@JP/extra/design
+     ((=ucs@jis/2004	  . #x9D60)	; &GT-63908;
+      (=jis-x0208@1978	  . #x3974)	; &GT-63908; [25-84]
+      (=ks-x1001	  . #x4D5C)	; &I-K0-4D5C; [45-60]
+      (=jis-x0213-1@2004  . #x3974)	; &I-JX3-3974; [25-84]
+      (=daikanwa	  . 46961)	; &I-M-46961;
+      ))
     ))
 (define-char
   '((ideographic-radical . 196)	; ⿃
@@ -7645,6 +7705,14 @@
     (ideographic-strokes . 11)
     (total-strokes	 . 22)
     (=ucs		. #x9DD6)	; 鷖
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x9DD6)	; 鷖
+      ))
+    (ideographic-radical . 196)	; ⿃
+    (ideographic-strokes . 11)
+    (total-strokes	 . 22)
     (->subsumptive
      ((=ucs@jis		  . #x9DD6)	; &M-47267;
       (=jis-x0212	  . #x6C3E)	; &M-47267; [76-30]
@@ -7652,13 +7720,24 @@
       (=daikanwa	  . 47267)	; &I-M-47267;
       )
      ((=ucs@unicode	  . #x9DD6)	; &UU+9DD6;
-      )
-     ((=cns11643-2	  . #x6E70)	; &C2-6E70; [78-80]
       ))
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x322A)	; &J97-322A; [18-10]
+     ((=ucs		  . #x9DD6)	; 鷖
+      ))
+    (ideographic-radical . 196)	; ⿃
+    (ideographic-strokes . 11)
+    (total-strokes	 . 22)
+    (=cns11643-2	. #x6E70)	; &C2-6E70; [78-80]
+    ))
+(define-char
+  '((ideographic-radical . 196)	; ⿃
+    (=>jis-x0208@1997	. #x322A)	; &J97-322A; [18-10]
+    ))
+(define-char
+  '((<-denotational
+     ((=>jis-x0208@1997	  . #x322A)	; &J97-322A; [18-10]
       ))
     (ideographic-radical . 196)	; ⿃
     (ideographic-strokes . 11)
@@ -7681,12 +7760,17 @@
     (=daikanwa		. 47268)	; &I-M-47268;
     ))
 (define-char
-  '((ideographic-radical . 196)	; ⿃
-    (=jis-x0208@1997	. #x322A)	; &J97-322A; [18-10]
+  '((<-denotational
+     ((=ucs		  . #x9DD7)	; 鷗
+      ))
+    (ideographic-radical . 196)	; ⿃
+    (ideographic-strokes . 11)
+    (total-strokes	 . 22)
+    (=cns11643-1	. #x7C2F)	; &C1-7C2F; [92-15]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x322A)	; &J97-322A; [18-10]
+     ((=>jis-x0208@1997	  . #x322A)	; &J97-322A; [18-10]
       ))
     (ideographic-radical . 196)	; ⿃
     (ideographic-strokes . 4)
@@ -7699,7 +7783,7 @@
     (=gt		. 63600)	; &I-GT-63600;
     (=gt-pj-1		. #x322A)	; &I-GT-63600; [18-10]
     (=jef-china3	. #x6FB0)	; &I-JC3-6FB0;
-    (<-simplified@JP/jis
+    (<-simplified@JP/extra
      ((=ucs@unicode	  . #x9DD7)	; &M-47268;
       (=jis-x0208@1978	  . #x322A)	; &M-47268; [18-10]
       (=ks-x1001	  . #x4F4E)	; &I-K0-4F4E; [47-46]
@@ -7709,15 +7793,6 @@
       ))
     ))
 (define-char
-  '((<-denotational
-     ((=ucs		  . #x9DD7)	; 鷗
-      ))
-    (ideographic-radical . 196)	; ⿃
-    (ideographic-strokes . 11)
-    (total-strokes	 . 22)
-    (=cns11643-1	. #x7C2F)	; &C1-7C2F; [92-15]
-    ))
-(define-char
   '((ideographic-radical . 196)	; ⿃
     (ideographic-strokes . 11)
     (total-strokes	 . 22)
diff --git a/lisp/utf-2000/Ideograph-R197-Salt.el b/lisp/utf-2000/Ideograph-R197-Salt.el
index 6e49e31..c913264 100644
--- a/lisp/utf-2000/Ideograph-R197-Salt.el
+++ b/lisp/utf-2000/Ideograph-R197-Salt.el
@@ -509,8 +509,12 @@
     (=daikanwa		. 47575)	; &I-M-47575;
     ))
 (define-char
+  '((ideographic-radical . 197)	; ⿄
+    (=>jis-x0208@1997	. #x3834)	; &J97-3834; [24-20]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3834)	; &J97-3834; [24-20]
+     ((=>jis-x0208@1997	  . #x3834)	; &J97-3834; [24-20]
       ))
     (ideographic-radical . 197)	; ⿄
     (ideographic-strokes . 13)
@@ -524,12 +528,8 @@
     (=daikanwa		. 47576)	; &I-M-47576;
     ))
 (define-char
-  '((ideographic-radical . 197)	; ⿄
-    (=jis-x0208@1997	. #x3834)	; &J97-3834; [24-20]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3834)	; &J97-3834; [24-20]
+     ((=>jis-x0208@1997	  . #x3834)	; &J97-3834; [24-20]
       ))
     (ideographic-radical . 197)	; ⿄
     (ideographic-strokes . 8)
@@ -540,7 +540,8 @@
     (=jis-x0213-1	. #x3834)	; &I-JX1-3834; [24-20]
     (=gt		. 64711)	; &I-GT-64711;
     (=gt-pj-1		. #x3834)	; &I-GT-64711; [24-20]
-    (<-simplified@JP/jis
+    (=jef-china3	. #x6FB5)	; &I-JC3-6FB5;
+    (<-simplified@JP/extra
      ((=ucs		  . #x9E7C)	; é¹¼
       (=jis-x0208@1978	  . #x3834)	; &I-J78-3834; [24-20]
       (=jis-x0212	  . #x6C5B)	; &I-JSP-6C5B; [76-59]
diff --git a/lisp/utf-2000/Ideograph-R199-Wheat.el b/lisp/utf-2000/Ideograph-R199-Wheat.el
index 3b3d684..2ec3245 100644
--- a/lisp/utf-2000/Ideograph-R199-Wheat.el
+++ b/lisp/utf-2000/Ideograph-R199-Wheat.el
@@ -1730,13 +1730,19 @@
     (=cns11643-4	. #x627C)	; &C4-627C; [66-92]
     ))
 (define-char
+  '((ideographic-radical . 199)	; ⿆
+    (ideographic-strokes . 8)
+    (=>jis-x0208@1997	. #x396D)	; &J97-396D; [25-77]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x396D)	; &J97-396D; [25-77]
+     ((=>jis-x0208@1997	  . #x396D)	; &J97-396D; [25-77]
       ))
     (ideographic-radical . 199)	; ⿆
     (ideographic-strokes . 8)
     (total-strokes	 . 19)
     (=ucs		. #x9EB4)	; 麴
+    (=>jis-x0213-1	. #x7E6F)	; 麴 [94-79]
     ))
 (define-char
   '((<-denotational
@@ -1745,21 +1751,32 @@
     (ideographic-radical . 199)	; ⿆
     (ideographic-strokes . 8)
     (total-strokes	 . 19)
-    (->subsumptive
-     ((=ucs@jis		  . #x9EB4)	; &M-47818;
-      (=jis-x0208@1978	  . #x396D)	; &M-47818; [25-77]
-      (=ks-x1001	  . #x4F55)	; &I-K0-4F55; [47-53]
-      (=jis-x0212	  . #x6C6F)	; &I-JSP-6C6F; [76-79]
-      (=jis-x0213-1	  . #x7E6F)	; &I-JX1-7E6F; [94-79]
-      (=daikanwa	  . 47818)	; &I-M-47818;
-      )
-     ((=cns11643-1	  . #x7960)	; &C1-7960; [89-64]
+    (=>gt		. 65145)	; &A-GT-65145;
+    ))
+(define-char
+  '((<-denotational
+     ((=>gt		  . 65145)	; &A-GT-65145;
       ))
+    (ideographic-radical . 199)	; ⿆
+    (ideographic-strokes . 8)
+    (total-strokes	 . 19)
+    (=ucs@jis		. #x9EB4)	; &GT-65145;
+    (=jis-x0208@1978	. #x396D)	; &GT-65145; [25-77]
+    (=ks-x1001		. #x4F55)	; &I-K0-4F55; [47-53]
+    (=jis-x0212		. #x6C6F)	; &I-JSP-6C6F; [76-79]
+    (=jis-x0213-1	. #x7E6F)	; &I-JX1-7E6F; [94-79]
+    (=gt		. 65145)	; &I-GT-65145;
+    (=gt-pj-8		. #x6C68)	; &I-GT-65145; [76-72]
+    (=daikanwa		. 47818)	; &I-M-47818;
     ))
 (define-char
-  '((ideographic-radical . 199)	; ⿆
+  '((<-denotational
+     ((=>gt		  . 65145)	; &A-GT-65145;
+      ))
+    (ideographic-radical . 199)	; ⿆
     (ideographic-strokes . 8)
-    (=jis-x0208@1997	. #x396D)	; &J97-396D; [25-77]
+    (total-strokes	 . 19)
+    (=cns11643-1	. #x7960)	; &C1-7960; [89-64]
     ))
 (define-char
   '((<-denotational
@@ -1773,12 +1790,13 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x396D)	; &J97-396D; [25-77]
+     ((=>jis-x0208@1997	  . #x396D)	; &J97-396D; [25-77]
       ))
     (ideographic-radical . 199)	; ⿆
     (ideographic-strokes . 8)
     (total-strokes	 . 15)
     (=ucs		. #x9EB9)	; 麹
+    (=>jis-x0213-1	. #x396D)	; 麹 [25-77]
     ))
 (define-char
   '((<-denotational
@@ -1802,6 +1820,7 @@
     (=jis-x0213-1	. #x396D)	; &I-JX1-396D; [25-77]
     (=gt		. 65008)	; &I-GT-65008;
     (=gt-pj-1		. #x396D)	; &I-GT-65008; [25-77]
+    (=jef-china3	. #x6FC3)	; &I-JC3-6FC3;
     ))
 (define-char
   '((=>ucs		. #x2A347)	; 𪍇
@@ -1937,13 +1956,19 @@
     (=cns11643-5	. #x6F4C)	; &C5-6F4C; [79-44]
     ))
 (define-char
+  '((ideographic-radical . 199)	; ⿆
+    (ideographic-strokes . 9)
+    (=>jis-x0208@1997	. #x4C4D)	; &J97-4C4D; [44-45]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4C4D)	; &J97-4C4D; [44-45]
+     ((=>jis-x0208@1997	  . #x4C4D)	; &J97-4C4D; [44-45]
       ))
     (ideographic-radical . 199)	; ⿆
     (ideographic-strokes . 9)
     (total-strokes	 . 20)
     (=ucs		. #x9EB5)	; 麵
+    (=>jis-x0213-1	. #x7E70)	; 麵 [94-80]
     ))
 (define-char
   '((<-denotational
@@ -1952,22 +1977,33 @@
     (ideographic-radical . 199)	; ⿆
     (ideographic-strokes . 9)
     (total-strokes	 . 20)
-    (->subsumptive
-     ((=ucs@jis		  . #x9EB5)	; &M-47827;
-      (=jis-x0208@1978	  . #x4C4D)	; &M-47827; [44-45]
-      (=ks-x1001	  . #x587D)	; &I-K0-587D; [56-93]
-      (=jis-x0212	  . #x6C70)	; &I-JSP-6C70; [76-80]
-      (=jis-x0213-1	  . #x7E70)	; &I-JX1-7E70; [94-80]
-      (=daikanwa	  . 47827)	; &I-M-47827;
-      (mojikyo		  . 047827)	; &MCS-6000BAD3;
-      )
-     ((=cns11643-1	  . #x7A5C)	; &C1-7A5C; [90-60]
+    (=>gt		. 65188)	; &A-GT-65188;
+    ))
+(define-char
+  '((<-denotational
+     ((=>gt		  . 65188)	; &A-GT-65188;
       ))
+    (ideographic-radical . 199)	; ⿆
+    (ideographic-strokes . 9)
+    (total-strokes	 . 20)
+    (=ucs@jis		. #x9EB5)	; &GT-65188;
+    (=jis-x0208@1978	. #x4C4D)	; &GT-65188; [44-45]
+    (=ks-x1001		. #x587D)	; &I-K0-587D; [56-93]
+    (=jis-x0212		. #x6C70)	; &I-JSP-6C70; [76-80]
+    (=jis-x0213-1	. #x7E70)	; &I-JX1-7E70; [94-80]
+    (=gt		. 65188)	; &I-GT-65188;
+    (=gt-pj-8		. #x6C71)	; &I-GT-65188; [76-81]
+    (=daikanwa		. 47827)	; &I-M-47827;
+    (mojikyo		. 047827)	; &MCS-6000BAD3;
     ))
 (define-char
-  '((ideographic-radical . 199)	; ⿆
+  '((<-denotational
+     ((=>gt		  . 65188)	; &A-GT-65188;
+      ))
+    (ideographic-radical . 199)	; ⿆
     (ideographic-strokes . 9)
-    (=jis-x0208@1997	. #x4C4D)	; &J97-4C4D; [44-45]
+    (total-strokes	 . 20)
+    (=cns11643-1	. #x7A5C)	; &C1-7A5C; [90-60]
     ))
 (define-char
   '((<-denotational
@@ -1982,12 +2018,13 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4C4D)	; &J97-4C4D; [44-45]
+     ((=>jis-x0208@1997	  . #x4C4D)	; &J97-4C4D; [44-45]
       ))
     (ideographic-radical . 199)	; ⿆
     (ideographic-strokes . 9)
     (total-strokes	 . 16)
     (=ucs		. #x9EBA)	; 麺
+    (=>jis-x0213-1	. #x4C4D)	; 麺 [44-45]
     ))
 (define-char
   '((<-denotational
@@ -2011,6 +2048,7 @@
     (=jis-x0213-1	. #x4C4D)	; &I-JX1-4C4D; [44-45]
     (=gt		. 65074)	; &I-GT-65074;
     (=gt-pj-1		. #x4C4D)	; &I-GT-65074; [44-45]
+    (=jef-china3	. #x6FC4)	; &I-JC3-6FC4;
     ))
 (define-char
   '((ideographic-radical . 199)	; ⿆
diff --git a/lisp/utf-2000/Ideograph-R200-Hemp.el b/lisp/utf-2000/Ideograph-R200-Hemp.el
index 36b222a..7dccf26 100644
--- a/lisp/utf-2000/Ideograph-R200-Hemp.el
+++ b/lisp/utf-2000/Ideograph-R200-Hemp.el
@@ -4,7 +4,8 @@
     (ideographic-strokes . 0)
     (total-strokes	 . 11)
     (=ucs		. #x9EBB)	; 麻
-    (=jis-x0208@1997	. #x4B63)	; 麻 [43-67]
+    (=>jis-x0208	. #x4B63)	; 麻 [43-67]
+    (=>jis-x0213-1	. #x4B63)	; 麻 [43-67]
     ))
 (define-char
   '((<-denotational
@@ -13,10 +14,14 @@
     (ideographic-radical . 200)	; ⿇
     (ideographic-strokes . 0)
     (total-strokes	 . 11)
+    (=>>gt		. 65256)	; &G-GT-65256;
     (->subsumptive
-     ((=ks-x1001	  . #x582B)	; &M-47887; [56-11]
+     ((=ks-x1001	  . #x582B)	; &GT-65256; [56-11]
+      (=gt		  . 65256)	; &I-GT-65256;
+      (=gt-k		  . 07879)	; &I-GT-K07879;
+      (=gt-pj-8		  . #x6D51)	; &I-GT-65256; [77-49]
       (=daikanwa	  . 47887)	; &I-M-47887;
-      (=shinjigen@1ed	  .  9805)	; &M-47887;
+      (=shinjigen	  .  9805)	; &GT-65256;
       (=jef-china3	  . #x6FC6)	; &I-JC3-6FC6;
       )
      ((=ucs@cns		  . #x9EBB)	; &C1-5E28;
@@ -41,6 +46,7 @@
     (ideographic-radical . 200)	; ⿇
     (ideographic-strokes . 0)
     (total-strokes	 . 11)
+    (=>>gt		. 65257)	; &G-GT-65257;
     (->subsumptive
      ((=ucs@jis		  . #x9EBB)	; &GT-65257;
       (=jis-x0208	  . #x4B63)	; &GT-65257; [43-67]
@@ -461,16 +467,18 @@
     (ideographic-radical . 200)	; ⿇
     (ideographic-strokes . 7)
     (total-strokes	 . 18)
-    (=jis-x0208@1997	. #x4B7B)	; &J97-4B7B; [43-91]
+    (=>jis-x0208	. #x4B7B)	; &J97-4B7B; [43-91]
+    (=>jis-x0213-1	. #x4B7B)	; &J97-4B7B; [43-91]
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4B7B)	; &J97-4B7B; [43-91]
+     ((=>jis-x0208	  . #x4B7B)	; &J97-4B7B; [43-91]
       ))
     (ideographic-radical . 200)	; ⿇
     (ideographic-strokes . 7)
     (total-strokes	 . 18)
     (=daikanwa		. 47909)	; &M-47909;
+    (=jef-china3	. #x6FC8)	; &I-JC3-6FC8;
     (mojikyo		. 047909)	; &MCS-6000BB25;
     ))
 (define-char
@@ -484,7 +492,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4B7B)	; &J97-4B7B; [43-91]
+     ((=>jis-x0208	  . #x4B7B)	; &J97-4B7B; [43-91]
       ))
     (morohashi-daikanwa	47909 1)
     (ideographic-radical . 200)	; ⿇
@@ -501,15 +509,40 @@
   '((ideographic-radical . 200)	; ⿇
     (ideographic-strokes . 8)
     (total-strokes	 . 19)
-    (=cns11643-7	. #x4C7C)	; &M-47910; [44-92]
+    (=ucs		. #x2A3A5)	; 𪎥
+    ))
+(define-char
+  '((<-denotational
+     ((=ucs		  . #x2A3A5)	; 𪎥
+      ))
+    (ideographic-radical . 200)	; ⿇
+    (ideographic-strokes . 8)
+    (total-strokes	 . 19)
+    (=gt		. 65297)	; &GT-65297;
+    (=gt-pj-8		. #x6D65)	; &GT-65297; [77-69]
     (=daikanwa		. 47910)	; &I-M-47910;
     ))
 (define-char
+  '((<-denotational
+     ((=ucs		  . #x2A3A5)	; 𪎥
+      ))
+    (ideographic-radical . 200)	; ⿇
+    (ideographic-strokes . 8)
+    (total-strokes	 . 19)
+    (=ucs@iso		. #x2A3A5)	; &C7-4C7C;
+    (=cns11643-7	. #x4C7C)	; &C7-4C7C; [44-92]
+    ))
+(define-char
   '((ideographic-radical . 200)	; ⿇
     (ideographic-strokes . 8)
     (total-strokes	 . 19)
-    (=cns11643-7	. #x4C7D)	; &M-47911; [44-93]
-    (=daikanwa		. 47911)	; &I-M-47911;
+    (=ucs		. #x2A3A7)	; 𪎧
+    (->subsumptive
+     ((=daikanwa	  . 47911)	; &M-47911;
+      )
+     ((=ucs@iso		  . #x2A3A7)	; &C7-4C7D;
+      (=cns11643-7	  . #x4C7D)	; &C7-4C7D; [44-93]
+      ))
     ))
 (define-char
   '((ideographic-radical . 200)	; ⿇
diff --git a/lisp/utf-2000/Ideograph-R201-Yellow.el b/lisp/utf-2000/Ideograph-R201-Yellow.el
index b533f31..9fd7d0e 100644
--- a/lisp/utf-2000/Ideograph-R201-Yellow.el
+++ b/lisp/utf-2000/Ideograph-R201-Yellow.el
@@ -1,12 +1,18 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (define-char
+  '((ideographic-radical . 201)	; ⿈
+    (ideographic-strokes . 0)
+    (=>jis-x0208@1997	. #x322B)	; &J97-322B; [18-11]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x322B)	; &J97-322B; [18-11]
+     ((=>jis-x0208@1997	  . #x322B)	; &J97-322B; [18-11]
       ))
     (ideographic-radical . 201)	; ⿈
     (ideographic-strokes . 0)
     (total-strokes	 . 12)
     (=ucs		. #x9EC3)	; 黃
+    (=>jis-x0213-1	. #x7E71)	; 黃 [94-81]
     (->subsumptive
      ((=ucs@unicode	  . #x9EC3)	; &GT-65324;
       (=ks-x1001	  . #x7C5C)	; &GT-65324; [92-60]
@@ -22,13 +28,8 @@
       ))
     ))
 (define-char
-  '((ideographic-radical . 201)	; ⿈
-    (ideographic-strokes . 0)
-    (=jis-x0208@1997	. #x322B)	; &J97-322B; [18-11]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x322B)	; &J97-322B; [18-11]
+     ((=>jis-x0208@1997	  . #x322B)	; &J97-322B; [18-11]
       ))
     (morohashi-daikanwa	47926 1)
     (ideographic-radical . 201)	; ⿈
@@ -68,14 +69,13 @@
   '((ideographic-radical . 201)	; ⿈
     (ideographic-strokes . 3)
     (total-strokes	 . 15)
-    (=daikanwa		. 47927)	; &M-47927;
-    ))
-(define-char
-  '((morohashi-daikanwa	47927 0 1)
-    (ideographic-radical . 201)	; ⿈
-    (ideographic-strokes . 3)
-    (total-strokes	 . 15)
-    (=cns11643-7	. #x2C32)	; &C7-2C32; [12-18]
+    (=ucs		. #x2A3B4)	; 𪎴
+    (->subsumptive
+     ((=daikanwa	  . 47927)	; &M-47927;
+      )
+     ((=ucs@iso		  . #x2A3B4)	; &C7-2C32;
+      (=cns11643-7	  . #x2C32)	; &C7-2C32; [12-18]
+      ))
     ))
 (define-char
   '((ideographic-radical . 201)	; ⿈
diff --git a/lisp/utf-2000/Ideograph-R203-Black.el b/lisp/utf-2000/Ideograph-R203-Black.el
index bb0d508..66f2bf0 100644
--- a/lisp/utf-2000/Ideograph-R203-Black.el
+++ b/lisp/utf-2000/Ideograph-R203-Black.el
@@ -1,7 +1,7 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3975)	; &J97-3975; [25-85]
+     ((=>jis-x0208@1997	  . #x3975)	; &J97-3975; [25-85]
       ))
     (ideographic-radical . 203)	; ⿊
     (ideographic-strokes . 0)
@@ -12,7 +12,7 @@
     (=cns11643-1	. #x6329)	; &I-C1-6329; [67-09]
     (=jis-x0213-1	. #x7E72)	; &I-JX1-7E72; [94-82]
     (=daikanwa		. 48038)	; &I-M-48038;
-    (=shinjigen@1ed	.  9818)	; 黑
+    (=shinjigen		.  9818)	; 黑
     (=jef-china3	. #x6FD6)	; &I-JC3-6FD6;
     ))
 (define-char
@@ -28,8 +28,14 @@
       ))
     ))
 (define-char
+  '((ideographic-radical@jis/a . 86)	; ⽕
+    (ideographic-radical@jis/b . 203)	; ⿊
+    (ideographic-strokes@jis/b . 0)
+    (=>jis-x0208@1997	. #x3975)	; &J97-3975; [25-85]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x3975)	; &J97-3975; [25-85]
+     ((=>jis-x0208@1997	  . #x3975)	; &J97-3975; [25-85]
       ))
     (ideographic-radical@ucs . 203)	; ⿊
     (ideographic-strokes@ucs . 0)
@@ -61,11 +67,6 @@
     ))
 (define-char
   '((ideographic-radical . 203)	; ⿊
-    (ideographic-strokes . 0)
-    (=jis-x0208@1997	. #x3975)	; &J97-3975; [25-85]
-    ))
-(define-char
-  '((ideographic-radical . 203)	; ⿊
     (ideographic-strokes . 1)
     (total-strokes	 . 13)
     (=ucs		. #x4D5D)	; 䵝
diff --git a/lisp/utf-2000/Ideograph-R209-Nose.el b/lisp/utf-2000/Ideograph-R209-Nose.el
index ad99db6..b312614 100644
--- a/lisp/utf-2000/Ideograph-R209-Nose.el
+++ b/lisp/utf-2000/Ideograph-R209-Nose.el
@@ -1,13 +1,21 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (define-char
+  '((ideographic-radical . 209)	; ⿐
+    (ideographic-strokes . 0)
+    (total-strokes	 . 14)
+    (=ucs		. #x9F3B)	; é¼»
+    (=>jis-x0208	. #x4921)	; é¼» [41-01]
+    (=>jis-x0213-1	. #x4921)	; é¼» [41-01]
+    ))
+(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4921)	; &J97-4921; [41-01]
+     ((=ucs		  . #x9F3B)	; é¼»
       ))
     (ideographic-radical . 209)	; ⿐
     (ideographic-strokes . 0)
     (total-strokes	 . 14)
-    (=ucs		. #x9F3B)	; é¼»
-    (=gb2312		. #x3147)	; &I-G0-3147; [17-39]
+    (=ucs@unicode	. #x9F3B)	; &GT-66224;
+    (=gb2312		. #x3147)	; &GT-66224; [17-39]
     (=cns11643-1	. #x6B7C)	; &I-C1-6B7C; [75-92]
     (=gt		. 66224)	; &I-GT-66224;
     (=gt-k		. 11266)	; &I-GT-K11266;
@@ -17,14 +25,8 @@
     (mojikyo		. 048498)	; &MCS-6000BD72;
     ))
 (define-char
-  '((ideographic-radical . 209)	; ⿐
-    (ideographic-strokes . 0)
-    (total-strokes	 . 14)
-    (=jis-x0208@1997	. #x4921)	; &J97-4921; [41-01]
-    ))
-(define-char
   '((<-denotational
-     ((=jis-x0208@1997	  . #x4921)	; &J97-4921; [41-01]
+     ((=ucs		  . #x9F3B)	; é¼»
       ))
     (=>ucs*		. #x9F3B)	; é¼»
     (morohashi-daikanwa	48498 1)
diff --git a/lisp/utf-2000/Ideograph-R210-Even.el b/lisp/utf-2000/Ideograph-R210-Even.el
index 959c9c6..2b09cd1 100644
--- a/lisp/utf-2000/Ideograph-R210-Even.el
+++ b/lisp/utf-2000/Ideograph-R210-Even.el
@@ -247,7 +247,8 @@
     (ideographic-strokes . 7)
     (total-strokes	 . 21)
     (=ucs		. #x9F4E)	; 齎
-    (=jis-x0208@1997	. #x6C5A)	; 齎 [76-58]
+    (=>jis-x0208	. #x6C5A)	; 齎 [76-58]
+    (=>jis-x0213-1	. #x6C5A)	; 齎 [76-58]
     (->subsumptive
      ((=ucs@jis		  . #x9F4E)	; &GT-66374;
       (=jis-x0208@1990	  . #x6C5A)	; &GT-66374; [76-58]
diff --git a/lisp/utf-2000/Oracle-Bones.el b/lisp/utf-2000/Oracle-Bones.el
index a4fe1f5..4303495 100644
--- a/lisp/utf-2000/Oracle-Bones.el
+++ b/lisp/utf-2000/Oracle-Bones.el
@@ -39,6 +39,21 @@
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (zinbun-oracle-page . 3)
+    (=>zinbun-oracle	. 00003)	; &A-ZOB-0003;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x4E00)	; 一
+	)
+       ((=ucs		    . #x725B)	; 牛
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00003)	; &A-ZOB-0003;
+      ))
+    (shuowen-radical	. 1)	; 一
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -50,17 +65,10 @@
     (sources		zob1968=1333 zob1968=1348 zob1968=3065)
     (zinbun-oracle-page . 3)
     (=zinbun-oracle	. 00003)	; &ZOB-0003;
-    (<-Oracle-Bones
-     ((ideographic-combination
-       ((=ucs		    . #x4E00)	; 一
-	)
-       ((=ucs		    . #x725B)	; 牛
-	))
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00003)	; &ZOB-0003;
+     ((=>zinbun-oracle	  . 00003)	; &A-ZOB-0003;
       ))
     (shuowen-radical	. 1)	; 一
     (sources		zob1968=0049 zob1968=0722 zob1968=1256 zob1968=1544
@@ -229,6 +237,21 @@
     ))
 (define-char
   '((shuowen-radical	. 1)	; 一
+    (zinbun-oracle-page . 3)
+    (=>zinbun-oracle	. 00012)	; &A-ZOB-0012;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x4E00)	; 一
+	)
+       ((=ucs		    . #x6708)	; 月
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00012)	; &A-ZOB-0012;
+      ))
+    (shuowen-radical	. 1)	; 一
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -240,17 +263,10 @@
     (sources		zob1968=1192 zob1968=3001 zob1968=3002)
     (zinbun-oracle-page . 3)
     (=zinbun-oracle	. 00012)	; &ZOB-0012;
-    (<-Oracle-Bones
-     ((ideographic-combination
-       ((=ucs		    . #x4E00)	; 一
-	)
-       ((=ucs		    . #x6708)	; 月
-	))
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00012)	; &ZOB-0012;
+     ((=>zinbun-oracle	  . 00012)	; &A-ZOB-0012;
       ))
     (shuowen-radical	. 1)	; 一
     (sources		zob1968=0004 zob1968=0037 zob1968=0068 zob1968=0084
@@ -530,13 +546,8 @@
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
-    (sources		zob1968=0008 zob1968=0009 zob1968=0010 zob1968=0011
-			zob1968=0716 zob1968=0717 zob1968=1780 zob1968=1781
-			zob1968=1783 zob1968=1784 zob1968=2263 zob1968=2264
-			zob1968=2265 zob1968=2266 zob1968=2267 zob1968=2268
-			zob1968=2285 zob1968=2363 zob1968=2979-2984)
     (zinbun-oracle-page . 4)
-    (=zinbun-oracle	. 00027)	; &ZOB-0027;
+    (=>zinbun-oracle	. 00027)	; &A-ZOB-0027;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E0A)	; 上
@@ -547,7 +558,20 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00027)	; &ZOB-0027;
+     ((=>zinbun-oracle	  . 00027)	; &A-ZOB-0027;
+      ))
+    (shuowen-radical	. 2)	; 上
+    (sources		zob1968=0008 zob1968=0009 zob1968=0010 zob1968=0011
+			zob1968=0716 zob1968=0717 zob1968=1780 zob1968=1781
+			zob1968=1783 zob1968=1784 zob1968=2263 zob1968=2264
+			zob1968=2265 zob1968=2266 zob1968=2267 zob1968=2268
+			zob1968=2285 zob1968=2363 zob1968=2979-2984)
+    (zinbun-oracle-page . 4)
+    (=zinbun-oracle	. 00027)	; &ZOB-0027;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00027)	; &A-ZOB-0027;
       ))
     (shuowen-radical	. 2)	; 上
     (ideographic-structure
@@ -564,7 +588,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00027)	; &ZOB-0027;
+     ((=>zinbun-oracle	  . 00027)	; &A-ZOB-0027;
       ))
     (shuowen-radical	. 2)	; 上
     (ideographic-structure
@@ -649,19 +673,27 @@
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (zinbun-oracle-page . 4)
+    (=>zinbun-oracle	. 00033)	; &A-ZOB-0033;
+    (<-Oracle-Bones
+     ((=ucs		  . #x5E1D)	; 帝
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00033)	; &A-ZOB-0033;
+      ))
+    (shuowen-radical	. 2)	; 上
     (sources		zob1968=0062 zob1968=0063 zob1968=0069 zob1968=0137
 			zob1968=0156 zob1968=0157 zob1968=0710 zob1968=0802
 			zob1968=1156 zob1968=1556 zob1968=1940 zob1968=2982
 			zob1968=3221)
     (zinbun-oracle-page . 4)
     (=zinbun-oracle	. 00033)	; &ZOB-0033;
-    (<-Oracle-Bones
-     ((=ucs		  . #x5E1D)	; 帝
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00033)	; &ZOB-0033;
+     ((=>zinbun-oracle	  . 00033)	; &A-ZOB-0033;
       ))
     (shuowen-radical	. 2)	; 上
     (sources		zob1968=0061 zob1968=0064 zob1968=3249)
@@ -670,7 +702,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00033)	; &ZOB-0033;
+     ((=>zinbun-oracle	  . 00033)	; &A-ZOB-0033;
       ))
     (shuowen-radical	. 2)	; 上
     (sources		zob1968=2142)
@@ -679,7 +711,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00033)	; &ZOB-0033;
+     ((=>zinbun-oracle	  . 00033)	; &A-ZOB-0033;
       ))
     (shuowen-radical	. 2)	; 上
     (sources		zob1968=2298 zob1968=3035)
@@ -688,7 +720,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00033)	; &ZOB-0033;
+     ((=>zinbun-oracle	  . 00033)	; &A-ZOB-0033;
       ))
     (shuowen-radical	. 2)	; 上
     (sources		zob1968=3032)
@@ -757,6 +789,14 @@
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=big5-cdp	  . #x8BEC)	; &CDP-8BEC;
+      )
+     ((=ucs		  . #x65B9)	; 方
+      ))
     (zinbun-oracle-page . 4)
     (=zinbun-oracle	. 00041)	; &ZOB-0041;
     (<-Oracle-Bones
@@ -841,6 +881,14 @@
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=zinbun-oracle	  . 00043)	; &ZOB-0043;
+      )
+     ((=ucs		  . #x6B73)	; æ­³
+      ))
     (zinbun-oracle-page . 4)
     (=zinbun-oracle	. 00046)	; &ZOB-0046;
     (<-Oracle-Bones
@@ -853,6 +901,21 @@
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=zinbun-oracle	  . 00043)	; &ZOB-0043;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x5C38)	; å°¸
+	)
+       ((=ucs		    . #x5216)	; 刖
+	))
+      ))
     (sources		zob1968=2363)
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00047)	; &ZOB-0047;
@@ -868,6 +931,14 @@
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E0B)	; 下
+      )
+     ((=ucs		  . #x65EC)	; 旬
+      ))
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00048)	; &ZOB-0048;
     (<-Oracle-Bones
@@ -880,6 +951,14 @@
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=zinbun-oracle	  . 00043)	; &ZOB-0043;
+      )
+     ((=ucs		  . #x5371)	; 危
+      ))
     (sources		zob1968=0331 zob1968=0887 zob1968=0913)
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00049)	; &ZOB-0049;
@@ -893,6 +972,21 @@
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=zinbun-oracle	  . 00043)	; &ZOB-0043;
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+	(=ucs		    . #x2FF8)	; ⿸
+	)
+       ((=ucs		    . #x4FA2)	; ä¾¢
+	)
+       ((=ucs		    . #x571F)	; 土
+	))
+      ))
     (sources		zob1968=1932)
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00050)	; &ZOB-0050;
@@ -913,6 +1007,14 @@
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=zinbun-oracle	  . 00043)	; &ZOB-0043;
+      )
+     ((=ucs		  . #x4E59)	; 乙
+      ))
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00051)	; &ZOB-0051;
     (<-Oracle-Bones
@@ -925,6 +1027,14 @@
     ))
 (define-char
   '((shuowen-radical	. 2)	; 上
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x4E0B)	; 下
+      )
+     ((=ucs		  . #x5DF1)	; å·±
+      ))
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00052)	; &ZOB-0052;
     (<-Oracle-Bones
@@ -957,19 +1067,27 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 5)
+    (=>zinbun-oracle	. 00054)	; &A-ZOB-0054;
+    (<-Oracle-Bones
+     ((=ucs		  . #x793A)	; 示
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00054)	; &A-ZOB-0054;
+      ))
+    (shuowen-radical	. 3)	; 示
     (sources		zob1968=0010 zob1968=0716 zob1968=1881 zob1968=2155
 			zob1968=2292 zob1968=2301 zob1968=2306 zob1968=2366
 			zob1968=2979 zob1968=3001 zob1968=3065 zob1968=3096
 			zob1968=3140)
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00054)	; &ZOB-0054;
-    (<-Oracle-Bones
-     ((=ucs		  . #x793A)	; 示
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00054)	; &ZOB-0054;
+     ((=>zinbun-oracle	  . 00054)	; &A-ZOB-0054;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=0011 zob1968=0036 zob1968=0511 zob1968=0939
@@ -981,6 +1099,14 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5F48)	; 彈
+      )
+     ((=zinbun-oracle	  . 00054)	; &ZOB-0054;
+      ))
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00056)	; &ZOB-0056;
     (<-Oracle-Bones
@@ -993,6 +1119,14 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@iso		  . #x25605)	; &U-00025605;
+      )
+     ((=ucs		  . #x7532)	; 甲
+      ))
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00057)	; &ZOB-0057;
     (<-Oracle-Bones
@@ -1005,6 +1139,14 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=zinbun-oracle	  . 00055)	; &ZOB-0055;
+      )
+     ((=ucs		  . #x4E01)	; 丁
+      ))
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00058)	; &ZOB-0058;
     (<-Oracle-Bones
@@ -1017,6 +1159,15 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x58EC)	; 壬
+      )
+     ((=cns11643-1	  . #x467C)	; &M-24623; [38-92]
+      (=daikanwa	  . 24623)	; &I-M-24623;
+      ))
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00059)	; &ZOB-0059;
     (<-Oracle-Bones
@@ -1030,7 +1181,7 @@
 (define-char
   '((shuowen-radical	. 3)	; 示
     (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00060)	; &ZOB-0060;
+    (=>zinbun-oracle	. 00060)	; &A-ZOB-0060;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x793A)	; 示
@@ -1041,15 +1192,47 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00060)	; &ZOB-0060;
+     ((=>zinbun-oracle	  . 00060)	; &A-ZOB-0060;
+      ))
+    (shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=zinbun-oracle	  . 00054)	; &ZOB-0054;
+      )
+     ((=ucs		  . #x7678)	; 癸
+      ))
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00060)	; &ZOB-0060;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00060)	; &A-ZOB-0060;
       ))
     (shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=zinbun-oracle	  . 00054)	; &ZOB-0054;
+      )
+     ((=ucs		  . #x7678)	; 癸
+      ))
     (sources		zob1968=1826 zob1968=1827)
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00061)	; &ZOB-0061;
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=zinbun-oracle	  . 00054)	; &ZOB-0054;
+      )
+     ((=ucs		  . #x53E4)	; 古
+      ))
     (sources		zob1968=1826 zob1968=1827)
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00062)	; &ZOB-0062;
@@ -1079,6 +1262,14 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=zinbun-oracle	  . 00909)	; &ZOB-0909;
+      )
+     ((=ucs		  . #x793A)	; 示
+      ))
     (sources		zob1968=1800 zob1968=1806 zob1968=1811 zob1968=1861
 			zob1968=1883 zob1968=2947)
     (zinbun-oracle-page . 5)
@@ -1099,46 +1290,91 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
-    (sources		zob1968=1255 zob1968=1284 zob1968=1302 zob1968=1785
-			zob1968=1790 zob1968=2316 zob1968=2613)
     (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00067)	; &ZOB-0067;
+    (=>zinbun-oracle	. 00067)	; &A-ZOB-0067;
     (<-Oracle-Bones
      ((=ucs		  . #x796D)	; 祭
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00067)	; &ZOB-0067;
-      ))
-    (shuowen-radical	. 3)	; 示
-    (sources		zob1968=1817)
-    (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00068)	; &ZOB-0068;
-    ))
-(define-char
-  '((<-denotational
-     ((=zinbun-oracle	  . 00067)	; &ZOB-0067;
+     ((=>zinbun-oracle	  . 00067)	; &A-ZOB-0067;
       ))
     (shuowen-radical	. 3)	; 示
     (ideographic-structure
-     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
-      (=ucs		  . #x2FF0)	; â¿°
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
+      (=ucs		  . #x2FF2)	; ⿲
       )
-     ((=cns11643-1	  . #x467C)	; &M-24623; [38-92]
-      (=daikanwa	  . 24623)	; &I-M-24623;
+     ((=zinbun-oracle	  . 00315)	; &ZOB-0315;
+      )
+     ((=ucs@unicode	  . #x793A)	; &GT-31489;
+      (=jis-x0208	  . #x3C28)	; &GT-31489; [28-08]
+      (=gb2312		  . #x4A3E)	; &I-G0-4A3E; [42-30]
+      (=ks-x1001	  . #x6346)	; &I-K0-6346; [67-38]
+      (=jis-x0213-1	  . #x3C28)	; &I-JX1-3C28; [28-08]
       )
      ((=zinbun-oracle	  . 00909)	; &ZOB-0909;
       ))
-    (sources		zob1968=1851)
+    (sources		zob1968=1255 zob1968=1284 zob1968=1302 zob1968=1785
+			zob1968=1790 zob1968=2316 zob1968=2613)
     (zinbun-oracle-page . 5)
-    (=zinbun-oracle	. 00069)	; &ZOB-0069;
+    (=zinbun-oracle	. 00067)	; &ZOB-0067;
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00067)	; &ZOB-0067;
+     ((=>zinbun-oracle	  . 00067)	; &A-ZOB-0067;
       ))
     (shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	(=ucs		    . #x2FF1)	; ⿱
+	)
+       ((=ucs		    . #x5C0F)	; 小
+	)
+       ((=zinbun-oracle	    . 00055)	; &ZOB-0055;
+	))
+      )
+     ((=zinbun-oracle	  . 00909)	; &ZOB-0909;
+      ))
+    (sources		zob1968=1817)
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00068)	; &ZOB-0068;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00067)	; &A-ZOB-0067;
+      ))
+    (shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=cns11643-1	  . #x467C)	; &M-24623; [38-92]
+      (=daikanwa	  . 24623)	; &I-M-24623;
+      )
+     ((=zinbun-oracle	  . 00909)	; &ZOB-0909;
+      ))
+    (sources		zob1968=1851)
+    (zinbun-oracle-page . 5)
+    (=zinbun-oracle	. 00069)	; &ZOB-0069;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00067)	; &A-ZOB-0067;
+      ))
+    (shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs		  . #x5C0F)	; 小
+      )
+     ((=zinbun-oracle	  . 00909)	; &ZOB-0909;
+      ))
     (sources		zob1968=2280)
     (zinbun-oracle-page . 5)
     (=zinbun-oracle	. 00070)	; &ZOB-0070;
@@ -1151,6 +1387,19 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 5)
+    (=>zinbun-oracle	. 00072)	; &A-ZOB-0072;
+    (<-Oracle-Bones
+     ((=ucs		  . #x7940)	; 祀
+      )
+     ((=ucs		  . #x5DF3)	; å·³
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00072)	; &A-ZOB-0072;
+      ))
+    (shuowen-radical	. 3)	; 示
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -1168,7 +1417,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00072)	; &ZOB-0072;
+     ((=>zinbun-oracle	  . 00072)	; &A-ZOB-0072;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=1885 zob1968=1886)
@@ -1176,8 +1425,6 @@
     (=zinbun-oracle	. 00073)	; &ZOB-0073;
     (<-Oracle-Bones
      ((=ucs		  . #x5DF3)	; å·³
-      )
-     ((=ucs		  . #x7940)	; 祀
       ))
     ))
 (define-char
@@ -1220,6 +1467,14 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT")
+      (=ucs		  . #x2FF9)	; ⿹
+      )
+     ((=ucs		  . #x77F3)	; 石
+      )
+     ((=zinbun-oracle	  . 00054)	; &ZOB-0054;
+      ))
     (zinbun-oracle-page . 6)
     (=zinbun-oracle	. 00077)	; &ZOB-0077;
     (<-Oracle-Bones
@@ -1238,6 +1493,14 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=ucs@iso		  . #x25605)	; &U-00025605;
+      )
+     ((=ucs		  . #x52FA)	; 勺
+      ))
     (zinbun-oracle-page . 6)
     (=zinbun-oracle	. 00079)	; &ZOB-0079;
     (<-Oracle-Bones
@@ -1256,6 +1519,19 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (zinbun-oracle-page . 6)
+    (=>zinbun-oracle	. 00081)	; &A-ZOB-0081;
+    (<-Oracle-Bones
+     ((=ucs		  . #x798F)	; 福
+      )
+     ((=ucs		  . #x797C)	; 祼
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
+      ))
+    (shuowen-radical	. 3)	; 示
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -1268,15 +1544,10 @@
     (sources		zob1968=0117 zob1968=0454 zob1968=0737)
     (zinbun-oracle-page . 6)
     (=zinbun-oracle	. 00081)	; &ZOB-0081;
-    (<-Oracle-Bones
-     ((=ucs		  . #x798F)	; 福
-      )
-     ((=ucs		  . #x797C)	; 祼
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00081)	; &ZOB-0081;
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=0043 zob1968=0118)
@@ -1285,7 +1556,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00081)	; &ZOB-0081;
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=1274 zob1968=1280 zob1968=1282 zob1968=1286
@@ -1297,7 +1568,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00081)	; &ZOB-0081;
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=1291 zob1968=1609 zob1968=1689)
@@ -1306,7 +1577,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00081)	; &ZOB-0081;
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=1292 zob1968=1298 zob1968=1560)
@@ -1315,7 +1586,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00081)	; &ZOB-0081;
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=1359)
@@ -1324,7 +1595,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00081)	; &ZOB-0081;
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=1475 zob1968=1866)
@@ -1333,7 +1604,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00081)	; &ZOB-0081;
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=1551 zob1968=2291)
@@ -1342,7 +1613,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00081)	; &ZOB-0081;
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=1810)
@@ -1351,7 +1622,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00081)	; &ZOB-0081;
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=2292)
@@ -1360,7 +1631,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00081)	; &ZOB-0081;
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=2315)
@@ -1369,7 +1640,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00081)	; &ZOB-0081;
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=2611)
@@ -1378,7 +1649,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00081)	; &ZOB-0081;
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=2621)
@@ -1387,7 +1658,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00081)	; &ZOB-0081;
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=2676)
@@ -1396,7 +1667,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00081)	; &ZOB-0081;
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=3006)
@@ -1405,7 +1676,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00081)	; &ZOB-0081;
+     ((=>zinbun-oracle	  . 00081)	; &A-ZOB-0081;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=3071)
@@ -1414,6 +1685,14 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+      (=ucs		  . #x2FF0)	; â¿°
+      )
+     ((=zinbun-oracle	  . 00054)	; &ZOB-0054;
+      )
+     ((=ucs		  . #x5144)	; 兄
+      ))
     (zinbun-oracle-page . 6)
     (=zinbun-oracle	. 00097)	; &ZOB-0097;
     (<-Oracle-Bones
@@ -1422,6 +1701,14 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x72AE)	; 犮
+      )
+     ((=zinbun-oracle	  . 00054)	; &ZOB-0054;
+      ))
     (zinbun-oracle-page . 6)
     (=zinbun-oracle	. 00098)	; &ZOB-0098;
     (<-Oracle-Bones
@@ -1438,6 +1725,17 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT")
+      (=ucs		  . #x2FF2)	; ⿲
+      )
+     ((=cns11643-1	  . #x467C)	; &M-24623; [38-92]
+      (=daikanwa	  . 24623)	; &I-M-24623;
+      )
+     ((=ucs		  . #x571F)	; 土
+      )
+     ((=ucs		  . #x5369)	; 卩
+      ))
     (zinbun-oracle-page . 6)
     (=zinbun-oracle	. 00100)	; &ZOB-0100;
     (<-Oracle-Bones
@@ -1446,16 +1744,24 @@
     ))
 (define-char
   '((shuowen-radical	. 3)	; 示
-    (sources		zob1968=0067 zob1968=0250 zob1968=2947)
     (zinbun-oracle-page . 6)
-    (=zinbun-oracle	. 00101)	; &ZOB-0101;
+    (=>zinbun-oracle	. 00101)	; &A-ZOB-0101;
     (<-Oracle-Bones
      ((=ucs		  . #x798D)	; 禍
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00101)	; &ZOB-0101;
+     ((=>zinbun-oracle	  . 00101)	; &A-ZOB-0101;
+      ))
+    (shuowen-radical	. 3)	; 示
+    (sources		zob1968=0067 zob1968=0250 zob1968=2947)
+    (zinbun-oracle-page . 6)
+    (=zinbun-oracle	. 00101)	; &ZOB-0101;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00101)	; &A-ZOB-0101;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=0207 zob1968=0260 zob1968=0448 zob1968=1162
@@ -1465,7 +1771,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00101)	; &ZOB-0101;
+     ((=>zinbun-oracle	  . 00101)	; &A-ZOB-0101;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=0259 zob1968=0443 zob1968=0444 zob1968=0446
@@ -1477,7 +1783,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00101)	; &ZOB-0101;
+     ((=>zinbun-oracle	  . 00101)	; &A-ZOB-0101;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=0452 zob1968=3124)
@@ -1486,7 +1792,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00101)	; &ZOB-0101;
+     ((=>zinbun-oracle	  . 00101)	; &A-ZOB-0101;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=2277 zob1968=2295 zob1968=2365 zob1968=2407
@@ -1497,7 +1803,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00101)	; &ZOB-0101;
+     ((=>zinbun-oracle	  . 00101)	; &A-ZOB-0101;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=2326)
@@ -1506,7 +1812,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00101)	; &ZOB-0101;
+     ((=>zinbun-oracle	  . 00101)	; &A-ZOB-0101;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=2399 zob1968=2475 zob1968=2477 zob1968=2480
@@ -1516,7 +1822,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00101)	; &ZOB-0101;
+     ((=>zinbun-oracle	  . 00101)	; &A-ZOB-0101;
       ))
     (shuowen-radical	. 3)	; 示
     (sources		zob1968=2481 zob1968=3016 zob1968=3048 zob1968=3107
@@ -1791,14 +2097,9 @@
       )
      ((=zinbun-oracle	  . 00121)	; &ZOB-0121;
       )
-     ((=ucs@unicode	  . #x516C)	; &GT-01893;
-      (=gb2312		  . #x392B)	; &GT-01893; [25-11]
-      (=jis-x0213-1	  . #x3878)	; &I-JX1-3878; [24-88]
+     ((=ucs		  . #x516C)	; 公
       )
-     ((=ucs@unicode	  . #x7236)	; &GT-25337;
-      (=gb2312		  . #x3838)	; &GT-25337; [24-24]
-      (=cns11643-1	  . #x4558)	; &I-C1-4558; [37-56]
-      (=jis-x0213-1	  . #x4963)	; &I-JX1-4963; [41-67]
+     ((=ucs		  . #x7236)	; 父
       ))
     (zinbun-oracle-page . 7)
     (=zinbun-oracle	. 00127)	; &ZOB-0127;
@@ -1806,10 +2107,9 @@
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
 	)
-       ((=gb2312	    . #x392B)	; &GT-01893; [25-11]
+       ((=ucs		    . #x516C)	; 公
 	)
-       ((=gb2312	    . #x3838)	; &GT-25337; [24-24]
-	(=cns11643-1	    . #x4558)	; &I-C1-4558; [37-56]
+       ((=ucs		    . #x7236)	; 父
 	))
       ))
     ))
@@ -2140,11 +2440,8 @@
       )
      ((=ucs		  . #x6708)	; 月
       ))
-    (sources		zob1968=0203 zob1968=0232 zob1968=0364 zob1968=0465
-			zob1968=0995 zob1968=1597 zob1968=1599 zob1968=1618
-			zob1968=3101 zob1968=3111 zob1968=3237)
     (zinbun-oracle-page . 8)
-    (=zinbun-oracle	. 00142)	; &ZOB-0142;
+    (=>zinbun-oracle	. 00142)	; &A-ZOB-0142;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x4E09)	; 三
@@ -2155,7 +2452,26 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00142)	; &ZOB-0142;
+     ((=>zinbun-oracle	  . 00142)	; &A-ZOB-0142;
+      ))
+    (shuowen-radical	. 4)	; 三
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=zinbun-oracle	  . 00121)	; &ZOB-0121;
+      )
+     ((=ucs		  . #x6708)	; 月
+      ))
+    (sources		zob1968=0203 zob1968=0232 zob1968=0364 zob1968=0465
+			zob1968=0995 zob1968=1597 zob1968=1599 zob1968=1618
+			zob1968=3101 zob1968=3111 zob1968=3237)
+    (zinbun-oracle-page . 8)
+    (=zinbun-oracle	. 00142)	; &ZOB-0142;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00142)	; &A-ZOB-0142;
       ))
     (shuowen-radical	. 4)	; 三
     (ideographic-structure
@@ -2758,16 +3074,24 @@
     ))
 (define-char
   '((shuowen-radical	. 10)	; 丨
-    (sources		zob1968=0972)
     (zinbun-oracle-page . 9)
-    (=zinbun-oracle	. 00180)	; &ZOB-0180;
+    (=>zinbun-oracle	. 00180)	; &A-ZOB-0180;
     (<-Oracle-Bones
      ((=ucs		  . #x4E2D)	; 中
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00180)	; &ZOB-0180;
+     ((=>zinbun-oracle	  . 00180)	; &A-ZOB-0180;
+      ))
+    (shuowen-radical	. 10)	; 丨
+    (sources		zob1968=0972)
+    (zinbun-oracle-page . 9)
+    (=zinbun-oracle	. 00180)	; &ZOB-0180;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00180)	; &A-ZOB-0180;
       ))
     (shuowen-radical	. 10)	; 丨
     (sources		zob1968=0417 zob1968=0723 zob1968=1817)
@@ -2776,7 +3100,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00180)	; &ZOB-0180;
+     ((=>zinbun-oracle	  . 00180)	; &A-ZOB-0180;
       ))
     (shuowen-radical	. 10)	; 丨
     (sources		zob1968=1476 zob1968=1596)
@@ -2915,6 +3239,21 @@
     ))
 (define-char
   '((shuowen-radical	. 10)	; 丨
+    (zinbun-oracle-page . 10)
+    (=>zinbun-oracle	. 00189)	; &A-ZOB-0189;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x4E2D)	; 中
+	)
+       ((=ucs		    . #x4E01)	; 丁
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00189)	; &A-ZOB-0189;
+      ))
+    (shuowen-radical	. 10)	; 丨
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -2926,17 +3265,10 @@
     (sources		zob1968=3000)
     (zinbun-oracle-page . 10)
     (=zinbun-oracle	. 00189)	; &ZOB-0189;
-    (<-Oracle-Bones
-     ((ideographic-combination
-       ((=ucs		    . #x4E2D)	; 中
-	)
-       ((=ucs		    . #x4E01)	; 丁
-	))
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00189)	; &ZOB-0189;
+     ((=>zinbun-oracle	  . 00189)	; &A-ZOB-0189;
       ))
     (shuowen-radical	. 10)	; 丨
     (ideographic-structure
@@ -2994,17 +3326,25 @@
     ))
 (define-char
   '((shuowen-radical	. 11)	; å±®
-    (sources		zob1968=2010 zob1968=2064 zob1968=2067 zob1968=2072
-			zob1968=2073 zob1968=2101 zob1968=2109 zob1968=2159)
     (zinbun-oracle-page . 10)
-    (=zinbun-oracle	. 00193)	; &ZOB-0193;
+    (=>zinbun-oracle	. 00193)	; &A-ZOB-0193;
     (<-Oracle-Bones
      ((=ucs		  . #x6BCE)	; 毎
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00193)	; &ZOB-0193;
+     ((=>zinbun-oracle	  . 00193)	; &A-ZOB-0193;
+      ))
+    (shuowen-radical	. 11)	; å±®
+    (sources		zob1968=2010 zob1968=2064 zob1968=2067 zob1968=2072
+			zob1968=2073 zob1968=2101 zob1968=2109 zob1968=2159)
+    (zinbun-oracle-page . 10)
+    (=zinbun-oracle	. 00193)	; &ZOB-0193;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00193)	; &A-ZOB-0193;
       ))
     (shuowen-radical	. 11)	; å±®
     (sources		zob1968=2003 zob1968=2033 zob1968=2043 zob1968=2045
@@ -3016,7 +3356,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00193)	; &ZOB-0193;
+     ((=>zinbun-oracle	  . 00193)	; &A-ZOB-0193;
       ))
     (shuowen-radical	. 11)	; å±®
     (sources		zob1968=1912)
@@ -3025,7 +3365,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00193)	; &ZOB-0193;
+     ((=>zinbun-oracle	  . 00193)	; &A-ZOB-0193;
       ))
     (shuowen-radical	. 11)	; å±®
     (sources		zob1968=1920)
@@ -3034,7 +3374,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00193)	; &ZOB-0193;
+     ((=>zinbun-oracle	  . 00193)	; &A-ZOB-0193;
       ))
     (shuowen-radical	. 11)	; å±®
     (sources		zob1968=2061)
@@ -3043,7 +3383,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00193)	; &ZOB-0193;
+     ((=>zinbun-oracle	  . 00193)	; &A-ZOB-0193;
       ))
     (shuowen-radical	. 11)	; å±®
     (sources		zob1968=2297)
@@ -3052,7 +3392,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00193)	; &ZOB-0193;
+     ((=>zinbun-oracle	  . 00193)	; &A-ZOB-0193;
       ))
     (shuowen-radical	. 11)	; å±®
     (sources		zob1968=2941)
@@ -4262,6 +4602,21 @@
     ))
 (define-char
   '((shuowen-radical	. 16)	; 八
+    (zinbun-oracle-page . 14)
+    (=>zinbun-oracle	. 00279)	; &A-ZOB-0279;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x516B)	; 八
+	)
+       ((=ucs		    . #x6708)	; 月
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00279)	; &A-ZOB-0279;
+      ))
+    (shuowen-radical	. 16)	; 八
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -4276,17 +4631,10 @@
 			zob1968=3250)
     (zinbun-oracle-page . 14)
     (=zinbun-oracle	. 00279)	; &ZOB-0279;
-    (<-Oracle-Bones
-     ((ideographic-combination
-       ((=ucs		    . #x516B)	; 八
-	)
-       ((=ucs		    . #x6708)	; 月
-	))
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00279)	; &ZOB-0279;
+     ((=>zinbun-oracle	  . 00279)	; &A-ZOB-0279;
       ))
     (shuowen-radical	. 16)	; 八
     (sources		zob1968=0197 zob1968=0216 zob1968=1544 zob1968=1601
@@ -4404,6 +4752,17 @@
     ))
 (define-char
   '((shuowen-radical	. 16)	; 八
+    (zinbun-oracle-page . 15)
+    (=>zinbun-oracle	. 00288)	; &A-ZOB-0288;
+    (<-Oracle-Bones
+     ((=ucs		  . #x4F59)	; 余
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00288)	; &A-ZOB-0288;
+      ))
+    (shuowen-radical	. 16)	; 八
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -4418,13 +4777,10 @@
 			zob1968=3246)
     (zinbun-oracle-page . 15)
     (=zinbun-oracle	. 00288)	; &ZOB-0288;
-    (<-Oracle-Bones
-     ((=ucs		  . #x4F59)	; 余
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00288)	; &ZOB-0288;
+     ((=>zinbun-oracle	  . 00288)	; &A-ZOB-0288;
       ))
     (shuowen-radical	. 16)	; 八
     (sources		zob1968=0335)
@@ -4557,6 +4913,17 @@
     ))
 (define-char
   '((shuowen-radical	. 19)	; 牛
+    (zinbun-oracle-page . 15)
+    (=>zinbun-oracle	. 00297)	; &A-ZOB-0297;
+    (<-Oracle-Bones
+     ((=ucs		  . #x725D)	; 牝
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00297)	; &A-ZOB-0297;
+      ))
+    (shuowen-radical	. 19)	; 牛
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -4568,13 +4935,10 @@
     (sources		zob1968=1547 zob1968=3022)
     (zinbun-oracle-page . 15)
     (=zinbun-oracle	. 00297)	; &ZOB-0297;
-    (<-Oracle-Bones
-     ((=ucs		  . #x725D)	; 牝
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00297)	; &ZOB-0297;
+     ((=>zinbun-oracle	  . 00297)	; &A-ZOB-0297;
       ))
     (shuowen-radical	. 19)	; 牛
     (sources		zob1968=2996)
@@ -4793,23 +5157,15 @@
       )
      ((=zinbun-oracle	  . 00315)	; &ZOB-0315;
       ))
-    (sources		zob1968=0003 zob1968=0010 zob1968=0051 zob1968=0117
-			zob1968=0126 zob1968=0127 zob1968=0129 zob1968=0216
-			zob1968=0495 zob1968=0799 zob1968=0896 zob1968=0970
-			zob1968=1016 zob1968=1062 zob1968=1359-1362
-			zob1968=1988 zob1968=2273 zob1968=2285 zob1968=2349
-			zob1968=2350 zob1968=2367 zob1968=2520 zob1968=2522
-			zob1968=2991 zob1968=3051 zob1968=3099 zob1968=3145
-			zob1968=3256)
     (zinbun-oracle-page . 16)
-    (=zinbun-oracle	. 00311)	; &ZOB-0311;
+    (=>zinbun-oracle	. 00311)	; &A-ZOB-0311;
     (<-Oracle-Bones
      ((=ucs		  . #x544A)	; 告
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00311)	; &ZOB-0311;
+     ((=>zinbun-oracle	  . 00311)	; &A-ZOB-0311;
       ))
     (shuowen-radical	. 21)	; 告
     (ideographic-structure
@@ -4820,13 +5176,37 @@
       )
      ((=zinbun-oracle	  . 00315)	; &ZOB-0315;
       ))
-    (sources		zob1968=0128 zob1968=0718)
-    (zinbun-oracle-page . 16)
+    (sources		zob1968=0003 zob1968=0010 zob1968=0051 zob1968=0117
+			zob1968=0126 zob1968=0127 zob1968=0129 zob1968=0216
+			zob1968=0495 zob1968=0799 zob1968=0896 zob1968=0970
+			zob1968=1016 zob1968=1062 zob1968=1359-1362
+			zob1968=1988 zob1968=2273 zob1968=2285 zob1968=2349
+			zob1968=2350 zob1968=2367 zob1968=2520 zob1968=2522
+			zob1968=2991 zob1968=3051 zob1968=3099 zob1968=3145
+			zob1968=3256)
+    (zinbun-oracle-page . 16)
+    (=zinbun-oracle	. 00311)	; &ZOB-0311;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00311)	; &A-ZOB-0311;
+      ))
+    (shuowen-radical	. 21)	; 告
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x725B)	; 牛
+      )
+     ((=zinbun-oracle	  . 00315)	; &ZOB-0315;
+      ))
+    (sources		zob1968=0128 zob1968=0718)
+    (zinbun-oracle-page . 16)
     (=zinbun-oracle	. 00312)	; &ZOB-0312;
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00311)	; &ZOB-0311;
+     ((=>zinbun-oracle	  . 00311)	; &A-ZOB-0311;
       ))
     (shuowen-radical	. 21)	; 告
     (ideographic-structure
@@ -4979,14 +5359,22 @@
 (define-char
   '((shuowen-radical	. 22)	; 口
     (zinbun-oracle-page . 17)
-    (=zinbun-oracle	. 00324)	; &ZOB-0324;
+    (=>zinbun-oracle	. 00324)	; &A-ZOB-0324;
     (<-Oracle-Bones
      ((=ucs		  . #x53EC)	; 召
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00324)	; &ZOB-0324;
+     ((=>zinbun-oracle	  . 00324)	; &A-ZOB-0324;
+      ))
+    (shuowen-radical	. 22)	; 口
+    (zinbun-oracle-page . 17)
+    (=zinbun-oracle	. 00324)	; &ZOB-0324;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00324)	; &A-ZOB-0324;
       ))
     (shuowen-radical	. 22)	; 口
     (sources		zob1968=2932 zob1968=2934 zob1968=2937 zob1968=2940)
@@ -4995,7 +5383,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00324)	; &ZOB-0324;
+     ((=>zinbun-oracle	  . 00324)	; &A-ZOB-0324;
       ))
     (shuowen-radical	. 22)	; 口
     (ideographic-structure
@@ -5175,18 +5563,34 @@
       )
      ((=zinbun-oracle	  . 00315)	; &ZOB-0315;
       ))
+    (zinbun-oracle-page . 17)
+    (=>zinbun-oracle	. 00336)	; &A-ZOB-0336;
+    (<-Oracle-Bones
+     ((=ucs		  . #x5409)	; 吉
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00336)	; &A-ZOB-0336;
+      ))
+    (shuowen-radical	. 22)	; 口
+    (ideographic-structure
+     ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+      (=ucs		  . #x2FF1)	; ⿱
+      )
+     ((=ucs		  . #x58EB)	; 士
+      )
+     ((=zinbun-oracle	  . 00315)	; &ZOB-0315;
+      ))
     (sources		zob1968=0074 zob1968=0520 zob1968=1066 zob1968=1067
 			zob1968=1068 zob1968=1070 zob1968=1077 zob1968=1355
 			zob1968=1683 zob1968=1690 zob1968=1691)
     (zinbun-oracle-page . 17)
     (=zinbun-oracle	. 00336)	; &ZOB-0336;
-    (<-Oracle-Bones
-     ((=ucs		  . #x5409)	; 吉
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00336)	; &ZOB-0336;
+     ((=>zinbun-oracle	  . 00336)	; &A-ZOB-0336;
       ))
     (shuowen-radical	. 22)	; 口
     (ideographic-structure
@@ -5225,7 +5629,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00336)	; &ZOB-0336;
+     ((=>zinbun-oracle	  . 00336)	; &A-ZOB-0336;
       ))
     (shuowen-radical	. 22)	; 口
     (ideographic-structure
@@ -5255,7 +5659,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00336)	; &ZOB-0336;
+     ((=>zinbun-oracle	  . 00336)	; &A-ZOB-0336;
       ))
     (shuowen-radical	. 22)	; 口
     (ideographic-structure
@@ -5319,17 +5723,25 @@
     ))
 (define-char
   '((shuowen-radical	. 22)	; 口
-    (sources		zob1968=0012 zob1968=0013 zob1968=0015
-			zob1968=0718-0721 zob1968=1253 zob1968=1340)
     (zinbun-oracle-page . 18)
-    (=zinbun-oracle	. 00345)	; &ZOB-0345;
+    (=>zinbun-oracle	. 00345)	; &A-ZOB-0345;
     (<-Oracle-Bones
      ((=ucs		  . #x5510)	; 唐
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00345)	; &ZOB-0345;
+     ((=>zinbun-oracle	  . 00345)	; &A-ZOB-0345;
+      ))
+    (shuowen-radical	. 22)	; 口
+    (sources		zob1968=0012 zob1968=0013 zob1968=0015
+			zob1968=0718-0721 zob1968=1253 zob1968=1340)
+    (zinbun-oracle-page . 18)
+    (=zinbun-oracle	. 00345)	; &ZOB-0345;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00345)	; &A-ZOB-0345;
       ))
     (shuowen-radical	. 22)	; 口
     (sources		zob1968=2991 zob1968=2992)
@@ -5338,7 +5750,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00345)	; &ZOB-0345;
+     ((=>zinbun-oracle	  . 00345)	; &A-ZOB-0345;
       ))
     (shuowen-radical	. 22)	; 口
     (sources		zob1968=2993)
@@ -5459,7 +5871,18 @@
       ))
     ))
 (define-char
-  '((shuowen-radical	. 22)	; 口
+  '((=>zinbun-oracle	. 00353)	; &A-ZOB-0353;
+    (<-Oracle-Bones
+     ((=ucs		  . #x5404)	; 各
+      )
+     ((=ucs		  . #x683C)	; æ ¼
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00353)	; &A-ZOB-0353;
+      ))
+    (shuowen-radical	. 22)	; 口
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -5776,6 +6199,14 @@
     ))
 (define-char
   '((shuowen-radical	. 22)	; 口
+    (zinbun-oracle-page . 19)
+    (=>zinbun-oracle	. 00368)	; &A-ZOB-0368;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00368)	; &A-ZOB-0368;
+      ))
+    (shuowen-radical	. 22)	; 口
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -5790,7 +6221,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00368)	; &ZOB-0368;
+     ((=>zinbun-oracle	  . 00368)	; &A-ZOB-0368;
       ))
     (shuowen-radical	. 22)	; 口
     (sources		zob1968=0564 zob1968=1456)
@@ -6900,6 +7331,17 @@
     ))
 (define-char
   '((shuowen-radical	. 28)	; 癶
+    (zinbun-oracle-page . 24)
+    (=>zinbun-oracle	. 00504)	; &A-ZOB-0504;
+    (<-Oracle-Bones
+     ((=ucs		  . #x767B)	; 登
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00504)	; &A-ZOB-0504;
+      ))
+    (shuowen-radical	. 28)	; 癶
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -6911,13 +7353,10 @@
     (sources		zob1968=0671)
     (zinbun-oracle-page . 24)
     (=zinbun-oracle	. 00504)	; &ZOB-0504;
-    (<-Oracle-Bones
-     ((=ucs		  . #x767B)	; 登
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00504)	; &ZOB-0504;
+     ((=>zinbun-oracle	  . 00504)	; &A-ZOB-0504;
       ))
     (shuowen-radical	. 28)	; 癶
     (sources		zob1968=0921 zob1968=0922)
@@ -6926,7 +7365,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00504)	; &ZOB-0504;
+     ((=>zinbun-oracle	  . 00504)	; &A-ZOB-0504;
       ))
     (shuowen-radical	. 28)	; 癶
     (sources		zob1968=1275 zob1968=1832 zob1968=1901 zob1968=2314)
@@ -7171,6 +7610,17 @@
     ))
 (define-char
   '((shuowen-radical	. 29)	; æ­¥
+    (zinbun-oracle-page . 25)
+    (=>zinbun-oracle	. 00524)	; &A-ZOB-0524;
+    (<-Oracle-Bones
+     ((=ucs		  . #x6B72)	; æ­²
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00524)	; &A-ZOB-0524;
+      ))
+    (shuowen-radical	. 29)	; æ­¥
     (sources		zob1968=0095 zob1968=0722 zob1968=1254 zob1968=1259
 			zob1968=1262 zob1968=1265 zob1968=1266 zob1968=1270
 			zob1968=1334-1340 zob1968=1541 zob1968=1544
@@ -7180,13 +7630,10 @@
 			zob1968=2295 zob1968=3253 zob1968=3254)
     (zinbun-oracle-page . 25)
     (=zinbun-oracle	. 00524)	; &ZOB-0524;
-    (<-Oracle-Bones
-     ((=ucs		  . #x6B72)	; æ­²
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00524)	; &ZOB-0524;
+     ((=>zinbun-oracle	  . 00524)	; &A-ZOB-0524;
       ))
     (shuowen-radical	. 29)	; æ­¥
     (sources		zob1968=0304 zob1968=0801 zob1968=1341 zob1968=1549
@@ -7202,7 +7649,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00524)	; &ZOB-0524;
+     ((=>zinbun-oracle	  . 00524)	; &A-ZOB-0524;
       ))
     (shuowen-radical	. 29)	; æ­¥
     (sources		zob1968=2589 zob1968=2590 zob1968=2596 zob1968=2598
@@ -7232,6 +7679,17 @@
     ))
 (define-char
   '((shuowen-radical	. 31)	; æ­£
+    (zinbun-oracle-page . 26)
+    (=>zinbun-oracle	. 00528)	; &A-ZOB-0528;
+    (<-Oracle-Bones
+     ((=ucs		  . #x6B63)	; æ­£
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00528)	; &A-ZOB-0528;
+      ))
+    (shuowen-radical	. 31)	; æ­£
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -7248,13 +7706,10 @@
 			zob1968=2951 zob1968=3001)
     (zinbun-oracle-page . 26)
     (=zinbun-oracle	. 00528)	; &ZOB-0528;
-    (<-Oracle-Bones
-     ((=ucs		  . #x6B63)	; æ­£
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00528)	; &ZOB-0528;
+     ((=>zinbun-oracle	  . 00528)	; &A-ZOB-0528;
       ))
     (shuowen-radical	. 31)	; æ­£
     (ideographic-structure
@@ -7690,7 +8145,18 @@
       ))
     ))
 (define-char
-  '((shuowen-radical	. 33)	; è¾µ
+  '((=>zinbun-oracle	. 00559)	; &A-ZOB-0559;
+    (<-Oracle-Bones
+     ((=ucs		  . #x9014)	; 途
+      )
+     ((=ucs		  . #x48C4)	; 䣄
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00559)	; &A-ZOB-0559;
+      ))
+    (shuowen-radical	. 33)	; è¾µ
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -8027,6 +8493,24 @@
     ))
 (define-char
   '((shuowen-radical	. 34)	; å½³
+    (zinbun-oracle-page . 28)
+    (=>zinbun-oracle	. 00581)	; &A-ZOB-0581;
+    (<-Oracle-Bones
+     ((ideographic-structure
+       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
+	(=ucs		    . #x2FFA)	; ⿺
+	)
+       ((=ucs		    . #x8FB6)	; 辶
+	)
+       ((=ucs		    . #x6214)	; 戔
+	))
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00581)	; &A-ZOB-0581;
+      ))
+    (shuowen-radical	. 34)	; å½³
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
       (=ucs		  . #x2FF1)	; ⿱
@@ -8047,20 +8531,10 @@
 			zob1968=2944)
     (zinbun-oracle-page . 28)
     (=zinbun-oracle	. 00581)	; &ZOB-0581;
-    (<-Oracle-Bones
-     ((ideographic-structure
-       ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT")
-	(=ucs		    . #x2FFA)	; ⿺
-	)
-       ((=ucs		    . #x8FB6)	; 辶
-	)
-       ((=ucs		    . #x6214)	; 戔
-	))
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00581)	; &ZOB-0581;
+     ((=>zinbun-oracle	  . 00581)	; &A-ZOB-0581;
       ))
     (shuowen-radical	. 34)	; å½³
     (sources		zob1968=1958 zob1968=2027-2038)
@@ -8171,6 +8645,17 @@
     ))
 (define-char
   '((shuowen-radical	. 34)	; å½³
+    (zinbun-oracle-page . 28)
+    (=>zinbun-oracle	. 00588)	; &A-ZOB-0588;
+    (<-Oracle-Bones
+     ((=ucs		  . #x5FA1)	; 御
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00588)	; &A-ZOB-0588;
+      ))
+    (shuowen-radical	. 34)	; å½³
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
       (=ucs		  . #x2FF0)	; â¿°
@@ -8185,13 +8670,10 @@
 			zob1968=2392)
     (zinbun-oracle-page . 28)
     (=zinbun-oracle	. 00588)	; &ZOB-0588;
-    (<-Oracle-Bones
-     ((=ucs		  . #x5FA1)	; 御
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00588)	; &ZOB-0588;
+     ((=>zinbun-oracle	  . 00588)	; &A-ZOB-0588;
       ))
     (shuowen-radical	. 34)	; å½³
     (ideographic-structure
@@ -8209,7 +8691,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00588)	; &ZOB-0588;
+     ((=>zinbun-oracle	  . 00588)	; &A-ZOB-0588;
       ))
     (shuowen-radical	. 34)	; å½³
     (sources		zob1968=2284 zob1968=2307 zob1968=3010 zob1968=3020
@@ -8219,7 +8701,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00588)	; &ZOB-0588;
+     ((=>zinbun-oracle	  . 00588)	; &A-ZOB-0588;
       ))
     (shuowen-radical	. 34)	; å½³
     (sources		zob1968=2142)
@@ -8770,14 +9252,25 @@
     (=zinbun-oracle	. 00643)	; &ZOB-0643;
     ))
 (define-char
-  '((shuowen-radical	. 36)	; 㢟
+  '((=>zinbun-oracle	. 00644)	; &A-ZOB-0644;
+    (<-Oracle-Bones
+     ((=ucs		  . #x5363)	; 卣
+      )
+     ((=ucs		  . #x5EFC)	; 廼
+      )
+     ((=ucs		  . #x209EA)	; 𠧪
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00644)	; &A-ZOB-0644;
+      ))
+    (shuowen-radical	. 36)	; 㢟
     (sources		zob1968=1803 zob1968=1872 zob1968=1873 zob1968=1945
 			zob1968=2014 zob1968=2018)
     (zinbun-oracle-page . 31)
     (=zinbun-oracle	. 00644)	; &ZOB-0644;
     (<-Oracle-Bones
-     ((=ucs		  . #x5363)	; 卣
-      )
      ((=ucs		  . #x5EFC)	; 廼
       ))
     ))
@@ -9412,11 +9905,8 @@
     ))
 (define-char
   '((shuowen-radical	. 54)	; 十
-    (sources		zob1968=0107 zob1968=0157 zob1968=0269 zob1968=0401
-			zob1968=0549 zob1968=1177 zob1968=1428 zob1968=1719
-			zob1968=3055 zob1968=3118)
     (zinbun-oracle-page . 34)
-    (=zinbun-oracle	. 00715)	; &ZOB-0715;
+    (=>zinbun-oracle	. 00715)	; &A-ZOB-0715;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x5341)	; 十
@@ -9429,7 +9919,18 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00715)	; &ZOB-0715;
+     ((=>zinbun-oracle	  . 00715)	; &A-ZOB-0715;
+      ))
+    (shuowen-radical	. 54)	; 十
+    (sources		zob1968=0107 zob1968=0157 zob1968=0269 zob1968=0401
+			zob1968=0549 zob1968=1177 zob1968=1428 zob1968=1719
+			zob1968=3055 zob1968=3118)
+    (zinbun-oracle-page . 34)
+    (=zinbun-oracle	. 00715)	; &ZOB-0715;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00715)	; &A-ZOB-0715;
       ))
     (shuowen-radical	. 54)	; 十
     (sources		zob1968=1277 zob1968=1319 zob1968=1470 zob1968=1527)
@@ -9438,10 +9939,8 @@
     ))
 (define-char
   '((shuowen-radical	. 54)	; 十
-    (sources		zob1968=0205 zob1968=0212 zob1968=0596 zob1968=0927
-			zob1968=1630 zob1968=1761 zob1968=3016)
     (zinbun-oracle-page . 34)
-    (=zinbun-oracle	. 00717)	; &ZOB-0717;
+    (=>zinbun-oracle	. 00717)	; &A-ZOB-0717;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x5341)	; 十
@@ -9454,7 +9953,17 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00717)	; &ZOB-0717;
+     ((=>zinbun-oracle	  . 00717)	; &A-ZOB-0717;
+      ))
+    (shuowen-radical	. 54)	; 十
+    (sources		zob1968=0205 zob1968=0212 zob1968=0596 zob1968=0927
+			zob1968=1630 zob1968=1761 zob1968=3016)
+    (zinbun-oracle-page . 34)
+    (=zinbun-oracle	. 00717)	; &ZOB-0717;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00717)	; &A-ZOB-0717;
       ))
     (shuowen-radical	. 54)	; 十
     (sources		zob1968=1257 zob1968=1263 zob1968=1297 zob1968=1357
@@ -9464,10 +9973,8 @@
     ))
 (define-char
   '((shuowen-radical	. 54)	; 十
-    (sources		zob1968=0084 zob1968=0449 zob1968=0773 zob1968=0853
-			zob1968=0949 zob1968=1192 zob1968=1771)
     (zinbun-oracle-page . 34)
-    (=zinbun-oracle	. 00719)	; &ZOB-0719;
+    (=>zinbun-oracle	. 00719)	; &A-ZOB-0719;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x5341)	; 十
@@ -9480,7 +9987,17 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00719)	; &ZOB-0719;
+     ((=>zinbun-oracle	  . 00719)	; &A-ZOB-0719;
+      ))
+    (shuowen-radical	. 54)	; 十
+    (sources		zob1968=0084 zob1968=0449 zob1968=0773 zob1968=0853
+			zob1968=0949 zob1968=1192 zob1968=1771)
+    (zinbun-oracle-page . 34)
+    (=zinbun-oracle	. 00719)	; &ZOB-0719;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00719)	; &A-ZOB-0719;
       ))
     (shuowen-radical	. 54)	; 十
     (sources		zob1968=0949 zob1968=1602)
@@ -10923,7 +11440,18 @@
     (=zinbun-oracle	. 00908)	; &ZOB-0908;
     ))
 (define-char
-  '((shuowen-radical	. 76)	; 又
+  '((=>zinbun-oracle	. 00909)	; &A-ZOB-0909;
+    (<-Oracle-Bones
+     ((=ucs		  . #x53C8)	; 又
+      )
+     ((=ucs		  . #x6709)	; 有
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00909)	; &A-ZOB-0909;
+      ))
+    (shuowen-radical	. 76)	; 又
     (sources		zob1968=0020 zob1968=0151 zob1968=0327 zob1968=0331
 			zob1968=0344 zob1968=0348 zob1968=0349 zob1968=0354
 			zob1968=0371 zob1968=0418 zob1968=0624 zob1968=0657
@@ -11062,9 +11590,8 @@
     ))
 (define-char
   '((shuowen-radical	. 76)	; 又
-    (sources		zob1968=1683 zob1968=1823 zob1968=3254)
     (zinbun-oracle-page . 43)
-    (=zinbun-oracle	. 00917)	; &ZOB-0917;
+    (=>zinbun-oracle	. 00917)	; &A-ZOB-0917;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x7236)	; 父
@@ -11075,7 +11602,16 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00917)	; &ZOB-0917;
+     ((=>zinbun-oracle	  . 00917)	; &A-ZOB-0917;
+      ))
+    (shuowen-radical	. 76)	; 又
+    (sources		zob1968=1683 zob1968=1823 zob1968=3254)
+    (zinbun-oracle-page . 43)
+    (=zinbun-oracle	. 00917)	; &ZOB-0917;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00917)	; &A-ZOB-0917;
       ))
     (shuowen-radical	. 76)	; 又
     (sources		zob1968=0032 zob1968=0033 zob1968=0034 zob1968=1812
@@ -11085,9 +11621,8 @@
     ))
 (define-char
   '((shuowen-radical	. 76)	; 又
-    (sources		zob1968=3015)
     (zinbun-oracle-page . 43)
-    (=zinbun-oracle	. 00919)	; &ZOB-0919;
+    (=>zinbun-oracle	. 00919)	; &A-ZOB-0919;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x7236)	; 父
@@ -11098,7 +11633,16 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00919)	; &ZOB-0919;
+     ((=>zinbun-oracle	  . 00919)	; &A-ZOB-0919;
+      ))
+    (shuowen-radical	. 76)	; 又
+    (sources		zob1968=3015)
+    (zinbun-oracle-page . 43)
+    (=zinbun-oracle	. 00919)	; &ZOB-0919;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00919)	; &A-ZOB-0919;
       ))
     (shuowen-radical	. 76)	; 又
     (sources		zob1968=0039 zob1968=0040-0044 zob1968=0729
@@ -11121,11 +11665,8 @@
     ))
 (define-char
   '((shuowen-radical	. 76)	; 又
-    (sources		zob1968=1254 zob1968=1265 zob1968=1266 zob1968=1340
-			zob1968=1547 zob1968=1548 zob1968=1549 zob1968=1815
-			zob1968=3254)
     (zinbun-oracle-page . 43)
-    (=zinbun-oracle	. 00922)	; &ZOB-0922;
+    (=>zinbun-oracle	. 00922)	; &A-ZOB-0922;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x7236)	; 父
@@ -11136,7 +11677,18 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00922)	; &ZOB-0922;
+     ((=>zinbun-oracle	  . 00922)	; &A-ZOB-0922;
+      ))
+    (shuowen-radical	. 76)	; 又
+    (sources		zob1968=1254 zob1968=1265 zob1968=1266 zob1968=1340
+			zob1968=1547 zob1968=1548 zob1968=1549 zob1968=1815
+			zob1968=3254)
+    (zinbun-oracle-page . 43)
+    (=zinbun-oracle	. 00922)	; &ZOB-0922;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00922)	; &A-ZOB-0922;
       ))
     (shuowen-radical	. 76)	; 又
     (sources		zob1968=2283 zob1968=2284 zob1968=2285
@@ -11162,7 +11714,7 @@
 (define-char
   '((shuowen-radical	. 76)	; 又
     (zinbun-oracle-page . 43)
-    (=zinbun-oracle	. 00925)	; &ZOB-0925;
+    (=>zinbun-oracle	. 00925)	; &A-ZOB-0925;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x7236)	; 父
@@ -11173,7 +11725,15 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00925)	; &ZOB-0925;
+     ((=>zinbun-oracle	  . 00925)	; &A-ZOB-0925;
+      ))
+    (shuowen-radical	. 76)	; 又
+    (zinbun-oracle-page . 43)
+    (=zinbun-oracle	. 00925)	; &ZOB-0925;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00925)	; &A-ZOB-0925;
       ))
     (shuowen-radical	. 76)	; 又
     (sources		zob1968=1816 zob1968=1902)
@@ -11182,9 +11742,8 @@
     ))
 (define-char
   '((shuowen-radical	. 76)	; 又
-    (sources		zob1968=1807 zob1968=1808 zob1968=1810 zob1968=1811)
     (zinbun-oracle-page . 43)
-    (=zinbun-oracle	. 00927)	; &ZOB-0927;
+    (=>zinbun-oracle	. 00927)	; &A-ZOB-0927;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x7236)	; 父
@@ -11195,7 +11754,16 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00927)	; &ZOB-0927;
+     ((=>zinbun-oracle	  . 00927)	; &A-ZOB-0927;
+      ))
+    (shuowen-radical	. 76)	; 又
+    (sources		zob1968=1807 zob1968=1808 zob1968=1810 zob1968=1811)
+    (zinbun-oracle-page . 43)
+    (=zinbun-oracle	. 00927)	; &ZOB-0927;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00927)	; &A-ZOB-0927;
       ))
     (shuowen-radical	. 76)	; 又
     (sources		zob1968=1809)
@@ -11219,7 +11787,7 @@
 (define-char
   '((shuowen-radical	. 76)	; 又
     (zinbun-oracle-page . 43)
-    (=zinbun-oracle	. 00930)	; &ZOB-0930;
+    (=>zinbun-oracle	. 00930)	; &A-ZOB-0930;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x7236)	; 父
@@ -11230,7 +11798,15 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00930)	; &ZOB-0930;
+     ((=>zinbun-oracle	  . 00930)	; &A-ZOB-0930;
+      ))
+    (shuowen-radical	. 76)	; 又
+    (zinbun-oracle-page . 43)
+    (=zinbun-oracle	. 00930)	; &ZOB-0930;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00930)	; &A-ZOB-0930;
       ))
     (shuowen-radical	. 76)	; 又
     (sources		zob1968=3014)
@@ -11437,16 +12013,8 @@
     ))
 (define-char
   '((shuowen-radical	. 76)	; 又
-    (sources		zob1968=1251 zob1968=1258 zob1968=1275-1279
-			zob1968=1281 zob1968=1283 zob1968=1284 zob1968=1285
-			zob1968=1288 zob1968=1563 zob1968=1571 zob1968=1578
-			zob1968=1592 zob1968=1945 zob1968=2585 zob1968=2596
-			zob1968=2602 zob1968=2616-2620 zob1968=2622-2629
-			zob1968=2631 zob1968=2632 zob1968=2634 zob1968=2654
-			zob1968=2658-2664 zob1968=2667 zob1968=2672
-			zob1968=2683 zob1968=3254)
     (zinbun-oracle-page . 44)
-    (=zinbun-oracle	. 00952)	; &ZOB-0952;
+    (=>zinbun-oracle	. 00952)	; &A-ZOB-0952;
     (<-Oracle-Bones
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -11460,7 +12028,23 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00952)	; &ZOB-0952;
+     ((=>zinbun-oracle	  . 00952)	; &A-ZOB-0952;
+      ))
+    (shuowen-radical	. 76)	; 又
+    (sources		zob1968=1251 zob1968=1258 zob1968=1275-1279
+			zob1968=1281 zob1968=1283 zob1968=1284 zob1968=1285
+			zob1968=1288 zob1968=1563 zob1968=1571 zob1968=1578
+			zob1968=1592 zob1968=1945 zob1968=2585 zob1968=2596
+			zob1968=2602 zob1968=2616-2620 zob1968=2622-2629
+			zob1968=2631 zob1968=2632 zob1968=2634 zob1968=2654
+			zob1968=2658-2664 zob1968=2667 zob1968=2672
+			zob1968=2683 zob1968=3254)
+    (zinbun-oracle-page . 44)
+    (=zinbun-oracle	. 00952)	; &ZOB-0952;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00952)	; &A-ZOB-0952;
       ))
     (shuowen-radical	. 76)	; 又
     (sources		zob1968=1269)
@@ -11469,7 +12053,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00952)	; &ZOB-0952;
+     ((=>zinbun-oracle	  . 00952)	; &A-ZOB-0952;
       ))
     (shuowen-radical	. 76)	; 又
     (sources		zob1968=1943)
@@ -11495,11 +12079,8 @@
     ))
 (define-char
   '((shuowen-radical	. 76)	; 又
-    (sources		zob1968=1899 zob1968=1927 zob1968=1933 zob1968=1958
-			zob1968=1972-1977 zob1968=2128 zob1968=2218
-			zob1968=2219 zob1968=2945)
     (zinbun-oracle-page . 44)
-    (=zinbun-oracle	. 00958)	; &ZOB-0958;
+    (=>zinbun-oracle	. 00958)	; &A-ZOB-0958;
     (<-Oracle-Bones
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -11513,7 +12094,18 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 00958)	; &ZOB-0958;
+     ((=>zinbun-oracle	  . 00958)	; &A-ZOB-0958;
+      ))
+    (shuowen-radical	. 76)	; 又
+    (sources		zob1968=1899 zob1968=1927 zob1968=1933 zob1968=1958
+			zob1968=1972-1977 zob1968=2128 zob1968=2218
+			zob1968=2219 zob1968=2945)
+    (zinbun-oracle-page . 44)
+    (=zinbun-oracle	. 00958)	; &ZOB-0958;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00958)	; &A-ZOB-0958;
       ))
     (shuowen-radical	. 76)	; 又
     (sources		zob1968=1790 zob1968=1811)
@@ -11871,7 +12463,18 @@
     (=zinbun-oracle	. 01018)	; &ZOB-1018;
     ))
 (define-char
-  '((shuowen-radical	. 77)	; 𠂇
+  '((=>zinbun-oracle	. 01019)	; &A-ZOB-1019;
+    (<-Oracle-Bones
+     ((=ucs		  . #x20087)	; 𠂇
+      )
+     ((=ucs		  . #x5DE6)	; å·¦
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01019)	; &A-ZOB-1019;
+      ))
+    (shuowen-radical	. 77)	; 𠂇
     (zinbun-oracle-page . 47)
     (=zinbun-oracle	. 01019)	; &ZOB-1019;
     (<-Oracle-Bones
@@ -11886,19 +12489,27 @@
     ))
 (define-char
   '((shuowen-radical	. 78)	; 㕜
+    (zinbun-oracle-page . 47)
+    (=>zinbun-oracle	. 01021)	; &A-ZOB-1021;
+    (<-Oracle-Bones
+     ((=ucs		  . #x53F2)	; 史
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01021)	; &A-ZOB-1021;
+      ))
+    (shuowen-radical	. 78)	; 㕜
     (sources		zob1968=0174 zob1968=0213-0221 zob1968=0373
 			zob1968=0562 zob1968=0563 zob1968=0621 zob1968=1158
 			zob1968=1271 zob1968=1272 zob1968=1738 zob1968=1784
 			zob1968=1801 zob1968=2529 zob1968=3124)
     (zinbun-oracle-page . 47)
     (=zinbun-oracle	. 01021)	; &ZOB-1021;
-    (<-Oracle-Bones
-     ((=ucs		  . #x53F2)	; 史
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01021)	; &ZOB-1021;
+     ((=>zinbun-oracle	  . 01021)	; &A-ZOB-1021;
       ))
     (shuowen-radical	. 78)	; 㕜
     (sources		zob1968=3016)
@@ -11987,16 +12598,24 @@
     ))
 (define-char
   '((shuowen-radical	. 85)	; 臣
-    (sources		zob1968=0155 zob1968=0283 zob1968=0967)
     (zinbun-oracle-page . 48)
-    (=zinbun-oracle	. 01036)	; &ZOB-1036;
+    (=>zinbun-oracle	. 01036)	; &A-ZOB-1036;
     (<-Oracle-Bones
      ((=ucs		  . #x81E3)	; 臣
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01036)	; &ZOB-1036;
+     ((=>zinbun-oracle	  . 01036)	; &A-ZOB-1036;
+      ))
+    (shuowen-radical	. 85)	; 臣
+    (sources		zob1968=0155 zob1968=0283 zob1968=0967)
+    (zinbun-oracle-page . 48)
+    (=zinbun-oracle	. 01036)	; &ZOB-1036;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01036)	; &A-ZOB-1036;
       ))
     (shuowen-radical	. 85)	; 臣
     (sources		zob1968=1940)
@@ -12632,14 +13251,22 @@
 (define-char
   '((shuowen-radical	. 93)	; 敎
     (zinbun-oracle-page . 52)
-    (=zinbun-oracle	. 01126)	; &ZOB-1126;
+    (=>zinbun-oracle	. 01126)	; &A-ZOB-1126;
     (<-Oracle-Bones
      ((=ucs		  . #x5B78)	; å­¸
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01126)	; &ZOB-1126;
+     ((=>zinbun-oracle	  . 01126)	; &A-ZOB-1126;
+      ))
+    (shuowen-radical	. 93)	; 敎
+    (zinbun-oracle-page . 52)
+    (=zinbun-oracle	. 01126)	; &ZOB-1126;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01126)	; &A-ZOB-1126;
       ))
     (shuowen-radical	. 93)	; 敎
     (sources		zob1968=0060 zob1968=2374 zob1968=3250)
@@ -12684,7 +13311,7 @@
 (define-char
   '((shuowen-radical	. 94)	; 卜
     (zinbun-oracle-page . 52)
-    (=zinbun-oracle	. 01131)	; &ZOB-1131;
+    (=>zinbun-oracle	. 01131)	; &A-ZOB-1131;
     (<-Oracle-Bones
      ((=ucs		  . #x9F0E)	; 鼎
       )
@@ -12693,7 +13320,15 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01131)	; &ZOB-1131;
+     ((=>zinbun-oracle	  . 01131)	; &A-ZOB-1131;
+      ))
+    (shuowen-radical	. 94)	; 卜
+    (zinbun-oracle-page . 52)
+    (=zinbun-oracle	. 01131)	; &ZOB-1131;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01131)	; &A-ZOB-1131;
       ))
     (shuowen-radical	. 94)	; 卜
     (sources		zob1968=1226 zob1968=1267 zob1968=1270 zob1968=1278
@@ -12709,7 +13344,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01131)	; &ZOB-1131;
+     ((=>zinbun-oracle	  . 01131)	; &A-ZOB-1131;
       ))
     (shuowen-radical	. 94)	; 卜
     (sources		zob1968=1514)
@@ -12718,7 +13353,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01131)	; &ZOB-1131;
+     ((=>zinbun-oracle	  . 01131)	; &A-ZOB-1131;
       ))
     (shuowen-radical	. 94)	; 卜
     (sources		zob1968=1579)
@@ -12727,7 +13362,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01131)	; &ZOB-1131;
+     ((=>zinbun-oracle	  . 01131)	; &A-ZOB-1131;
       ))
     (shuowen-radical	. 94)	; 卜
     (sources		zob1968=1853)
@@ -12736,7 +13371,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01131)	; &ZOB-1131;
+     ((=>zinbun-oracle	  . 01131)	; &A-ZOB-1131;
       ))
     (shuowen-radical	. 94)	; 卜
     (sources		zob1968=2270 zob1968=2292)
@@ -12745,7 +13380,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01131)	; &ZOB-1131;
+     ((=>zinbun-oracle	  . 01131)	; &A-ZOB-1131;
       ))
     (shuowen-radical	. 94)	; 卜
     (sources		zob1968=2266 zob1968=2330 zob1968=2359 zob1968=2361
@@ -12759,7 +13394,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01131)	; &ZOB-1131;
+     ((=>zinbun-oracle	  . 01131)	; &A-ZOB-1131;
       ))
     (shuowen-radical	. 94)	; 卜
     (sources		zob1968=2329 zob1968=2482 zob1968=3241 zob1968=3246)
@@ -12768,7 +13403,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01131)	; &ZOB-1131;
+     ((=>zinbun-oracle	  . 01131)	; &A-ZOB-1131;
       ))
     (shuowen-radical	. 94)	; 卜
     (sources		zob1968=2481)
@@ -12777,7 +13412,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01131)	; &ZOB-1131;
+     ((=>zinbun-oracle	  . 01131)	; &A-ZOB-1131;
       ))
     (shuowen-radical	. 94)	; 卜
     (sources		zob1968=3105)
@@ -12821,6 +13456,16 @@
     ))
 (define-char
   '((shuowen-radical	. 95)	; 用
+    (=>zinbun-oracle	. 01147)	; &A-ZOB-1147;
+    (<-Oracle-Bones
+     ((=ucs		  . #x7528)	; 用
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01147)	; &A-ZOB-1147;
+      ))
+    (shuowen-radical	. 95)	; 用
     (sources		zob1968=0019 zob1968=0075 zob1968=0076 zob1968=0077
 			zob1968=0083 zob1968=0094 zob1968=0208 zob1968=0290
 			zob1968=0400 zob1968=0425 zob1968=0588 zob1968=0633
@@ -12847,13 +13492,10 @@
 			zob1968=3097)
     (zinbun-oracle-page . 52)
     (=zinbun-oracle	. 01147)	; &ZOB-1147;
-    (<-Oracle-Bones
-     ((=ucs		  . #x7528)	; 用
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01147)	; &ZOB-1147;
+     ((=>zinbun-oracle	  . 01147)	; &A-ZOB-1147;
       ))
     (shuowen-radical	. 95)	; 用
     (sources		zob1968=2615 zob1968=2702)
@@ -13061,19 +13703,27 @@
     ))
 (define-char
   '((shuowen-radical	. 101)	; 眉
+    (zinbun-oracle-page . 55)
+    (=>zinbun-oracle	. 01176)	; &A-ZOB-1176;
+    (<-Oracle-Bones
+     ((=ucs		  . #x7701)	; 省
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01176)	; &A-ZOB-1176;
+      ))
+    (shuowen-radical	. 101)	; 眉
     (sources		zob1968=0277 zob1968=0871 zob1968=1996 zob1968=2003
 			zob1968=2046 zob1968=2050 zob1968=2054 zob1968=2057
 			zob1968=2060 zob1968=2072-2075 zob1968=2080
 			zob1968=2081 zob1968=2084 zob1968=2094 zob1968=2105)
     (zinbun-oracle-page . 55)
     (=zinbun-oracle	. 01176)	; &ZOB-1176;
-    (<-Oracle-Bones
-     ((=ucs		  . #x7701)	; 省
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01176)	; &ZOB-1176;
+     ((=>zinbun-oracle	  . 01176)	; &A-ZOB-1176;
       ))
     (shuowen-radical	. 101)	; 眉
     (sources		zob1968=3245)
@@ -13097,6 +13747,17 @@
     ))
 (define-char
   '((shuowen-radical	. 103)	; 自
+    (zinbun-oracle-page . 55)
+    (=>zinbun-oracle	. 01179)	; &A-ZOB-1179;
+    (<-Oracle-Bones
+     ((=ucs		  . #x81EA)	; 自
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01179)	; &A-ZOB-1179;
+      ))
+    (shuowen-radical	. 103)	; 自
     (sources		zob1968=0008-0011 zob1968=0083 zob1968=0090
 			zob1968=0119 zob1968=0235 zob1968=0276 zob1968=0347
 			zob1968=0425 zob1968=0544 zob1968=0558 zob1968=0600
@@ -13110,13 +13771,10 @@
 			zob1968=3099)
     (zinbun-oracle-page . 55)
     (=zinbun-oracle	. 01179)	; &ZOB-1179;
-    (<-Oracle-Bones
-     ((=ucs		  . #x81EA)	; 自
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01179)	; &ZOB-1179;
+     ((=>zinbun-oracle	  . 01179)	; &A-ZOB-1179;
       ))
     (shuowen-radical	. 103)	; 自
     (sources		zob1968=1803 zob1968=1811 zob1968=1830 zob1968=1910
@@ -13126,7 +13784,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01179)	; &ZOB-1179;
+     ((=>zinbun-oracle	  . 01179)	; &A-ZOB-1179;
       ))
     (shuowen-radical	. 103)	; 自
     (sources		zob1968=0765 zob1968=2292 zob1968=2614 zob1968=3000
@@ -13287,6 +13945,16 @@
     ))
 (define-char
   '((shuowen-radical	. 108)	; ç¾½
+    (=>zinbun-oracle	. 01198)	; &A-ZOB-1198;
+    (<-Oracle-Bones
+     ((=ucs		  . #x7FCC)	; 翌
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01198)	; &A-ZOB-1198;
+      ))
+    (shuowen-radical	. 108)	; ç¾½
     (sources		zob1968=0016 zob1968=0049 zob1968=0053 zob1968=0073
 			zob1968=0078 zob1968=0079 zob1968=0081 zob1968=0085
 			zob1968=0086 zob1968=0101 zob1968=0133 zob1968=0144
@@ -13310,13 +13978,10 @@
 			zob1968=2982 zob1968=2983 zob1968=3115 zob1968=3250)
     (zinbun-oracle-page . 55)
     (=zinbun-oracle	. 01198)	; &ZOB-1198;
-    (<-Oracle-Bones
-     ((=ucs		  . #x7FCC)	; 翌
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01198)	; &ZOB-1198;
+     ((=>zinbun-oracle	  . 01198)	; &A-ZOB-1198;
       ))
     (shuowen-radical	. 108)	; ç¾½
     (sources		zob1968=1774 zob1968=1808 zob1968=1863 zob1968=2951)
@@ -13325,10 +13990,8 @@
     ))
 (define-char
   '((shuowen-radical	. 108)	; ç¾½
-    (sources		zob1968=1681 zob1968=1818 zob1968=2024 zob1968=2040
-			zob1968=2284 zob1968=2398 zob1968=2617 zob1968=2683)
     (zinbun-oracle-page . 56)
-    (=zinbun-oracle	. 01200)	; &ZOB-1200;
+    (=>zinbun-oracle	. 01200)	; &A-ZOB-1200;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x7FCC)	; 翌
@@ -13339,7 +14002,17 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01200)	; &ZOB-1200;
+     ((=>zinbun-oracle	  . 01200)	; &A-ZOB-1200;
+      ))
+    (shuowen-radical	. 108)	; ç¾½
+    (sources		zob1968=1681 zob1968=1818 zob1968=2024 zob1968=2040
+			zob1968=2284 zob1968=2398 zob1968=2617 zob1968=2683)
+    (zinbun-oracle-page . 56)
+    (=zinbun-oracle	. 01200)	; &ZOB-1200;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01200)	; &A-ZOB-1200;
       ))
     (shuowen-radical	. 108)	; ç¾½
     (sources		zob1968=2001 zob1968=2008 zob1968=2009 zob1968=2011
@@ -13416,6 +14089,17 @@
     ))
 (define-char
   '((shuowen-radical	. 109)	; 隹
+    (zinbun-oracle-page . 56)
+    (=>zinbun-oracle	. 01205)	; &A-ZOB-1205;
+    (<-Oracle-Bones
+     ((=ucs		  . #x96BB)	; 隻
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01205)	; &A-ZOB-1205;
+      ))
+    (shuowen-radical	. 109)	; 隹
     (sources		zob1968=0043 zob1968=0259 zob1968=0264 zob1968=0274
 			zob1968=0279 zob1968=0282 zob1968=0283
 			zob1968=0294-0298 zob1968=0302 zob1968=0345
@@ -13426,13 +14110,10 @@
 			zob1968=3250)
     (zinbun-oracle-page . 56)
     (=zinbun-oracle	. 01205)	; &ZOB-1205;
-    (<-Oracle-Bones
-     ((=ucs		  . #x96BB)	; 隻
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01205)	; &ZOB-1205;
+     ((=>zinbun-oracle	  . 01205)	; &A-ZOB-1205;
       ))
     (shuowen-radical	. 109)	; 隹
     (sources		zob1968=0299)
@@ -13825,6 +14506,17 @@
     ))
 (define-char
   '((shuowen-radical	. 114)	; 羊
+    (zinbun-oracle-page . 58)
+    (=>zinbun-oracle	. 01252)	; &A-ZOB-1252;
+    (<-Oracle-Bones
+     ((=ucs		  . #x7F8C)	; 羌
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01252)	; &A-ZOB-1252;
+      ))
+    (shuowen-radical	. 114)	; 羊
     (sources		zob1968=0044 zob1968=0049 zob1968=0077 zob1968=0082
 			zob1968=0090 zob1968=0337 zob1968=0366 zob1968=0367
 			zob1968=0368 zob1968=0371 zob1968=0395 zob1968=0451
@@ -13835,13 +14527,10 @@
 			zob1968=3248)
     (zinbun-oracle-page . 58)
     (=zinbun-oracle	. 01252)	; &ZOB-1252;
-    (<-Oracle-Bones
-     ((=ucs		  . #x7F8C)	; 羌
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01252)	; &ZOB-1252;
+     ((=>zinbun-oracle	  . 01252)	; &A-ZOB-1252;
       ))
     (shuowen-radical	. 114)	; 羊
     (sources		zob1968=1799 zob1968=1888 zob1968=1889 zob1968=1891
@@ -13851,7 +14540,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01252)	; &ZOB-1252;
+     ((=>zinbun-oracle	  . 01252)	; &A-ZOB-1252;
       ))
     (shuowen-radical	. 114)	; 羊
     (sources		zob1968=2265 zob1968=2277 zob1968=2279 zob1968=2313
@@ -13874,9 +14563,8 @@
     ))
 (define-char
   '((shuowen-radical	. 114)	; 羊
-    (sources		zob1968=1818 zob1968=2742)
     (zinbun-oracle-page . 58)
-    (=zinbun-oracle	. 01256)	; &ZOB-1256;
+    (=>zinbun-oracle	. 01256)	; &A-ZOB-1256;
     (<-Oracle-Bones
      ((ideographic-combination
        ((=ucs		    . #x7F8C)	; 羌
@@ -13887,7 +14575,16 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01256)	; &ZOB-1256;
+     ((=>zinbun-oracle	  . 01256)	; &A-ZOB-1256;
+      ))
+    (shuowen-radical	. 114)	; 羊
+    (sources		zob1968=1818 zob1968=2742)
+    (zinbun-oracle-page . 58)
+    (=zinbun-oracle	. 01256)	; &ZOB-1256;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01256)	; &A-ZOB-1256;
       ))
     (shuowen-radical	. 114)	; 羊
     (sources		zob1968=0022 zob1968=0023 zob1968=0024)
@@ -15191,7 +15888,18 @@
       ))
     ))
 (define-char
-  '((shuowen-radical	. 145)	; 丌
+  '((=>zinbun-oracle	. 01395)	; &A-ZOB-1395;
+    (<-Oracle-Bones
+     ((=ucs		  . #x5960)	; 奠
+      )
+     ((=ucs		  . #x912D)	; 鄭
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01395)	; &A-ZOB-1395;
+      ))
+    (shuowen-radical	. 145)	; 丌
     (sources		zob1968=0387 zob1968=0424 zob1968=0766 zob1968=1468
 			zob1968=2307 zob1968=2512 zob1968=2522 zob1968=2535)
     (zinbun-oracle-page . 66)
@@ -15206,27 +15914,36 @@
     (=zinbun-oracle	. 01396)	; &ZOB-1396;
     ))
 (define-char
-  '((shuowen-radical	. 146)	; å·¦
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01019)	; &A-ZOB-1019;
+      ))
+    (shuowen-radical	. 146)	; å·¦
     (zinbun-oracle-page . 66)
     (=zinbun-oracle	. 01397)	; &ZOB-1397;
     (<-Oracle-Bones
-     ((=ucs		  . #x20087)	; 𠂇
-      )
      ((=ucs		  . #x5DE6)	; å·¦
       ))
     ))
 (define-char
   '((shuowen-radical	. 147)	; å·¥
-    (sources		zob1968=0060)
     (zinbun-oracle-page . 66)
-    (=zinbun-oracle	. 01398)	; &ZOB-1398;
+    (=>zinbun-oracle	. 01398)	; &A-ZOB-1398;
     (<-Oracle-Bones
      ((=ucs		  . #x5DE5)	; å·¥
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01398)	; &ZOB-1398;
+     ((=>zinbun-oracle	  . 01398)	; &A-ZOB-1398;
+      ))
+    (shuowen-radical	. 147)	; å·¥
+    (sources		zob1968=0060)
+    (zinbun-oracle-page . 66)
+    (=zinbun-oracle	. 01398)	; &ZOB-1398;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01398)	; &A-ZOB-1398;
       ))
     (shuowen-radical	. 147)	; å·¥
     (sources		zob1968=1633 zob1968=3246)
@@ -15372,12 +16089,13 @@
       ))
     ))
 (define-char
-  '((shuowen-radical	. 152)	; 乃
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00644)	; &A-ZOB-0644;
+      ))
+    (shuowen-radical	. 152)	; 乃
     (zinbun-oracle-page . 67)
     (=zinbun-oracle	. 01416)	; &ZOB-1416;
     (<-Oracle-Bones
-     ((=ucs		  . #x5363)	; 卣
-      )
      ((=ucs		  . #x209EA)	; 𠧪
       ))
     ))
@@ -15390,10 +16108,21 @@
       ))
     ))
 (define-char
-  '((shuowen-radical	. 153)	; 丂
-    (sources		zob1968=2370 zob1968=2868 zob1968=2914)
-    (zinbun-oracle-page . 67)
-    (=zinbun-oracle	. 01418)	; &ZOB-1418;
+  '((=>zinbun-oracle	. 01418)	; &A-ZOB-1418;
+    (<-Oracle-Bones
+     ((=ucs		  . #x5BE7)	; 寧
+      )
+     ((=ucs		  . #x5BCD)	; 寍
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01418)	; &A-ZOB-1418;
+      ))
+    (shuowen-radical	. 153)	; 丂
+    (sources		zob1968=2370 zob1968=2868 zob1968=2914)
+    (zinbun-oracle-page . 67)
+    (=zinbun-oracle	. 01418)	; &ZOB-1418;
     (<-Oracle-Bones
      ((=ucs		  . #x5BE7)	; 寧
       ))
@@ -15409,14 +16138,22 @@
 (define-char
   '((shuowen-radical	. 155)	; 兮
     (zinbun-oracle-page . 67)
-    (=zinbun-oracle	. 01420)	; &ZOB-1420;
+    (=>zinbun-oracle	. 01420)	; &A-ZOB-1420;
     (<-Oracle-Bones
      ((=ucs		  . #x516E)	; 兮
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01420)	; &ZOB-1420;
+     ((=>zinbun-oracle	  . 01420)	; &A-ZOB-1420;
+      ))
+    (shuowen-radical	. 155)	; 兮
+    (zinbun-oracle-page . 67)
+    (=zinbun-oracle	. 01420)	; &ZOB-1420;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01420)	; &A-ZOB-1420;
       ))
     (shuowen-radical	. 155)	; 兮
     (sources		zob1968=2368)
@@ -15464,16 +16201,24 @@
     ))
 (define-char
   '((shuowen-radical	. 157)	; 亏
-    (sources		zob1968=0106)
     (zinbun-oracle-page . 67)
-    (=zinbun-oracle	. 01425)	; &ZOB-1425;
+    (=>zinbun-oracle	. 01425)	; &A-ZOB-1425;
     (<-Oracle-Bones
      ((=ucs		  . #x4E8E)	; 于
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01425)	; &ZOB-1425;
+     ((=>zinbun-oracle	  . 01425)	; &A-ZOB-1425;
+      ))
+    (shuowen-radical	. 157)	; 亏
+    (sources		zob1968=0106)
+    (zinbun-oracle-page . 67)
+    (=zinbun-oracle	. 01425)	; &ZOB-1425;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01425)	; &A-ZOB-1425;
       ))
     (shuowen-radical	. 157)	; 亏
     (sources		zob1968=3242)
@@ -15494,7 +16239,18 @@
     (=zinbun-oracle	. 01428)	; &ZOB-1428;
     ))
 (define-char
-  '((shuowen-radical	. 159)	; 喜
+  '((=>zinbun-oracle	. 01429)	; &A-ZOB-1429;
+    (<-Oracle-Bones
+     ((=ucs		  . #x559C)	; 喜
+      )
+     ((=ucs		  . #x994E)	; 饎
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01429)	; &A-ZOB-1429;
+      ))
+    (shuowen-radical	. 159)	; 喜
     (sources		zob1968=0404 zob1968=1098 zob1968=1299 zob1968=1311
 			zob1968=1430 zob1968=1431 zob1968=1560 zob1968=1563
 			zob1968=1572)
@@ -15586,7 +16342,18 @@
       ))
     ))
 (define-char
-  '((shuowen-radical	. 165)	; 豐
+  '((=>zinbun-oracle	. 01441)	; &A-ZOB-1441;
+    (<-Oracle-Bones
+     ((=ucs		  . #x8C50)	; 豐
+      )
+     ((=ucs		  . #x9146)	; 酆
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01441)	; &A-ZOB-1441;
+      ))
+    (shuowen-radical	. 165)	; 豐
     (sources		zob1968=0870 zob1968=1879 zob1968=1881 zob1968=1882
 			zob1968=2315 zob1968=3039)
     (zinbun-oracle-page . 68)
@@ -16154,7 +16921,18 @@
       ))
     ))
 (define-char
-  '((shuowen-radical	. 177)	; 井
+  '((=>zinbun-oracle	. 01511)	; &A-ZOB-1511;
+    (<-Oracle-Bones
+     ((=ucs		  . #x4E95)	; 井
+      )
+     ((=ucs		  . #x28677)	; 𨙷
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01511)	; &A-ZOB-1511;
+      ))
+    (shuowen-radical	. 177)	; 井
     (sources		zob1968=0278 zob1968=0460)
     (zinbun-oracle-page . 71)
     (=zinbun-oracle	. 01511)	; &ZOB-1511;
@@ -16215,17 +16993,25 @@
     ))
 (define-char
   '((shuowen-radical	. 178)	; 皀
-    (sources		zob1968=1943 zob1968=1945 zob1968=2268 zob1968=2285
-			zob1968=2305 zob1968=2307 zob1968=3074 zob1968=3077)
     (zinbun-oracle-page . 72)
-    (=zinbun-oracle	. 01518)	; &ZOB-1518;
+    (=>zinbun-oracle	. 01518)	; &A-ZOB-1518;
     (<-Oracle-Bones
      ((=ucs		  . #x537D)	; 卽
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01518)	; &ZOB-1518;
+     ((=>zinbun-oracle	  . 01518)	; &A-ZOB-1518;
+      ))
+    (shuowen-radical	. 178)	; 皀
+    (sources		zob1968=1943 zob1968=1945 zob1968=2268 zob1968=2285
+			zob1968=2305 zob1968=2307 zob1968=3074 zob1968=3077)
+    (zinbun-oracle-page . 72)
+    (=zinbun-oracle	. 01518)	; &ZOB-1518;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01518)	; &A-ZOB-1518;
       ))
     (shuowen-radical	. 178)	; 皀
     (sources		zob1968=1549 zob1968=1557 zob1968=1561 zob1968=1578
@@ -16315,12 +17101,13 @@
       ))
     ))
 (define-char
-  '((shuowen-radical	. 180)	; 食
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01429)	; &A-ZOB-1429;
+      ))
+    (shuowen-radical	. 180)	; 食
     (zinbun-oracle-page . 72)
     (=zinbun-oracle	. 01530)	; &ZOB-1530;
     (<-Oracle-Bones
-     ((=ucs		  . #x559C)	; 喜
-      )
      ((=ucs		  . #x994E)	; 饎
       ))
     ))
@@ -16333,13 +17120,24 @@
       ))
     ))
 (define-char
-  '((shuowen-radical	. 180)	; 食
-    (zinbun-oracle-page . 72)
-    (=zinbun-oracle	. 01532)	; &ZOB-1532;
+  '((=>zinbun-oracle	. 01532)	; &A-ZOB-1532;
     (<-Oracle-Bones
      ((=ucs		  . #x537F)	; 卿
       )
      ((=ucs		  . #x9957)	; 饗
+      )
+     ((=ucs		  . #x90F7)	; 郷
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01532)	; &A-ZOB-1532;
+      ))
+    (shuowen-radical	. 180)	; 食
+    (zinbun-oracle-page . 72)
+    (=zinbun-oracle	. 01532)	; &ZOB-1532;
+    (<-Oracle-Bones
+     ((=ucs		  . #x9957)	; 饗
       ))
     ))
 (define-char
@@ -17154,7 +17952,18 @@
     (=zinbun-oracle	. 01626)	; &ZOB-1626;
     ))
 (define-char
-  '((shuowen-radical	. 194)	; 㐭
+  '((=>zinbun-oracle	. 01627)	; &A-ZOB-1627;
+    (<-Oracle-Bones
+     ((=ucs		  . #x555A)	; 啚
+      )
+     ((=ucs		  . #x9119)	; 鄙
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01627)	; &A-ZOB-1627;
+      ))
+    (shuowen-radical	. 194)	; 㐭
     (sources		zob1968=0559 zob1968=0632)
     (zinbun-oracle-page . 77)
     (=zinbun-oracle	. 01627)	; &ZOB-1627;
@@ -17330,7 +18139,18 @@
     (=zinbun-oracle	. 01647)	; &ZOB-1647;
     ))
 (define-char
-  '((shuowen-radical	. 199)	; 舛
+  '((=>zinbun-oracle	. 01648)	; &A-ZOB-1648;
+    (<-Oracle-Bones
+     ((=ucs		  . #x821E)	; 舞
+      )
+     ((=ucs		  . #x7121)	; 無
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01648)	; &A-ZOB-1648;
+      ))
+    (shuowen-radical	. 199)	; 舛
     (sources		zob1968=0121 zob1968=1356 zob1968=1853 zob1968=1954
 			zob1968=1955 zob1968=2260 zob1968=3078 zob1968=3084
 			zob1968=3085 zob1968=3098 zob1968=3158)
@@ -17501,12 +18321,13 @@
       ))
     ))
 (define-char
-  '((shuowen-radical	. 206)	; 木
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00353)	; &A-ZOB-0353;
+      ))
+    (shuowen-radical	. 206)	; 木
     (zinbun-oracle-page . 79)
     (=zinbun-oracle	. 01667)	; &ZOB-1667;
     (<-Oracle-Bones
-     ((=ucs		  . #x5404)	; 各
-      )
      ((=ucs		  . #x683C)	; æ ¼
       ))
     ))
@@ -17921,9 +18742,11 @@
      ((ideographic-combination
        ((=ucs		    . #x6771)	; 東
 	)
-       ((=jis-x0208	    . #x4B4C)	; &GT-03302; [43-44]
+       ((=ucs@unicode	    . #x5317)	; &GT-03302;
+	(=jis-x0208	    . #x4B4C)	; &GT-03302; [43-44]
 	(=gb2312	    . #x3131)	; &I-G0-3131; [17-17]
 	(=ks-x1001	    . #x5D41)	; &I-K0-5D41; [61-33]
+	(=jis-x0213-1	    . #x4B4C)	; &I-JX1-4B4C; [43-44]
 	(=daikanwa	    . 02574)	; &I-M-02574;
 	)
        ((=ucs		    . #x4EBA)	; 人
@@ -18043,12 +18866,13 @@
     (=zinbun-oracle	. 01732)	; &ZOB-1732;
     ))
 (define-char
-  '((shuowen-radical	. 208)	; 林
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01648)	; &A-ZOB-1648;
+      ))
+    (shuowen-radical	. 208)	; 林
     (zinbun-oracle-page . 82)
     (=zinbun-oracle	. 01733)	; &ZOB-1733;
     (<-Oracle-Bones
-     ((=ucs		  . #x821E)	; 舞
-      )
      ((=ucs		  . #x7121)	; 無
       ))
     ))
@@ -18315,6 +19139,13 @@
     ))
 (define-char
   '((shuowen-radical	. 211)	; 之
+    (=>zinbun-oracle	. 01765)	; &A-ZOB-1765;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01765)	; &A-ZOB-1765;
+      ))
+    (shuowen-radical	. 211)	; 之
     (sources		zob1968=0001 zob1968=0006 zob1968=0011 zob1968=0016
 			zob1968=0017 zob1968=0019 zob1968=0027
 			zob1968=0032-0035 zob1968=0038 zob1968=0039
@@ -18353,7 +19184,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01765)	; &ZOB-1765;
+     ((=>zinbun-oracle	  . 01765)	; &A-ZOB-1765;
       ))
     (shuowen-radical	. 211)	; 之
     (sources		zob1968=3010 zob1968=3012 zob1968=3014 zob1968=3016
@@ -18365,7 +19196,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01765)	; &ZOB-1765;
+     ((=>zinbun-oracle	  . 01765)	; &A-ZOB-1765;
       ))
     (shuowen-radical	. 211)	; 之
     (sources		zob1968=3247)
@@ -18914,6 +19745,17 @@
     ))
 (define-char
   '((shuowen-radical	. 228)	; 貝
+    (zinbun-oracle-page . 87)
+    (=>zinbun-oracle	. 01830)	; &A-ZOB-1830;
+    (<-Oracle-Bones
+     ((=ucs		  . #x8CD3)	; 賓
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01830)	; &A-ZOB-1830;
+      ))
+    (shuowen-radical	. 228)	; 貝
     (sources		zob1968=0001 zob1968=0003 zob1968=0053 zob1968=0077
 			zob1968=0079 zob1968=0083 zob1968=0085 zob1968=0089
 			zob1968=0090 zob1968=0127 zob1968=0133 zob1968=0143
@@ -18932,13 +19774,10 @@
 			zob1968=1150)
     (zinbun-oracle-page . 87)
     (=zinbun-oracle	. 01830)	; &ZOB-1830;
-    (<-Oracle-Bones
-     ((=ucs		  . #x8CD3)	; 賓
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01830)	; &ZOB-1830;
+     ((=>zinbun-oracle	  . 01830)	; &A-ZOB-1830;
       ))
     (shuowen-radical	. 228)	; 貝
     (sources		zob1968=0711)
@@ -18947,7 +19786,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01830)	; &ZOB-1830;
+     ((=>zinbun-oracle	  . 01830)	; &A-ZOB-1830;
       ))
     (shuowen-radical	. 228)	; 貝
     (sources		zob1968=1251 zob1968=1252 zob1968=1258 zob1968=1262
@@ -19080,42 +19919,46 @@
     (=zinbun-oracle	. 01847)	; &ZOB-1847;
     ))
 (define-char
-  '((shuowen-radical	. 229)	; 邑
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01627)	; &A-ZOB-1627;
+      ))
+    (shuowen-radical	. 229)	; 邑
     (zinbun-oracle-page . 88)
     (=zinbun-oracle	. 01848)	; &ZOB-1848;
     (<-Oracle-Bones
-     ((=ucs		  . #x555A)	; 啚
-      )
      ((=ucs		  . #x9119)	; 鄙
       ))
     ))
 (define-char
-  '((shuowen-radical	. 229)	; 邑
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01441)	; &A-ZOB-1441;
+      ))
+    (shuowen-radical	. 229)	; 邑
     (zinbun-oracle-page . 88)
     (=zinbun-oracle	. 01849)	; &ZOB-1849;
     (<-Oracle-Bones
-     ((=ucs		  . #x8C50)	; 豐
-      )
      ((=ucs		  . #x9146)	; 酆
       ))
     ))
 (define-char
-  '((shuowen-radical	. 229)	; 邑
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01395)	; &A-ZOB-1395;
+      ))
+    (shuowen-radical	. 229)	; 邑
     (zinbun-oracle-page . 88)
     (=zinbun-oracle	. 01850)	; &ZOB-1850;
     (<-Oracle-Bones
-     ((=ucs		  . #x5960)	; 奠
-      )
      ((=ucs		  . #x912D)	; 鄭
       ))
     ))
 (define-char
-  '((shuowen-radical	. 229)	; 邑
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01511)	; &A-ZOB-1511;
+      ))
+    (shuowen-radical	. 229)	; 邑
     (zinbun-oracle-page . 88)
     (=zinbun-oracle	. 01851)	; &ZOB-1851;
     (<-Oracle-Bones
-     ((=ucs		  . #x4E95)	; 井
-      )
      ((=ucs		  . #x28677)	; 𨙷
       ))
     ))
@@ -19130,22 +19973,24 @@
       ))
     ))
 (define-char
-  '((shuowen-radical	. 229)	; 邑
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00559)	; &A-ZOB-0559;
+      ))
+    (shuowen-radical	. 229)	; 邑
     (zinbun-oracle-page . 88)
     (=zinbun-oracle	. 01854)	; &ZOB-1854;
     (<-Oracle-Bones
-     ((=ucs		  . #x9014)	; 途
-      )
      ((=ucs		  . #x48C4)	; 䣄
       ))
     ))
 (define-char
-  '((shuowen-radical	. 230)	; 𨛜
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01532)	; &A-ZOB-1532;
+      ))
+    (shuowen-radical	. 230)	; 𨛜
     (zinbun-oracle-page . 88)
     (=zinbun-oracle	. 01856)	; &ZOB-1856;
     (<-Oracle-Bones
-     ((=ucs		  . #x537F)	; 卿
-      )
      ((=ucs		  . #x90F7)	; 郷
       ))
     ))
@@ -19254,14 +20099,22 @@
 (define-char
   '((shuowen-radical	. 231)	; 日
     (zinbun-oracle-page . 89)
-    (=zinbun-oracle	. 01864)	; &ZOB-1864;
+    (=>zinbun-oracle	. 01864)	; &A-ZOB-1864;
     (<-Oracle-Bones
      ((=ucs		  . #x6675)	; 晵
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01864)	; &ZOB-1864;
+     ((=>zinbun-oracle	  . 01864)	; &A-ZOB-1864;
+      ))
+    (shuowen-radical	. 231)	; 日
+    (zinbun-oracle-page . 89)
+    (=zinbun-oracle	. 01864)	; &ZOB-1864;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01864)	; &A-ZOB-1864;
       ))
     (shuowen-radical	. 231)	; 日
     (sources		zob1968=0091 zob1968=0188 zob1968=0189 zob1968=0279
@@ -19275,7 +20128,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01864)	; &ZOB-1864;
+     ((=>zinbun-oracle	  . 01864)	; &A-ZOB-1864;
       ))
     (shuowen-radical	. 231)	; 日
     (sources		zob1968=0185)
@@ -19284,7 +20137,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01864)	; &ZOB-1864;
+     ((=>zinbun-oracle	  . 01864)	; &A-ZOB-1864;
       ))
     (shuowen-radical	. 231)	; 日
     (sources		zob1968=0186)
@@ -19684,12 +20537,13 @@
       ))
     ))
 (define-char
-  '((shuowen-radical	. 238)	; 有
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00909)	; &A-ZOB-0909;
+      ))
+    (shuowen-radical	. 238)	; 有
     (zinbun-oracle-page . 92)
     (=zinbun-oracle	. 01908)	; &ZOB-1908;
     (<-Oracle-Bones
-     ((=ucs		  . #x53C8)	; 又
-      )
      ((=ucs		  . #x6709)	; 有
       ))
     ))
@@ -19704,14 +20558,22 @@
 (define-char
   '((shuowen-radical	. 239)	; 明
     (zinbun-oracle-page . 92)
-    (=zinbun-oracle	. 01910)	; &ZOB-1910;
+    (=>zinbun-oracle	. 01910)	; &A-ZOB-1910;
     (<-Oracle-Bones
      ((=ucs		  . #x660E)	; 明
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01910)	; &ZOB-1910;
+     ((=>zinbun-oracle	  . 01910)	; &A-ZOB-1910;
+      ))
+    (shuowen-radical	. 239)	; 明
+    (zinbun-oracle-page . 92)
+    (=zinbun-oracle	. 01910)	; &ZOB-1910;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01910)	; &A-ZOB-1910;
       ))
     (shuowen-radical	. 239)	; 明
     (sources		zob1968=3016)
@@ -19720,7 +20582,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01910)	; &ZOB-1910;
+     ((=>zinbun-oracle	  . 01910)	; &A-ZOB-1910;
       ))
     (shuowen-radical	. 239)	; 明
     (sources		zob1968=3113)
@@ -19761,6 +20623,17 @@
     ))
 (define-char
   '((shuowen-radical	. 241)	; 夕
+    (zinbun-oracle-page . 92)
+    (=>zinbun-oracle	. 01918)	; &A-ZOB-1918;
+    (<-Oracle-Bones
+     ((=ucs		  . #x5915)	; 夕
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01918)	; &A-ZOB-1918;
+      ))
+    (shuowen-radical	. 241)	; 夕
     (sources		zob1968=0078 zob1968=0132 zob1968=0166 zob1968=0201
 			zob1968=0213 zob1968=0229 zob1968=0241 zob1968=0242
 			zob1968=0243 zob1968=0246 zob1968=0315 zob1968=0374
@@ -19780,13 +20653,10 @@
 			zob1968=1811 zob1968=1840 zob1968=3180)
     (zinbun-oracle-page . 92)
     (=zinbun-oracle	. 01918)	; &ZOB-1918;
-    (<-Oracle-Bones
-     ((=ucs		  . #x5915)	; 夕
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01918)	; &ZOB-1918;
+     ((=>zinbun-oracle	  . 01918)	; &A-ZOB-1918;
       ))
     (shuowen-radical	. 241)	; 夕
     (sources		zob1968=0180 zob1968=0215 zob1968=0219 zob1968=0222
@@ -19813,7 +20683,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01918)	; &ZOB-1918;
+     ((=>zinbun-oracle	  . 01918)	; &A-ZOB-1918;
       ))
     (shuowen-radical	. 241)	; 夕
     (sources		zob1968=2891)
@@ -20145,14 +21015,15 @@
     (=zinbun-oracle	. 01950)	; &ZOB-1950;
     ))
 (define-char
-  '((shuowen-radical	. 246)	; 卣
+  '((<-denotational
+     ((=>zinbun-oracle	  . 00644)	; &A-ZOB-0644;
+      ))
+    (shuowen-radical	. 246)	; 卣
     (sources		zob1968=0131 zob1968=0282 zob1968=0525 zob1968=1765
 			zob1968=1857 zob1968=2091 zob1968=2998 zob1968=3014)
     (zinbun-oracle-page . 94)
     (=zinbun-oracle	. 01951)	; &ZOB-1951;
     (<-Oracle-Bones
-     ((=ucs		  . #x5EFC)	; 廼
-      )
      ((=ucs		  . #x5363)	; 卣
       ))
     ))
@@ -20487,16 +21358,24 @@
     ))
 (define-char
   '((shuowen-radical	. 253)	; 禾
-    (sources		zob1968=0304 zob1968=1988 zob1968=2362 zob1968=2367)
     (zinbun-oracle-page . 96)
-    (=zinbun-oracle	. 01996)	; &ZOB-1996;
+    (=>zinbun-oracle	. 01996)	; &A-ZOB-1996;
     (<-Oracle-Bones
      ((=ucs		  . #x79CB)	; 秋
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 01996)	; &ZOB-1996;
+     ((=>zinbun-oracle	  . 01996)	; &A-ZOB-1996;
+      ))
+    (shuowen-radical	. 253)	; 禾
+    (sources		zob1968=0304 zob1968=1988 zob1968=2362 zob1968=2367)
+    (zinbun-oracle-page . 96)
+    (=zinbun-oracle	. 01996)	; &ZOB-1996;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01996)	; &A-ZOB-1996;
       ))
     (shuowen-radical	. 253)	; 禾
     (sources		zob1968=2529)
@@ -20704,18 +21583,26 @@
     ))
 (define-char
   '((shuowen-radical	. 259)	; 臼
+    (zinbun-oracle-page . 97)
+    (=>zinbun-oracle	. 02026)	; &A-ZOB-2026;
+    (<-Oracle-Bones
+     ((=ucs		  . #x8202)	; 舂
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 02026)	; &A-ZOB-2026;
+      ))
+    (shuowen-radical	. 259)	; 臼
     (sources		zob1968=0342 zob1968=0343 zob1968=0424 zob1968=0895
 			zob1968=0931 zob1968=2146 zob1968=2265 zob1968=2519
 			zob1968=2523 zob1968=2530 zob1968=2535 zob1968=2546)
     (zinbun-oracle-page . 97)
     (=zinbun-oracle	. 02026)	; &ZOB-2026;
-    (<-Oracle-Bones
-     ((=ucs		  . #x8202)	; 舂
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 02026)	; &ZOB-2026;
+     ((=>zinbun-oracle	  . 02026)	; &A-ZOB-2026;
       ))
     (shuowen-radical	. 259)	; 臼
     (sources		zob1968=0940)
@@ -20822,12 +21709,13 @@
       ))
     ))
 (define-char
-  '((shuowen-radical	. 269)	; 宀
+  '((<-denotational
+     ((=>zinbun-oracle	  . 01418)	; &A-ZOB-1418;
+      ))
+    (shuowen-radical	. 269)	; 宀
     (zinbun-oracle-page . 98)
     (=zinbun-oracle	. 02041)	; &ZOB-2041;
     (<-Oracle-Bones
-     ((=ucs		  . #x5BE7)	; 寧
-      )
      ((=ucs		  . #x5BCD)	; 寍
       ))
     ))
@@ -20893,14 +21781,22 @@
 (define-char
   '((shuowen-radical	. 269)	; 宀
     (zinbun-oracle-page . 98)
-    (=zinbun-oracle	. 02050)	; &ZOB-2050;
+    (=>zinbun-oracle	. 02050)	; &A-ZOB-2050;
     (<-Oracle-Bones
      ((=ucs		  . #x5BA2)	; 客
       ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 02050)	; &ZOB-2050;
+     ((=>zinbun-oracle	  . 02050)	; &A-ZOB-2050;
+      ))
+    (shuowen-radical	. 269)	; 宀
+    (zinbun-oracle-page . 98)
+    (=zinbun-oracle	. 02050)	; &ZOB-2050;
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 02050)	; &A-ZOB-2050;
       ))
     (shuowen-radical	. 269)	; 宀
     (sources		zob1968=0379)
@@ -20909,7 +21805,7 @@
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 02050)	; &ZOB-2050;
+     ((=>zinbun-oracle	  . 02050)	; &A-ZOB-2050;
       ))
     (shuowen-radical	. 269)	; 宀
     (sources		zob1968=3099)
@@ -21653,18 +22549,26 @@
     ))
 (define-char
   '((shuowen-radical	. 274)	; 𤕫
+    (zinbun-oracle-page . 102)
+    (=>zinbun-oracle	. 02155)	; &A-ZOB-2155;
+    (<-Oracle-Bones
+     ((=ucs		  . #x75BE)	; 疾
+      ))
+    ))
+(define-char
+  '((<-denotational
+     ((=>zinbun-oracle	  . 02155)	; &A-ZOB-2155;
+      ))
+    (shuowen-radical	. 274)	; 𤕫
     (sources		zob1968=0438 zob1968=0439-0443 zob1968=0446
 			zob1968=0447 zob1968=0896 zob1968=1779 zob1968=3016
 			zob1968=3176 zob1968=3239)
     (zinbun-oracle-page . 102)
     (=zinbun-oracle	. 02155)	; &ZOB-2155;
-    (<-Oracle-Bones
-     ((=ucs		  . #x75BE)	; 疾
-      ))
     ))
 (define-char
   '((<-denotational
-     ((=zinbun-oracle	  . 02155)	; &ZOB-2155;
+     ((=>zinbun-oracle	  . 02155)	; &A-ZOB-2155;
       ))
     (shuowen-radical	. 274)	; 𤕫
     (sources		zob1968=1641)
@@ -22027,3 +22931,338 @@
 	))
       ))
     ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02207)	; &ZOB-2207;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=ucs		      . #x5973)	; 女
+	  )
+	 ((=ucs		      . #x5EFE)	; 廾
+	  ))
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02208)	; &ZOB-2208;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=ucs		      . #x81EA)	; 自
+	  )
+	 ((=gt-k	      . 00059)	; &GT-K00059;
+	  ))
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02209)	; &ZOB-2209;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x7F8A)	; 羊
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02210)	; &ZOB-2210;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x559C)	; 喜
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02211)	; &ZOB-2211;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x58F4)	; 壴
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02212)	; &ZOB-2212;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x9F13)	; 鼓
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02213)	; &ZOB-2213;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x826F)	; 良
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02214)	; &ZOB-2214;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x6851)	; 桑
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02215)	; &ZOB-2215;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x5BF6)	; 寶
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02216)	; &ZOB-2216;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	  (=ucs		      . #x2FF1)	; ⿱
+	  )
+	 ((=ucs		      . #x5B80)	; 宀
+	  )
+	 ((ideographic-structure
+	   ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	    (=ucs		. #x2FF0)	; â¿°
+	    )
+	   ((=ucs		. #x5973)	; 女
+	    )
+	   ((=ucs		. #x8840)	; 血
+	    ))
+	  ))
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02217)	; &ZOB-2217;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x767D)	; 白
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	  (=ucs		      . #x2FF0)	; â¿°
+	  )
+	 ((=ucs		      . #x5E7A)	; 幺
+	  )
+	 ((=ucs		      . #x5C39)	; å°¹
+	  ))
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02218)	; &ZOB-2218;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x8C55)	; 豕
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02219)	; &ZOB-2219;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x9F20)	; é¼ 
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02220)	; &ZOB-2220;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x5973)	; 女
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (sources		zob1968=0053)
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02221)	; &ZOB-2221;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x598A)	; 妊
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02222)	; &ZOB-2222;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x59B9)	; 妹
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02223)	; &ZOB-2223;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x59EA)	; 姪
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02224)	; &ZOB-2224;
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02225)	; &ZOB-2225;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x59FC)	; 姼
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02226)	; &ZOB-2226;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((ideographic-structure
+	 ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
+	  (=ucs		      . #x2FF0)	; â¿°
+	  )
+	 ((=ucs		      . #x5973)	; 女
+	  )
+	 ((ideographic-structure
+	   ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
+	    (=ucs		. #x2FF1)	; ⿱
+	    )
+	   ((=ucs		. #x6B62)	; æ­¢
+	    )
+	   ((=ucs		. #x571F)	; 土
+	    ))
+	  ))
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (sources		zob1968=0463 zob1968=0465 zob1968=0989 zob1968=0992
+			zob1968=3251)
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02227)	; &ZOB-2227;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x597D)	; 好
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02228)	; &ZOB-2228;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x59CC)	; 姌
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02229)	; &ZOB-2229;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x59C0)	; 姀
+	))
+      ))
+    ))
+(define-char
+  '((shuowen-radical	. 281)	; å·¾
+    (zinbun-oracle-page . 105)
+    (=zinbun-oracle	. 02230)	; &ZOB-2230;
+    (<-Oracle-Bones
+     ((ideographic-combination
+       ((=ucs		    . #x5E1A)	; 帚
+	)
+       ((=ucs		    . #x5A50)	; 婐
+	))
+      ))
+    ))
diff --git a/lisp/utf-2000/auto-autoloads.el b/lisp/utf-2000/auto-autoloads.el
index d2ac7f0..7a677f8 100644
--- a/lisp/utf-2000/auto-autoloads.el
+++ b/lisp/utf-2000/auto-autoloads.el
@@ -1,7 +1,10 @@
 ;;; DO NOT MODIFY THIS FILE
 (if (featurep 'utf-2000-autoloads) (error "Already loaded"))
 
-;;;### (autoloads (what-char-definition) "char-db-util" "utf-2000/char-db-util.el")
+;;;### (autoloads (what-char-definition ideographic-radical) "char-db-util" "utf-2000/char-db-util.el")
+
+(autoload 'ideographic-radical "char-db-util" "\
+Return character corresponding with Kangxi-radical number." nil nil)
 
 (autoload 'what-char-definition "char-db-util" nil t nil)
 
diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 4b557b7..b1b8cf4 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -1,7 +1,7 @@
 ;;; char-db-util.el --- Character Database utility -*- coding: utf-8-er; -*-
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009 MORIOKA Tomohiko.
+;;   2007, 2008, 2009, 2010 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -70,7 +70,9 @@
       (setq i (1+ i)))
     v))
 
+;;;###autoload
 (defun ideographic-radical (number)
+  "Return character corresponding with Kangxi-radical number."
   (aref ideographic-radicals number))
 
 (defconst shuowen-radicals
@@ -209,8 +211,10 @@
     chinese-cns11643-5
     chinese-cns11643-6
     chinese-cns11643-7
-    =jis-x0213-1-2000
-    =jis-x0213-2-2000
+    =jis-x0213-1
+    =jis-x0213-1@2000
+    =jis-x0213-1@2004
+    =jis-x0213-2
     korean-ksc5601
     chinese-isoir165
     katakana-jisx0201
@@ -220,6 +224,8 @@
     ethiopic-ucs
     =big5-cdp
     =gt
+    =>>gt
+    =>gt
     ideograph-daikanwa-2
     ideograph-daikanwa
     =cbeta
@@ -238,12 +244,25 @@
     =gt-k
     =ucs@iso
     =ucs@unicode
+    =>>jis-x0208
+    =>>jis-x0213-1
+    =>>jis-x0213-1@2000
+    =>>jis-x0213-1@2004
+    =>>jis-x0213-2
+    =>>jis-x0208@1978
+    =>jis-x0208
+    =>jis-x0208@1997
+    =>jis-x0213-1
+    =>jis-x0213-1@2000
+    =>jis-x0213-1@2004
+    =>jis-x0213-2
     =big5
     =big5-eten
-    =jis-x0208@1997
     =zinbun-oracle
+    =>zinbun-oracle
     =ruimoku-v6
-    =jef-china3))
+    =jef-china3
+    =shinjigen))
 
 (defun char-db-make-char-spec (char)
   (let (ret char-spec)
@@ -488,7 +507,8 @@
 	   "(%-18s . %04d)\t; %c")
 	  ((or (memq name '(=daikanwa
 			    =daikanwa@rev1 =daikanwa@rev2
-			    =gt <=>gt =gt-k =cbeta =zinbun-oracle))
+			    =gt =>>gt =>gt =gt-k =cbeta
+			    =zinbun-oracle =>zinbun-oracle))
 	       (string-match "^=adobe-" (symbol-name name)))
 	   "(%-18s . %05d)\t; %c")
 	  ((eq name 'mojikyo)
diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 35fd0c8..bfbfa34 100644
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -1,6 +1,7 @@
 ;;; ideograph-util.el --- Ideographic Character Database utility
 
-;; Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2007,2008 MORIOKA Tomohiko.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
+;;   2009 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Chaon model, ISO/IEC 10646, Unicode, UCS-4, MULE.
@@ -281,24 +282,31 @@
 	  (if (= (car a) (car b))
 	      (int-list< (cdr a)(cdr b))
 	    (< (car a) (car b)))
-	nil)
-    (numberp (car b))))
+	(if (= (car a) 0)
+	    nil
+	  (< (car a) 0)))
+    (if (numberp (car b))
+	(if (= (car b) 0)
+	    t
+	  (< 0 (car b)))
+      )))
 
 (defun morohashi-daikanwa< (a b)
   (if (integerp a)
       (setq a (list a)))
   (if (integerp b)
       (setq b (list b)))
-  (cond ((eq (car a) 'ho)
-	 (if (eq (car b) 'ho)
-	     (int-list< (cdr a)(cdr b))
+  (cond ((eq (car-safe a) 'ho)
+	 (if (eq (car-safe b) 'ho)
+	     (int-list< (cdr-safe a)(cdr-safe b))
 	   nil))
-	((numberp (car a))
+	((or (integerp a)
+	     (integerp (car a)))
 	 (if (eq (car b) 'ho)
 	     t
 	   (int-list< a b)))
 	(t
-	 (if (eq (car b) 'ho)
+	 (if (eq (car-safe b) 'ho)
 	     t
 	   (int-list< a b)))))
 
@@ -424,7 +432,7 @@
   (char-ideographic-strokes char radical '(daikanwa)))
 
 ;;;###autoload
-(defun char-daikanwa (char &optional radical checked)
+(defun char-daikanwa (char &optional radical checked depth)
   (unless radical
     (setq radical ideographic-radical))
   (if (or (null radical)
@@ -434,22 +442,30 @@
       (let ((ret (or (encode-char char 'ideograph-daikanwa 'defined-only)
                      (encode-char char '=daikanwa-rev2 'defined-only)
                      (get-char-attribute char 'morohashi-daikanwa))))
-        (or ret
+        (or (if ret
+		(if depth
+		    (if (integerp ret)
+			(list ret depth)
+		      (append ret (list depth)))
+		  ret))
 	    (and (setq ret (get-char-attribute char '=>daikanwa))
 		 (if (numberp ret)
 		     (list ret 0 8)
 		   (append ret '(8))))
 	    (unless (memq char checked)
+	      (unless depth
+		(setq depth 0))
 	      (catch 'tag
 		(let ((rest
 		       (append (get-char-attribute char '->subsumptive)
 			       (get-char-attribute char '->denotational)))
 		      (i 0)
-		      sc)
+		      sc lnum)
 		  (setq checked (cons char checked))
 		  (while rest
 		    (setq sc (car rest))
-		    (if (setq ret (char-daikanwa sc radical checked))
+		    (if (setq ret (char-daikanwa sc radical checked
+						 (1- depth)))
 			(throw 'tag ret))
 		    (setq checked (cons sc checked)
 			  rest (cdr rest)
@@ -457,7 +473,7 @@
 		  (setq rest (get-char-attribute char '->identical))
 		  (while rest
 		    (setq sc (car rest))
-		    (when (setq ret (char-daikanwa sc radical checked))
+		    (when (setq ret (char-daikanwa sc radical checked depth))
 		      (throw 'tag
 			     (if (numberp ret)
 				 (list ret 0)
@@ -469,11 +485,14 @@
 				(get-char-attribute char '<-denotational)))
 		  (while rest
 		    (setq sc (car rest))
-		    (when (setq ret (char-daikanwa sc radical checked))
+		    (when (setq ret (char-daikanwa sc radical checked depth))
 		      (throw 'tag
 			     (if (numberp ret)
 				 (list ret 0 i)
-			       (append ret (list i)))))
+			       (if (>= (setq lnum (car (last ret))) 0)
+				   (append ret (list i))
+				 (nconc (butlast ret)
+					(list 0 (- lnum) i))))))
 		    (setq checked (cons sc checked)
 			  rest (cdr rest))))))))))
 
diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index 23c0be4..85b4e43 100644
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -62,7 +62,10 @@
 ;;                      #x3F5D #x6E49 #x4D6F #x3C72 #x3D37
 ;;                      #x6E4C #x3B44 #x734E #x5567 #x545A
 ;;                      #x3071 #x332A #x516A #x476D #x3675
-;;                      #x5734))
+;;                      #x5734 #x552D #x565A #x564B #x5B79
+;;                      #x5C74 #x5C27 #x5B5E #x3564 #x3823
+;;                      #x6131 #x4A4D #x632E #x635E #x3729
+;;                      #x3951 #x6967 #x704B))
 ;;      (put-char-attribute (decode-char 'japanese-jisx0208-1990 v)
 ;;                          '=gt-pj-1 v))
 ;;    nil)
@@ -162,10 +165,42 @@
 ;;        nil)
 ;;      feature)))
 
-(dolist (ccs '(=jis-x0208 =jis-x0208@1990))
-  (map-char-attribute
-   (lambda (c v)
-     (unless (eq (encode-char c '=jis-x0213-1@2000) v)
-       (put-char-attribute c '=jis-x0213-1 v))
-     nil)
-   ccs))
+;; (dolist (ccs '(=jis-x0208 =jis-x0208@1990))
+;;   (map-char-attribute
+;;    (lambda (c v)
+;;      (unless (eq (encode-char c '=jis-x0213-1@2000) v)
+;;        (put-char-attribute c '=jis-x0213-1 v))
+;;      nil)
+;;    ccs))
+
+;; (with-temp-buffer
+;;   (buffer-disable-undo)
+;;   (insert-file-contents "../etc/char-data/JX3-JX1-rep-diff.txt")
+;;   (goto-char (point-min))
+;;   (let (ku ten char code ucs)
+;;     (while (re-search-forward "^1-\\([0-9]+\\)-\\([0-9]+\\)[ \t]+" nil t)
+;;       (setq ku (string-to-number (match-string 1))
+;;             ten (string-to-number (match-string 2)))
+;;       (setq char (make-char '=jis-x0213-1@2000 (+ ku 32)(+ ten 32)))
+;;       (setq code (encode-char char '=jis-x0213-1@2000))
+;;       (put-char-attribute char '=jis-x0213-1@2000 code)
+;;       (remove-char-attribute char '=jis-x0213-1)
+;;       (remove-char-attribute char '=jis-x0213-1@2004)
+;;       (setq ucs (encode-char char '=ucs@jis/2000))
+;;       (remove-char-attribute char '=ucs@jis)
+;;       (remove-char-attribute char '=ucs@jis/2004)
+;;       (when (setq char (decode-char '=jis-x0213-1@2004 code))
+;;         (unless (eq (encode-char char '=ucs@jis/2004) ucs)
+;;           (put-char-attribute char '=ucs@jis/2004 ucs)))
+;;       (unless (eq code #x332A)
+;;         (when (setq char (decode-char '=>jis-x0208@1997 code 'defined-only))
+;;           (put-char-attribute char '=>jis-x0208 code)
+;;           (remove-char-attribute char '=>jis-x0208@1997)))
+;;       )))
+
+;; (map-char-attribute
+;;  (lambda (c v)
+;;    (unless (eq (encode-char c '=>jis-x0213-1) v)
+;;      (put-char-attribute c '=>jis-x0213-1 v))
+;;    nil)
+;;  '=>jis-x0208)
diff --git a/src/ChangeLog b/src/ChangeLog
index 18a5a04..14a9712 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2010-03-29  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* chartab.c (save_uint8_byte_table): Fixed problem when a property
+	is unloaded.
+	(save_uint16_byte_table): Likewise.
+
+2010-02-21  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* chartab.c (Fchar_feature_property): New function when LIBCHISE
+	is enabled.
+	(Fput_char_feature_property): Likewise.
+	(syms_of_chartab): Add new builtin functions
+	`char-feature-property' and `put-char-feature-property' when
+	LIBCHISE is enabled.
+
 2009-04-04  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* mule-charset.c (Fmake_charset): Add DOC-string of 'iso-ir and
diff --git a/src/chartab.c b/src/chartab.c
index 4b70f46..0b3c130 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -4,7 +4,8 @@
    Copyright (C) 1995, 1996 Ben Wing.
    Copyright (C) 1995, 1997, 1999 Electrotechnical Laboratory, JAPAN.
    Licensed to the Free Software Foundation.
-   Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2008 MORIOKA Tomohiko
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008,
+     2010 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -354,7 +355,7 @@ save_uint8_byte_table (Lisp_Uint8_Byte_Table *ct, Lisp_Char_Table* root,
     {
       if (ct->property[i] == BT_UINT8_unloaded)
 	{
-	  c1 = c + unit;
+	  c += unit;
 	}
       else if (ct->property[i] != BT_UINT8_unbound)
 	{
@@ -678,7 +679,7 @@ save_uint16_byte_table (Lisp_Uint16_Byte_Table *ct, Lisp_Char_Table* root,
     {
       if (ct->property[i] == BT_UINT16_unloaded)
 	{
-	  c1 = c + unit;
+	  c += unit;
 	}
       else if (ct->property[i] != BT_UINT16_unbound)
 	{
@@ -4362,6 +4363,62 @@ Retrieve the character of the given ATTRIBUTES.
 
 
 /************************************************************************/
+/*                      Character Feature Property                      */
+/************************************************************************/
+
+#ifdef HAVE_LIBCHISE
+DEFUN ("char-feature-property", Fchar_feature_property, 2, 3, 0, /*
+Return the value of FEATURE's PROPERTY.
+Return DEFAULT-VALUE if the value is not exist.
+*/
+       (feature, property, default_value))
+{
+  unsigned char* feature_name;
+  unsigned char* property_name;
+  CHISE_Value value;
+  int status;
+
+  feature_name = XSTRING_DATA (Fsymbol_name (feature));
+  property_name = XSTRING_DATA (Fsymbol_name (property));
+  status
+    = chise_feature_load_property_value (chise_ds_get_feature
+					 (default_chise_data_source,
+					  feature_name),
+					 chise_ds_get_property
+					 (default_chise_data_source,
+					  property_name),
+					 &value);
+  if (!status)
+    return read_from_c_string (chise_value_data (&value),
+			       chise_value_size (&value) );
+  else
+    return default_value;
+}
+
+DEFUN ("put-char-feature-property", Fput_char_feature_property, 3, 3, 0, /*
+Store FEATURE's PROPERTY with VALUE.
+*/
+       (feature, property, value))
+{
+  unsigned char* feature_name;
+  unsigned char* property_name;
+  CHISE_Property prop;
+
+  feature_name = XSTRING_DATA (Fsymbol_name (feature));
+  property_name = XSTRING_DATA (Fsymbol_name (property));
+  prop = chise_ds_get_property (default_chise_data_source,
+				property_name);
+  chise_feature_set_property_value
+    (chise_ds_get_feature (default_chise_data_source, feature_name),
+     prop, XSTRING_DATA (Fprin1_to_string
+			 (value, Qnil)));
+  chise_property_sync (prop);
+  return Qnil;
+}
+#endif
+
+
+/************************************************************************/
 /*                         Char table read syntax                       */
 /************************************************************************/
 
@@ -4772,6 +4829,10 @@ syms_of_chartab (void)
   DEFSUBR (Fchar_variants);
 
   DEFSUBR (Fget_composite_char);
+#ifdef HAVE_LIBCHISE
+  DEFSUBR (Fchar_feature_property);
+  DEFSUBR (Fput_char_feature_property);
+#endif /* HAVE_LIBCHISE */
 #endif
 
   INIT_LRECORD_IMPLEMENTATION (char_table);